align keys for snapshotKVStore

mmsqe · mmsqe · commit 04f5ae280582 · 2025-09-05T15:59:50.000+08:00
Revert "less" This reverts commit 21ef5c3.
diff --git a/evmd/app.go b/evmd/app.go
@@ -489,7 +489,9 @@ func NewExampleApp(
 	// NOTE: it's required to set up the EVM keeper before the ERC-20 keeper, because it is used in its instantiation.
 	app.EVMKeeper = evmkeeper.NewKeeper(
 		// TODO: check why this is not adjusted to use the runtime module methods like SDK native keepers
-		appCodec, keys[evmtypes.StoreKey], okeys[evmtypes.ObjectStoreKey], keys,
+		appCodec,
+		keys,
+		okeys,
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper,
 		app.PreciseBankKeeper,
diff --git a/evmd/tests/ibc/ics20_precompile_transfer_test.go b/evmd/tests/ibc/ics20_precompile_transfer_test.go
@@ -7,6 +7,7 @@ package ibc
 
 import (
 	"math/big"
+	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/vm"
@@ -354,6 +355,6 @@ func (suite *ICS20TransferTestSuite) TestHandleMsgTransfer() {
 	}
 }
 
-// func TestICS20TransferTestSuite(t *testing.T) {
-// 	suite.Run(t, new(ICS20TransferTestSuite))
-// }
+func TestICS20TransferTestSuite(t *testing.T) {
+	suite.Run(t, new(ICS20TransferTestSuite))
+}
diff --git a/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go b/evmd/tests/ibc/v2_ics20_precompile_transfer_test.go
@@ -7,6 +7,7 @@ package ibc
 
 import (
 	"math/big"
+	"testing"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -358,6 +359,6 @@ func (suite *ICS20TransferV2TestSuite) TestHandleMsgTransfer() {
 	}
 }
 
-// func TestICS20TransferV2TestSuite(t *testing.T) {
-// 	suite.Run(t, new(ICS20TransferV2TestSuite))
-// }
+func TestICS20TransferV2TestSuite(t *testing.T) {
+	suite.Run(t, new(ICS20TransferV2TestSuite))
+}
diff --git a/mempool/interface.go b/mempool/interface.go
@@ -27,7 +27,7 @@ type VMKeeperI interface {
 	DeleteCode(ctx sdk.Context, codeHash []byte)
 	SetCode(ctx sdk.Context, codeHash []byte, code []byte)
 	DeleteAccount(ctx sdk.Context, addr common.Address) error
-	KVStoreKeys() map[string]*storetypes.KVStoreKey
+	KVStoreKeys() map[string]storetypes.StoreKey
 	SetEvmMempool(evmMempool *ExperimentalEVMMempool)
 }
 
diff --git a/x/feemarket/keeper/keeper.go b/x/feemarket/keeper/keeper.go
@@ -23,7 +23,7 @@ type Keeper struct {
 
 // NewKeeper generates new fee market module keeper
 func NewKeeper(
-	cdc codec.BinaryCodec, authority sdk.AccAddress, storeKey, transientKey storetypes.StoreKey,
+	cdc codec.BinaryCodec, authority sdk.AccAddress, storeKey, objectKey storetypes.StoreKey,
 ) Keeper {
 	// ensure authority account is correctly formatted
 	if err := sdk.VerifyAddressFormat(authority); err != nil {
@@ -34,7 +34,7 @@ func NewKeeper(
 		cdc:       cdc,
 		storeKey:  storeKey,
 		authority: authority,
-		objectKey: transientKey,
+		objectKey: objectKey,
 	}
 }
 
diff --git a/x/vm/keeper/keeper.go b/x/vm/keeper/keeper.go
@@ -43,7 +43,7 @@ type Keeper struct {
 	objectKey storetypes.StoreKey
 
 	// KVStore Keys for modules wired to app
-	storeKeys map[string]*storetypes.KVStoreKey
+	storeKeys map[string]storetypes.StoreKey
 
 	// the address capable of executing a MsgUpdateParams message. Typically, this should be the x/gov module account.
 	authority sdk.AccAddress
@@ -86,8 +86,8 @@ type Keeper struct {
 // NewKeeper generates new evm module keeper
 func NewKeeper(
 	cdc codec.BinaryCodec,
-	storeKey, objKey storetypes.StoreKey,
 	keys map[string]*storetypes.KVStoreKey,
+	okeys map[string]*storetypes.ObjectStoreKey,
 	authority sdk.AccAddress,
 	ak types.AccountKeeper,
 	bankKeeper types.BankKeeper,
@@ -110,6 +110,13 @@ func NewKeeper(
 	bankWrapper := wrappers.NewBankWrapper(bankKeeper)
 	feeMarketWrapper := wrappers.NewFeeMarketWrapper(fmk)
 
+	storeKeys := make(map[string]storetypes.StoreKey)
+	for k, v := range keys {
+		storeKeys[k] = v
+	}
+	for k, v := range okeys {
+		storeKeys[k] = v
+	}
 	// NOTE: we pass in the parameter space to the CommitStateDB in order to use custom denominations for the EVM operations
 	return &Keeper{
 		cdc:              cdc,
@@ -118,12 +125,12 @@ func NewKeeper(
 		bankWrapper:      bankWrapper,
 		stakingKeeper:    sk,
 		feeMarketWrapper: feeMarketWrapper,
-		storeKey:         storeKey,
-		objectKey:        objKey,
+		storeKey:         keys[types.StoreKey],
+		objectKey:        okeys[types.ObjectStoreKey],
 		tracer:           tracer,
 		consensusKeeper:  consensusKeeper,
 		erc20Keeper:      erc20Keeper,
-		storeKeys:        keys,
+		storeKeys:        storeKeys,
 	}
 }
 
@@ -359,7 +366,7 @@ func (k Keeper) AddTransientGasUsed(ctx sdk.Context, gasUsed uint64) (uint64, er
 }
 
 // KVStoreKeys returns KVStore keys injected to keeper
-func (k Keeper) KVStoreKeys() map[string]*storetypes.KVStoreKey {
+func (k Keeper) KVStoreKeys() map[string]storetypes.StoreKey {
 	return k.storeKeys
 }
 
diff --git a/x/vm/keeper/keeper_test.go b/x/vm/keeper/keeper_test.go
@@ -66,9 +66,8 @@ func (suite *KeeperTestSuite) SetupTest() {
 		// Cosmos EVM store keys
 		vmtypes.StoreKey, feemarkettypes.StoreKey, erc20types.StoreKey, precisebanktypes.StoreKey,
 	)
-	okeys := storetypes.NewObjectStoreKeys(vmtypes.ObjectStoreKey)
-	key := storetypes.NewKVStoreKey(vmtypes.StoreKey)
-	testCtx := testutil.DefaultContextWithDB(suite.T(), key, storetypes.NewTransientStoreKey("transient_test"))
+	okeys := storetypes.NewObjectStoreKeys(banktypes.ObjectStoreKey)
+	testCtx := testutil.DefaultContextWithDB(suite.T(), keys[vmtypes.StoreKey], storetypes.NewTransientStoreKey("transient_test"))
 	ctx := testCtx.Ctx.WithBlockHeader(cmtproto.Header{Time: cmttime.Now()})
 	encCfg := moduletestutil.MakeTestEncodingConfig()
 
@@ -86,9 +85,8 @@ func (suite *KeeperTestSuite) SetupTest() {
 	suite.accKeeper.On("GetModuleAddress", vmtypes.ModuleName).Return(sdk.AccAddress("evm"))
 	suite.vmKeeper = vmkeeper.NewKeeper(
 		encCfg.Codec,
-		key,
-		okeys[vmtypes.ObjectStoreKey],
 		keys,
+		okeys,
 		authority,
 		suite.accKeeper,
 		suite.bankKeeper,
diff --git a/x/vm/statedb/interfaces.go b/x/vm/statedb/interfaces.go
@@ -39,5 +39,5 @@ type Keeper interface {
 
 	// Getter for injected KVStore keys
 	// It is used for StateDB.snapshotter creation
-	KVStoreKeys() map[string]*storetypes.KVStoreKey
+	KVStoreKeys() map[string]storetypes.StoreKey
 }
diff --git a/x/vm/statedb/mock_test.go b/x/vm/statedb/mock_test.go
@@ -120,6 +120,6 @@ func (k MockKeeper) Clone() *MockKeeper {
 	return &MockKeeper{accounts, codes}
 }
 
-func (k MockKeeper) KVStoreKeys() map[string]*storetypes.KVStoreKey {
-	return make(map[string]*storetypes.KVStoreKey)
+func (k MockKeeper) KVStoreKeys() map[string]storetypes.StoreKey {
+	return make(map[string]storetypes.StoreKey)
 }
diff --git a/x/vm/statedb/statedb.go b/x/vm/statedb/statedb.go
@@ -199,7 +199,7 @@ func (s *StateDB) cache() error {
 	s.cacheCtx, _ = s.ctx.CacheContext()
 
 	// Get KVStores for modules wired to app
-	cms := s.cacheCtx.MultiStore().(storetypes.CacheMultiStore)
+	cms := s.cacheCtx.MultiStore()
 	storeKeys := s.keeper.KVStoreKeys()
 
 	// Create and set snapshot store to stateDB
diff --git a/x/vm/store/snapshotkv/store.go b/x/vm/store/snapshotkv/store.go
@@ -5,24 +5,23 @@ import (
 
 	"github.com/cosmos/evm/x/vm/store/types"
 
-	"cosmossdk.io/store/cachekv"
 	storetypes "cosmossdk.io/store/types"
 )
 
 // Store manages a stack of nested cache store to
 // support the evm `StateDB`'s `Snapshot` and `RevertToSnapshot` methods.
 type Store struct {
 	// Store of the initial state before transaction execution
-	initialStore storetypes.CacheKVStore
+	initialStore storetypes.CacheWrap
 
 	// Stack of cached store
-	cacheStores []storetypes.CacheKVStore
+	cacheStores []storetypes.CacheWrap
 }
 
 var _ types.SnapshotKVStore = (*Store)(nil)
 
 // NewStore creates a new Store object
-func NewStore(store storetypes.CacheKVStore) *Store {
+func NewStore(store storetypes.CacheWrap) *Store {
 	return &Store{
 		initialStore: store,
 		cacheStores:  nil,
@@ -31,7 +30,7 @@ func NewStore(store storetypes.CacheKVStore) *Store {
 
 // CurrentStore returns the top of cached store stack.
 // If the stack is empty, returns the initial store.
-func (cs *Store) CurrentStore() storetypes.CacheKVStore {
+func (cs *Store) CurrentStore() storetypes.CacheWrap {
 	l := len(cs.cacheStores)
 	if l == 0 {
 		return cs.initialStore
@@ -53,7 +52,7 @@ func (cs *Store) Commit() {
 // Snapshot pushes a new cached store to the stack,
 // and returns the index of it.
 func (cs *Store) Snapshot() int {
-	cs.cacheStores = append(cs.cacheStores, cachekv.NewStore(cs.CurrentStore()))
+	cs.cacheStores = append(cs.cacheStores, cs.CurrentStore().CacheWrap())
 	return len(cs.cacheStores) - 1
 }
 
diff --git a/x/vm/store/snapshotkv/store_test.go b/x/vm/store/snapshotkv/store_test.go
@@ -11,6 +11,7 @@ import (
 
 	"cosmossdk.io/store/cachekv"
 	"cosmossdk.io/store/dbadapter"
+	storetypes "cosmossdk.io/store/types"
 )
 
 func newSnapshotKV() *snapshotkv.Store {
@@ -35,28 +36,28 @@ func TestSnapshotRevertAndCommit(t *testing.T) {
 	store := newSnapshotKV()
 
 	// set in base store
-	base := store.CurrentStore()
+	base := store.CurrentStore().(storetypes.KVStore)
 	base.Set([]byte("a"), []byte("1"))
 
 	idx0 := store.Snapshot()
-	store.CurrentStore().Set([]byte("b"), []byte("2"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("b"), []byte("2"))
 
 	idx1 := store.Snapshot()
-	store.CurrentStore().Set([]byte("c"), []byte("3"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("c"), []byte("3"))
 
 	// revert latest snapshot (idx1)
 	store.RevertToSnapshot(idx1)
-	require.Nil(t, store.CurrentStore().Get([]byte("c")))
-	require.Equal(t, []byte("2"), store.CurrentStore().Get([]byte("b")))
+	require.Nil(t, store.CurrentStore().(storetypes.KVStore).Get([]byte("c")))
+	require.Equal(t, []byte("2"), store.CurrentStore().(storetypes.KVStore).Get([]byte("b")))
 
 	// revert the first snapshot
 	store.RevertToSnapshot(idx0)
-	require.Nil(t, store.CurrentStore().Get([]byte("b")))
-	require.Equal(t, []byte("1"), store.CurrentStore().Get([]byte("a")))
+	require.Nil(t, store.CurrentStore().(storetypes.KVStore).Get([]byte("b")))
+	require.Equal(t, []byte("1"), store.CurrentStore().(storetypes.KVStore).Get([]byte("a")))
 
 	// take new snapshot and commit
 	store.Snapshot()
-	store.CurrentStore().Set([]byte("d"), []byte("4"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("d"), []byte("4"))
 	store.Commit()
 
 	require.Equal(t, []byte("4"), base.Get([]byte("d")))
@@ -72,31 +73,31 @@ func TestSnapshotKVRevertOverwriteSameKey(t *testing.T) {
 	base := store.CurrentStore()
 
 	// Initial write under key "a"
-	store.CurrentStore().Set([]byte("a"), []byte("1"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("a"), []byte("1"))
 
 	// Overwrite "a" with "2"
 	idx0 := store.Snapshot()
-	store.CurrentStore().Set([]byte("a"), []byte("2"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("a"), []byte("2"))
 
 	// Overwrite "a" with "3"
 	idx1 := store.Snapshot()
-	store.CurrentStore().Set([]byte("a"), []byte("3"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("a"), []byte("3"))
 
 	// Revert to idx1: expect value "2"
 	store.RevertToSnapshot(idx1)
-	require.Equal(t, []byte("2"), store.CurrentStore().Get([]byte("a")))
+	require.Equal(t, []byte("2"), store.CurrentStore().(storetypes.KVStore).Get([]byte("a")))
 
 	// Revert to idx0: expect value "1"
 	store.RevertToSnapshot(idx0)
-	require.Equal(t, []byte("1"), store.CurrentStore().Get([]byte("a")))
+	require.Equal(t, []byte("1"), store.CurrentStore().(storetypes.KVStore).Get([]byte("a")))
 
 	// Take a new snapshot, overwrite "a" with "4", then commit
 	idx2 := store.Snapshot()
-	store.CurrentStore().Set([]byte("a"), []byte("4"))
+	store.CurrentStore().(storetypes.KVStore).Set([]byte("a"), []byte("4"))
 	store.Commit()
 
 	// After commit, the base store should have "4"
-	require.Equal(t, []byte("4"), base.Get([]byte("a")))
+	require.Equal(t, []byte("4"), base.(storetypes.KVStore).Get([]byte("a")))
 
 	// Commit clears the snapshot stack, so reverting to idx2 should panic
 	expectedErr := fmt.Sprintf("snapshot index %d out of bound [%d..%d)", idx2, 0, 0)
diff --git a/x/vm/store/snapshotmulti/store.go b/x/vm/store/snapshotmulti/store.go
@@ -14,23 +14,28 @@ import (
 
 type Store struct {
 	stores    map[storetypes.StoreKey]types.SnapshotKVStore
-	storeKeys []*storetypes.KVStoreKey // ordered keys
+	storeKeys []storetypes.StoreKey // ordered keys
 	head      int
 }
 
 var _ types.SnapshotMultiStore = (*Store)(nil)
 
 // NewStore creates a new Store objectwith CacheMultiStore and KVStoreKeys
-func NewStore(cms storetypes.CacheMultiStore, keys map[string]*storetypes.KVStoreKey) *Store {
+func NewStore(cms storetypes.MultiStore, keys map[string]storetypes.StoreKey) *Store {
 	s := &Store{
 		stores:    make(map[storetypes.StoreKey]types.SnapshotKVStore),
 		storeKeys: vmtypes.SortedKVStoreKeys(keys),
 		head:      types.InitialHead,
 	}
 
 	for _, key := range s.storeKeys {
-		store := cms.GetKVStore(key).(storetypes.CacheKVStore)
-		s.stores[key] = snapshotkv.NewStore(store)
+		if _, ok := key.(*storetypes.KVStoreKey); ok {
+			store := cms.GetKVStore(key)
+			s.stores[key] = snapshotkv.NewStore(store.(storetypes.CacheWrap))
+		} else {
+			store := cms.GetObjKVStore(key)
+			s.stores[key] = snapshotkv.NewStore(store.(storetypes.CacheWrap))
+		}
 	}
 
 	return s
@@ -44,7 +49,7 @@ func NewStoreWithKVStores(stores map[*storetypes.KVStoreKey]storetypes.CacheWrap
 	}
 
 	for key, store := range stores {
-		s.stores[key] = snapshotkv.NewStore(store.(storetypes.CacheKVStore))
+		s.stores[key] = snapshotkv.NewStore(store)
 		s.storeKeys = append(s.storeKeys, key)
 	}
 
@@ -117,7 +122,7 @@ func (s *Store) GetStore(key storetypes.StoreKey) storetypes.Store {
 	if key == nil || store == nil {
 		panic(fmt.Sprintf("kv store with key %v has not been registered in stores", key))
 	}
-	return store.CurrentStore()
+	return store.CurrentStore().(storetypes.Store)
 }
 
 // GetKVStore returns an underlying KVStore by key.
@@ -126,7 +131,7 @@ func (s *Store) GetKVStore(key storetypes.StoreKey) storetypes.KVStore {
 	if key == nil || store == nil {
 		panic(fmt.Sprintf("kv store with key %v has not been registered in stores", key))
 	}
-	return store.CurrentStore()
+	return store.CurrentStore().(storetypes.KVStore)
 }
 
 // TracingEnabled returns if tracing is enabled for the MultiStore.
@@ -161,9 +166,9 @@ func (s *Store) LatestVersion() int64 {
 func (s *Store) GetObjKVStore(key storetypes.StoreKey) storetypes.ObjKVStore {
 	store := s.stores[key]
 	if store == nil {
-		panic(fmt.Sprintf("kv store with key %v has not been registered in stores", key))
+		panic(fmt.Sprintf("obj kv store with key %v has not been registered in stores", key))
 	}
-	return store.(storetypes.ObjKVStore)
+	return store.CurrentStore().(storetypes.ObjKVStore)
 }
 
 // Write calls Write on each underlying store.
diff --git a/x/vm/store/types/store.go b/x/vm/store/types/store.go
@@ -26,7 +26,7 @@ type SnapshotKVStore interface {
 
 	// CurrentStore returns the underlying CacheKVStore that is currently
 	// active (i.e., where reads and writes will be applied).
-	CurrentStore() storetypes.CacheKVStore
+	CurrentStore() storetypes.CacheWrap
 
 	// Commit flushes all pending changes in the current store layer
 	// down to its parent, making them permanent.
diff --git a/x/vm/types/mocks/EVMKeeper.go b/x/vm/types/mocks/EVMKeeper.go
diff --git a/x/vm/types/utils.go b/x/vm/types/utils.go

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ package ibc`
`7`	`7`
`8`	`8`	`import (`
`9`	`9`	`"math/big"`
	`10`	`+ "testing"`
`10`	`11`
`11`	`12`	`"github.com/ethereum/go-ethereum/common"`
`12`	`13`	`"github.com/ethereum/go-ethereum/core/vm"`
`@@ -354,6 +355,6 @@ func (suite *ICS20TransferTestSuite) TestHandleMsgTransfer() {`
`354`	`355`	`}`
`355`	`356`	`}`
`356`	`357`
`357`		`-// func TestICS20TransferTestSuite(t *testing.T) {`
`358`		`-// suite.Run(t, new(ICS20TransferTestSuite))`
`359`		`-// }`
	`358`	`+func TestICS20TransferTestSuite(t *testing.T) {`
	`359`	`+ suite.Run(t, new(ICS20TransferTestSuite))`
	`360`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ type VMKeeperI interface {`
`27`	`27`	`DeleteCode(ctx sdk.Context, codeHash []byte)`
`28`	`28`	`SetCode(ctx sdk.Context, codeHash []byte, code []byte)`
`29`	`29`	`DeleteAccount(ctx sdk.Context, addr common.Address) error`
`30`		`- KVStoreKeys() map[string]*storetypes.KVStoreKey`
	`30`	`+ KVStoreKeys() map[string]storetypes.StoreKey`
`31`	`31`	`SetEvmMempool(evmMempool *ExperimentalEVMMempool)`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,5 @@ type Keeper interface {`
`39`	`39`
`40`	`40`	`// Getter for injected KVStore keys`
`41`	`41`	`// It is used for StateDB.snapshotter creation`
`42`		`- KVStoreKeys() map[string]*storetypes.KVStoreKey`
	`42`	`+ KVStoreKeys() map[string]storetypes.StoreKey`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,6 @@ func (k MockKeeper) Clone() *MockKeeper {`
`120`	`120`	`return &MockKeeper{accounts, codes}`
`121`	`121`	`}`
`122`	`122`
`123`		`-func (k MockKeeper) KVStoreKeys() map[string]*storetypes.KVStoreKey {`
`124`		`- return make(map[string]*storetypes.KVStoreKey)`
	`123`	`+func (k MockKeeper) KVStoreKeys() map[string]storetypes.StoreKey {`
	`124`	`+ return make(map[string]storetypes.StoreKey)`
`125`	`125`	`}`