diff --git a/chain/app/db_app.go b/chain/app/db_app.go index 557e6d375f..4e89b72091 100644 --- a/chain/app/db_app.go +++ b/chain/app/db_app.go @@ -31,7 +31,7 @@ func NewDBBandApp( app := NewBandApp(logger, db, traceStore, loadLatest, invCheckPeriod, baseAppOptions...) dbBand.StakingKeeper = app.StakingKeeper - dbBand.ZoracleKeeper = app.ZoracleKeeper + // dbBand.ZoracleKeeper = app.ZoracleKeeper return &dbBandApp{bandApp: app, dbBand: dbBand} } diff --git a/chain/app/genesis.go b/chain/app/genesis.go index 960caf9953..7e414d4f1c 100644 --- a/chain/app/genesis.go +++ b/chain/app/genesis.go @@ -2,7 +2,6 @@ package app import ( "encoding/json" - "io/ioutil" "time" sdk "github.com/cosmos/cosmos-sdk/types" @@ -17,8 +16,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/staking" "github.com/cosmos/cosmos-sdk/x/supply" - - "github.com/bandprotocol/bandchain/chain/x/zoracle" + // "github.com/bandprotocol/bandchain/chain/x/zoracle" ) // GenesisState defines a type alias for the Gaia genesis application state. @@ -114,82 +112,82 @@ func NewDefaultGenesisState() GenesisState { supply.ModuleName: supply.ModuleCdc.MustMarshalJSON(supply.GenesisState{ Supply: sdk.NewCoins(), }), - zoracle.ModuleName: zoracle.ModuleCdc.MustMarshalJSON(zoracle.DefaultGenesisState()), + // zoracle.ModuleName: zoracle.ModuleCdc.MustMarshalJSON(zoracle.DefaultGenesisState()), genutil.ModuleName: genutil.ModuleCdc.MustMarshalJSON(genutil.GenesisState{ GenTxs: []json.RawMessage{}, }), } } -func GetDefaultDataSourcesAndOracleScripts(owner sdk.AccAddress) json.RawMessage { - state := zoracle.DefaultGenesisState() - dataSources := []struct { - name string - description string - path string - }{ - { - "Coingecko script", - "The Script that queries crypto price from https://coingecko.com", - "./datasources/coingecko_price.sh", - }, - { - "Crypto compare script", - "The Script that queries crypto price from https://cryptocompare.com", - "./datasources/crypto_compare_price.sh", - }, - { - "Binance price", - "The Script that queries crypto price from https://www.binance.com/en", - "./datasources/binance_price.sh", - }, - { - "Open weather", - "The script that queries current weather", - "./datasources/open_weather_map.sh", - }, - } +// func GetDefaultDataSourcesAndOracleScripts(owner sdk.AccAddress) json.RawMessage { +// state := zoracle.DefaultGenesisState() +// dataSources := []struct { +// name string +// description string +// path string +// }{ +// { +// "Coingecko script", +// "The Script that queries crypto price from https://coingecko.com", +// "./datasources/coingecko_price.sh", +// }, +// { +// "Crypto compare script", +// "The Script that queries crypto price from https://cryptocompare.com", +// "./datasources/crypto_compare_price.sh", +// }, +// { +// "Binance price", +// "The Script that queries crypto price from https://www.binance.com/en", +// "./datasources/binance_price.sh", +// }, +// { +// "Open weather", +// "The script that queries current weather", +// "./datasources/open_weather_map.sh", +// }, +// } - // TODO: Find a better way to specify path to data sources - state.DataSources = make([]zoracle.DataSource, len(dataSources)) - for i, dataSource := range dataSources { - script, err := ioutil.ReadFile(dataSource.path) - if err != nil { - panic(err) - } - state.DataSources[i] = zoracle.NewDataSource( - owner, - dataSource.name, - dataSource.description, - sdk.Coins{}, - script, - ) - } +// // TODO: Find a better way to specify path to data sources +// state.DataSources = make([]zoracle.DataSource, len(dataSources)) +// for i, dataSource := range dataSources { +// script, err := ioutil.ReadFile(dataSource.path) +// if err != nil { +// panic(err) +// } +// state.DataSources[i] = zoracle.NewDataSource( +// owner, +// dataSource.name, +// dataSource.description, +// sdk.Coins{}, +// script, +// ) +// } - // TODO: Find a better way to specify path to oracle scripts - oracleScripts := []struct { - name string - description string - path string - }{ - { - "Crypto price script", - "Oracle script for getting an average crypto price from many sources.", - "./owasm/res/crypto_price.wasm", - }, - } - state.OracleScripts = make([]zoracle.OracleScript, len(oracleScripts)) - for i, oracleScript := range oracleScripts { - code, err := ioutil.ReadFile(oracleScript.path) - if err != nil { - panic(err) - } - state.OracleScripts[i] = zoracle.NewOracleScript( - owner, - oracleScript.name, - oracleScript.description, - code, - ) - } - return zoracle.ModuleCdc.MustMarshalJSON(state) -} +// // TODO: Find a better way to specify path to oracle scripts +// oracleScripts := []struct { +// name string +// description string +// path string +// }{ +// { +// "Crypto price script", +// "Oracle script for getting an average crypto price from many sources.", +// "./owasm/res/crypto_price.wasm", +// }, +// } +// state.OracleScripts = make([]zoracle.OracleScript, len(oracleScripts)) +// for i, oracleScript := range oracleScripts { +// code, err := ioutil.ReadFile(oracleScript.path) +// if err != nil { +// panic(err) +// } +// state.OracleScripts[i] = zoracle.NewOracleScript( +// owner, +// oracleScript.name, +// oracleScript.description, +// code, +// ) +// } +// return zoracle.ModuleCdc.MustMarshalJSON(state) +// } diff --git a/chain/cmd/bandcli/main.go b/chain/cmd/bandcli/main.go index 88aec8015e..104d1cfc87 100644 --- a/chain/cmd/bandcli/main.go +++ b/chain/cmd/bandcli/main.go @@ -6,7 +6,7 @@ import ( "path" "github.com/bandprotocol/bandchain/chain/app" - bandclient "github.com/bandprotocol/bandchain/chain/client" + // bandclient "github.com/bandprotocol/bandchain/chain/client" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/keys" @@ -68,7 +68,7 @@ func main() { } func registerRoutes(rs *lcd.RestServer) { - bandclient.RegisterRoutes(rs.CliCtx, rs.Mux) + // bandclient.RegisterRoutes(rs.CliCtx, rs.Mux) client.RegisterRoutes(rs.CliCtx, rs.Mux) authrest.RegisterTxRoutes(rs.CliCtx, rs.Mux) app.ModuleBasics.RegisterRESTRoutes(rs.CliCtx, rs.Mux) diff --git a/chain/cmd/bandd/init.go b/chain/cmd/bandd/init.go index e253c6940a..35aca7cea8 100644 --- a/chain/cmd/bandd/init.go +++ b/chain/cmd/bandd/init.go @@ -20,14 +20,13 @@ import ( "github.com/tendermint/tendermint/libs/common" "github.com/tendermint/tendermint/privval" "github.com/tendermint/tendermint/types" - - "github.com/bandprotocol/bandchain/chain/x/zoracle" + // "github.com/bandprotocol/bandchain/chain/x/zoracle" ) const ( flagOverwrite = "overwrite" flagClientHome = "home-client" - flagZoracle = "zoracle" + // flagZoracle = "zoracle" ) type printInfo struct { @@ -100,7 +99,7 @@ func InitCmd( ctx *server.Context, cdc *codec.Codec, customAppState map[string]json.RawMessage, - getDefaultDataSourcesAndOracleScripts func(sdk.AccAddress) json.RawMessage, + // getDefaultDataSourcesAndOracleScripts func(sdk.AccAddress) json.RawMessage, defaultNodeHome string, ) *cobra.Command { cmd := &cobra.Command{ @@ -135,13 +134,13 @@ func InitCmd( if !viper.GetBool(flagOverwrite) && common.FileExists(genFile) { return fmt.Errorf("genesis.json file already exists: %v", genFile) } - if viper.IsSet(flagZoracle) { - owner, err := sdk.AccAddressFromBech32(viper.GetString(flagZoracle)) - if err != nil { - return err - } - customAppState[zoracle.ModuleName] = getDefaultDataSourcesAndOracleScripts(owner) - } + // if viper.IsSet(flagZoracle) { + // owner, err := sdk.AccAddressFromBech32(viper.GetString(flagZoracle)) + // if err != nil { + // return err + // } + // customAppState[zoracle.ModuleName] = getDefaultDataSourcesAndOracleScripts(owner) + // } appState, err := codec.MarshalJSONIndent(cdc, customAppState) if err != nil { return err @@ -187,7 +186,7 @@ func InitCmd( cmd.Flags().String(cli.HomeFlag, defaultNodeHome, "node's home directory") cmd.Flags().BoolP(flagOverwrite, "o", false, "overwrite the genesis.json file") cmd.Flags().String(client.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") - cmd.Flags().String(flagZoracle, "band15d4apf20449ajvwycq8ruaypt7v6d345n9fpt9", "owner of these data sources and oracle scripts") + // cmd.Flags().String(flagZoracle, "band15d4apf20449ajvwycq8ruaypt7v6d345n9fpt9", "owner of these data sources and oracle scripts") return cmd } diff --git a/chain/cmd/bandd/main.go b/chain/cmd/bandd/main.go index 8a0d0e5afe..881e6a47b0 100644 --- a/chain/cmd/bandd/main.go +++ b/chain/cmd/bandd/main.go @@ -54,7 +54,7 @@ func main() { } // CLI commands to initialize the chain rootCmd.AddCommand( - InitCmd(ctx, cdc, app.NewDefaultGenesisState(), app.GetDefaultDataSourcesAndOracleScripts, app.DefaultNodeHome), + InitCmd(ctx, cdc, app.NewDefaultGenesisState() /* app.GetDefaultDataSourcesAndOracleScripts, */, app.DefaultNodeHome), genutilcli.CollectGenTxsCmd(ctx, cdc, genaccounts.AppModuleBasic{}, app.DefaultNodeHome), genutilcli.MigrateGenesisCmd(ctx, cdc), genutilcli.GenTxCmd( diff --git a/chain/db/db.go b/chain/db/db.go index 8b04d2acd4..e189213c92 100644 --- a/chain/db/db.go +++ b/chain/db/db.go @@ -26,7 +26,7 @@ type BandDB struct { ctx sdk.Context StakingKeeper staking.Keeper - ZoracleKeeper zoracle.Keeper + // ZoracleKeeper zoracle.Keeper } func NewDB(dialect, path string, metadata map[string]string) (*BandDB, error) { diff --git a/chain/db/reports.go b/chain/db/reports.go index 1613c37ea4..610ebd7f83 100644 --- a/chain/db/reports.go +++ b/chain/db/reports.go @@ -21,26 +21,26 @@ func (b *BandDB) handleMsgReportData( return err } - for _, data := range msg.DataSet { - rawDataRequest, errSdk := b.ZoracleKeeper.GetRawDataRequest( - b.ctx, msg.RequestID, data.ExternalDataID, - ) - if errSdk != nil { - return errSdk - } - err := b.tx.Create(&ReportDetail{ - RequestID: int64(msg.RequestID), - Validator: msg.Validator.String(), - ExternalID: int64(data.ExternalDataID), - DataSourceID: int64(rawDataRequest.DataSourceID), - Data: data.Data, - Exitcode: data.ExitCode, - }).Error + // for _, data := range msg.DataSet { + // rawDataRequest, errSdk := b.ZoracleKeeper.GetRawDataRequest( + // b.ctx, msg.RequestID, data.ExternalDataID, + // ) + // if errSdk != nil { + // return errSdk + // } + // err := b.tx.Create(&ReportDetail{ + // RequestID: int64(msg.RequestID), + // Validator: msg.Validator.String(), + // ExternalID: int64(data.ExternalDataID), + // DataSourceID: int64(rawDataRequest.DataSourceID), + // Data: data.Data, + // Exitcode: data.ExitCode, + // }).Error - if err != nil { - return err - } - } + // if err != nil { + // return err + // } + // } return nil } diff --git a/chain/db/request.go b/chain/db/request.go index c256422d44..127e65eca3 100644 --- a/chain/db/request.go +++ b/chain/db/request.go @@ -136,32 +136,32 @@ func (b *BandDB) handleMsgRequestData( return err } - req, err := b.ZoracleKeeper.GetRequest(b.ctx, zoracle.RequestID(id)) - if err != nil { - return err - } - - for _, validatorAddress := range req.RequestedValidators { - requestedValidator := createRequestedValidator(id, validatorAddress.String()) - err = b.tx.Save(&requestedValidator).Error - if err != nil { - return err - } - } - - for _, raw := range b.ZoracleKeeper.GetRawDataRequestWithExternalIDs(b.ctx, zoracle.RequestID(id)) { - rawDataRequests := createRawDataRequests(id, int64(raw.ExternalID), int64(raw.RawDataRequest.DataSourceID), raw.RawDataRequest.Calldata) - err = b.tx.Save(&rawDataRequests).Error - if err != nil { - return err - } - - b.tx.FirstOrCreate(&RelatedDataSources{ - DataSourceID: int64(raw.RawDataRequest.DataSourceID), - OracleScriptID: int64(msg.OracleScriptID), - }) - - } + // req, err := b.ZoracleKeeper.GetRequest(b.ctx, zoracle.RequestID(id)) + // if err != nil { + // return err + // } + + // for _, validatorAddress := range req.RequestedValidators { + // requestedValidator := createRequestedValidator(id, validatorAddress.String()) + // err = b.tx.Save(&requestedValidator).Error + // if err != nil { + // return err + // } + // } + + // for _, raw := range b.ZoracleKeeper.GetRawDataRequestWithExternalIDs(b.ctx, zoracle.RequestID(id)) { + // rawDataRequests := createRawDataRequests(id, int64(raw.ExternalID), int64(raw.RawDataRequest.DataSourceID), raw.RawDataRequest.Calldata) + // err = b.tx.Save(&rawDataRequests).Error + // if err != nil { + // return err + // } + + // b.tx.FirstOrCreate(&RelatedDataSources{ + // DataSourceID: int64(raw.RawDataRequest.DataSourceID), + // OracleScriptID: int64(msg.OracleScriptID), + // }) + + // } return nil }