Skip to content

Problem: recent bug fixes are not included #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yihuang merged 12 commits into from
Feb 16, 2022
Merged

Problem: recent bug fixes are not included #340

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
60090c5
Problem: recent bug fixes are not included
Feb 14, 2022
3e64b96
update go.sum and gomod2nix.toml
Feb 14, 2022
ef612ee
upgrade go-ethereum
Feb 15, 2022
0f4f800
fix build
Feb 15, 2022
ced583b
force load go-ethereum assets
Feb 15, 2022
c0a9d02
fix port conflict in integration test
Feb 15, 2022
086d5e1
fix upgrade integration test
Feb 15, 2022
7058de4
fix app config in upgrade test
Feb 15, 2022
1798a93
push to crypto-org-chain repo
Feb 15, 2022
d7e270a
fix tests
Feb 15, 2022
bb6d9e6
fix pystarport
Feb 15, 2022
08d637c
rename plan name
Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
- [cronos#323](https://github.com/crypto-org-chain/cronos/pull/323) Upgrade gravity bridge to v0.3.9 which contain a bugfix on `batchTxExecuted.`
- [cronos#324](https://github.com/crypto-org-chain/cronos/pull/324) Update to cosmos-sdk `v0.45.1`, which fixes an OOM issue.
- [cronos#329](https://github.com/crypto-org-chain/cronos/pull/329) Fix panic of eth_call on blocks prior to upgrade.
- [cronos#340](https://github.com/crypto-org-chain/cronos/pull/340) Update dependencies to include several bug fixes: a) fix subscription deadlock issue in ethermint, b) fix data races `traceContext`.

*December 10, 2021*

Expand Down
11 changes: 10 additions & 1 deletion app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ import (

// unnamed import of statik for swagger UI support
_ "github.com/crypto-org-chain/cronos/client/docs/statik"

// Force-load the tracer engines to trigger registration
_ "github.com/ethereum/go-ethereum/eth/tracers/js"
_ "github.com/ethereum/go-ethereum/eth/tracers/native"
)

const (
Expand Down Expand Up @@ -692,13 +696,18 @@ func New(

app.SetEndBlocker(app.EndBlocker)

// upgrade handler
// upgrade handlers
plan0_7_0 := "v0.7.0"
app.UpgradeKeeper.SetUpgradeHandler(plan0_7_0, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// The default genesis parameters of `feemarket` module are fine, because the `InitialBaseFee (1000000000)` is much lower than the current minimal gas price,
// so it don't have effect at the beginning, we can always adjust the parameters through the governance later.
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})
// this upgrade is for breaking bug fixes on testnet
plan0_7_0HotfixTestnet := "v0.7.0-hotfix-testnet"
Comment thread
JayT106 marked this conversation as resolved.
Outdated

@thomas-nguy thomas-nguy Feb 16, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we are planning to do a new binary release, should be increase the minor version?

@yihuang yihuang Feb 16, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently, it's still 0.7.0-rcX

@thomas-nguy thomas-nguy Feb 16, 2022

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe change the name of the plan to "v0.7.0-rc2" ?

Because if we do another upgrade for testnet hotfix after this one, the naming will become really confusing

@yihuang yihuang Feb 16, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

app.UpgradeKeeper.SetUpgradeHandler(plan0_7_0HotfixTestnet, func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
return app.mm.RunMigrations(ctx, app.configurator, fromVM)
})

upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk()
if err != nil {
Expand Down
13 changes: 7 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/armon/go-metrics v0.3.10
github.com/cosmos/cosmos-sdk v0.45.1
github.com/cosmos/ibc-go/v2 v2.0.2
github.com/ethereum/go-ethereum v1.10.11
github.com/ethereum/go-ethereum v1.10.15
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/gorilla/mux v1.8.0
Expand All @@ -20,8 +20,8 @@ require (
github.com/tendermint/tendermint v0.34.14
github.com/tendermint/tm-db v0.6.4
github.com/tharsis/ethermint v0.10.0-alpha1
google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb
google.golang.org/grpc v1.43.0
google.golang.org/genproto v0.0.0-20220211171837-173942840c17
google.golang.org/grpc v1.44.0
gopkg.in/yaml.v2 v2.4.0
)

Expand Down Expand Up @@ -136,7 +136,7 @@ require (
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zondax/hid v0.9.0 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
Expand All @@ -153,7 +153,8 @@ 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.1
// release/v0.45.x branch, TODO use tag when released
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.2-0.20220209090836-4161d2b6022a

@yihuang yihuang Feb 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cosmos/cosmos-sdk@v0.45.1...4161d2b


// 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
Expand All @@ -164,7 +165,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-4
github.com/tharsis/ethermint => github.com/crypto-org-chain/ethermint v0.10.0-alpha1-cronos-6

@yihuang yihuang Feb 15, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/crypto-org-chain/ethermint/compare/v0.10.0-alpha1-cronos-4...v0.10.0-alpha1-cronos-6?expand=1


google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
46 changes: 37 additions & 9 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

134 changes: 111 additions & 23 deletions gomod2nix.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,30 @@
rev = "9aa49832a739dcd78a5542ff189fb82c3e423116"
sha256 = "12klijhq4fckzbhv0cwygbazj6lvhmdqksha9y6jgfmwzv51kwv5"

["github.com/Masterminds/goutils"]
sumVersion = "v1.1.1"
["github.com/Masterminds/goutils".fetch]
type = "git"
url = "https://github.com/Masterminds/goutils"
rev = "f1923532a168b8203bfe956d8cd3b17ebece5982"
sha256 = "09m4mbcdlv9ng3xcrmjlxi0niavby52y9nl2jhjnbx1xxpjw0jrh"

["github.com/Masterminds/semver"]
sumVersion = "v1.5.0"
["github.com/Masterminds/semver".fetch]
type = "git"
url = "https://github.com/Masterminds/semver"
rev = "805c489aa98f412e79eb308a37996bf9d8b1c91e"
sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"

["github.com/Masterminds/sprig"]
sumVersion = "v2.22.0+incompatible"
["github.com/Masterminds/sprig".fetch]
type = "git"
url = "https://github.com/Masterminds/sprig"
rev = "e4c0945838d570720d876a6ad9b4568ed32317b4"
sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"

["github.com/Microsoft/go-winio"]
sumVersion = "v0.5.0"
["github.com/Microsoft/go-winio".fetch]
Expand Down Expand Up @@ -379,6 +403,14 @@
rev = "c3f0ba9c1a592b971d66b2787679af55b5c58f21"
sha256 = "1ix08vl49qxr58rc6201cl97g1yznhhkwvqldslawind99js4rj0"

["github.com/aokoli/goutils"]
sumVersion = "v1.1.1"
["github.com/aokoli/goutils".fetch]
type = "git"
url = "https://github.com/aokoli/goutils"
rev = "f1923532a168b8203bfe956d8cd3b17ebece5982"
sha256 = "09m4mbcdlv9ng3xcrmjlxi0niavby52y9nl2jhjnbx1xxpjw0jrh"

["github.com/apache/arrow/go/arrow"]
sumVersion = "v0.0.0-20191024131854-af6fa24be0db"
relPath = "go/arrow"
Expand Down Expand Up @@ -935,12 +967,12 @@
sha256 = "10x22k92ra1sdddj2pksprfhsm683sldflcnjm8nfz4rjjhjwkay"

["github.com/cosmos/cosmos-sdk"]
sumVersion = "v0.45.1"
sumVersion = "v0.45.2-0.20220209090836-4161d2b6022a"
["github.com/cosmos/cosmos-sdk".fetch]
type = "git"
url = "https://github.com/cosmos/cosmos-sdk"
rev = "2646b474c7beb0c93d4fafd395ef345f41afc251"
sha256 = "1z3yvvv7zzmp4likc023xmdmf9z1fjbakbqx6xazqadc5847av5l"
rev = "4161d2b6022a59ad859265a0e2483eb8e9b2f84d"
sha256 = "10jy4vyxy8xqy0ria0zf5cvkdf6ryfnyv8klvkn0w72qyiy1jxgf"

["github.com/cosmos/go-bip39"]
sumVersion = "v1.0.0"
Expand Down Expand Up @@ -1249,20 +1281,20 @@
sha256 = "0amjw4x1904r14ps07l3wi5vdph5v2m9c97kkrr567kxr5xpjsv3"

["github.com/envoyproxy/protoc-gen-validate"]
sumVersion = "v0.6.2"
sumVersion = "v0.6.3"
["github.com/envoyproxy/protoc-gen-validate".fetch]
type = "git"
url = "https://github.com/envoyproxy/protoc-gen-validate"
rev = "8c0f6372216272771488d63323787e86377aefe0"
sha256 = "15n0iimdvirxmd1kyysss8fcnlds316dzh3rfzmcz4k3ip26npw5"
rev = "dc51e59d2e463996ef24e45621cf61f95fa64b0f"
sha256 = "1618xdiv0ffi72m7kw33ih80l62mvszdmq1h2jgwvq0jsxsc2pr1"

["github.com/ethereum/go-ethereum"]
sumVersion = "v1.10.11"
sumVersion = "v1.10.15"
["github.com/ethereum/go-ethereum".fetch]
type = "git"
url = "https://github.com/ethereum/go-ethereum"
rev = "7231b3efb8095d3dd18d7164c3fa84d7705759d3"
sha256 = "0p3h9szm8i0fw83a717h8jsv25i3vcgasixfjg0xvvfyn74aqnsp"
rev = "8be800ffa9c4992666e2620e0ab4725a1a83352b"
sha256 = "1sknwfh1vngn5942ix8hsq0k5c9ww9q0h7qsyjbv9c6srkxgpa81"

["github.com/facebookgo/ensure"]
sumVersion = "v0.0.0-20200202191622-63f1cf65ac4c"
Expand Down Expand Up @@ -2094,6 +2126,14 @@
rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"
sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"

["github.com/huandu/xstrings"]
sumVersion = "v1.3.2"
["github.com/huandu/xstrings".fetch]
type = "git"
url = "https://github.com/huandu/xstrings"
rev = "52197b1fb3155666d9613b4eb4ed72a86d1f8ab6"
sha256 = "0pwar6rc0fqb6pll38a44s81g5kb65vbg71jg5lx8caphjnikq5r"

["github.com/hudl/fargo"]
sumVersion = "v1.3.0"
["github.com/hudl/fargo".fetch]
Expand Down Expand Up @@ -2134,6 +2174,14 @@
rev = "28f6c0f3b63983aaa99575ca3b693afff7996387"
sha256 = "0rsq3622gd40f1x1l7caidsxrmzg1993ich2higwd94fqbxs1r83"

["github.com/imdario/mergo"]
sumVersion = "v0.3.12"
["github.com/imdario/mergo".fetch]
type = "git"
url = "https://github.com/imdario/mergo"
rev = "29fb3d3bdc5512887f1dc9aedde6a0fed407fa8f"
sha256 = "15s6807vcm7xq4l6my7rnw1i7x57712jvdidjli5bip79jfaxw90"

["github.com/improbable-eng/grpc-web"]
sumVersion = "v0.15.0"
["github.com/improbable-eng/grpc-web".fetch]
Expand Down Expand Up @@ -2569,12 +2617,12 @@
sha256 = "1cby9n647v4gh11mpz1dfscks8n0cw0rj8d2hjh4q9mky4m7jzl1"

["github.com/lyft/protoc-gen-star"]
sumVersion = "v0.5.3"
sumVersion = "v0.6.0"
["github.com/lyft/protoc-gen-star".fetch]
type = "git"
url = "https://github.com/lyft/protoc-gen-star"
rev = "8ed22a1d0a9ee734c2b61d673e5013a51f3f9bf8"
sha256 = "0xzwh1q27c22ja7ixnsal838f638jxljb5hs1z1rn6dxb87wxkz9"
rev = "d186061f0cdc717ce813e52d91c29130e2d1a6bc"
sha256 = "0mbgwnd3nhafx9hvjbyyl38x1ch1b4nmk03pisybqfq1qyadx93q"

["github.com/magiconair/properties"]
sumVersion = "v1.8.5"
Expand Down Expand Up @@ -2696,6 +2744,14 @@
rev = "902dcca838c81f360568876054b74ffcc419e421"
sha256 = "1x1jq0amsa0jpd4w19saz1wahmd8fb9mzs2ii4wk0mckr30n8nki"

["github.com/mitchellh/copystructure"]
sumVersion = "v1.2.0"
["github.com/mitchellh/copystructure".fetch]
type = "git"
url = "https://github.com/mitchellh/copystructure"
rev = "d4ce1f938f7a7ea2a40bff4544b56be9c00b5e84"
sha256 = "1izw243b3r03nvgnnxvk706l3s3v3q7k69kq3n4asnzjkcymq7sm"

["github.com/mitchellh/go-homedir"]
sumVersion = "v1.1.0"
["github.com/mitchellh/go-homedir".fetch]
Expand Down Expand Up @@ -2744,6 +2800,14 @@
rev = "09edf7f47224892e450d1c704156ce2f245efaab"
sha256 = "1p6rmkwixnyf291v5jc0g72b3krp3awyakfamkq5485gvm8vk0mm"

["github.com/mitchellh/reflectwalk"]
sumVersion = "v1.0.2"
["github.com/mitchellh/reflectwalk".fetch]
type = "git"
url = "https://github.com/mitchellh/reflectwalk"
rev = "e0c24fdb021963cd2c4013097a0b993a7c4e344f"
sha256 = "1nxgb4gskzv045539vb312n0a443308dvh1akz7vi6x1l0z46zsm"

["github.com/moby/sys/mountinfo"]
sumVersion = "v0.4.1"
relPath = "mountinfo"
Expand Down Expand Up @@ -2801,6 +2865,14 @@
rev = "2f068394615f73e460c2f3d2c158b0ad9321cadb"
sha256 = "0ymjmy12ks7smgwmrwsa5kf07d9w5kpk1dn650azlzr61b561aw7"

["github.com/mwitkow/go-proto-validators"]
sumVersion = "v0.3.2"
["github.com/mwitkow/go-proto-validators".fetch]
type = "git"
url = "https://github.com/mwitkow/go-proto-validators"
rev = "32a686adf8b5194d3ea07d632d49b6fb344af678"
sha256 = "0flr9964jz4bgzhjpcc54niiy6zg1skf8f8x7bcp2qvbwshxwb44"

["github.com/mwitkow/grpc-proxy"]
sumVersion = "v0.0.0-20181017164139-0f1106ef9c76"
["github.com/mwitkow/grpc-proxy".fetch]
Expand Down Expand Up @@ -3242,6 +3314,22 @@
rev = "c20450564cc42983bf923c13f3fda42de709ac13"
sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04"

["github.com/pseudomuto/protoc-gen-doc"]
sumVersion = "v1.5.0"
["github.com/pseudomuto/protoc-gen-doc".fetch]
type = "git"
url = "https://github.com/pseudomuto/protoc-gen-doc"
rev = "27bd2775ea68088ac52ebc847c7860e4889b981d"
sha256 = "1bpb5wv76p0sjffh5d1frbygp3q1p07sdh5c8pznl5bdh5pd7zxq"

["github.com/pseudomuto/protokit"]
sumVersion = "v0.2.0"
["github.com/pseudomuto/protokit".fetch]
type = "git"
url = "https://github.com/pseudomuto/protokit"
rev = "c63c13958542d70af1d1ef7826d30b25cd5bf6e9"
sha256 = "14l1y989136xmbp5vigr41r594hh9h1nfx8bl5gkjrk585akrmmr"

["github.com/rakyll/statik"]
sumVersion = "v0.1.7"
["github.com/rakyll/statik".fetch]
Expand Down Expand Up @@ -3668,13 +3756,13 @@
sha256 = "1sgjf2vaq554ybc0cwkzn17cz2ibzph2rq0dgaw21c2hym09437x"

["github.com/tharsis/ethermint"]
sumVersion = "v0.10.0-alpha1-cronos-4"
vendorPath = "github.com/crypto-org-chain/ethermint"
sumVersion = "v0.10.0-alpha1-cronos-6"
vendorPath = "github.com/yihuang/ethermint"
["github.com/tharsis/ethermint".fetch]
type = "git"
url = "https://github.com/crypto-org-chain/ethermint"
rev = "caa29c298bd80e9659d427368d598e7f46d04ec3"
sha256 = "1gpjsfqld2w6jxcq12g57253zg1fyzw77k3niw1n18y25l80dy0k"
url = "https://github.com/yihuang/ethermint"
rev = "c627df496803c5b54fcb71b5e4dc1412c7463fa4"
sha256 = "05yw8vi4ayg8wmk7sa0w14xhs57hchwi5x37yck90cj1yw107zcb"

["github.com/tidwall/gjson"]
sumVersion = "v1.6.7"
Expand Down Expand Up @@ -3994,12 +4082,12 @@
sha256 = "14mr66h7vxirpvb12106372apw1w3ppymbf89lprxkkg03srkfy8"

["golang.org/x/crypto"]
sumVersion = "v0.0.0-20211215153901-e495a2d5b3d3"
sumVersion = "v0.0.0-20220213190939-1e6e3497d506"
["golang.org/x/crypto".fetch]
type = "git"
url = "https://go.googlesource.com/crypto"
rev = "e495a2d5b3d3be43468d0ebb413f46eeaedf7eb3"
sha256 = "06xw3x5sf6aq6gxdh24jlhfzi26zpym5jc4g43s63v8gh1fghg6m"
rev = "1e6e3497d506cca640d89d202b2070f00e81b0cb"
sha256 = "1c5azrs118yksrjlw7xm603kki0a6k80n9nkwgsj4gg6alpmrrx2"

["golang.org/x/exp"]
sumVersion = "v0.0.0-20200331195152-e8c3332aa8e5"
Expand Down Expand Up @@ -4154,12 +4242,12 @@
sha256 = "1wkipg7xxc0ha5p6c3bj0vpgq38l18441n5l6zxdhx0gzvz5z1hs"

["google.golang.org/genproto"]
sumVersion = "v0.0.0-20211223182754-3ac035c7e7cb"
sumVersion = "v0.0.0-20220211171837-173942840c17"
["google.golang.org/genproto".fetch]
type = "git"
url = "https://github.com/googleapis/go-genproto"
rev = "3ac035c7e7cbd86eb6d8b95be888cf83d73dedd3"
sha256 = "0fk3n2f6x3pyrfx2nn5ws88sp16yr42awc1n5dsfkzx47w9grczi"
rev = "173942840c1747671a8fe6c2fb041172a58dc948"
sha256 = "1zlcvki6z1wnwafx7rsi48y4c5lp642q09ywz89gl49kycgvjk3n"

["google.golang.org/grpc"]
sumVersion = "v1.33.2"
Expand Down
3 changes: 3 additions & 0 deletions integration_tests/configs/cosmovisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ cronos_777-1:
json-rpc:
address: "0.0.0.0:{EVMRPC_PORT}"
ws-address: "0.0.0.0:{EVMRPC_PORT_WS}"
feehistory-cap: 100
block-range-cap: 10000
logs-cap: 10000
validators:
- coins: 1000000000000000000stake,10000000000000000000000basetcro
staked: 1000000000000000000stake
Expand Down
5 changes: 4 additions & 1 deletion integration_tests/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def __init__(self, cronos, geth, contract):
self.contract = contract


def setup_custom_cronos(path, base_port, config, post_init=None):
def setup_custom_cronos(path, base_port, config, post_init=None, chain_binary=None):
cmd = [
"pystarport",
"init",
Expand All @@ -182,7 +182,10 @@ def setup_custom_cronos(path, base_port, config, post_init=None):
path,
"--base_port",
str(base_port),
"--no_remove",
]
if chain_binary is not None:
cmd = cmd[:1] + ["--cmd", chain_binary] + cmd[1:]
print(*cmd)
subprocess.run(cmd, check=True)
if post_init is not None:
Expand Down
Loading