feat: Elys Integration

app/app.go

@@ -423,13 +423,10 @@ func New(
 
 	app.OracleKeeper = oraclekeeper.NewKeeper(
 		appCodec,
-		keys[oracletypes.ModuleName],
-		app.GetSubspace(oracletypes.ModuleName),
+		runtime.NewKVStoreService(app.keys[oracletypes.StoreKey]),
 		app.AccountKeeper,
 		app.BankKeeper,
-		app.DistrKeeper,
 		app.StakingKeeper,
-		app.GasEstimateKeeper,
 		distrtypes.ModuleName,
 		cast.ToBool(appOpts.Get("telemetry.enabled")),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),

app/preblocker.go

@@ -8,8 +8,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ojo-network/ojo/x/oracle/abci"
 	"github.com/ojo-network/ojo/x/oracle/types"
-
-	gasestimatetypes "github.com/ojo-network/ojo/x/gasestimate/types"
 )
 
 // PreBlocker is run before finalize block to update the aggregrate exchange rate votes on the oracle module
@@ -58,15 +56,8 @@ func (app *App) PreBlocker(ctx sdk.Context, req *cometabci.RequestFinalizeBlock)
 				app.Logger().Error("failed to get voter address", "err", err)
 				continue
 			}
-			app.OracleKeeper.SetAggregateExchangeRateVote(ctx, valAddr, exchangeRateVote)
-		}
-		for _, gasEstimate := range injectedVoteExtTx.GasEstimateMedians {
-			app.GasEstimateKeeper.SetGasEstimate(ctx, gasestimatetypes.GasEstimate{
-				Network:     gasEstimate.Network,
-				GasEstimate: gasEstimate.GasEstimation,
-			})
+			app.OracleKeeper.SetAggregateExchangeRateVote(ctx, valAddr.String(), exchangeRateVote)
 		}
-		app.Logger().Info("gas estimates updated", "gasestimates", injectedVoteExtTx.GasEstimateMedians)
 	}
 
 	app.Logger().Info(

app/upgrades.go

@@ -36,7 +36,7 @@ func (app App) RegisterUpgradeHandlers() {
 		panic(err)
 	}
 
-	app.registerUpgrade0_1_4(upgradeInfo)
+	// app.registerUpgrade0_1_4(upgradeInfo)
 	app.registerUpgrade0_2_0(upgradeInfo)
 	app.registerUpgrade0_2_1(upgradeInfo)
 	app.registerUpgrade0_2_2(upgradeInfo)
@@ -52,22 +52,22 @@ func (app App) RegisterUpgradeHandlers() {
 	app.registerUpgrade0_5_1(upgradeInfo)
 }
 
-// performs upgrade from v0.1.3 to v0.1.4
-func (app *App) registerUpgrade0_1_4(_ upgradetypes.Plan) {
-	const planName = "v0.1.4"
-	app.UpgradeKeeper.SetUpgradeHandler(planName,
-		func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-			sdkCtx := sdk.UnwrapSDKContext(ctx)
-			sdkCtx.Logger().Info("Upgrade handler execution", "name", planName)
-			upgrader := oraclekeeper.NewMigrator(&app.OracleKeeper)
-			err := upgrader.MigrateValidatorSet(sdkCtx)
-			if err != nil {
-				panic(err)
-			}
-			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
-		},
-	)
-}
+// // performs upgrade from v0.1.3 to v0.1.4
+// func (app *App) registerUpgrade0_1_4(_ upgradetypes.Plan) {
+// 	const planName = "v0.1.4"
+// 	app.UpgradeKeeper.SetUpgradeHandler(planName,
+// 		func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+// 			sdkCtx := sdk.UnwrapSDKContext(ctx)
+// 			sdkCtx.Logger().Info("Upgrade handler execution", "name", planName)
+// 			upgrader := oraclekeeper.NewMigrator(&app.OracleKeeper)
+// 			err := upgrader.MigrateValidatorSet(sdkCtx)
+// 			if err != nil {
+// 				panic(err)
+// 			}
+// 			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
+// 		},
+// 	)
+// }
 
 //nolint: all
 func (app *App) registerUpgrade0_2_0(upgradeInfo upgradetypes.Plan) {

cmd/ojod/cmd/commands.go

@@ -69,8 +69,8 @@ func initAppConfig() (string, interface{}) {
 			QueryGasLimit: 300000,
 		},
 		PriceFeeder: pricefeeder.AppConfig{
-			ConfigPath: "",
-			LogLevel:   "info",
+			LogLevel: "info",
+			Enable:   true,
 		},
 	}
 
@@ -126,9 +126,8 @@ func initRootCmd(
 	)
 
 	// add price feeder flags
-	rootCmd.PersistentFlags().String(pricefeeder.FlagConfigPath, "", "Path to price feeder config file")
-	rootCmd.PersistentFlags().String(pricefeeder.FlagLogLevel, "", "Log level of price feeder process")
-	rootCmd.PersistentFlags().Bool(pricefeeder.FlagEnablePriceFeeder, false, "Enable the price feeder")
+	rootCmd.PersistentFlags().String(pricefeeder.FlagLogLevel, "info", "Log level of price feeder process")
+	rootCmd.PersistentFlags().Bool(pricefeeder.FlagEnablePriceFeeder, true, "Enable the price feeder")
 }
 
 // genesisCommand builds genesis-related `simd genesis` command. Users may

cmd/ojod/cmd/root.go

@@ -8,7 +8,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
 	"github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/cosmos/cosmos-sdk/server"
 	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -85,7 +84,6 @@ up-to-date and accurate data.`,
 	// add keyring to autocli opts
 	autoCliOpts := tempApp.AutoCliOpts()
 	initClientCtx, _ = config.ReadFromClientConfig(initClientCtx)
-	autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring)
 	autoCliOpts.ClientCtx = initClientCtx
 
 	if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil {