fix

crypto-org-chain · Aug 7, 2024 · 0fc37df · 0fc37df
1 parent 5542282
commit 0fc37df
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 45 deletions.
diff --git a/app/executor.go b/app/executor.go
@@ -3,7 +3,6 @@ package app
 import (
 	"context"
 	"io"
-	"sync/atomic"
 
 	"cosmossdk.io/store/cachemulti"
 	storetypes "cosmossdk.io/store/types"
@@ -18,11 +17,11 @@ import (
 func DefaultTxExecutor(_ context.Context,
 	blockSize int,
 	ms storetypes.MultiStore,
-	deliverTxWithMultiStore func(int, storetypes.MultiStore, map[string]any) *abci.ExecTxResult,
+	deliverTxWithMultiStore func(int, storetypes.MultiStore) *abci.ExecTxResult,
 ) ([]*abci.ExecTxResult, error) {
 	results := make([]*abci.ExecTxResult, blockSize)
 	for i := 0; i < blockSize; i++ {
-		results[i] = deliverTxWithMultiStore(i, ms, nil)
+		results[i] = deliverTxWithMultiStore(i, ms)
 	}
 	return evmtypes.PatchTxResponses(results), nil
 }
@@ -36,39 +35,21 @@ func STMTxExecutor(stores []storetypes.StoreKey, workers int) baseapp.TxExecutor
 		ctx context.Context,
 		blockSize int,
 		ms storetypes.MultiStore,
-		deliverTxWithMultiStore func(int, storetypes.MultiStore, map[string]any) *abci.ExecTxResult,
+		deliverTxWithMultiStore func(int, storetypes.MultiStore) *abci.ExecTxResult,
 	) ([]*abci.ExecTxResult, error) {
 		if blockSize == 0 {
 			return nil, nil
 		}
 		results := make([]*abci.ExecTxResult, blockSize)
-		incarnationCache := make([]atomic.Pointer[map[string]any], blockSize)
-		for i := 0; i < blockSize; i++ {
-			m := make(map[string]any)
-			incarnationCache[i].Store(&m)
-		}
 		if err := blockstm.ExecuteBlock(
 			ctx,
 			blockSize,
 			index,
 			stmMultiStoreWrapper{ms},
 			workers,
 			func(txn blockstm.TxnIndex, ms blockstm.MultiStore) {
-				var cache map[string]any
-
-				// only one of the concurrent incarnations gets the cache if there are any, otherwise execute without
-				// cache, concurrent incarnations should be rare.
-				v := incarnationCache[txn].Swap(nil)
-				if v != nil {
-					cache = *v
-				}
-
-				result := deliverTxWithMultiStore(int(txn), msWrapper{ms}, cache)
+				result := deliverTxWithMultiStore(int(txn), msWrapper{ms})
 				results[txn] = result
-
-				if v != nil {
-					incarnationCache[txn].Store(v)
-				}
 			},
 		); err != nil {
 			return nil, err

diff --git a/go.mod b/go.mod
@@ -243,10 +243,10 @@ require (
 
 replace (
 	// release/v0.50.x
-	cosmossdk.io/client/v2 => github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240715031529-5a1594f17924
-	cosmossdk.io/store => github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240715031529-5a1594f17924
-	cosmossdk.io/x/tx => github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240715031529-5a1594f17924
-	github.com/cosmos/cosmos-sdk => github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240715031529-5a1594f17924
+	cosmossdk.io/client/v2 => github.com/mmsqe/cosmos-sdk/client/v2 v2.0.0-20240807022756-4a5f2340a6c6
+	cosmossdk.io/store => github.com/mmsqe/cosmos-sdk/store v0.0.0-20240807022756-4a5f2340a6c6
+	cosmossdk.io/x/tx => github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20240807022756-4a5f2340a6c6
+	github.com/cosmos/cosmos-sdk => github.com/mmsqe/cosmos-sdk v0.46.0-beta2.0.20240807022756-4a5f2340a6c6
 )
 
 replace (

diff --git a/go.sum b/go.sum
@@ -411,14 +411,6 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c h1:MOgfS4+FBB8cMkDE2j2VBVsbY+HCkPIu0YsJ/9bbGeQ=
 github.com/crypto-org-chain/btree v0.0.0-20240406140148-2687063b042c/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
-github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240715031529-5a1594f17924 h1:rTiEYiXC8AxKeKsOTz4QODkX9fvMAnlAj8R2gOACoxU=
-github.com/crypto-org-chain/cosmos-sdk v0.50.6-0.20240715031529-5a1594f17924/go.mod h1:bIUzWfqXnCF2WTFb2uN+FjzMIG3BsOk+P2QmvMtm4ic=
-github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240715031529-5a1594f17924 h1:blkVK4n/pPTFq3nyN3j91AD7Hs3c5qqsO2DXknFpEOM=
-github.com/crypto-org-chain/cosmos-sdk/client/v2 v2.0.0-20240715031529-5a1594f17924/go.mod h1:W5sR4asmVDUhJpEmuXTUBkk/yEefKlXTjVWcNciVSR0=
-github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240715031529-5a1594f17924 h1:/F1OL8c4anqKwLNTYDfd7F4wFsf0T6fJoP6tiP0CjOw=
-github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240715031529-5a1594f17924/go.mod h1:gjE3DZe4t/+VeIk6CmrouyqiuDbZ7QOVDDq3nLqBTpg=
-github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240715031529-5a1594f17924 h1:zJUxWcSGsahMpDYACCmsuzdu/K+3Col1pNsoC8YEIiU=
-github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240715031529-5a1594f17924/go.mod h1:RTiTs4hkXG6IvYGknvB8p79YgjYJdcbzLUOGJChsPnY=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20240806075927-09a64748f883 h1:Oj7VvlK8iXRaugnpGA8CBXGrgkyigji+Ae5weSRD85I=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20240806075927-09a64748f883/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240425065928-ebb09502e7a7 h1:V43F3JFcqG4MUThf9W/DytnPblpR6CcaLBw2Wx6zTgE=
@@ -882,6 +874,14 @@ 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.20240807022756-4a5f2340a6c6 h1:AzO/S3//glr6suQly5G3BB6pvF52mli3ErA0+NMT6UU=
+github.com/mmsqe/cosmos-sdk v0.46.0-beta2.0.20240807022756-4a5f2340a6c6/go.mod h1:Rb43DdB0i/rKcCN69Tg2X3+zA4WhJ7MC8K3a6Ezh38E=
+github.com/mmsqe/cosmos-sdk/client/v2 v2.0.0-20240807022756-4a5f2340a6c6 h1:rwGTI/Y+oJZdb/Jd5DQXsQmpdZCGBJAt+sSbsTPDZAw=
+github.com/mmsqe/cosmos-sdk/client/v2 v2.0.0-20240807022756-4a5f2340a6c6/go.mod h1:W5sR4asmVDUhJpEmuXTUBkk/yEefKlXTjVWcNciVSR0=
+github.com/mmsqe/cosmos-sdk/store v0.0.0-20240807022756-4a5f2340a6c6 h1:pcMfPP9EREOH88wfz/B8pl8P1gVXB1p6BgWeiJTA4bc=
+github.com/mmsqe/cosmos-sdk/store v0.0.0-20240807022756-4a5f2340a6c6/go.mod h1:gjE3DZe4t/+VeIk6CmrouyqiuDbZ7QOVDDq3nLqBTpg=
+github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20240807022756-4a5f2340a6c6 h1:FXXby9/khZLeaKXRM6Gba6bjoSUKUepQ5jkoAhemBYw=
+github.com/mmsqe/cosmos-sdk/x/tx v0.0.0-20240807022756-4a5f2340a6c6/go.mod h1:RTiTs4hkXG6IvYGknvB8p79YgjYJdcbzLUOGJChsPnY=
 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
@@ -20,9 +20,9 @@ schema = 3
     version = "v0.7.5"
     hash = "sha256-Nuw697sJr56kU3EU7DV1eYNkyI76psznIVqYAV6RfbQ="
   [mod."cosmossdk.io/client/v2"]
-    version = "v2.0.0-20240715031529-5a1594f17924"
+    version = "v2.0.0-20240807022756-4a5f2340a6c6"
     hash = "sha256-60hmufv3Ml4Pv3zNwgn8eeqlEINOR6n9MKr2QHddoxo="
-    replaced = "github.com/crypto-org-chain/cosmos-sdk/client/v2"
+    replaced = "github.com/mmsqe/cosmos-sdk/client/v2"
   [mod."cosmossdk.io/collections"]
     version = "v0.4.0"
     hash = "sha256-minFyzgO/D+Oda4E3B1qvOAN5qd65SjS6nmjca4cp/8="
@@ -42,9 +42,9 @@ schema = 3
     version = "v1.3.0"
     hash = "sha256-EEFK43Cr0g0ndhQhkIKher0FqV3mvkmE9z0sP7uVSHg="
   [mod."cosmossdk.io/store"]
-    version = "v0.0.0-20240715031529-5a1594f17924"
-    hash = "sha256-zne7cIFs9WLg11pIr9VLBBc+G+kZfKLn8UU1mP4w6BM="
-    replaced = "github.com/crypto-org-chain/cosmos-sdk/store"
+    version = "v0.0.0-20240807022756-4a5f2340a6c6"
+    hash = "sha256-Dm3sSZNJBcnBF33PULoTpK4rkNQbsZl0DfTqH1GPCQM="
+    replaced = "github.com/mmsqe/cosmos-sdk/store"
   [mod."cosmossdk.io/tools/confix"]
     version = "v0.1.1"
     hash = "sha256-/Et2FFhb4XfakbLFvGQK3QxN5Y7alzO+DGfi2/EWbxo="
@@ -55,9 +55,9 @@ schema = 3
     version = "v0.1.0"
     hash = "sha256-/gWvrqvy6bW90+NU66T+9QysYgvG1VbwfYJZ8tkqpeA="
   [mod."cosmossdk.io/x/tx"]
-    version = "v0.0.0-20240715031529-5a1594f17924"
+    version = "v0.0.0-20240807022756-4a5f2340a6c6"
     hash = "sha256-xT5IdapEx1h46ofBpxcBQfzGF2EntmC8xZl7aym/6xE="
-    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.1"
     hash = "sha256-bM9ybpaibMH7k4M6/QAXCZ3fJcADfJHxvMgp4AVUihs="
@@ -163,9 +163,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.20240715031529-5a1594f17924"
-    hash = "sha256-1oX4RDHti4eGTkHIdqUZfCYUXpw5Ao7oBZDfZclF1Mk="
-    replaced = "github.com/crypto-org-chain/cosmos-sdk"
+    version = "v0.46.0-beta2.0.20240807022756-4a5f2340a6c6"
+    hash = "sha256-DLhRl/nVJCRetMR5c58Xwe/9hCSw+z3Xv8YzNY1O0UU="
+    replaced = "github.com/mmsqe/cosmos-sdk"
   [mod."github.com/cosmos/go-bip39"]
     version = "v1.0.0"
     hash = "sha256-Qm2aC2vaS8tjtMUbHmlBSagOSqbduEEDwc51qvQaBmA="