fix build

crypto-org-chain · Nov 29, 2024 · 11713af · 11713af
1 parent 48db2e2
commit 11713af
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -251,9 +251,9 @@ require (
 
 // release/v0.50.x
 replace (
-	cosmossdk.io/store => github.com/yihuang/cosmos-sdk/store b6ec0d55cc17f179113e320e72b530c8388fae61
-	cosmossdk.io/x/tx => github.com/yihuang/cosmos-sdk/x/tx b6ec0d55cc17f179113e320e72b530c8388fae61
-	github.com/cosmos/cosmos-sdk => github.com/yihuang/cosmos-sdk b6ec0d55cc17f179113e320e72b530c8388fae61
+	cosmossdk.io/store => github.com/yihuang/cosmos-sdk/store v0.0.0-20241129083954-b6ec0d55cc17
+	cosmossdk.io/x/tx => github.com/yihuang/cosmos-sdk/x/tx v0.0.0-20241129083954-b6ec0d55cc17
+	github.com/cosmos/cosmos-sdk => github.com/yihuang/cosmos-sdk v0.43.0-beta1.0.20241129083954-b6ec0d55cc17
 )
 
 replace (
@@ -267,7 +267,6 @@ replace (
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 	// v0.38.x
 	github.com/cometbft/cometbft => github.com/crypto-org-chain/cometbft v0.0.0-20241106091515-ce418f845d9a
-	github.com/cosmos/iavl => ../iavl
 	// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2

diff --git a/go.sum b/go.sum
@@ -422,8 +422,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/x/tx v0.0.0-20241114020021-3300cc8f3836 h1:i4ubInu2ixIWOxjADpdLcaO08iIAQjIQucwsNutNZmM=
-github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241114020021-3300cc8f3836/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
 github.com/crypto-org-chain/ethermint v0.6.1-0.20241118003049-cd93407bcf05 h1:4mewSJnWOTwRbBntlAtOj5ZevujX4PGwn57QcO99+Bo=
 github.com/crypto-org-chain/ethermint v0.6.1-0.20241118003049-cd93407bcf05/go.mod h1:9FNO9k70szJ7CEge4tnJraWu3baTbwNxjpZhZBqlMok=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI=
@@ -1135,10 +1133,12 @@ github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yihuang/cosmos-sdk v0.43.0-beta1.0.20241126152358-dbeafc84b800 h1:/mWXPFd/TO+tLCffNZ6HXFfXWzNHZ4hDNPAG/s/8Tkw=
-github.com/yihuang/cosmos-sdk v0.43.0-beta1.0.20241126152358-dbeafc84b800/go.mod h1:JwwsMeZldLN20b72mmbWPY0EV9rs+v/12hRu1JFttvY=
-github.com/yihuang/cosmos-sdk/store v0.0.0-20241126152358-dbeafc84b800 h1:hg8uQVa+hEEKXCAkC8dtBaxwX1ratzRUm7IbjkvXmhQ=
-github.com/yihuang/cosmos-sdk/store v0.0.0-20241126152358-dbeafc84b800/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
+github.com/yihuang/cosmos-sdk v0.43.0-beta1.0.20241129083954-b6ec0d55cc17 h1:PUzF5+LqEsHxtYXKbmd8HbPBbvJdIZivqKJnnGKUDEs=
+github.com/yihuang/cosmos-sdk v0.43.0-beta1.0.20241129083954-b6ec0d55cc17/go.mod h1:JwwsMeZldLN20b72mmbWPY0EV9rs+v/12hRu1JFttvY=
+github.com/yihuang/cosmos-sdk/store v0.0.0-20241129083954-b6ec0d55cc17 h1:aDTR1ghcnfcYqvih5inBZjxVm1fPXxf29bWUUriz3R0=
+github.com/yihuang/cosmos-sdk/store v0.0.0-20241129083954-b6ec0d55cc17/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
+github.com/yihuang/cosmos-sdk/x/tx v0.0.0-20241129083954-b6ec0d55cc17 h1:fwuWMuEgNP9vByFitwI9F0l+xr8C6z7cLZibMcLJlUs=
+github.com/yihuang/cosmos-sdk/x/tx v0.0.0-20241129083954-b6ec0d55cc17/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/gomod2nix.toml b/gomod2nix.toml
diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
@@ -445,6 +445,10 @@ func (rs *Store) SetIAVLCacheSize(size int) {
 func (rs *Store) SetIAVLDisableFastNode(disable bool) {
 }
 
+// Implements interface CommitMultiStore
+func (rs *Store) SetIAVLSyncPruning(syncPruning bool) {
+}
+
 // Implements interface CommitMultiStore
 func (rs *Store) SetLazyLoading(lazyLoading bool) {
 }