Problem: trace-block inconsistency with state machine (#1603)

* Problem: trace-block inconsistency with state machine * Update CHANGELOG.md Signed-off-by: yihuang <[email protected]> * merge * release date * double lint timeout --------- Signed-off-by: yihuang <[email protected]>
crypto-org-chain · Sep 24, 2024 · 2c977e6 · 2c977e6
1 parent 2534f80
commit 2c977e6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -18,7 +18,7 @@ jobs:
   golangci:
     name: Run golangci-lint
     runs-on: macos-latest
-    timeout-minutes: 60
+    timeout-minutes: 120
     steps:
       - uses: actions/setup-go@v3
         with:
@@ -46,13 +46,13 @@ jobs:
 
           BUILD_TAGS=rocksdb,grocksdb_clean_link
           go build -tags $BUILD_TAGS ./cmd/cronosd
-          golangci-lint run --out-format=github-actions --path-prefix=./ --timeout 10m --build-tags $BUILD_TAGS
+          golangci-lint run --out-format=github-actions --path-prefix=./ --timeout 20m --build-tags $BUILD_TAGS
           cd versiondb
-          golangci-lint run --out-format=github-actions --path-prefix=./versiondb --timeout 10m --build-tags $BUILD_TAGS
+          golangci-lint run --out-format=github-actions --path-prefix=./versiondb --timeout 20m --build-tags $BUILD_TAGS
           cd ../memiavl
-          golangci-lint run --out-format=github-actions --path-prefix=./memiavl --timeout 10m --build-tags $BUILD_TAGS
+          golangci-lint run --out-format=github-actions --path-prefix=./memiavl --timeout 20m --build-tags $BUILD_TAGS
           cd ../store
-          golangci-lint run --out-format=github-actions --path-prefix=./store --timeout 10m --build-tags $BUILD_TAGS
+          golangci-lint run --out-format=github-actions --path-prefix=./store --timeout 20m --build-tags $BUILD_TAGS
         # Check only if there are differences in the source code
         if: steps.changed-files.outputs.any_changed == 'true'
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,13 @@
 # Changelog
 
-*Sep 23, 2024*
+*Sep 24, 2024*
 
 ## v1.3.2
 
 ### Bug Fixes
 
 * [#1584](https://github.com/crypto-org-chain/cronos/pull/1584) Update ethermint to fix of mismatch tx hash in newHeads.
+* [#1603](https://github.com/crypto-org-chain/cronos/pull/1603) Fix trace block inconsistency with state machine.
 
 *Jul 26, 2024*
 

diff --git a/go.mod b/go.mod
@@ -249,7 +249,7 @@ replace (
 	// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
 	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.20231207063621-43cf32d91c3e
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240918012625-f61338d29b1c
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240924033445-e55b15cf1494
 	// 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
@@ -491,8 +491,8 @@ github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63 h1:R1
 github.com/crypto-org-chain/cometbft-db v0.0.0-20231011055109-57922ac52a63/go.mod h1:rocwIfnS+kA060x64gkSIRvWB9StSppIkJuo5MWzL24=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240517084251-5ba20d99ec23 h1:pmpedXv3cd18uDwv62mfevmEVa0KCMgR/hlsTRU9p8g=
 github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240517084251-5ba20d99ec23/go.mod h1:vdMQLvLSGh56GqAAQP/w2R389j+g+hHOIwKcUNt9yAc=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240918012625-f61338d29b1c h1:ydlVBWIVeibGtfRbFWOe8A6cD3RWJHH4Q7N/5w/DkTM=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20240918012625-f61338d29b1c/go.mod h1:zJYmx1D+tDggzvXmdJ0/I62TeIykdCMfJBjBxOcniAU=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240924033445-e55b15cf1494 h1:PsBCicxLYx9u8LXgqoL1DYYQXACank9z1FNkwBqz/tY=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20240924033445-e55b15cf1494/go.mod h1:zJYmx1D+tDggzvXmdJ0/I62TeIykdCMfJBjBxOcniAU=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e h1:vnyepPQ/m25+19xcTuBUdRxmltZ/EjVWNqEjhg7Ummk=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20231207063621-43cf32d91c3e/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
 github.com/crypto-org-chain/gravity-bridge/module/v2 v2.0.1-0.20230825054824-75403cd90c6e h1:rSTc35OBjjCBx47rHPWBCIHNGPbMnEj8f7fNcK2TjVI=

diff --git a/gomod2nix.toml b/gomod2nix.toml
@@ -219,8 +219,8 @@ schema = 3
     hash = "sha256-lDIqRLUrXYCb9mmFBY/+WW+ee69+IkxOgqjHVyo4ij0="
     replaced = "github.com/crypto-org-chain/go-ethereum"
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20240918012625-f61338d29b1c"
-    hash = "sha256-rlIdWS0B9Wl/M+8KyykUoqel1dd/+52UR90htZ/F7WA="
+    version = "v0.6.1-0.20240924033445-e55b15cf1494"
+    hash = "sha256-111y71iUS8atbQVTA8oJWG2mUKIzjS9nXZuLZ4zpZHg="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/felixge/httpsnoop"]
     version = "v1.0.4"