From bc2769a5f8fb6baf0d130a656dbea32ed4162cad Mon Sep 17 00:00:00 2001 From: HuangYi Date: Fri, 3 Mar 2023 19:26:59 +0800 Subject: [PATCH 1/2] Problem: dynamic fee extension is problematic Solution: - fix in ethermint and update dependency --- CHANGELOG.md | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f33e81baba..6975c42fd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## UNRELEASED +### Bug Fixes + +- [#]() Forbids negative priority fee. + ### Improvements - [#904](https://github.com/crypto-org-chain/cronos/pull/904) Enable "dynamic-level-bytes" on new `application.db`. diff --git a/go.mod b/go.mod index bde519b489..1b35f188cf 100644 --- a/go.mod +++ b/go.mod @@ -198,7 +198,7 @@ replace ( github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.46.10 github.com/crypto-org-chain/cronos/versiondb => ./versiondb github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable - github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.4-cronos.0.20230209114232-89e8195d14ba + github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.20.6-cronos // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.0 diff --git a/go.sum b/go.sum index 5b05826059..bb7b911058 100644 --- a/go.sum +++ b/go.sum @@ -789,8 +789,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= -github.com/crypto-org-chain/ethermint v0.20.4-cronos.0.20230209114232-89e8195d14ba h1:y4/UJu4pC7cw1qT9M3likHaASOoFOYQo6xwg2J7Kacg= -github.com/crypto-org-chain/ethermint v0.20.4-cronos.0.20230209114232-89e8195d14ba/go.mod h1:q7CGi8HdGbVu/nfQTddr0sXiqE9spdP1QHNSKHATl9E= +github.com/crypto-org-chain/ethermint v0.20.6-cronos h1:zvnamngUnUfN1OfGkHY2R8C2RmQBBcbWoXB/ZzKhVPQ= +github.com/crypto-org-chain/ethermint v0.20.6-cronos/go.mod h1:q7CGi8HdGbVu/nfQTddr0sXiqE9spdP1QHNSKHATl9E= github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable h1:VQLW0R8t9DcC/HvQZO1i0mIWjJfAezhI8lLUCholP0M= github.com/crypto-org-chain/go-ethereum v1.10.19-deepcopy-jumptable/go.mod h1:IJBNMtzKcNHPtllYihy6BL2IgK1u+32JriaTbdt4v+w= github.com/crypto-org-chain/go-ethereum-hdwallet v0.1.2 h1:Qu2GMavGHCcomdVWmZej76JpOO6uvII6IpPDdJUG+Qo= diff --git a/gomod2nix.toml b/gomod2nix.toml index c733cfce19..8f351ff30a 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -166,8 +166,8 @@ schema = 3 hash = "sha256-QKuYnEXXrnHPPHk/Xc9ocez2Jheo/0IOOa1IQaMH61c=" replaced = "github.com/crypto-org-chain/go-ethereum" [mod."github.com/evmos/ethermint"] - version = "v0.20.4-cronos.0.20230209114232-89e8195d14ba" - hash = "sha256-NvNVMgPLaz7RznqEY9J95iOhRhfifFwLATO/VZap7OE=" + version = "v0.20.6-cronos" + hash = "sha256-S9iLoLbmx1hBcbo2rqxIiSoodsKN+EOrSiFE2LIGPgs=" replaced = "github.com/crypto-org-chain/ethermint" [mod."github.com/felixge/httpsnoop"] version = "v1.0.2" From a894ff027a803dd38fd70ab27877ac120104a74a Mon Sep 17 00:00:00 2001 From: yihuang Date: Mon, 6 Mar 2023 08:41:52 +0800 Subject: [PATCH 2/2] Update CHANGELOG.md Signed-off-by: yihuang --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6975c42fd3..4a0af65d15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bug Fixes -- [#]() Forbids negative priority fee. +- [#908](https://github.com/crypto-org-chain/cronos/pull/908) Forbids negative priority fee. ### Improvements