update PreCommit

bnb-chain · Jun 27, 2023 · 47a8107 · 47a8107
1 parent ff97fdb
commit 47a8107
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -470,14 +470,12 @@ func (app *BaseApp) setPreState(number int64, header tmproto.Header) {
 		if _, ok := app.cms.(*rootmulti.Store); ok {
 			ms = app.cms.(*rootmulti.Store).DeepCopyMultiStore()
 		}
+
 		baseState := &state{
 			ms:  ms,
 			ctx: sdk.NewContext(ms, header, false, app.upgradeChecker, app.logger),
 		}
 		app.preDeliverStates = append(app.preDeliverStates, baseState)
-
-		app.preDeliverStates[i].ctx = app.preDeliverStates[i].ctx.
-			WithConsensusParams(app.GetConsensusParams(app.preDeliverStates[i].ctx))
 	}
 }
 

diff --git a/go.mod b/go.mod
@@ -171,9 +171,9 @@ replace (
 	// use cosmos fork of keyring
 	github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
 	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.23.0
-	github.com/cometbft/cometbft => github.com/Pythonberg1997/greenfield-cometbft v0.0.0-20230620094733-69ff26f72c64
+	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v0.0.2-0.20230626021059-4b919e74f49e
 
-	github.com/cosmos/iavl => github.com/Pythonberg1997/iavl v0.0.0-20230620094434-1dcb46b7c5f0
+	github.com/cosmos/iavl => github.com/Pythonberg1997/iavl v0.0.0-20230625152557-29e0fb6d5d05
 	// Downgraded to avoid bugs in following commits which caused simulations to fail.
 	// dgrijalva/jwt-go is deprecated and doesn't receive security updates.
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134

diff --git a/go.sum b/go.sum
@@ -143,10 +143,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
 github.com/OpenPeeDeeP/depguard v1.1.0/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/Pythonberg1997/greenfield-cometbft v0.0.0-20230620094733-69ff26f72c64 h1:ryCG87x3HH3whaoPRrUyQG8AoFOTT3eS3oYWGEXbIf4=
-github.com/Pythonberg1997/greenfield-cometbft v0.0.0-20230620094733-69ff26f72c64/go.mod h1:9q11eHNRY9FDwFH+4pompzPNGv//Z3VcfvkELaHJPMs=
-github.com/Pythonberg1997/iavl v0.0.0-20230620094434-1dcb46b7c5f0 h1:HO76lhqzxJlj6O8g/F+WZlEKGeWIe52vwCsFP49vjso=
-github.com/Pythonberg1997/iavl v0.0.0-20230620094434-1dcb46b7c5f0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
+github.com/Pythonberg1997/iavl v0.0.0-20230625152557-29e0fb6d5d05 h1:rjrcDRYE1IlwQnDfohiwNwDVhudn9Oc79rlaI/LkA5o=
+github.com/Pythonberg1997/iavl v0.0.0-20230625152557-29e0fb6d5d05/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/sarama v1.26.1/go.mod h1:NbSGBSSndYaIhRcBtY9V0U7AyH+x71bG668AuWys/yU=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
@@ -234,6 +232,8 @@ github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsy
 github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI=
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
+github.com/bnb-chain/greenfield-cometbft v0.0.2-0.20230626021059-4b919e74f49e h1:UQx/lF+rZUw1zNHTKdnP/Qs0F0uerpa+pE5+3RZE1hI=
+github.com/bnb-chain/greenfield-cometbft v0.0.2-0.20230626021059-4b919e74f49e/go.mod h1:9q11eHNRY9FDwFH+4pompzPNGv//Z3VcfvkELaHJPMs=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=

diff --git a/store/iavl/store.go b/store/iavl/store.go
@@ -159,7 +159,7 @@ func (st *Store) SetPruning(_ pruningtypes.PruningOptions) {
 	panic("cannot set pruning options on an initialized IAVL store")
 }
 
-// SetPruning panics as pruning options should be provided at initialization
+// GetPruning panics as pruning options should be provided at initialization
 // since IAVl accepts pruning options directly.
 func (st *Store) GetPruning() pruningtypes.PruningOptions {
 	panic("cannot get pruning options on an initialized IAVL store")

diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go
@@ -508,13 +508,7 @@ func (rs *Store) DeepCopyMultiStore() types.CacheMultiStore {
 				}
 			}
 		}
-		store := types.KVStore(storeCache)
-		// Wire the listenkv.Store to allow listeners to observe the writes from the cache store,
-		// set same listeners on cache store will observe duplicated writes.
-		if rs.ListeningEnabled(k) {
-			store = listenkv.NewStore(store, k, rs.listeners[k])
-		}
-		stores[k] = store
+		stores[k] = storeCache
 	}
 	return cachemulti.NewStore(rs.db, stores, rs.keysByName, rs.traceWriter, rs.getTracingContext())
 }