From 14908f530c79695869c87d63661a554059f118b5 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Fri, 17 Dec 2021 11:59:03 +0800 Subject: [PATCH 1/3] reject MsgEthereumTx wrapping tx without the extension option. reject MsgEthereumTx wrapping tx without the extension option. update gomod2nix try to build in CI fix GOPRIVATE fix mount update to public ethermint --- CHANGELOG.md | 5 +++++ go.mod | 2 +- go.sum | 4 ++-- gomod2nix.toml | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85002de527..9a735d689a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## Unreleased +### Bug Fixes + +- [cronos#255](https://github.com/crypto-org-chain/cronos/pull/255) fix empty topics in non-breaking way +- [cronos#]() reject MsgEthereumTx wrapping tx without the extension option. + *November 30, 2021* ## v0.6.4 diff --git a/go.mod b/go.mod index 660aa80986..fa664dbe57 100644 --- a/go.mod +++ b/go.mod @@ -164,4 +164,4 @@ replace github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethere // TODO: remove when ibc-go and ethermint upgrades cosmos-sdk replace github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.44.2 -replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.7.2-cronos-4 +replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.7.2-cronos-6 diff --git a/go.sum b/go.sum index f5d74f4616..c1320397ef 100644 --- a/go.sum +++ b/go.sum @@ -261,8 +261,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crypto-org-chain/ethermint v0.7.2-cronos-4 h1:NaCc0L5zN2u7B9WofmhJfur23UDebWSRD+Goqf9URnY= -github.com/crypto-org-chain/ethermint v0.7.2-cronos-4/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= +github.com/crypto-org-chain/ethermint v0.7.2-cronos-6 h1:AHmZ4d/VvRPYEwRK8WATDVgAW+LQLuus9/oRo8UHkB4= +github.com/crypto-org-chain/ethermint v0.7.2-cronos-6/go.mod h1:J96LX4KvLyl+5jV6+mt/4l6srtGX/mdDTuqQQuYrdDk= github.com/crypto-org-chain/go-ethereum v1.10.3-patched h1:kr6oQIYOi2VC8SZwkhlUDZE1Omit/YHVysKMgCB2nes= github.com/crypto-org-chain/go-ethereum v1.10.3-patched/go.mod h1:99onQmSd1GRGOziyGldI41YQb7EESX3Q4H41IfJgIQQ= github.com/crypto-org-chain/ibc-go v1.2.1-hooks h1:wuWaQqm/TFKJQwuFgjCPiPumQio+Yik5Z1DObDExrrU= diff --git a/gomod2nix.toml b/gomod2nix.toml index 2c93adee02..b958b1e7a6 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -4637,13 +4637,13 @@ sha256 = "1kmdk3v2a6ygcg2i8jfgz61yzxi4183xgzlaviq9jwsqwc2hj60w" ["github.com/tharsis/ethermint"] - sumVersion = "v0.7.2-cronos-4" + sumVersion = "v0.7.2-cronos-6" vendorPath = "github.com/crypto-org-chain/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" url = "https://github.com/crypto-org-chain/ethermint" - rev = "82805507f7d2e83cad547736883dc22acfb52440" - sha256 = "01f9i8vq0jqml676wvh0kr9kxg7grqw7f64g1qd81pzm2n89k7pn" + rev = "60af027299c1aec580240d1e03d66c0ad100934b" + sha256 = "1074b5rbi1l0ija5iz4i9d92r1as030wkqllz5ga0ahhqrgb2rp9" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" From 6d4678c123d33cbeb2da823f1bee62effbe5910f Mon Sep 17 00:00:00 2001 From: yihuang Date: Tue, 21 Dec 2021 11:21:03 +0800 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a735d689a..e80522a97b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Bug Fixes - [cronos#255](https://github.com/crypto-org-chain/cronos/pull/255) fix empty topics in non-breaking way -- [cronos#]() reject MsgEthereumTx wrapping tx without the extension option. +- [cronos#270](https://github.com/crypto-org-chain/cronos/pull/270) reject MsgEthereumTx wrapping tx without the extension option. *November 30, 2021* From 94209295472aba3faf43868a356d45c47b728176 Mon Sep 17 00:00:00 2001 From: yihuang Date: Tue, 21 Dec 2021 11:23:12 +0800 Subject: [PATCH 3/3] v0.6.5 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e80522a97b..e82d3b254a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## v0.6.5 ### Bug Fixes