Use versioned precompiles in tracing (#2122)

* Add back legacy precompile versions

* rebase

* wip

* tests

* test

* test

Author: codchen

app/app.go

@@ -631,7 +631,7 @@ func New(
 	app.EvmKeeper = *evmkeeper.NewKeeper(keys[evmtypes.StoreKey],
 		tkeys[evmtypes.TransientStoreKey], app.GetSubspace(evmtypes.ModuleName), app.receiptStore, app.BankKeeper,
 		&app.AccountKeeper, &app.StakingKeeper, app.TransferKeeper,
-		wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper), &app.WasmKeeper, &app.ConfidentialTransfersKeeper)
+		wasmkeeper.NewDefaultPermissionKeeper(app.WasmKeeper), &app.WasmKeeper, &app.ConfidentialTransfersKeeper, &app.UpgradeKeeper)
 	app.BankKeeper.RegisterRecipientChecker(app.EvmKeeper.CanAddressReceive)
 
 	bApp.SetPreCommitHandler(app.HandlePreCommit)
@@ -730,6 +730,7 @@ func New(
 
 	if enableCustomEVMPrecompiles {
 		customPrecompiles := precompiles.GetCustomPrecompiles(
+			LatestUpgrade,
 			&app.EvmKeeper,
 			app.BankKeeper,
 			bankkeeper.NewMsgServerImpl(app.BankKeeper),
@@ -748,8 +749,7 @@ func New(
 			app.ConfidentialTransfersKeeper,
 			ctkeeper.NewMsgServerImpl(app.ConfidentialTransfersKeeper),
 		)
-
-		app.EvmKeeper.SetCustomPrecompiles(customPrecompiles)
+		app.EvmKeeper.SetCustomPrecompiles(customPrecompiles, LatestUpgrade)
 	}
 
 	/****  Module Options ****/
@@ -1877,14 +1877,14 @@ func (app *App) RegisterTxService(clientCtx client.Context) {
 
 func (app *App) RPCContextProvider(i int64) sdk.Context {
 	if i == evmrpc.LatestCtxHeight {
-		return app.GetCheckCtx()
+		return app.GetCheckCtx().WithIsTracing(true)
 	}
 	ctx, err := app.CreateQueryContext(i, false)
 	if err != nil {
 		app.Logger().Error(fmt.Sprintf("failed to create query context for EVM; using latest context instead: %v+", err.Error()))
-		return app.GetCheckCtx()
+		return app.GetCheckCtx().WithIsTracing(true)
 	}
-	return ctx.WithIsEVM(true)
+	return ctx.WithIsEVM(true).WithIsTracing(true)
 }
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.

app/upgrades.go

@@ -119,6 +119,8 @@ var upgradesList = []string{
 	"v6.0.5",
 }
 
+var LatestUpgrade = upgradesList[len(upgradesList)-1]
+
 // if there is an override list, use that instead, for integration tests
 func overrideList() {
 	// if there is an override list, use that instead, for integration tests

evmrpc/simulate.go

@@ -381,12 +381,12 @@ func (b *Backend) StateAtBlock(ctx context.Context, block *ethtypes.Block, reexe
 	return statedb, emptyRelease, nil
 }
 
-func (b *Backend) GetEVM(_ context.Context, msg *core.Message, stateDB vm.StateDB, _ *ethtypes.Header, vmConfig *vm.Config, blockCtx *vm.BlockContext) *vm.EVM {
+func (b *Backend) GetEVM(_ context.Context, msg *core.Message, stateDB vm.StateDB, h *ethtypes.Header, vmConfig *vm.Config, blockCtx *vm.BlockContext) *vm.EVM {
 	txContext := core.NewEVMTxContext(msg)
 	if blockCtx == nil {
 		blockCtx, _ = b.keeper.GetVMBlockContext(b.ctxProvider(LatestCtxHeight).WithIsEVM(true).WithEVMEntryViaWasmdPrecompile(wasmd.IsWasmdCall(msg.To)), core.GasPool(b.RPCGasCap()))
 	}
-	return vm.NewEVM(*blockCtx, txContext, stateDB, b.ChainConfig(), *vmConfig, b.keeper.CustomPrecompiles())
+	return vm.NewEVM(*blockCtx, txContext, stateDB, b.ChainConfig(), *vmConfig, b.keeper.CustomPrecompiles(b.ctxProvider(h.Number.Int64())))
 }
 
 func (b *Backend) CurrentHeader() *ethtypes.Header {
@@ -442,8 +442,8 @@ func (b *Backend) getHeader(blockNumber *big.Int) *ethtypes.Header {
 	return header
 }
 
-func (b *Backend) GetCustomPrecompiles(int64) map[common.Address]vm.PrecompiledContract {
-	return b.keeper.CustomPrecompiles()
+func (b *Backend) GetCustomPrecompiles(h int64) map[common.Address]vm.PrecompiledContract {
+	return b.keeper.CustomPrecompiles(b.ctxProvider(h))
 }
 
 type Engine struct {

evmrpc/tests/mock_upgrade.go

@@ -0,0 +1,12 @@
+package tests
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/sei-protocol/sei-chain/app"
+)
+
+func mockUpgrade(version string, height int64) func(ctx sdk.Context, a *app.App) {
+	return func(ctx sdk.Context, a *app.App) {
+		a.UpgradeKeeper.SetDone(ctx.WithBlockHeight(height), version)
+	}
+}

evmrpc/tests/tracers_test.go

@@ -1,8 +1,12 @@
 package tests
 
 import (
+	"encoding/json"
 	"testing"
 
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/lib/ethapi"
 	"github.com/stretchr/testify/require"
 )
 
@@ -19,3 +23,35 @@ func TestTraceBlockByNumber(t *testing.T) {
 		},
 	)
 }
+
+func TestTraceHistoricalPrecompiles(t *testing.T) {
+	from := getAddrWithMnemonic(mnemonic1)
+	txData := jsonExtractAsBytesFromArray(0).(*ethtypes.DynamicFeeTx)
+	SetupTestServer([][][]byte{{}, {}, {}}, mnemonicInitializer(mnemonic1), mockUpgrade("v5.5.2", 1), mockUpgrade("v6.0.5", 3)).Run(
+		func(port int) {
+			args := ethapi.TransactionArgs{
+				From:     &from,
+				To:       txData.To,
+				Gas:      (*hexutil.Uint64)(&txData.Gas),
+				GasPrice: (*hexutil.Big)(txData.GasFeeCap),
+				Nonce:    (*hexutil.Uint64)(&txData.Nonce),
+				Input:    (*hexutil.Bytes)(&txData.Data),
+				ChainID:  (*hexutil.Big)(txData.ChainID),
+			}
+			bz, err := json.Marshal(args)
+			require.Nil(t, err)
+			// error when traced on a block prior to v6.0.5
+			res := sendRequestWithNamespace("debug", port, "traceCall", bz, "0x2", map[string]interface{}{
+				"timeout": "60s", "tracer": "flatCallTracer",
+			})
+			errMsg := res["result"].([]interface{})[0].(map[string]interface{})["error"].(string)
+			require.Contains(t, errMsg, "no method with id")
+			// no error when traced on a block post v6.0.5
+			res = sendRequestWithNamespace("debug", port, "traceCall", bz, "0x3", map[string]interface{}{
+				"timeout": "60s", "tracer": "flatCallTracer",
+			})
+			resultMap := res["result"].([]interface{})[0].(map[string]interface{})
+			require.NotContains(t, resultMap, "error")
+		},
+	)
+}

evmrpc/tests/tx.go

@@ -1,8 +1,10 @@
 package tests
 
 import (
+	"bytes"
 	"fmt"
 	"math/big"
+	"os"
 	"strings"
 
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
@@ -11,6 +13,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/sei-protocol/sei-chain/precompiles"
+	"github.com/sei-protocol/sei-chain/precompiles/json"
 	"github.com/sei-protocol/sei-chain/precompiles/pointer"
 	testkeeper "github.com/sei-protocol/sei-chain/testutil/keeper"
 	"github.com/sei-protocol/sei-chain/x/evm/artifacts/wsei"
@@ -80,3 +83,27 @@ func transferCW20Msg(mnemonic string, cw20Addr string) sdk.Msg {
 		Msg:      []byte(fmt.Sprintf("{\"transfer\":{\"recipient\":\"%s\",\"amount\":\"100\"}}", recipient.String())),
 	}
 }
+
+func jsonExtractAsBytesFromArray(nonce uint64) ethtypes.TxData {
+	abiBz, err := os.ReadFile("../../precompiles/json/abi.json")
+	if err != nil {
+		panic(err)
+	}
+	newAbi, err := abi.JSON(bytes.NewReader(abiBz))
+	if err != nil {
+		panic(err)
+	}
+	input, err := newAbi.Pack("extractAsBytesFromArray", []byte("[\"1\"]"), uint16(0))
+	if err != nil {
+		panic(err)
+	}
+	to := common.HexToAddress(json.JSONAddress)
+	return &ethtypes.DynamicFeeTx{
+		Nonce:     nonce,
+		GasFeeCap: big.NewInt(1000000000),
+		Gas:       50000,
+		To:        &to,
+		Data:      input,
+		ChainID:   chainId,
+	}
+}

evmrpc/tests/utils.go

@@ -176,7 +176,7 @@ func formatParam(p interface{}) string {
 		}
 		return fmt.Sprintf("{%s}", strings.Join(kvs, ","))
 	default:
-		panic("did not match on type")
+		return fmt.Sprintf("%s", p)
 	}
 }
 

go.mod

@@ -357,7 +357,7 @@ replace (
 	github.com/CosmWasm/wasmvm => github.com/sei-protocol/sei-wasmvm v1.5.4-sei.0.0.1
 	github.com/coinbase/kryptology => github.com/sei-protocol/coinbase-kryptology v0.0.0-20241210171554-278d19024e41
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.56-0.20250313190228-9fb9a4fd8636
+	github.com/cosmos/cosmos-sdk => github.com/sei-protocol/sei-cosmos v0.3.56
 	github.com/cosmos/iavl => github.com/sei-protocol/sei-iavl v0.2.0
 	github.com/cosmos/ibc-go/v3 => github.com/sei-protocol/sei-ibc-go/v3 v3.3.5
 	github.com/ethereum/go-ethereum => github.com/sei-protocol/go-ethereum v1.13.5-sei-30

go.sum

@@ -1358,8 +1358,8 @@ github.com/sei-protocol/go-ethereum v1.13.5-sei-30 h1:8aIlzdH1LpbVLTzXRJvO/Crmxh
 github.com/sei-protocol/go-ethereum v1.13.5-sei-30/go.mod h1:kcRZmuzRn1lVejiFNTz4l4W7imnpq1bDAnuKS/RyhbQ=
 github.com/sei-protocol/goutils v0.0.2 h1:Bfa7Sv+4CVLNM20QcpvGb81B8C5HkQC/kW1CQpIbXDA=
 github.com/sei-protocol/goutils v0.0.2/go.mod h1:iYE2DuJfEnM+APPehr2gOUXfuLuPsVxorcDO+Tzq9q8=
-github.com/sei-protocol/sei-cosmos v0.3.56-0.20250313190228-9fb9a4fd8636 h1:9RMstipSzuAgpwz8IcM+LvZB2frXSBolu8CRj660fI4=
-github.com/sei-protocol/sei-cosmos v0.3.56-0.20250313190228-9fb9a4fd8636/go.mod h1:Z+0XynKuhMu9m2XHIvUBwk4A+iLPc4YnzFlabpMOWqw=
+github.com/sei-protocol/sei-cosmos v0.3.56 h1:ADju29g0LtSnn5tS7OG09++DUKOlcPapC4TshrMnqnk=
+github.com/sei-protocol/sei-cosmos v0.3.56/go.mod h1:Z+0XynKuhMu9m2XHIvUBwk4A+iLPc4YnzFlabpMOWqw=
 github.com/sei-protocol/sei-cryptography v0.0.0-20241210192144-b20fa09be987 h1:l2EcEUO2rThRIvqIlnJQvqSOwutSbuY01xf1gbgx4qM=
 github.com/sei-protocol/sei-cryptography v0.0.0-20241210192144-b20fa09be987/go.mod h1:274GmYGRLVKlf/XcOx4SI2kmq1tJQYzlqboK9RNA9Q8=
 github.com/sei-protocol/sei-db v0.0.48 h1:BgSF5jq9hiPz0JMmbf5f34CnZijqTO+3zOo8IG62lFY=

precompiles/common/legacy/v575/expected_keepers.go

@@ -48,14 +48,14 @@ type EVMKeeper interface {
 	GetERC721CW721Pointer(ctx sdk.Context, cw721Address string) (addr common.Address, version uint16, exists bool)
 	SetCode(ctx sdk.Context, addr common.Address, code []byte)
 	UpsertERCNativePointer(
-		ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, token string, metadata utils.ERCMetadata,
-	) (contractAddr common.Address, remainingGas uint64, err error)
+		ctx sdk.Context, evm *vm.EVM, token string, metadata utils.ERCMetadata,
+	) (contractAddr common.Address, err error)
 	UpsertERCCW20Pointer(
-		ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, cw20Addr string, metadata utils.ERCMetadata,
-	) (contractAddr common.Address, remainingGas uint64, err error)
+		ctx sdk.Context, evm *vm.EVM, cw20Addr string, metadata utils.ERCMetadata,
+	) (contractAddr common.Address, err error)
 	UpsertERCCW721Pointer(
-		ctx sdk.Context, evm *vm.EVM, suppliedGas uint64, cw721Addr string, metadata utils.ERCMetadata,
-	) (contractAddr common.Address, remainingGas uint64, err error)
+		ctx sdk.Context, evm *vm.EVM, cw721Addr string, metadata utils.ERCMetadata,
+	) (contractAddr common.Address, err error)
 }
 
 type AccountKeeper interface {

precompiles/pointer/legacy/v575/pointer.go

@@ -113,11 +113,12 @@ func (p PrecompileExecutor) AddNative(ctx sdk.Context, method *ethabi.Method, ca
 			}
 		}
 	}
-	contractAddr, remainingGas, err := p.evmKeeper.UpsertERCNativePointer(ctx, evm, suppliedGas, token, utils.ERCMetadata{Name: name, Symbol: symbol, Decimals: decimals})
+	contractAddr, err := p.evmKeeper.UpsertERCNativePointer(ctx, evm, token, utils.ERCMetadata{Name: name, Symbol: symbol, Decimals: decimals})
 	if err != nil {
 		return nil, 0, err
 	}
 	ret, err = method.Outputs.Pack(contractAddr)
+	remainingGas = pcommon.GetRemainingGas(ctx, p.evmKeeper)
 	return
 }
 
@@ -143,11 +144,12 @@ func (p PrecompileExecutor) AddCW20(ctx sdk.Context, method *ethabi.Method, call
 	}
 	name := formattedRes["name"].(string)
 	symbol := formattedRes["symbol"].(string)
-	contractAddr, remainingGas, err := p.evmKeeper.UpsertERCCW20Pointer(ctx, evm, suppliedGas, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
+	contractAddr, err := p.evmKeeper.UpsertERCCW20Pointer(ctx, evm, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
 	if err != nil {
 		return nil, 0, err
 	}
 	ret, err = method.Outputs.Pack(contractAddr)
+	remainingGas = pcommon.GetRemainingGas(ctx, p.evmKeeper)
 	return
 }
 
@@ -173,10 +175,11 @@ func (p PrecompileExecutor) AddCW721(ctx sdk.Context, method *ethabi.Method, cal
 	}
 	name := formattedRes["name"].(string)
 	symbol := formattedRes["symbol"].(string)
-	contractAddr, remainingGas, err := p.evmKeeper.UpsertERCCW721Pointer(ctx, evm, suppliedGas, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
+	contractAddr, err := p.evmKeeper.UpsertERCCW721Pointer(ctx, evm, cwAddr, utils.ERCMetadata{Name: name, Symbol: symbol})
 	if err != nil {
 		return nil, 0, err
 	}
 	ret, err = method.Outputs.Pack(contractAddr)
+	remainingGas = pcommon.GetRemainingGas(ctx, p.evmKeeper)
 	return
 }

precompiles/pointer/pointer_test.go

@@ -34,7 +34,7 @@ func TestAddNative(t *testing.T) {
 	require.Nil(t, err)
 	statedb := state.NewDBImpl(ctx, &testApp.EvmKeeper, true)
 	blockCtx, _ := testApp.EvmKeeper.GetVMBlockContext(ctx, core.GasPool(suppliedGas))
-	evm := vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles())
+	evm := vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles(ctx))
 	_, g, err := p.RunAndCalculateGas(evm, caller, caller, append(p.GetExecutor().(*pointer.PrecompileExecutor).AddNativePointerID, args...), suppliedGas, nil, nil, false, false)
 	require.NotNil(t, err)
 	require.NotNil(t, statedb.GetPrecompileError())
@@ -54,7 +54,7 @@ func TestAddNative(t *testing.T) {
 		}},
 	})
 	statedb = state.NewDBImpl(ctx, &testApp.EvmKeeper, false)
-	evm = vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles())
+	evm = vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles(ctx))
 	ret, g, err := p.RunAndCalculateGas(evm, caller, caller, append(p.GetExecutor().(*pointer.PrecompileExecutor).AddNativePointerID, args...), suppliedGas, nil, nil, false, false)
 	require.Nil(t, err)
 	require.Equal(t, uint64(8889527), g)
@@ -83,7 +83,7 @@ func TestAddNative(t *testing.T) {
 	testApp.EvmKeeper.DeleteERC20NativePointer(statedb.Ctx(), "test", version)
 	testApp.EvmKeeper.SetERC20NativePointerWithVersion(statedb.Ctx(), "test", pointerAddr, version-1)
 	statedb = state.NewDBImpl(statedb.Ctx(), &testApp.EvmKeeper, true)
-	evm = vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles())
+	evm = vm.NewEVM(*blockCtx, vm.TxContext{}, statedb, cfg, vm.Config{}, testApp.EvmKeeper.CustomPrecompiles(ctx))
 	_, _, err = p.RunAndCalculateGas(evm, caller, caller, append(p.GetExecutor().(*pointer.PrecompileExecutor).AddNativePointerID, args...), suppliedGas, nil, nil, false, false)
 	require.Nil(t, err)
 	require.Nil(t, statedb.GetPrecompileError())