From a8fb3769828df7f4e47b655102b459771a432e6c Mon Sep 17 00:00:00 2001 From: HuangYi Date: Wed, 23 Oct 2024 15:55:16 +0800 Subject: [PATCH 1/4] Problem: check tx blocks consensus try `NewConnSyncLocalClientCreator` --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 525960b41d..6e19f11de0 100644 --- a/go.mod +++ b/go.mod @@ -273,7 +273,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.20240926023215-d2275b4afb9a // develop - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241022025636-430068294727 + github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20241023074529-5e75ab7810cb // 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 03b1db312a..494c80607c 100644 --- a/go.sum +++ b/go.sum @@ -428,8 +428,6 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712 h1:vvN3FqhFTakKy4jgVC1GoEtHW52zQg49uNE/e16Scu8= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= -github.com/crypto-org-chain/ethermint v0.6.1-0.20241022025636-430068294727 h1:vMY/xLOa4kBZahv6JgIeJPLeaiNfKsgRirKRFzd+oeg= -github.com/crypto-org-chain/ethermint v0.6.1-0.20241022025636-430068294727/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= @@ -1144,6 +1142,8 @@ 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/ethermint v0.6.1-0.20241023074529-5e75ab7810cb h1:2ftuBR245v14oRdPB9Vcb/DTKp9dF+wvKEzqtEfdV2o= +github.com/yihuang/ethermint v0.6.1-0.20241023074529-5e75ab7810cb/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= 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 index dec9b33381..a4250a9294 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -262,9 +262,9 @@ schema = 3 hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20241022025636-430068294727" - hash = "sha256-BLzVdTWu6We25O2DRCAyB5ShbBEnw4aKzWY9vDVSRok=" - replaced = "github.com/crypto-org-chain/ethermint" + version = "v0.6.1-0.20241023074529-5e75ab7810cb" + hash = "sha256-NQRJtZXSSVbzGkxoAwSl5k1E56xoIfiD5X+YxIHoSZ8=" + replaced = "github.com/yihuang/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" hash = "sha256-Aq/SM28aPJVzvapllQ64R/DM4aZ5CHPewcm/AUJPyJQ=" From 1fdd1c1e46545fc7b00c23b6c2146350c7cac83f Mon Sep 17 00:00:00 2001 From: HuangYi Date: Wed, 23 Oct 2024 16:21:10 +0800 Subject: [PATCH 2/4] use in benchmark --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- testground/benchmark/benchmark/stateless.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6e19f11de0..8dca01bd83 100644 --- a/go.mod +++ b/go.mod @@ -273,7 +273,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.20240926023215-d2275b4afb9a // develop - github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20241023074529-5e75ab7810cb + github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20241023081831-7cfec8aacb28 // 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 494c80607c..4b9df5d6fa 100644 --- a/go.sum +++ b/go.sum @@ -1142,8 +1142,8 @@ 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/ethermint v0.6.1-0.20241023074529-5e75ab7810cb h1:2ftuBR245v14oRdPB9Vcb/DTKp9dF+wvKEzqtEfdV2o= -github.com/yihuang/ethermint v0.6.1-0.20241023074529-5e75ab7810cb/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= +github.com/yihuang/ethermint v0.6.1-0.20241023081831-7cfec8aacb28 h1:DlFDKo4rE9HnZgwMdtzZRHDeKrcPqjyBexsrsBt/ZBs= +github.com/yihuang/ethermint v0.6.1-0.20241023081831-7cfec8aacb28/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= 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 index a4250a9294..6e98e13a63 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -262,8 +262,8 @@ schema = 3 hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20241023074529-5e75ab7810cb" - hash = "sha256-NQRJtZXSSVbzGkxoAwSl5k1E56xoIfiD5X+YxIHoSZ8=" + version = "v0.6.1-0.20241023081831-7cfec8aacb28" + hash = "sha256-GPpdgZ8kinpSrLMTkdxV7fk1n7AdEzn+331/o+zbI/0=" replaced = "github.com/yihuang/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" diff --git a/testground/benchmark/benchmark/stateless.py b/testground/benchmark/benchmark/stateless.py index f938633c19..0030fd1deb 100644 --- a/testground/benchmark/benchmark/stateless.py +++ b/testground/benchmark/benchmark/stateless.py @@ -286,7 +286,7 @@ def do_run( print("start node") logfile = open(home / "node.log", "ab", buffering=0) proc = subprocess.Popen( - [cronosd, "start", "--home", str(home)], + [cronosd, "start", "--home", str(home), "--async-check-tx"], stdout=logfile, ) From 837ccd02d25bdfa2b4953c5a8a5f3865c261fc88 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 28 Oct 2024 11:01:06 +0800 Subject: [PATCH 3/4] update deps --- go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8dca01bd83..a8a19581fd 100644 --- a/go.mod +++ b/go.mod @@ -273,7 +273,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.20240926023215-d2275b4afb9a // develop - github.com/evmos/ethermint => github.com/yihuang/ethermint v0.6.1-0.20241023081831-7cfec8aacb28 + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20241028015856-e567c5ad3acf // 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 4b9df5d6fa..9ef754bf07 100644 --- a/go.sum +++ b/go.sum @@ -428,6 +428,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241018012743-d78d66e74712/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712 h1:vvN3FqhFTakKy4jgVC1GoEtHW52zQg49uNE/e16Scu8= github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241018012743-d78d66e74712/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w= +github.com/crypto-org-chain/ethermint v0.6.1-0.20241028015856-e567c5ad3acf h1:n0iiQzO6ek6/mJKWkKqCjaExi+KDMOkDPgMpOI0qBzs= +github.com/crypto-org-chain/ethermint v0.6.1-0.20241028015856-e567c5ad3acf/go.mod h1:NBVPCs64TPZQJWBnJu/mJbSQwUpPhtjU+EiOZA4991Y= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716 h1:OvD5Rm0B6LHUJk6z858UgwdP72jU2DuUdXeclRyKpDI= github.com/crypto-org-chain/go-block-stm v0.0.0-20240919080136-6c49aef68716/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE= github.com/crypto-org-chain/go-ethereum v1.10.20-0.20240926023215-d2275b4afb9a h1:IUPD+dg1YQl8cLocxQ/Mbx/ObTgAgcrZlcBhFjsLO40= @@ -1142,8 +1144,6 @@ 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/ethermint v0.6.1-0.20241023081831-7cfec8aacb28 h1:DlFDKo4rE9HnZgwMdtzZRHDeKrcPqjyBexsrsBt/ZBs= -github.com/yihuang/ethermint v0.6.1-0.20241023081831-7cfec8aacb28/go.mod h1:LUv3b8+dRjqAI9UTml5XzjExT2ANyvjtkFssi7lIRb0= 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 index 6e98e13a63..faffc65fd2 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -262,9 +262,9 @@ schema = 3 hash = "sha256-ozwVS2BhAoz+OOisAyMhgg+lq8FdQjf90xoOq9cxtGw=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.6.1-0.20241023081831-7cfec8aacb28" - hash = "sha256-GPpdgZ8kinpSrLMTkdxV7fk1n7AdEzn+331/o+zbI/0=" - replaced = "github.com/yihuang/ethermint" + version = "v0.6.1-0.20241028015856-e567c5ad3acf" + hash = "sha256-/TSmGsYqQkXZuPA8d18o4WGIp0etnH5TLn9e2LEE114=" + replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/fatih/color"] version = "v1.16.0" hash = "sha256-Aq/SM28aPJVzvapllQ64R/DM4aZ5CHPewcm/AUJPyJQ=" From 83466507b7ae6b238ac367694fc699aed4eddc93 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Mon, 28 Oct 2024 11:01:34 +0800 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ecb6b2c69..0c7dcd2332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ * (testground)[#1650](https://github.com/crypto-org-chain/cronos/pull/1650) Benchmark support batch mode. * [#1658](https://github.com/crypto-org-chain/cronos/pull/1658) Optimize when block-list is empty. * (testground)[#1659](https://github.com/crypto-org-chain/cronos/pull/1659) Support skip check-tx in benchmark. +* [#1660](https://github.com/crypto-org-chain/cronos/pull/1660) Support async check tx. *Oct 14, 2024*