Skip to content
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

Jump to bottom

Problem: recent ethermint and cosmos-sdk fixes not included #289

Merged
merged 1 commit into from
Jan 17, 2022
Merged

Problem: recent ethermint and cosmos-sdk fixes not included #289

merged 1 commit into from
Jan 17, 2022

Conversation

yihuang
Copy link
Collaborator

@yihuang yihuang commented Jan 4, 2022 •
edited
Loading

Closes: #288
Solution:

  • update ethermint to v0.10.0 with ibc-go reverted to v2.0.2.
  • update cosmos-sdk to v0.45.0
  • ibc-go: v2.0.2-hooks
  • gravity-bridge module: v0.3.4
    👮🏻👮🏻👮🏻 !!!! REFERENCE THE PROBLEM YOUR ARE SOLVING IN THE PR TITLE AND DESCRIBE YOUR SOLUTION HERE !!!! DO NOT FORGET !!!! 👮🏻👮🏻👮🏻

PR Checklist:

  • Have you read the CONTRIBUTING.md?
  • Does your PR follow the C4 patch requirements?
  • Have you rebased your work on top of the latest master?
  • Have you checked your code compiles? (make)
  • Have you included tests for any non-trivial functionality?
  • Have you checked your code passes the unit tests? (make test)
  • Have you checked your code formatting is correct? (go fmt)
  • Have you checked your basic code style is fine? (golangci-lint run)
  • If you added any dependencies, have you checked they do not contain any known vulnerabilities? (go list -json -m all | nancy sleuth)
  • If your changes affect the client infrastructure, have you run the integration test?
  • If your changes affect public APIs, does your PR follow the C4 evolution of public contracts?
  • If your code changes public APIs, have you incremented the crate version numbers and documented your changes in the CHANGELOG.md?
  • If you are contributing for the first time, please read the agreement in CONTRIBUTING.md now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thank you for your code, it's appreciated! :)

@yihuang yihuang requested a review from a team as a code owner January 4, 2022 06:33
@yihuang yihuang requested review from JayT106 and thomas-nguy and removed request for a team January 4, 2022 06:33
@codecov
Copy link

codecov bot commented Jan 4, 2022 •
edited
Loading

Codecov Report

Merging #289 (cb01e1a) into main (3ea70c5) will increase coverage by 19.54%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             main     #289       +/-   ##
===========================================
+ Coverage   21.51%   41.06%   +19.54%     
===========================================
  Files          27       30        +3     
  Lines        1729     1505      -224     
===========================================
+ Hits          372      618      +246     
+ Misses       1324      841      -483     
- Partials       33       46       +13
Impacted Files Coverage Δ
x/cronos/genesis.go 61.53% <ø> (-38.47%) ⬇️
x/cronos/handler.go 100.00% <ø> (ø)
x/cronos/keeper/evm.go 58.00% <ø> (+6.27%) ⬆️
x/cronos/keeper/evm_hooks.go 80.00% <ø> (ø)
x/cronos/keeper/evm_log_handlers.go 83.50% <ø> (ø)
x/cronos/keeper/gravity_hooks.go 0.00% <ø> (ø)
x/cronos/keeper/grpc_query.go 0.00% <ø> (ø)
x/cronos/keeper/ibc.go 83.20% <ø> (+5.01%) ⬆️
x/cronos/keeper/ibc_hooks.go 50.00% <ø> (-8.83%) ⬇️
x/cronos/keeper/keeper.go 64.89% <ø> (-29.45%) ⬇️
... and 28 more

@yihuang yihuang marked this pull request as draft January 4, 2022 06:37
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
yihuang
yihuang commented Jan 4, 2022
View reviewed changes
integration_tests/test_basic.py

# expect failure, because contract is not connected with native denom yet
# TODO complete the test after gov managed token mapping is implemented.
with pytest.raises(ValueError):
Copy link
Collaborator Author

@yihuang yihuang Jan 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

the error is not an exception anymore, but a zero receipt status now. I guess it's because the internal error message changed. But at least it's still a failure, so should be fine.

yihuang
yihuang commented Jan 5, 2022
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@lhypj
Copy link

lhypj commented Jan 7, 2022

when finished.

@JayT106
Copy link
Collaborator

JayT106 commented Jan 10, 2022

LGTM

@yihuang yihuang marked this pull request as ready for review January 14, 2022 08:25
yihuang
yihuang commented Jan 14, 2022
View reviewed changes
app/app.go
// this line is used by starport scaffolding # stargate/app/appModule
cronosModule,
)
modules := []module.AppModule{
Copy link
Collaborator Author

@yihuang yihuang Jan 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

cosmos-sdk 0.45 requires passing full module list to the APIs: SetOrderBeginBlockers/SetOrderEndBlockers/SetInitGenesis, so it's good to share the module list.

@yihuang yihuang force-pushed the update-ethermint branch 4 times, most recently from 559a867 to 9e8b302 Compare January 17, 2022 00:53
@yihuang
Problem: recent ethermint and cosmos-sdk fixes not included
cb01e1a 
Closes: crypto-org-chain#288
Solution:
- update ethermint to rebased statedb-refactoring branch
- update cosmos-sdk to block gas limit bug fix branch
- port the hooks to ibc-go v3.0.0-alpha and use the branch

fix native call testcase

fix nonce issue in estimateGas

update to ethermint main

update app scaffolding for cosmos-sdk 0.45

update dependencies

temp

ibc-go => v2.0.2-hooks
yihuang
yihuang commented Jan 17, 2022
View reviewed changes
go.mod
// TODO: remove when middleware will be implemented
github.com/cosmos/ibc-go/v2 => github.com/crypto-org-chain/ibc-go/v2 v2.0.1-hooks

github.com/enigmampc/btcutil => github.com/scrtlabs/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this dependency is gone now even without this replacement.

yihuang
yihuang commented Jan 17, 2022
View reviewed changes
go.mod
@@ -151,21 +154,16 @@ replace (
// TODO: fix keyring upstream
github.com/99designs/keyring => github.com/crypto-org-chain/keyring v1.1.6-fixes

github.com/cosmos/iavl => github.com/cosmos/iavl v0.17.3
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

it's fine without replacement now.

calvinaco
calvinaco approved these changes Jan 17, 2022
View reviewed changes
Copy link
Contributor

@calvinaco calvinaco left a comment

Choose a reason for hiding this comment

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

LGTM

@yihuang yihuang merged commit 38e2af7 into crypto-org-chain:main Jan 17, 2022
@yihuang yihuang deleted the update-ethermint branch January 17, 2022 05:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@calvinaco calvinaco calvinaco approved these changes

@JayT106 JayT106 Awaiting requested review from JayT106 JayT106 is a code owner automatically assigned from crypto-org-chain/cronos-dev

@thomas-nguy thomas-nguy Awaiting requested review from thomas-nguy thomas-nguy is a code owner automatically assigned from crypto-org-chain/cronos-dev

@tomtau tomtau Awaiting requested review from tomtau

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Problem: recent ethermint and cosmos-sdk fixes not included
5 participants
@yihuang @lhypj @JayT106 @calvinaco @thomas-nguy