From 6a4edeac7aa2dda263467bbb8b1505cf4fbd5436 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 17 Jan 2025 22:33:38 +0800 Subject: [PATCH 1/2] Problem: no object kvStore service for runtime --- app/app.go | 2 +- go.mod | 8 +++++--- go.sum | 20 ++++++++++---------- gomod2nix.toml | 26 ++++++++++++++------------ 4 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/app.go b/app/app.go index 8ceff9e81c..827712d327 100644 --- a/app/app.go +++ b/app/app.go @@ -377,7 +377,7 @@ func NewEthermintApp( app.BankKeeper = bankkeeper.NewBaseKeeper( appCodec, runtime.NewKVStoreService(keys[banktypes.StoreKey]), - okeys[banktypes.ObjectStoreKey], + runtime.NewObjKVStoreService(okeys[banktypes.ObjectStoreKey]), app.AccountKeeper, app.BlockedAddrs(), authAddr, diff --git a/go.mod b/go.mod index 269fa37153..8bf376f1de 100644 --- a/go.mod +++ b/go.mod @@ -241,9 +241,11 @@ require ( replace ( // release/v0.50.x - cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20250116033154-05863f6ce4b8 - cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20250116033154-05863f6ce4b8 - github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250116033154-05863f6ce4b8 + cosmossdk.io/core => github.com/mmsqe/cosmos-sdk/core v0.0.0-20250117014440-1123fbe3623b + cosmossdk.io/store => github.com/mmsqe/cosmos-sdk/store v0.0.0-20250117014440-1123fbe3623b + cosmossdk.io/x/tx => github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20250117014440-1123fbe3623b + github.com/cosmos/cosmos-sdk => github.com/mmsqe/cosmos-sdk v0.46.0-beta2.0.20250117014440-1123fbe3623b + github.com/crypto-org-chain/go-block-stm => github.com/mmsqe/go-block-stm v0.0.0-20250117142350-3cf6d8c771bf ) replace ( diff --git a/go.sum b/go.sum index c595173fc1..3e1d236240 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,6 @@ cosmossdk.io/client/v2 v2.0.0-beta.5 h1:0LVv3nEByn//hFDIrYLs2WvsEU3HodOelh4SDHnA cosmossdk.io/client/v2 v2.0.0-beta.5/go.mod h1:4p0P6o0ro+FizakJUYS9SeM94RNbv0thLmkHRw5o5as= cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= -cosmossdk.io/core v0.11.1 h1:h9WfBey7NAiFfIcUhDVNS503I2P2HdZLebJlUIs8LPA= -cosmossdk.io/core v0.11.1/go.mod h1:OJzxcdC+RPrgGF8NJZR2uoQr56tc7gfBKhiKeDO7hH0= cosmossdk.io/depinject v1.0.0 h1:dQaTu6+O6askNXO06+jyeUAnF2/ssKwrrszP9t5q050= cosmossdk.io/depinject v1.0.0/go.mod h1:zxK/h3HgHoA/eJVtiSsoaRaRA2D5U4cJ5thIG4ssbB8= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= @@ -410,14 +408,6 @@ github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+F github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= github.com/crypto-org-chain/cometbft v0.0.0-20241106091515-ce418f845d9a h1:0EN1TkzHTAxpgpGaZJY3G7L4jf4+sYnI7FOmBFLCg4U= github.com/crypto-org-chain/cometbft v0.0.0-20241106091515-ce418f845d9a/go.mod h1:khbgmtxbgwJfMqDmnGY4rl2sQpTdzpPb1f9nqnfpy1o= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250116033154-05863f6ce4b8 h1:KYwCiEEuNZ8j4zpIRdMwr4AHT58nh3KKfJ+UKLZSw7E= -github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20250116033154-05863f6ce4b8/go.mod h1:JwwsMeZldLN20b72mmbWPY0EV9rs+v/12hRu1JFttvY= -github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20250116033154-05863f6ce4b8 h1:7kbrHLCo505EBH0um5be15R8xdc9bw7WIriZDUQJ1Ro= -github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20250116033154-05863f6ce4b8/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= -github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20250116033154-05863f6ce4b8 h1:GwNyoWViRCZa8TLITeRPTxMx1MsGRShszKThxqRngng= -github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20250116033154-05863f6ce4b8/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6 h1:6KPEi8dWkDSBddQb4NAvEXmNnTXymF3yVeTaT4Hz1iU= -github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20241030073450-b9cc632bc183 h1:JDBTqDkd9X9oBF2C4FKOpn0GVDQDzVkHzeS8eDWNl6A= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20241030073450-b9cc632bc183/go.mod h1:5DnkptqPQr+Mo3sy/2V3OQu+K94x1PVzFGZJZbDF8mI= github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= @@ -875,6 +865,16 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/mmsqe/cosmos-sdk v0.46.0-beta2.0.20250117014440-1123fbe3623b h1:hV126b5eVqWrMsdINdDWbjvKyKemZ42PqXqleh/nj58= +github.com/mmsqe/cosmos-sdk v0.46.0-beta2.0.20250117014440-1123fbe3623b/go.mod h1:JwwsMeZldLN20b72mmbWPY0EV9rs+v/12hRu1JFttvY= +github.com/mmsqe/cosmos-sdk/core v0.0.0-20250117014440-1123fbe3623b h1:K3mnWDKGALEhJvvIP9Jiz/wJkyWaKQTdaX51l81q0t0= +github.com/mmsqe/cosmos-sdk/core v0.0.0-20250117014440-1123fbe3623b/go.mod h1:01u7jX5X4U/LlkPfEONgYGMTsHtyLPeFm1cPHeLce2Y= +github.com/mmsqe/cosmos-sdk/store v0.0.0-20250117014440-1123fbe3623b h1:yXTA61dku6yv0ZsOkZL5zkMyupc7hE98HE/vIRc4jA8= +github.com/mmsqe/cosmos-sdk/store v0.0.0-20250117014440-1123fbe3623b/go.mod h1:JU6fNrdyPfb20AW+CgIPlZhn8flZu1zjabyzLVxwpVk= +github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20250117014440-1123fbe3623b h1:PlkWhByzQnoBsn0mQsDHtfbpbo+f9A8YCo3AjY2Q490= +github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20250117014440-1123fbe3623b/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= +github.com/mmsqe/go-block-stm v0.0.0-20250117142350-3cf6d8c771bf h1:Qv7VHT+Ukgb/NewHJm4iijZn/dbXUevlslkrfJJ7dPc= +github.com/mmsqe/go-block-stm v0.0.0-20250117142350-3cf6d8c771bf/go.mod h1:8R2DUCrcwL07xUOBYaIPGtvtXfODlxSuxMB8jP4cM8g= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= diff --git a/gomod2nix.toml b/gomod2nix.toml index 4f6dcbda30..ca311d09d1 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -29,8 +29,9 @@ schema = 3 version = "v0.4.0" hash = "sha256-minFyzgO/D+Oda4E3B1qvOAN5qd65SjS6nmjca4cp/8=" [mod."cosmossdk.io/core"] - version = "v0.11.1" - hash = "sha256-A857PYFy22B43qo8raLkstLOao7RRltt6TB+s3ZuuM4=" + version = "v0.0.0-20250117014440-1123fbe3623b" + hash = "sha256-DOsw6BlBfoy6vDZwQ+j/htUr99bl+pIKVEqmPQ1pg8s=" + replaced = "github.com/mmsqe/cosmos-sdk/core" [mod."cosmossdk.io/depinject"] version = "v1.0.0" hash = "sha256-dtsNfj5zUlX6e4YslzyegrebztmlLiBFvqDb2IHV+Zc=" @@ -44,9 +45,9 @@ schema = 3 version = "v1.3.0" hash = "sha256-EEFK43Cr0g0ndhQhkIKher0FqV3mvkmE9z0sP7uVSHg=" [mod."cosmossdk.io/store"] - version = "v0.0.0-20250116033154-05863f6ce4b8" - hash = "sha256-vXJBzc0ZxdjYYn2V5jfzOumbY4VUnMfYtMYfYzzD56M=" - replaced = "github.com/crypto-org-chain/cosmos-sdk/store" + version = "v0.0.0-20250117014440-1123fbe3623b" + hash = "sha256-SQgIuAvgR9fuV4oxMvWrE1jA1MnGVBPtmBaWxsEus1g=" + replaced = "github.com/mmsqe/cosmos-sdk/store" [mod."cosmossdk.io/tools/confix"] version = "v0.1.2" hash = "sha256-1VhdIdBDG7jaSiRTNYtoQ3WGaGm+vQ1Qf671zSiWAek=" @@ -57,9 +58,9 @@ schema = 3 version = "v0.1.1" hash = "sha256-aps3LfnQau1TYeccGwtqHQvy1Rudc9+O+iVAwXBKyDw=" [mod."cosmossdk.io/x/tx"] - version = "v0.0.0-20250116033154-05863f6ce4b8" + version = "v0.0.0-20250117014440-1123fbe3623b" hash = "sha256-3A5GTl5NRD4zH3PsSd450C6HvU2zi4I7b4Zqu+L9YAo=" - replaced = "github.com/crypto-org-chain/cosmos-sdk/x/tx" + replaced = "github.com/mmsqe/cosmos-sdk/x/tx" [mod."cosmossdk.io/x/upgrade"] version = "v0.1.4" hash = "sha256-lm0Ccc9zWs1ldWv1cArXuzRxq45zMir1ZNvoPY+9n7o=" @@ -168,9 +169,9 @@ schema = 3 version = "v1.0.0-beta.5" hash = "sha256-Fy/PbsOsd6iq0Njy3DVWK6HqWsogI+MkE8QslHGWyVg=" [mod."github.com/cosmos/cosmos-sdk"] - version = "v0.50.6-0.20250116033154-05863f6ce4b8" - hash = "sha256-FdqMirVPBm0lbUaBrbIxnlIaD9mYmZeW8ooJRUD/oYE=" - replaced = "github.com/crypto-org-chain/cosmos-sdk" + version = "v0.46.0-beta2.0.20250117014440-1123fbe3623b" + hash = "sha256-vF+Q7MgPO3uUH2b+rTqGslKoqAm/pVOr5BGvIqQMDBc=" + replaced = "github.com/mmsqe/cosmos-sdk" [mod."github.com/cosmos/go-bip39"] version = "v1.0.0" hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA=" @@ -208,8 +209,9 @@ schema = 3 version = "v0.0.24" hash = "sha256-4vUukHONOjNn0qfQr4esK6TWfPWsIp+rbdz65og84lw=" [mod."github.com/crypto-org-chain/go-block-stm"] - version = "v0.0.0-20241213061541-7afe924fb4a6" - hash = "sha256-bl5jVL5oouu9/kbuJv9ua4w4hRhchnWQ8ogIEnW9NLs=" + version = "v0.0.0-20250117142350-3cf6d8c771bf" + hash = "sha256-ReelDSZI1uoR0IyUalFIRZGgMb2IsgUVU47J8jpB4MI=" + replaced = "github.com/mmsqe/go-block-stm" [mod."github.com/danieljoos/wincred"] version = "v1.2.1" hash = "sha256-hmJediHYMONMEvrRnMs88OXEp4SDt1Pmi8t8eOEk83o=" From 68cebeb6ef78a91f46a8125cdac94f7431667711 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 20 Jan 2025 09:38:03 +0800 Subject: [PATCH 2/2] fix test --- x/evm/statedb/statedb_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/evm/statedb/statedb_test.go b/x/evm/statedb/statedb_test.go index 5060e4abbf..a74c89b741 100644 --- a/x/evm/statedb/statedb_test.go +++ b/x/evm/statedb/statedb_test.go @@ -813,7 +813,7 @@ func newTestKeeper(t *testing.T, cms storetypes.MultiStore) (sdk.Context, *evmke bankKeeper := bankkeeper.NewBaseKeeper( appCodec, runtime.NewKVStoreService(testStoreKeys[banktypes.StoreKey]), - testObjKeys[banktypes.ObjectStoreKey], + runtime.NewObjKVStoreService(testObjKeys[banktypes.ObjectStoreKey]), accountKeeper, map[string]bool{}, authAddr,