From 8fc9446afd1a27f3aadf249ebc9ddda190e85e57 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Mon, 22 Jan 2024 12:22:08 +0800 Subject: [PATCH] Problem: ethermint is outdated (#1294) * Problem: ethermint is outdated * Update CHANGELOG.md Signed-off-by: mmsqe * point align of fee history * update deps * update deps --------- Signed-off-by: mmsqe --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- integration_tests/test_min_gas_price.py | 5 +++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd1fe9db29..dcbb0e6b0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## UNRELEASED - [#1292](https://github.com/crypto-org-chain/cronos/pull/1292) memiavl cancel background snapshot rewriting when graceful shutdown. +- [#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 caf3324ea7..4b81a82989 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.20240105065311-ec8d73f585a9 + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20240122030949-2f3643bff8f9 // 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 f53efbeee2..e6ad88ba8e 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.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/ethermint v0.6.1-0.20240122030949-2f3643bff8f9 h1:oIxuY5GLkamJ70/1sf0EUrUnWM1Qhqum9u9NWg8VhbE= +github.com/crypto-org-chain/ethermint v0.6.1-0.20240122030949-2f3643bff8f9/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 e0e52dd973..db5b67c39a 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.20240105065311-ec8d73f585a9" - hash = "sha256-7lxGgcTXXRSShErMncDLHtHv+nIbHJ22MMLCo1pqKBg=" + version = "v0.6.1-0.20240122030949-2f3643bff8f9" + hash = "sha256-QIsc4PFyuyE7/UEf+vC1MlSsx9eFtAGMEEy68IfpvfM=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" 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