diff --git a/CHANGELOG.md b/CHANGELOG.md index 8643975e6b..ccbd5c7bc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## UNRELEASED -- [#1294](https://github.com/crypto-org-chain/cronos/pull/1294) Update ethermint to fix and improve of debug_traceCall. +- [#1294](https://github.com/crypto-org-chain/cronos/pull/1294) Update ethermint to fix and improve of debug_traceCall and eth_feeHistory. *January 5, 2024* diff --git a/go.mod b/go.mod index 7d93bed188..5b6e3b100c 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.20240112072747-e2b1d5ed5624 + github.com/evmos/ethermint => github.com/mmsqe/ethermint v0.6.5-0.20240118012629-2662c0fa52d1 // 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 9f311f0fbd..08df3b5c5f 100644 --- a/go.sum +++ b/go.sum @@ -484,8 +484,6 @@ 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.20240112072747-e2b1d5ed5624 h1:LVzJ+FdwnvyJKYVYjZhywhMa97HtUPsUqjEjy/3x8Pk= -github.com/crypto-org-chain/ethermint v0.6.1-0.20240112072747-e2b1d5ed5624/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= @@ -1145,6 +1143,8 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mmsqe/ethermint v0.6.5-0.20240118012629-2662c0fa52d1 h1:h0HQOGw0QLwewDqWsPFj0ZZbhgW7+3VIbSXp+vFINdU= +github.com/mmsqe/ethermint v0.6.5-0.20240118012629-2662c0fa52d1/go.mod h1:T3Tkhw8XMu8rYObcXpeTqGUaKogS+DKsGPD3ulHN/mg= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= diff --git a/gomod2nix.toml b/gomod2nix.toml index 4ea9af78d1..9f14e79b6c 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -216,9 +216,9 @@ 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.20240112072747-e2b1d5ed5624" - hash = "sha256-kMTCxT8j5gqw7lgA76RhdN+R2PxWFZB+V0rHEMukXFY=" - replaced = "github.com/crypto-org-chain/ethermint" + version = "v0.6.5-0.20240118012629-2662c0fa52d1" + hash = "sha256-5tu9O1zEXRYJqmplGMHAlTNvQgAiqxQUQDvP1YBd9cI=" + replaced = "github.com/mmsqe/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" hash = "sha256-hj6FZQ1fDAV+1wGIViAt8XaAkWZ1I5vJzgjIJa7XRBA=" diff --git a/integration_tests/test_min_gas_price.py b/integration_tests/test_min_gas_price.py index 5a9a7bd53f..ba6e49809b 100644 --- a/integration_tests/test_min_gas_price.py +++ b/integration_tests/test_min_gas_price.py @@ -116,3 +116,8 @@ def test_base_fee_adjustment(custom_cluster): fee = w3.eth.get_block(begin + 1 + i).baseFeePerGas assert fee == adjust_base_fee(parent_fee, blk.gasLimit, 0, params) parent_fee = fee + + call = w3.provider.make_request + res = call("eth_feeHistory", [2, "latest", []])["result"]["baseFeePerGas"] + # nextBaseFee should align max with minGasPrice in eth_feeHistory + assert all(fee == hex(10000000000000) for fee in res), res