diff --git a/app/bench_test.go b/app/bench_test.go index e71c52db4b..8baff0e054 100644 --- a/app/bench_test.go +++ b/app/bench_test.go @@ -39,7 +39,7 @@ import ( "github.com/crypto-org-chain/cronos/v2/x/cronos/types" ) -const BlockSTMPreEstimate = false +const BlockSTMPreEstimate = true // BenchmarkERC20Transfer benchmarks execution of standard erc20 token transfer transactions func BenchmarkERC20Transfer(b *testing.B) { diff --git a/go.mod b/go.mod index 3715e666ea..90fd401660 100644 --- a/go.mod +++ b/go.mod @@ -96,7 +96,7 @@ require ( github.com/creachadair/atomicfile v0.3.1 // indirect github.com/creachadair/tomledit v0.0.24 // indirect github.com/crypto-org-chain/cronos/memiavl v0.0.4 // indirect - github.com/crypto-org-chain/go-block-stm v0.0.0-20240911081142-92839e79a3ae // indirect + github.com/crypto-org-chain/go-block-stm v0.0.0-20240912024944-1cd89976aa5e // indirect github.com/danieljoos/wincred v1.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/deckarep/golang-set/v2 v2.1.0 // indirect @@ -275,7 +275,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 // develop - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240911093556-79bb39ed91e4 + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240912060135-56f8a5be75ec // 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 index ad845be134..11e4629b0f 100644 --- a/go.sum +++ b/go.sum @@ -427,10 +427,10 @@ 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-block-stm v0.0.0-20240911081142-92839e79a3ae h1:gakWYsVubWX8P9NpxaPnvg0UJYfIZigfko5WN57t7OA= -github.com/crypto-org-chain/go-block-stm v0.0.0-20240911081142-92839e79a3ae/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= +github.com/crypto-org-chain/ethermint v0.6.1-0.20240912060135-56f8a5be75ec h1:9J1fV54SQDeFzzWQnIvr1uwVJIAIkPv3+sm0RapfDM0= +github.com/crypto-org-chain/ethermint v0.6.1-0.20240912060135-56f8a5be75ec/go.mod h1:D2lnc8ARuVmgc2/2IWla2Ky1o8/pjmyrnIt+d46Clco= +github.com/crypto-org-chain/go-block-stm v0.0.0-20240912024944-1cd89976aa5e h1:FFpE6+Y4o5GxkeGwUcETM6amgohh7msWvWf1MDqueVc= +github.com/crypto-org-chain/go-block-stm v0.0.0-20240912024944-1cd89976aa5e/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= 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= diff --git a/gomod2nix.toml b/gomod2nix.toml index 375a68b82f..1172af8aa7 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -210,8 +210,8 @@ schema = 3 version = "v0.0.24" hash = "sha256-4vUukHONOjNn0qfQr4esK6TWfPWsIp+rbdz65og84lw=" [mod."github.com/crypto-org-chain/go-block-stm"] - version = "v0.0.0-20240911081142-92839e79a3ae" - hash = "sha256-8MhSeC5BB5BwOet3k3Rfua0TBeBATtLSwaW6s5WpYCM=" + version = "v0.0.0-20240912024944-1cd89976aa5e" + hash = "sha256-rY8W4dSciOXT29MCySbH5sw0Fp15IQVgBK9QlMX0JeU=" [mod."github.com/danieljoos/wincred"] version = "v1.2.0" hash = "sha256-LHcvTJCc8++bFndbd8ZgMSTe4L5h2C4rN+cSWHCz54Y=" @@ -259,8 +259,8 @@ schema = 3 hash = "sha256-lE4G5FaRb3MVi9FFVn+WlwsSTOB4SbjmVboKyQ5yB0A=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20240911093556-79bb39ed91e4" - hash = "sha256-pImZqrOysiMTCgzdWyVttLeTEiszjA1KBVTnzDU0vRg=" + version = "v0.6.1-0.20240912060135-56f8a5be75ec" + hash = "sha256-LkGl7SLTfEJ5wf/dKf7Dq8P7LQLNspjm6zz+iPSY7Ic=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" diff --git a/testground/benchmark/benchmark/peer.py b/testground/benchmark/benchmark/peer.py index 3d399cf359..b9d8ce6f7e 100644 --- a/testground/benchmark/benchmark/peer.py +++ b/testground/benchmark/benchmark/peer.py @@ -134,6 +134,7 @@ def patch_configs(home: Path, group: str, peers: str, block_executor: str): "memiavl.enable": True, "mempool.max-txs": MEMPOOL_SIZE, "evm.block-executor": block_executor, + "evm.block-stm-pre-estimate": True, "json-rpc.enable-indexer": True, } if block_executor == "block-stm":