update deps

crypto-org-chain · Sep 11, 2024 · 44f25df · 44f25df
1 parent c4fef9f
commit 44f25df
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/app/bench_test.go b/app/bench_test.go
@@ -39,6 +39,8 @@ import (
 	"github.com/crypto-org-chain/cronos/v2/x/cronos/types"
 )
 
+const BlockSTMPreEstimate = false
+
 // BenchmarkERC20Transfer benchmarks execution of standard erc20 token transfer transactions
 func BenchmarkERC20Transfer(b *testing.B) {
 	b.Run("memdb", func(b *testing.B) {
@@ -64,11 +66,12 @@ func BenchmarkERC20Transfer(b *testing.B) {
 	for _, workers := range []int{1, 8, 16, 32} {
 		b.Run(fmt.Sprintf("memiavl-stm-%d", workers), func(b *testing.B) {
 			benchmarkERC20Transfer(b, nil, AppOptionsMap{
-				flags.FlagHome:              b.TempDir(),
-				memiavlstore.FlagMemIAVL:    true,
-				memiavlstore.FlagCacheSize:  0,
-				srvflags.EVMBlockExecutor:   "block-stm",
-				srvflags.EVMBlockSTMWorkers: workers,
+				flags.FlagHome:                  b.TempDir(),
+				memiavlstore.FlagMemIAVL:        true,
+				memiavlstore.FlagCacheSize:      0,
+				srvflags.EVMBlockExecutor:       "block-stm",
+				srvflags.EVMBlockSTMWorkers:     workers,
+				srvflags.EVMBlockSTMPreEstimate: BlockSTMPreEstimate,
 			})
 		})
 	}

diff --git a/go.mod b/go.mod
@@ -276,7 +276,7 @@ replace (
 	github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240425065928-ebb09502e7a7
 	// block-stm branch
-	github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20240911091354-98721c24bdc3
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240911093556-79bb39ed91e4
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0

diff --git a/go.sum b/go.sum
@@ -427,6 +427,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240911084450-6870ba130be2
 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20240911084450-6870ba130be2/go.mod h1:gjE3DZe4t/+VeIk6CmrouyqiuDbZ7QOVDDq3nLqBTpg=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240911084450-6870ba130be2 h1:mxlOSCru7YgmX055rrlkCSUu0D8lAqJ8Dnhp0yXCBuM=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20240911084450-6870ba130be2/go.mod h1:RTiTs4hkXG6IvYGknvB8p79YgjYJdcbzLUOGJChsPnY=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240911093556-79bb39ed91e4 h1:+eTaPw8ZN9iBbmk215r5I1lnva9oWbvYatetUffaOO0=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240911093556-79bb39ed91e4/go.mod h1:Ua2vxy7IozDX878Gq6o0SneUDRbgorAKmb9tuUuAsHM=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240425065928-ebb09502e7a7 h1:V43F3JFcqG4MUThf9W/DytnPblpR6CcaLBw2Wx6zTgE=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240425065928-ebb09502e7a7/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
 github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE=
@@ -1153,8 +1155,6 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 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/ethermint v0.6.1-0.20240911091354-98721c24bdc3 h1:IcjP4h2kJ6fimxSqhrM0VLZJMukbWVoOfk80pSCSbOE=
-github.com/yihuang/ethermint v0.6.1-0.20240911091354-98721c24bdc3/go.mod h1:Ua2vxy7IozDX878Gq6o0SneUDRbgorAKmb9tuUuAsHM=
 github.com/yihuang/go-block-stm v0.0.0-20240911061126-1f831176379f h1:G17UpSucfm3SPCXdkJMrsAXJyXDJHsD5zWiQ6GUCwZ4=
 github.com/yihuang/go-block-stm v0.0.0-20240911061126-1f831176379f/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -260,9 +260,9 @@ schema = 3
     hash = "sha256-lE4G5FaRb3MVi9FFVn+WlwsSTOB4SbjmVboKyQ5yB0A="
     replaced = "github.com/crypto-org-chain/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20240911091354-98721c24bdc3"
+    version = "v0.6.1-0.20240911093556-79bb39ed91e4"
     hash = "sha256-pImZqrOysiMTCgzdWyVttLeTEiszjA1KBVTnzDU0vRg="
-    replaced = "github.com/yihuang/ethermint"
+    replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/fatih/color"]
     version = "v1.16.0"
     hash = "sha256-Aq/SM28aPJVzvapllQ64R/DM4aZ5CHPewcm/AUJPyJQ="