feat: relay to EVM via ABCI

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         if: env.GIT_DIFF
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-version: '1.23'
           cache: true
         env:
           GOOS: ${{ matrix.targetos }}

.github/workflows/code-ql.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3

.github/workflows/debug.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
 
       - uses: actions/checkout@v4

.github/workflows/lint.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
 
       - name: Set Env

.github/workflows/simulations.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
 
       - name: Install runsim
         run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
       - name: Test application non-determinism
         if: env.GIT_DIFF
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF
@@ -113,7 +113,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
       - uses: actions/cache@v4
         if: env.GIT_DIFF

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
       - name: Display Go Version
         run: go version
       - uses: actions/cache@v4
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
       - name: Test and Create Coverage Report
         if: env.GIT_DIFF
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/setup-go@v5
         if: env.GIT_DIFF
         with:
-          go-version: '1.22.1'
+          go-go-version: '1.23'
           cache: true
 
       - name: Test E2E

app/app.go

@@ -117,6 +117,10 @@ import (
 	gmpkeeper "github.com/ojo-network/ojo/x/gmp/keeper"
 	gmptypes "github.com/ojo-network/ojo/x/gmp/types"
 
+	"github.com/ojo-network/ojo/x/gasestimate"
+	gasestimatekeeper "github.com/ojo-network/ojo/x/gasestimate/keeper"
+	gasestimatetypes "github.com/ojo-network/ojo/x/gasestimate/types"
+
 	"github.com/ojo-network/ojo/x/airdrop"
 	airdropkeeper "github.com/ojo-network/ojo/x/airdrop/keeper"
 	airdroptypes "github.com/ojo-network/ojo/x/airdrop/types"
@@ -145,6 +149,7 @@ var (
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 		oracletypes.ModuleName:         {authtypes.Minter},
 		gmptypes.ModuleName:            {authtypes.Minter},
+		gasestimatetypes.ModuleName:    {authtypes.Burner},
 		airdroptypes.ModuleName:        {authtypes.Minter},
 	}
 )
@@ -201,6 +206,7 @@ type App struct {
 	GroupKeeper           groupkeeper.Keeper
 	OracleKeeper          oraclekeeper.Keeper
 	GmpKeeper             gmpkeeper.Keeper
+	GasEstimateKeeper     gasestimatekeeper.Keeper
 	AirdropKeeper         airdropkeeper.Keeper
 	ConsensusParamsKeeper consensusparamkeeper.Keeper
 
@@ -264,7 +270,7 @@ func New(
 		govtypes.StoreKey, paramstypes.StoreKey, ibcexported.StoreKey, upgradetypes.StoreKey,
 		feegrant.StoreKey, evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey,
 		consensusparamtypes.StoreKey, group.StoreKey, oracletypes.StoreKey, gmptypes.StoreKey,
-		airdroptypes.StoreKey,
+		gasestimatetypes.ModuleName, airdroptypes.StoreKey,
 	)
 	tkeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey)
 	memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
@@ -409,6 +415,12 @@ func New(
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
+	app.GasEstimateKeeper = gasestimatekeeper.NewKeeper(
+		appCodec,
+		keys[gasestimatetypes.ModuleName],
+		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	app.OracleKeeper = oraclekeeper.NewKeeper(
 		appCodec,
 		keys[oracletypes.ModuleName],
@@ -417,6 +429,7 @@ func New(
 		app.BankKeeper,
 		app.DistrKeeper,
 		app.StakingKeeper,
+		app.GasEstimateKeeper,
 		distrtypes.ModuleName,
 		cast.ToBool(appOpts.Get("telemetry.enabled")),
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
@@ -428,6 +441,8 @@ func New(
 		app.OracleKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		app.TransferKeeper,
+		app.BankKeeper,
+		app.GasEstimateKeeper,
 	)
 
 	app.AirdropKeeper = airdropkeeper.NewKeeper(
@@ -580,6 +595,7 @@ func New(
 		ibctm.NewAppModule(),
 		oracle.NewAppModule(appCodec, app.OracleKeeper, app.AccountKeeper, app.BankKeeper),
 		gmp.NewAppModule(appCodec, app.GmpKeeper, app.OracleKeeper),
+		gasestimate.NewAppModule(appCodec, app.GasEstimateKeeper),
 		airdrop.NewAppModule(appCodec, app.AirdropKeeper, app.AccountKeeper, app.BankKeeper),
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
 	)
@@ -631,6 +647,7 @@ func New(
 		vestingtypes.ModuleName,
 		oracletypes.ModuleName,
 		gmptypes.ModuleName,
+		gasestimatetypes.ModuleName,
 		airdroptypes.ModuleName,
 		consensusparamtypes.ModuleName,
 	)
@@ -657,6 +674,7 @@ func New(
 		vestingtypes.ModuleName,
 		oracletypes.ModuleName,
 		gmptypes.ModuleName,
+		gasestimatetypes.ModuleName,
 		airdroptypes.ModuleName,
 		consensusparamtypes.ModuleName,
 	)
@@ -672,7 +690,8 @@ func New(
 		minttypes.ModuleName, crisistypes.ModuleName, genutiltypes.ModuleName, ibctransfertypes.ModuleName,
 		ibcexported.ModuleName, evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName,
 		group.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName,
-		oracletypes.ModuleName, gmptypes.ModuleName, airdroptypes.ModuleName, consensusparamtypes.ModuleName,
+		oracletypes.ModuleName, gmptypes.ModuleName, gasestimatetypes.ModuleName,
+		airdroptypes.ModuleName, consensusparamtypes.ModuleName,
 	}
 	app.mm.SetOrderInitGenesis(genesisModuleOrder...)
 	app.mm.SetOrderExportGenesis(genesisModuleOrder...)
@@ -991,6 +1010,7 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(govtypes.ModuleName)
 	paramsKeeper.Subspace(crisistypes.ModuleName)
 	paramsKeeper.Subspace(oracletypes.ModuleName)
+	paramsKeeper.Subspace(gasestimatetypes.ModuleName)
 
 	// register the key tables for legacy param subspaces
 	keyTable := ibcclienttypes.ParamKeyTable()

app/preblocker.go

@@ -8,6 +8,8 @@
 	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
@@ -45,26 +47,33 @@
 	}
 	voteExtensionsEnabled := abci.VoteExtensionsEnabled(ctx)
 	if voteExtensionsEnabled {
-		var injectedVoteExtTx types.InjectedVoteExtensionTx
-		if err := injectedVoteExtTx.Unmarshal(req.Txs[0]); err != nil {
-			app.Logger().Error("failed to decode injected vote extension tx", "err", err)
-			return nil, err
-		}
-
-		// set oracle exchange rate votes using the passed in context, which will make
-		// these votes available in the current block.
-		for _, exchangeRateVote := range injectedVoteExtTx.ExchangeRateVotes {
-			valAddr, err := sdk.ValAddressFromBech32(exchangeRateVote.Voter)
-			if err != nil {
-				app.Logger().Error("failed to get voter address", "err", err)
-				continue
+		for _, tx := range req.Txs {
+			var injectedVoteExtTx types.InjectedVoteExtensionTx
+			if err := injectedVoteExtTx.Unmarshal(tx); err != nil {
+				app.Logger().Error("failed to decode injected vote extension tx", "err", err)
+				return nil, err
+			} else {
+				for _, exchangeRateVote := range injectedVoteExtTx.ExchangeRateVotes {
+					valAddr, err := sdk.ValAddressFromBech32(exchangeRateVote.Voter)
+					if err != nil {
+						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.Logger().Info("gas estimates updated", "gasestimates", injectedVoteExtTx.GasEstimateMedians)
 			}
-			app.OracleKeeper.SetAggregateExchangeRateVote(ctx, valAddr, exchangeRateVote)
 		}
 	}
 
 	app.Logger().Info(
-		"oracle preblocker executed",
+		"preblocker executed",
 		"vote_extensions_enabled", voteExtensionsEnabled,
 	)
 

go.mod

@@ -1,8 +1,6 @@
 module github.com/ojo-network/ojo
 
-go 1.22.1
-
-toolchain go1.22.5
+go 1.23
 
 require (
 	cosmossdk.io/api v0.7.4
@@ -37,6 +35,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
 	github.com/mgechev/revive v1.3.9
 	github.com/mitchellh/mapstructure v1.5.0
+	github.com/ojo-network/ojo-evm/relayer v0.0.0-20240904192312-acda927a5d24
 	github.com/ojo-network/price-feeder v0.2.1-rc1
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/rs/zerolog v1.32.0

go.sum

@@ -1122,6 +1122,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q=
 github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s=
+github.com/ojo-network/ojo-evm/relayer v0.0.0-20240904192312-acda927a5d24 h1:t0E41HkLJJmyh8rCwNjGQPoHfQSH4QHDTg51UawFKyA=
+github.com/ojo-network/ojo-evm/relayer v0.0.0-20240904192312-acda927a5d24/go.mod h1:dW6/pQ+hNtC6955jQUR1cUJrGWcQ6fNEjeSLJCJPz3A=
 github.com/ojo-network/price-feeder v0.2.1-rc1 h1:m9vgR9DYuXhM5f2DQX/wewihzkPVAVdVjZgtr/gB6bs=
 github.com/ojo-network/price-feeder v0.2.1-rc1/go.mod h1:CSdgh7XiOMLGQwRW8OqbL5FlkE5Mc3+fDZEMRN8JkYY=
 github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=

proto/ojo/gasestimate/v1/gasestimate.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+package ojo.gasestimate.v1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/ojo-network/ojo/x/gasestimate/types";
+
+option (gogoproto.goproto_getters_all) = false;
+
+// Params defines the parameters for the gasestimate module.
+message Params {
+  // The contracts we'll send gasestimate messages to.
+  repeated Contract contract_registry = 1;
+  // The gas limit for the gasestimate messages. E.x., "1000000"
+  string gas_limit = 2;
+  // The gas adjustment multiplier for the gasestimate messages. E.x., "1.5"
+  string gas_adjustment = 3;
+}
+
+// Contract defines a contract that we
+message Contract {
+  string address = 1;
+  string network = 2;
+}
+
+// GasEstimate is the gas estimate for a given network.
+message GasEstimate {
+  string network = 1;
+  int64 gas_estimate = 2;
+}

proto/ojo/gasestimate/v1/genesis.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+package ojo.gasestimate.v1;
+
+import "gogoproto/gogo.proto";
+import "ojo/gasestimate/v1/gasestimate.proto";
+
+option go_package = "github.com/ojo-network/ojo/x/gasestimate/types";
+
+// GenesisState represents the genesis state of the gasestimate module.
+message GenesisState {
+  Params params = 1 [ (gogoproto.nullable) = false ];
+}

proto/ojo/gasestimate/v1/query.proto

@@ -0,0 +1,39 @@
+syntax = "proto3";
+package ojo.gasestimate.v1;
+
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "ojo/gasestimate/v1/gasestimate.proto";
+
+option go_package = "github.com/ojo-network/ojo/x/gasestimate/types";
+
+// Query defines the gRPC querier service for the gasestimate module
+service Query {
+  // Params queries all parameters.
+  rpc Params(ParamsRequest) returns (ParamsResponse) {
+    option (google.api.http).get = "/ojo/gasestimate/v1/params";
+  }
+  // GasEstimate queries the gas estimate for a given network.
+  rpc GasEstimate(GasEstimateRequest) returns (GasEstimateResponse) {
+    option (google.api.http).get = "/ojo/gasestimate/v1/gasestimate";
+  }
+}
+
+// ParamsRequest is the request type for the Query/Params RPC method.
+message ParamsRequest {}
+
+// ParamsResponse is the response type for the Query/Params RPC method.
+message ParamsResponse {
+  // params defines the parameters of the module.
+  Params params = 1 [(gogoproto.nullable) = false];
+}
+
+// GasEstimateRequest is the request type for the Query/GasEstimate RPC method.
+message GasEstimateRequest {
+  string network = 1;
+}
+
+// GasEstimateResponse is the response type for the Query/GasEstimate RPC method.
+message GasEstimateResponse {
+  int64 gas_estimate = 1;
+}