diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c183f73e4..8e34cf6a39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +### Bug Fixes +- [crypto-org-chain/ethermint#19](https://github.com/crypto-org-chain/ethermint/pull/19) revert tharsis#786 because it contains consensus breaking changes + *November 29, 2021* ## v0.6.3 diff --git a/go.mod b/go.mod index 555e509ba4..660aa80986 100644 --- a/go.mod +++ b/go.mod @@ -100,6 +100,7 @@ require ( github.com/mitchellh/mapstructure v1.4.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -163,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-3 +replace github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.7.2-cronos-4 diff --git a/go.sum b/go.sum index b01b68f7ca..f5d74f4616 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-3 h1:q72Xkbi4Xz/4GuwrnA5bSl9YmThihnkYS0RC9Dmedi8= -github.com/crypto-org-chain/ethermint v0.7.2-cronos-3/go.mod h1:AA52lISLoISCc/JMRF8aIGJCl++7digVCV97V0o+WZ4= +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/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= @@ -921,6 +921,8 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= +github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177 h1:nRlQD0u1871kaznCnn1EvYiMbum36v7hw1DLPEjds4o= +github.com/palantir/stacktrace v0.0.0-20161112013806-78658fd2d177/go.mod h1:ao5zGxj8Z4x60IOVYZUbDSmt3R8Ddo080vEgPosHpak= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= diff --git a/gomod2nix.toml b/gomod2nix.toml index 98320040f0..2c93adee02 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -3840,6 +3840,14 @@ rev = "3ce08c8af46b7bc33a06efc9b8807c08806c8af2" sha256 = "08mnyf1yb6zjqfzs1pdh44drv390lfilhh4vi4asnjk52gknqfn0" +["github.com/palantir/stacktrace"] + sumVersion = "v0.0.0-20161112013806-78658fd2d177" + ["github.com/palantir/stacktrace".fetch] + type = "git" + url = "https://github.com/palantir/stacktrace" + rev = "78658fd2d1772b755720ed8c44367d11ee5380d6" + sha256 = "1322v09p008yxyk76drci9hz5xxqghgp2r7yp7wwn6xmmgyfvyf0" + ["github.com/pascaldekloe/goe"] sumVersion = "v0.1.0" ["github.com/pascaldekloe/goe".fetch] @@ -4629,13 +4637,13 @@ sha256 = "1kmdk3v2a6ygcg2i8jfgz61yzxi4183xgzlaviq9jwsqwc2hj60w" ["github.com/tharsis/ethermint"] - sumVersion = "v0.7.2-cronos-3" + sumVersion = "v0.7.2-cronos-4" vendorPath = "github.com/crypto-org-chain/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" url = "https://github.com/crypto-org-chain/ethermint" - rev = "839e6b433980f26c5fc82dc959671587e5cb497f" - sha256 = "14r4hpzpq88vsyd0b1k5hvjk5g9q4rqlhd205zm2zv8idik7lig2" + rev = "82805507f7d2e83cad547736883dc22acfb52440" + sha256 = "01f9i8vq0jqml676wvh0kr9kxg7grqw7f64g1qd81pzm2n89k7pn" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7"