diff --git a/CHANGELOG.md b/CHANGELOG.md index dfcfe1cb80..b59b5fade7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -*January 2, 2023* +*January 5, 2024* ## v1.1.0-rc2 @@ -8,6 +8,7 @@ - [#1272](https://github.com/crypto-org-chain/cronos/pull/1272) Update ethermint to develop, cosmos-sdk to `v0.47.7`. - [#1273](https://github.com/crypto-org-chain/cronos/pull/1273) Enable push0 opcode in integration test. - [#1274](https://github.com/crypto-org-chain/cronos/pull/1274) Remove authz module. +- [#1287](https://github.com/crypto-org-chain/cronos/pull/1287) Support debug_traceCall. ### Bug Fixes diff --git a/go.mod b/go.mod index 9977cbab36..caf3324ea7 100644 --- a/go.mod +++ b/go.mod @@ -233,7 +233,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.20231222013133-aff52db6631a + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240105065311-ec8d73f585a9 // 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 2d25137e03..f53efbeee2 100644 --- a/go.sum +++ b/go.sum @@ -484,8 +484,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.20240103063449-c887e863fae2 h1:z3LXxlOuRHfRuS6LpA3t9eSaekHmzsdrrDkaXP8UEeU= github.com/crypto-org-chain/cosmos-sdk v0.46.0-beta2.0.20240103063449-c887e863fae2/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk= -github.com/crypto-org-chain/ethermint v0.6.1-0.20231222013133-aff52db6631a h1:zvyzrHojL+VkdG80bhHN7ad8s//vXYroW98d5buCWuI= -github.com/crypto-org-chain/ethermint v0.6.1-0.20231222013133-aff52db6631a/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg= +github.com/crypto-org-chain/ethermint v0.6.1-0.20240105065311-ec8d73f585a9 h1:GyksSoYaokH0gQoUAWSAWCUe0Dasg9mNDA6RqaVMPeA= +github.com/crypto-org-chain/ethermint v0.6.1-0.20240105065311-ec8d73f585a9/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg= 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 index d898f90d8b..e0e52dd973 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,8 +216,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.20231222013133-aff52db6631a" - hash = "sha256-zmZWMEEhDBVOasR1KzL3uPLNcaKCAlBo0kb4y2B+Qtg=" + version = "v0.6.1-0.20240105065311-ec8d73f585a9" + hash = "sha256-7lxGgcTXXRSShErMncDLHtHv+nIbHJ22MMLCo1pqKBg=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py index 7d0445b355..b150d46dbf 100644 --- a/integration_tests/test_basic.py +++ b/integration_tests/test_basic.py @@ -743,14 +743,21 @@ def test_failed_transfer_tx(cronos): # check traceTransaction rsps = [ - w3.provider.make_request("debug_traceTransaction", [h.hex()])["result"] - for h in tx_hashes + w3.provider.make_request("debug_traceTransaction", [h.hex()]) for h in tx_hashes ] for rsp, receipt in zip(rsps, receipts): - # FIXME https://github.com/evmos/ethermint/issues/1185 - # trace transaction always return success for simple transfer tx - assert not rsp["failed"] - assert receipt.gasUsed == rsp["gas"] + if receipt.status == 1: + result = rsp["result"] + assert not result["failed"] + assert receipt.gasUsed == result["gas"] + else: + assert rsp["error"] == { + "code": -32000, + "message": ( + "rpc error: code = Internal desc = " + "insufficient balance for transfer" + ), + } def test_log0(cluster):