From a49e7b35510365414b94e1d9328caa053fbbd1be Mon Sep 17 00:00:00 2001 From: yihuang Date: Fri, 21 Jan 2022 16:23:09 +0800 Subject: [PATCH] Problem: final cosmos-sdk 0.45.0 is not used (#315) * Problem: final cosmos-sdk 0.45.0 is not used Solution: - update dependencies * changelog * re-tag as v0.10.0-alpha1-cronos-2 * replace cosmos-sdk to 0.45.0 * fix integration test --- CHANGELOG.md | 5 ++++- go.mod | 5 +++-- go.sum | 10 ++++------ gomod2nix.toml | 12 ++++++------ integration_tests/test_basic.py | 3 +-- nix/sources.json | 8 ++++---- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b2085b0ed..160680255c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## Unreleased +*January 21, 2022* + +## v0.7.0 ### State Machine Breaking @@ -15,6 +17,7 @@ - [cosmos-sdk#10833](https://github.com/cosmos/cosmos-sdk/pull/10833) fix reported tx gas used when block gas limit exceeded. - [cosmos-sdk#10814](https://github.com/cosmos/cosmos-sdk/pull/10814) revert tx when block gas limit exceeded. - [cosmos-sdk#10725](https://github.com/cosmos/cosmos-sdk/pull/10725) populate `ctx.ConsensusParams` for begin/end blockers (fix baseFee calculation in ethermint). +- [cronos#315](https://github.com/crypto-org-chain/cronos/pull/315) Update cosmos-sdk to `v0.45.0` ### Improvements - [cronos#210](https://github.com/crypto-org-chain/cronos/pull/210) re-enabling gravity bridge conditionally diff --git a/go.mod b/go.mod index 22df1f9bbe..d9330f0028 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/armon/go-metrics v0.3.10 - github.com/cosmos/cosmos-sdk v0.45.0-rc1 + github.com/cosmos/cosmos-sdk v0.45.0 github.com/cosmos/ibc-go/v2 v2.0.2 github.com/ethereum/go-ethereum v1.10.11 github.com/gogo/protobuf v1.3.3 @@ -153,6 +153,7 @@ require ( replace ( // TODO: fix keyring upstream github.com/99designs/keyring => github.com/crypto-org-chain/keyring v1.1.6-fixes + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.0 // TODO: remove when middleware will be implemented github.com/cosmos/ibc-go/v2 => github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks @@ -163,7 +164,7 @@ replace ( // See https://github.com/tecbot/gorocksdb/pull/216 github.com/tecbot/gorocksdb => github.com/cosmos/gorocksdb v1.1.1 - github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos + github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2 google.golang.org/grpc => google.golang.org/grpc v1.33.2 ) diff --git a/go.sum b/go.sum index d668ea3eed..9ad08178d2 100644 --- a/go.sum +++ b/go.sum @@ -204,7 +204,6 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo= github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= github.com/confio/ics23/go v0.6.6 h1:pkOy18YxxJ/r0XFDCnrl4Bjv6h4LkBSpLS6F38mrKL8= @@ -227,9 +226,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.44.5/go.mod h1:maUA6m2TBxOJZkbwl0eRtEBgTX37kcaiOWU5t1HEGaY= -github.com/cosmos/cosmos-sdk v0.45.0-rc1 h1:94EoI38gvnkYVUO+w4vBunEFPX8/5S0kwc6QEdkP0mo= -github.com/cosmos/cosmos-sdk v0.45.0-rc1/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= +github.com/cosmos/cosmos-sdk v0.45.0 h1:DHD+CIRZ+cYgiLXuTEUL/aprnfPsWSwaww/fIZEsZlk= +github.com/cosmos/cosmos-sdk v0.45.0/go.mod h1:XXS/asyCqWNWkx2rW6pSuen+EVcpAFxq6khrhnZgHaQ= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -247,8 +245,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= 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.10.0-alpha1-cronos h1:Af2AZ7SgUW8lvZ2tKM2DsykHO0Cci05Ml3A7jhORtuk= -github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos/go.mod h1:Ru13sUAimNRseyqVneUMta8b+Zi5kbF2mgA+1opZwOY= +github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2 h1:1v0CFqtCFNx67c7GHf7/T6qh41yCo/CXl+M2WE5v828= +github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-2/go.mod h1:mDIs9UkvLmjjg6cJX0dyO2GKn0GP6cuq4AfbDnFZl/4= github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks h1:d2MOrJQE6lZQ+nUznUaSlE8/QQZ4j5rkv5hw2DnCt50= github.com/crypto-org-chain/ibc-go/v2 v2.0.2-hooks/go.mod h1:XUmW7wmubCRhIEAGtMGS+5IjiSSmcAwihoN/yPGd6Kk= github.com/crypto-org-chain/keyring v1.1.6-fixes h1:AUFSu56NY6XobY6XfRoDx6v3loiOrHK5MNUm32GEjwA= diff --git a/gomod2nix.toml b/gomod2nix.toml index 31b7151670..7d4151f345 100644 --- a/gomod2nix.toml +++ b/gomod2nix.toml @@ -935,12 +935,12 @@ sha256 = "10x22k92ra1sdddj2pksprfhsm683sldflcnjm8nfz4rjjhjwkay" ["github.com/cosmos/cosmos-sdk"] - sumVersion = "v0.45.0-rc1" + sumVersion = "v0.45.0" ["github.com/cosmos/cosmos-sdk".fetch] type = "git" url = "https://github.com/cosmos/cosmos-sdk" - rev = "c1c1ad7425292924b77dc632370815088b2d3c58" - sha256 = "06m3yfa54adh87lmdifay663w174j2n9mviq6j2bqzq8sq2if2x3" + rev = "b6c77e6c819f8a51166649eaef125d1bfb276f04" + sha256 = "09ns4yfxyfi7c7n5g69zv32m1rdssdl48c1akmv1y2vz6ayz4v02" ["github.com/cosmos/go-bip39"] sumVersion = "v1.0.0" @@ -3668,13 +3668,13 @@ sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x" ["github.com/tharsis/ethermint"] - sumVersion = "v0.10.0-alpha1-cronos" + sumVersion = "v0.10.0-alpha1-cronos-2" vendorPath = "github.com/crypto-org-chain/ethermint" ["github.com/tharsis/ethermint".fetch] type = "git" url = "https://github.com/crypto-org-chain/ethermint" - rev = "4f1b640999c76dea09c99b404ebd0e385eda9dd0" - sha256 = "03xvhkz83sr4s52bfq1888204p3hqikz2ni22kd7cd2irvks5ivm" + rev = "41019c613ecb111a77592864297720701c7ec0da" + sha256 = "0s607cwkdwdd81ci4fkszzsk4s4r6i0w4xlrq8yiwyxhhwknn7qm" ["github.com/tidwall/gjson"] sumVersion = "v1.6.7" diff --git a/integration_tests/test_basic.py b/integration_tests/test_basic.py index b72aa06632..9baa7836fa 100644 --- a/integration_tests/test_basic.py +++ b/integration_tests/test_basic.py @@ -295,8 +295,7 @@ def test_transaction(cronos): }, KEYS["validator"], )["transactionHash"] - # FIXME https://github.com/tharsis/ethermint/pull/911 - assert "invalid base fee" in str(exc) + assert "insufficient fee" in str(exc) # check all failed transactions are not included in blockchain assert w3.eth.get_block_number() == initial_block_number diff --git a/nix/sources.json b/nix/sources.json index 879efd18b6..9544774493 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cosmos-sdk": { - "branch": "v0.45.0-rc1", + "branch": "v0.45.0", "description": ":chains: A Framework for Building High Value Public Blockchains :sparkles:", "homepage": "https://cosmos.network/", "owner": "cosmos", "repo": "cosmos-sdk", - "rev": "c1c1ad7425292924b77dc632370815088b2d3c58", - "sha256": "06m3yfa54adh87lmdifay663w174j2n9mviq6j2bqzq8sq2if2x3", + "rev": "b6c77e6c819f8a51166649eaef125d1bfb276f04", + "sha256": "09ns4yfxyfi7c7n5g69zv32m1rdssdl48c1akmv1y2vz6ayz4v02", "type": "tarball", - "url": "https://github.com/cosmos/cosmos-sdk/archive/c1c1ad7425292924b77dc632370815088b2d3c58.tar.gz", + "url": "https://github.com/cosmos/cosmos-sdk/archive/b6c77e6c819f8a51166649eaef125d1bfb276f04.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "dapptools": {