Merge remote-tracking branch 'origin/main' into yevhenii/rocksdb-metrics

.github/mergify.yml

@@ -0,0 +1,91 @@
+# Mergify is a Github app that automates workflows.
+# It is used by kava-labs/ethermint to help automate backporting to previous releases.
+
+# For details on this file, see https://docs.mergify.com/getting-started/#configuration
+# For backport-specific details, see https://docs.mergify.com/workflow/actions/backport
+
+defaults:
+  actions:
+    backport:
+      assignees:
+        - "{{ author }}"
+
+pull_request_rules:
+  # one PR label to rule them all
+  - name: Backport patches to all kava/release/* branches
+    conditions:
+      - base=main
+      - label=backport/all
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.17.x
+          - kava/release/v0.18.x
+          - kava/release/v0.19.x
+          - kava/release/v0.21.x
+          - kava/release/v0.23.x
+          - kava/release/v0.24.x
+          - kava/release/v0.26.x
+
+  - name: Backport patches to the kava/release/v0.17.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.17
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.17.x
+
+  - name: Backport patches to the kava/release/v0.18.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.18
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.18.x
+
+  - name: Backport patches to the kava/release/v0.19.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.19
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.19.x
+
+  - name: Backport patches to the kava/release/v0.21.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.21
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.21.x
+
+  - name: Backport patches to the kava/release/v0.23.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.23
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.23.x
+
+  - name: Backport patches to the kava/release/v0.24.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.24
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.24.x
+
+  - name: Backport patches to the kava/release/v0.26.x branch
+    conditions:
+      - base=main
+      - label=backport/v0.26
+    actions:
+      backport:
+        branches:
+          - kava/release/v0.26.x

Makefile

@@ -235,7 +235,7 @@ endif
 
 ifeq (, $(shell which go-bindata))
 	@echo "Installing go-bindata..."
-	@go get github.com/kevinburke/go-bindata/go-bindata
+	@go get github.com/kevinburke/go-bindata/v4/go-bindata
 else
 	@echo "go-bindata already installed; skipping..."
 endif

app/ante/eth.go

@@ -307,7 +307,7 @@ func (ctd CanTransferDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate
 
 		// check that caller has enough balance to cover asset transfer for **topmost** call
 		// NOTE: here the gas consumed is from the context with the infinite gas meter
-		if coreMsg.Value().Sign() > 0 && !evm.Context().CanTransfer(stateDB, coreMsg.From(), coreMsg.Value()) {
+		if coreMsg.Value().Sign() > 0 && !evm.Context.CanTransfer(stateDB, coreMsg.From(), coreMsg.Value()) {
 			return ctx, errorsmod.Wrapf(
 				errortypes.ErrInsufficientFunds,
 				"failed to transfer %s from address %s using the EVM block context transfer function",

app/ante/interfaces.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/evmos/ethermint/x/evm/statedb"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
-	evm "github.com/evmos/ethermint/x/evm/vm"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 )
 
@@ -44,7 +43,7 @@ type EVMKeeper interface {
 	statedb.Keeper
 	DynamicFeeEVMKeeper
 
-	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) evm.EVM
+	NewEVM(ctx sdk.Context, msg core.Message, cfg *statedb.EVMConfig, tracer vm.EVMLogger, stateDB vm.StateDB) *vm.EVM
 	DeductTxCostsFromUserBalance(ctx sdk.Context, fees sdk.Coins, from common.Address) error
 	GetBalance(ctx sdk.Context, addr common.Address) *big.Int
 	ResetTransientGasUsed(ctx sdk.Context)

app/app.go

@@ -23,14 +23,14 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/gorilla/mux"
-	"github.com/rakyll/statik/fs"
-	"github.com/spf13/cast"
-
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
 	"github.com/cometbft/cometbft/libs/log"
 	tmos "github.com/cometbft/cometbft/libs/os"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/gorilla/mux"
+	"github.com/rakyll/statik/fs"
+	"github.com/spf13/cast"
 
 	"cosmossdk.io/simapp"
 	simappparams "cosmossdk.io/simapp/params"
@@ -127,7 +127,6 @@ import (
 	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 	legacyevmtypes "github.com/evmos/ethermint/x/evm/types/legacy"
-	"github.com/evmos/ethermint/x/evm/vm/geth"
 	"github.com/evmos/ethermint/x/feemarket"
 	feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
@@ -427,7 +426,7 @@ func NewEthermintApp(
 		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey],
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper, app.BankKeeper, stakingKeeper, app.FeeMarketKeeper,
-		nil, geth.NewEVM, tracer, evmSs,
+		vm.NewEVM, tracer, evmSs,
 	)
 
 	// Create IBC Keeper

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/holiman/uint256 v1.2.1
 	github.com/improbable-eng/grpc-web v0.15.0
 	github.com/onsi/ginkgo/v2 v2.9.1
 	github.com/onsi/gomega v1.27.4
@@ -142,6 +141,7 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/holiman/uint256 v1.2.1 // indirect
 	github.com/huandu/skiplist v1.2.0 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -204,12 +204,12 @@ require (
 	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect
 	golang.org/x/oauth2 v0.17.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.7.0 // indirect
+	golang.org/x/tools v0.20.0 // indirect
 	google.golang.org/api v0.162.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
@@ -226,6 +226,7 @@ replace (
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 	// Use cosmos-sdk fork with staking transfer events, and custom tally handler support
 	github.com/cosmos/cosmos-sdk => github.com/kava-labs/cosmos-sdk v0.47.10-iavl-v1-kava.1
+	github.com/ethereum/go-ethereum => github.com/Kava-Labs/go-ethereum v1.10.27-0.20240308170502-da7973e5eee0
 	// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0