refactor(server/v2/cometbft): sync with storage changes (partial backport #22683)

server/v2/cometbft/abci_test.go

@@ -591,7 +591,7 @@ func TestConsensus_Query(t *testing.T) {
 	c := setUpConsensus(t, 100_000, cometmock.MockMempool[mock.Tx]{})
 
 	// Write data to state storage
-	err := c.store.GetStateStorage().ApplyChangeset(&store.Changeset{
+	err := c.store.GetStateCommitment().WriteChangeset(&store.Changeset{
 		Version: 1,
 		Changes: []store.StateChanges{
 			{
@@ -691,9 +691,8 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock.
 	)
 	require.NoError(t, err)
 
-	ss := cometmock.NewMockStorage(log.NewNopLogger(), t.TempDir())
 	sc := cometmock.NewMockCommiter(log.NewNopLogger(), string(actorName), "stf")
-	mockStore := cometmock.NewMockStore(ss, sc)
+	mockStore := cometmock.NewMockStore(sc)
 
 	am := appmanager.New(appmanager.Config{
 		ValidateTxGasLimit: gasLimit,
@@ -786,6 +785,7 @@ func TestOptimisticExecution(t *testing.T) {
 		Txs:    ppReq.Txs,
 	}
 	fbResp, err := c.FinalizeBlock(context.Background(), fbReq)
+	require.Nil(t, fbResp)
 	require.Error(t, err)
 	require.ErrorContains(t, err, "test error") // from optimisticMockFunc
 	require.Equal(t, 1, calledTimes)

server/v2/cometbft/go.mod

@@ -20,10 +20,10 @@ require (
 	cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5
 	cosmossdk.io/log v1.5.0
 	cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b //main
-	cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2 // main
-	cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 // main
-	cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 // main
-	cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2 // main
+	cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main
+	cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 // main
+	cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 // main
+	cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main
 	cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
 	github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
 	github.com/cometbft/cometbft/api v1.0.0-rc2

server/v2/cometbft/go.sum

@@ -24,16 +24,16 @@ cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
 cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
 cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo=
 cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
-cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2 h1:PBV8S+nGjXNEW/sGUgYYwsyI315I4LtXQTrKk5g8G2A=
-cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
-cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 h1:GOznErJieaI0OS0LDUsu5Vy3qPnCyjdvkncejP0Zv5s=
-cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
-cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 h1:cK7wvmlA18AvLcaInseKTBmt5EXtLwafe7oH1rx7veU=
-cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
+cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:TGvCN7MYep68o1X3/mgEt+raIf5x6m9wHC3erLMWfr0=
+cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
+cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 h1:uQk1cl7ZvDud6FkZgbGj4LMQ2jKZe6wfqrjSwuLDABw=
+cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
+cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 h1:K5stPleqQZGWZuvPJdlMWNgddkUeT55hw1R6ZXnXEqk=
+cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
 cosmossdk.io/store v1.0.0-rc.0.0.20241202115147-f350775d0ed2 h1:UCe04NMBR+1M5JRpZJvM+I0EZzD3zXrk9YOm2RZdKDg=
 cosmossdk.io/store v1.0.0-rc.0.0.20241202115147-f350775d0ed2/go.mod h1:oZBBY4BrkYnghr6MFL0MP5mGqpkPedHcWkXwXddd6tU=
-cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2 h1:SmP9frnyUuBXW6rqNfPXDGaLfgN9INaHzBMZZW8ZraU=
-cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
+cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:pITcGoEspRSWxCpCaAkSoMDuikoapkfo7eg1OYFE2M8=
+cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
 cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk=
 cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=

server/v2/cometbft/internal/mock/mock_reader.go

@@ -39,7 +39,7 @@ func NewMockReader(v uint64, rs *MockStore, actor []byte) *MockReader {
 }
 
 func (roa *MockReader) Has(key []byte) (bool, error) {
-	val, err := roa.store.GetStateStorage().Has(roa.actor, roa.version, key)
+	val, err := roa.store.GetStateCommitment().Has(roa.actor, roa.version, key)
 	if err != nil {
 		return false, err
 	}
@@ -48,7 +48,7 @@ func (roa *MockReader) Has(key []byte) (bool, error) {
 }
 
 func (roa *MockReader) Get(key []byte) ([]byte, error) {
-	result, err := roa.store.GetStateStorage().Get(roa.actor, roa.version, key)
+	result, err := roa.store.GetStateCommitment().Get(roa.actor, roa.version, key)
 	if err != nil {
 		return nil, err
 	}
@@ -57,9 +57,9 @@ func (roa *MockReader) Get(key []byte) ([]byte, error) {
 }
 
 func (roa *MockReader) Iterator(start, end []byte) (corestore.Iterator, error) {
-	return roa.store.GetStateStorage().Iterator(roa.actor, roa.version, start, end)
+	return roa.store.GetStateCommitment().Iterator(roa.actor, roa.version, start, end)
 }
 
 func (roa *MockReader) ReverseIterator(start, end []byte) (corestore.Iterator, error) {
-	return roa.store.GetStateStorage().ReverseIterator(roa.actor, roa.version, start, end)
+	return roa.store.GetStateCommitment().ReverseIterator(roa.actor, roa.version, start, end)
 }

server/v2/cometbft/internal/mock/mock_store.go

@@ -11,21 +11,12 @@ import (
 	"cosmossdk.io/store/v2/commitment/iavl"
 	dbm "cosmossdk.io/store/v2/db"
 	"cosmossdk.io/store/v2/proof"
-	"cosmossdk.io/store/v2/storage"
-	"cosmossdk.io/store/v2/storage/pebbledb"
 )
 
 type MockStore struct {
-	Storage   storev2.VersionedWriter
 	Committer storev2.Committer
 }
 
-func NewMockStorage(logger log.Logger, dir string) storev2.VersionedWriter {
-	storageDB, _ := pebbledb.New(dir)
-	ss := storage.NewStorageStore(storageDB, logger)
-	return ss
-}
-
 func NewMockCommiter(logger log.Logger, actors ...string) storev2.Committer {
 	treeMap := make(map[string]commitment.Tree)
 	for _, actor := range actors {
@@ -36,8 +27,8 @@ func NewMockCommiter(logger log.Logger, actors ...string) storev2.Committer {
 	return sc
 }
 
-func NewMockStore(ss storev2.VersionedWriter, sc storev2.Committer) *MockStore {
-	return &MockStore{Storage: ss, Committer: sc}
+func NewMockStore(sc storev2.Committer) *MockStore {
+	return &MockStore{Committer: sc}
 }
 
 func (s *MockStore) GetLatestVersion() (uint64, error) {
@@ -59,12 +50,7 @@ func (s *MockStore) StateLatest() (uint64, corestore.ReaderMap, error) {
 }
 
 func (s *MockStore) Commit(changeset *corestore.Changeset) (corestore.Hash, error) {
-	err := s.Storage.ApplyChangeset(changeset)
-	if err != nil {
-		return []byte{}, err
-	}
-
-	err = s.Committer.WriteChangeset(changeset)
+	err := s.Committer.WriteChangeset(changeset)
 	if err != nil {
 		return []byte{}, err
 	}
@@ -81,10 +67,6 @@ func (s *MockStore) StateAt(version uint64) (corestore.ReaderMap, error) {
 	return NewMockReaderMap(version, s), nil
 }
 
-func (s *MockStore) GetStateStorage() storev2.VersionedWriter {
-	return s.Storage
-}
-
 func (s *MockStore) GetStateCommitment() storev2.Committer {
 	return s.Committer
 }

server/v2/cometbft/server.go

@@ -127,7 +127,6 @@ func New[T transaction.Tx](
 		indexEvents[e] = struct{}{}
 	}
 
-	ss := store.GetStateStorage().(snapshots.StorageSnapshotter)
 	sc := store.GetStateCommitment().(snapshots.CommitSnapshotter)
 
 	snapshotStore, err := GetSnapshotStore(srv.config.ConfigTomlConfig.RootDir)
@@ -155,7 +154,6 @@ func New[T transaction.Tx](
 		snapshotStore,
 		srv.serverOptions.SnapshotOptions(cfg),
 		sc,
-		ss,
 		nil, // extensions snapshotter registered below
 		logger,
 	)

simapp/go.mod

@@ -38,7 +38,7 @@ require (
 	github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
 	github.com/cometbft/cometbft/api v1.0.0-rc2
 	// this version is not used as it is always replaced by the latest Cosmos SDK version
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/golang/mock v1.6.0
 	github.com/jackc/pgx/v5 v5.7.1

simapp/v2/go.mod

@@ -10,12 +10,15 @@ require (
 	cosmossdk.io/depinject v1.1.0
 	cosmossdk.io/log v1.5.0
 	cosmossdk.io/math v1.4.0
-	cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 // main
-	cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2 // main
+	cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main
+	cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main
 	cosmossdk.io/server/v2/cometbft v0.0.0-00010101000000-000000000000
-	cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2 // main
+	cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 // main
 	cosmossdk.io/tools/confix v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/accounts v0.0.0-20240913065641-0064ccbce64e
+	cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000
+	cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5
+	cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
 	cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
 	cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f
@@ -34,30 +37,14 @@ require (
 	cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
 	github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
 	// this version is not used as it is always replaced by the latest Cosmos SDK version
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0
 	google.golang.org/protobuf v1.35.2
 )
 
-require (
-	cosmossdk.io/x/accounts/defaults/base v0.0.0-00010101000000-000000000000
-	cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5
-	cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000
-)
-
-require (
-	github.com/bytedance/sonic v1.12.4 // indirect
-	github.com/bytedance/sonic/loader v0.2.1 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
-	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	golang.org/x/arch v0.12.0 // indirect
-)
-
 require (
 	buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.35.2-20241120201313-68e42a58b301.1 // indirect
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.35.2-20240130113600-88ef6483f90f.1 // indirect
@@ -71,8 +58,8 @@ require (
 	cosmossdk.io/errors v1.0.1 // indirect
 	cosmossdk.io/errors/v2 v2.0.0-20240731132947-df72853b3ca5 // indirect
 	cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b // indirect
-	cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 // indirect; main
-	cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 // indirect; main
+	cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 // indirect; main
+	cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 // indirect; main
 	cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // indirect; main
 	cosmossdk.io/x/tx v1.0.0-alpha.2 // indirect; main
 	filippo.io/edwards25519 v1.1.0 // indirect
@@ -87,8 +74,12 @@ require (
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.2.0 // indirect
 	github.com/bits-and-blooms/bitset v1.10.0 // indirect
+	github.com/bytedance/sonic v1.12.4 // indirect
+	github.com/bytedance/sonic/loader v0.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chzyer/readline v1.5.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/cockroachdb/errors v1.11.3 // indirect
 	github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
@@ -165,6 +156,7 @@ require (
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
@@ -209,6 +201,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tidwall/btree v1.7.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/zondax/hid v0.9.2 // indirect
 	github.com/zondax/ledger-go v0.14.3 // indirect
@@ -222,6 +215,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.27.0 // indirect
 	go.opentelemetry.io/otel/trace v1.27.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/arch v0.12.0 // indirect
 	golang.org/x/crypto v0.29.0 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
 	golang.org/x/mod v0.22.0 // indirect

simapp/v2/go.sum

@@ -210,20 +210,20 @@ cosmossdk.io/log v1.5.0 h1:dVdzPJW9kMrnAYyMf1duqacoidB9uZIl+7c6z0mnq0g=
 cosmossdk.io/log v1.5.0/go.mod h1:Tr46PUJjiUthlwQ+hxYtUtPn4D/oCZXAkYevBeh5+FI=
 cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
 cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
-cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95 h1:hYI7pvrmdkgFZJ4HVQow7ubopsTmleYet4S56tFMdI0=
-cosmossdk.io/runtime/v2 v2.0.0-20241119134933-d697a3de0f95/go.mod h1:J4Wv2eOwAz8t14Ak8XBMWDoFbwqwyllMaJF91O7n/wI=
+cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:g8rsvk80KaR5SNIr9cs0RnRM+yFgkKV5OjCu0ARHTJo=
+cosmossdk.io/runtime/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:7DCLOq3Xzyq+DA0WoMD5HcZUuflShDmq6g2qgh2yVdI=
 cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b h1:svpFdulZRrYz+RTHu2u9CeKkMKrIHx5354vjiHerovo=
 cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b/go.mod h1:RDAhxIeNB4bYqAlF4NBJwRrgtnciMcyyg0DOKnhNZQQ=
-cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2 h1:PBV8S+nGjXNEW/sGUgYYwsyI315I4LtXQTrKk5g8G2A=
-cosmossdk.io/server/v2 v2.0.0-20241202115147-f350775d0ed2/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
-cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95 h1:GOznErJieaI0OS0LDUsu5Vy3qPnCyjdvkncejP0Zv5s=
-cosmossdk.io/server/v2/appmanager v0.0.0-20241119134933-d697a3de0f95/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
-cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95 h1:cK7wvmlA18AvLcaInseKTBmt5EXtLwafe7oH1rx7veU=
-cosmossdk.io/server/v2/stf v0.0.0-20241119134933-d697a3de0f95/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
+cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:TGvCN7MYep68o1X3/mgEt+raIf5x6m9wHC3erLMWfr0=
+cosmossdk.io/server/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:NT1O+DPv2bWxqX8QTtvBbjXpeXFw5doT2hoRRNr8ob4=
+cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5 h1:uQk1cl7ZvDud6FkZgbGj4LMQ2jKZe6wfqrjSwuLDABw=
+cosmossdk.io/server/v2/appmanager v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:elhlrldWtm+9U4PxE0G3wjz83yQwVVGVAOncXJPY1Xc=
+cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5 h1:K5stPleqQZGWZuvPJdlMWNgddkUeT55hw1R6ZXnXEqk=
+cosmossdk.io/server/v2/stf v0.0.0-20241203161819-94cfcc11aaf5/go.mod h1:4e9SzLyeGptQ3tSR6nKCNwCu7Ye4uUS2WIJih29dG2c=
 cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95 h1:5hIgRL6VsicdJ7FVK6AG7cSy1C8tiVbCp6W3Y+QQ5ko=
 cosmossdk.io/store v1.0.0-rc.0.0.20241119134933-d697a3de0f95/go.mod h1:ceNwMZIU8ZIDoeUdA9+sGxz3GVt0orEGoVpkBfa/UtU=
-cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2 h1:SmP9frnyUuBXW6rqNfPXDGaLfgN9INaHzBMZZW8ZraU=
-cosmossdk.io/store/v2 v2.0.0-20241202115147-f350775d0ed2/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
+cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5 h1:pITcGoEspRSWxCpCaAkSoMDuikoapkfo7eg1OYFE2M8=
+cosmossdk.io/store/v2 v2.0.0-20241203161819-94cfcc11aaf5/go.mod h1:1DbksNgjyQ1XxlCYqkU82WqBGWcxmgciO5dBf6dRhKM=
 cosmossdk.io/x/tx v1.0.0-alpha.2 h1:UW80FMm7B0fiAMsrfe5+HabSJ3XBg+tQa6/GK9prqWk=
 cosmossdk.io/x/tx v1.0.0-alpha.2/go.mod h1:r4yTKSJ7ZCCR95YbBfY3nfvbgNw6m9F6f25efWYYQWo=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

tests/go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/cometbft/cometbft v1.0.0-rc2.0.20241127125717-4ce33b646ac9
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	// this version is not used as it is always replaced by the latest Cosmos SDK version
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/spf13/cobra v1.8.1 // indirect
 	github.com/stretchr/testify v1.10.0

tests/integration/accounts/base_account_test.go

@@ -51,12 +51,14 @@ func TestBaseAccount(t *testing.T) {
 }
 
 func sendTx(t *testing.T, ctx sdk.Context, app *simapp.SimApp, sender []byte, msg sdk.Msg) {
+	t.Helper()
 	tx := sign(t, ctx, app, sender, privKey, msg)
 	_, _, err := app.SimDeliver(app.TxEncode, tx)
 	require.NoError(t, err)
 }
 
 func sign(t *testing.T, ctx sdk.Context, app *simapp.SimApp, from sdk.AccAddress, privKey cryptotypes.PrivKey, msg sdk.Msg) sdk.Tx {
+	t.Helper()
 	r := rand.New(rand.NewSource(0))
 
 	accNum, err := app.AccountsKeeper.AccountByNumber.Get(ctx, from)
@@ -81,12 +83,14 @@ func sign(t *testing.T, ctx sdk.Context, app *simapp.SimApp, from sdk.AccAddress
 }
 
 func bechify(t *testing.T, app *simapp.SimApp, addr []byte) string {
+	t.Helper()
 	bech32, err := app.AuthKeeper.AddressCodec().BytesToString(addr)
 	require.NoError(t, err)
 	return bech32
 }
 
 func fundAccount(t *testing.T, app *simapp.SimApp, ctx sdk.Context, addr sdk.AccAddress, amt string) {
+	t.Helper()
 	require.NoError(t, testutil.FundAccount(ctx, app.BankKeeper, addr, coins(t, amt)))
 }
 

tests/integration/accounts/bundler_test.go

@@ -209,6 +209,7 @@ func TestMsgServer_ExecuteBundle(t *testing.T) {
 }
 
 func makeTx(t *testing.T, msg gogoproto.Message, sig []byte, xt *account_abstractionv1.TxExtension) []byte {
+	t.Helper()
 	anyMsg, err := codectypes.NewAnyWithValue(msg)
 	require.NoError(t, err)
 

x/circuit/go.mod

@@ -11,7 +11,7 @@ require (
 	cosmossdk.io/errors v1.0.1
 	cosmossdk.io/schema v0.3.1-0.20241128094659-bd76b47e1d8b
 	cosmossdk.io/store v1.1.1-0.20240909133312-50288938d1b6 // main
-	github.com/cosmos/cosmos-sdk v0.53.0
+	github.com/cosmos/cosmos-sdk v0.52.0
 	github.com/cosmos/gogoproto v1.7.0
 	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0