deps: upgrade of SDK to 0.46 and tendermint to 0.35 #1205

crodriguezvega · 2022-03-30T13:08:40Z

Description

Upgrade of SDK to 0.46-alpha3 and Tendermint to 0.35.

This PR is based on the excellent work done by @faddat on his PR. This PR is basically a subset of all the changes included in #949 (i.e. it adds only the changes strictly necessary for the upgrade of SDK and Tendermint) to narrow the scope and make the review easier.

TODO:

Add changelog entry.
Add migration docs.

closes: #909 #539

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

Targeted PR against correct branch (see CONTRIBUTING.md)
Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
Code follows the module structure standards.
Wrote unit and integration tests
Updated relevant documentation (docs/) or specification (x/<module>/spec/)
Added relevant godoc comments.
Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
Re-reviewed Files changed in the Github PR explorer
Review Codecov Report in the comment section below once CI passes

fedekunze · 2022-03-30T13:09:21Z

Will there not be a v0.45 compatible version?

crodriguezvega · 2022-03-30T13:19:09Z

Will there not be a v0.45 compatible version?

You mean SDK 0.45 with Tendermint 0.35? We could look into it...

codecov-commenter · 2022-03-30T13:20:10Z

Codecov Report

Merging #1205 (44a057b) into carlos/upgrade-sdk-0.46-tendermint-0.35 (f4a5dcb) will decrease coverage by 0.34%.
The diff coverage is 81.11%.

@@                             Coverage Diff                             @@
##           carlos/upgrade-sdk-0.46-tendermint-0.35    #1205      +/-   ##
===========================================================================
- Coverage                                    79.82%   79.47%   -0.35%     
===========================================================================
  Files                                          151      151              
  Lines                                        10907    10945      +38     
===========================================================================
- Hits                                          8706     8699       -7     
- Misses                                        1776     1819      +43     
- Partials                                       425      427       +2

Impacted Files	Coverage Δ
...27-interchain-accounts/controller/keeper/keeper.go	`96.46% <ø> (ø)`
.../apps/27-interchain-accounts/host/keeper/keeper.go	`83.49% <ø> (ø)`
modules/apps/transfer/keeper/keeper.go	`94.36% <ø> (ø)`
modules/core/02-client/proposal_handler.go	`77.77% <ø> (ø)`
modules/core/02-client/types/codec.go	`77.77% <ø> (ø)`
modules/core/02-client/types/proposal.go	`86.48% <ø> (ø)`
modules/core/04-channel/keeper/keeper.go	`84.41% <ø> (ø)`
modules/core/keeper/keeper.go	`85.71% <ø> (ø)`
...s/apps/27-interchain-accounts/host/keeper/relay.go	`75.00% <70.00%> (-3.05%)`	⬇️
modules/core/keeper/sdk_middleware.go	`81.33% <81.33%> (ø)`
... and 13 more

testing/sdk_test.go

crodriguezvega · 2022-03-30T13:37:20Z

go.mod

@@ -4,119 +4,142 @@ module github.com/cosmos/ibc-go/v3

 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

+replace github.com/zondax/hid => github.com/zondax/hid v0.9.0


I had to add this to make the branch build on my Mac running Big Sur. I will take it off before merging.

testing/utils.go

crodriguezvega · 2022-03-30T14:12:35Z

Will there not be a v0.45 compatible version?

Just did a quick test of trying to upgrade to Tendermint 0.35 with SDK 0.45.1 and I get errors like this:

github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts imports
        github.com/cosmos/cosmos-sdk/types imports
        github.com/tendermint/tendermint/rpc/core/types: module github.com/tendermint/tendermint@latest found (v0.35.2, replaced by github.com/tendermint/tendermint@v0.35.2), but does not contain package github.com/tendermint/tendermint/rpc/core/types

So not sure if it will be possible...

colin-axner

Nice start! Left several suggestions after briefly diving through a lot of the changes. I'm wondering if we should split up this update. For example, the IBC ante handler changes are technically not required to update to v0.46 (simply remove them), then we can have a followup pr which properly fixes the code. The old structure of the ante handler code doesn't make sense to just copy over given the new API

modules/core/02-client/proposal_handler.go

testing/simapp/app.go

modules/apps/27-interchain-accounts/controller/keeper/keeper.go

modules/core/02-client/client/proposal_handler.go

modules/light-clients/07-tendermint/types/update_test.go

modules/core/middleware/middleware.go

zavgorodnii · 2022-04-04T16:30:26Z

hey! testing/simapp/params/amino.go imports "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx", which is not present in cosmos-sdk v0.46.0-alpha3.0.20220325134903-a69764f9f01b. is this intentional?

amaury1093 · 2022-04-04T16:35:49Z

"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"

This has been moved to "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx".

Edit: also, beta1 has been released, which should be more API stable.

zavgorodnii · 2022-04-04T16:39:04Z

"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"

This has been moved to "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

right! just saw a reference to the old path here:

ibc-go/testing/simapp/params/amino.go

Line 8 in 34f03df

"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"

faddat · 2022-04-15T11:47:18Z

hey, I'm really happy to see the progress here and also to be getting help on discerning exactly which changes were needed for v46 compatiblity.

For our upgrade, the primary authors were @catShaark and @nguyenvuong1122000.

In the coming week, I'll be updating the testnet code for https://github.com/notional-labs/craft to the beta1 cosmos-sdk (or possibly release/v0.46.x) and we should have some more input on the work here.

crodriguezvega · 2022-04-21T07:52:23Z

hey! testing/simapp/params/amino.go imports "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx", which is not present in cosmos-sdk v0.46.0-alpha3.0.20220325134903-a69764f9f01b. is this intentional?

Thanks for pointing this out! I just pushed a fix.

modules/apps/27-interchain-accounts/host/ibc_module_test.go

modules/apps/27-interchain-accounts/host/keeper/relay_test.go

modules/core/legacy/v100/genesis_test.go

…SDK v0.46 (#1288) * refactor: simplify ibc redundancy check used as sdk middleware Instead of having the function checkRedundancy check if the call is on CheckTx or SimulateTx, only call the function on CheckTx or SimulateTx * add godoc

colin-axner

Looking good! I still need to rereview the sdk middleware code and I am still concerned about updating the ABCIResponsesResultHash, implementing the function ourself defeats the purpose of the test added to indicate when the expected downstream behaviour changes

I would prefer updates to newer release (ie beta3) to be done in a separate pr since this one already has many changes. Ideally we merge this as soon as the ABCIResponsesResultHash is resolved

testing/mock/privval_test.go

testing/simapp/test_helpers.go

seantking · 2022-05-12T13:55:58Z

testing/simapp/simd/cmd/testnet.go

@@ -390,7 +392,7 @@ func writeFile(name string, dir string, contents []byte) error {
 		return err
 	}

-	err = tmos.WriteFile(file, contents, 0644)
+	err = ioutil.WriteFile(file, contents, 0644)


Side note: running this branch locally deletes a local genesis file which causes other branches (without the SDK update) cmd_test.go tests to break. I think this line is the culprit. I guess there isn't much to do other than just get this merged asap :)

colin-axner

utACK pending the merge of #1349 (approval only applies to merging into the 0.46 feature branch, not main)

go.mod

…age responses (#1349) * begin refactoring ack_test * fix test due to delayed block execution * refactor: switch ics27 response creation to use new SDK version, update tests * fix import

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

…ibc-go into carlos/upgrade-pr-branch

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

crodriguezvega · 2022-05-17T19:01:27Z

Another PR will be opened when there's an SDK 0.46 RC pre-release.

### Summary by CodeRabbit - **Documentation**: Updated the file structure for better organization. Introduced a new specification file "Block Validity" for enhanced clarity on block and header validation in our blockchain system. - **New Feature**: Added detailed descriptions and requirements for verifying blocks and headers, including basic validation and verification against the previous block. This will improve the reliability and security of our blockchain system.  --------- Co-authored-by: Connor O'Hara <connor@switchboard.xyz> Co-authored-by: nashqueue <99758629+nashqueue@users.noreply.github.com>

deps: upgrade of SDK to 0.46 and tendermint to 0.35

93ee2d7

crodriguezvega requested review from seantking, colin-axner, AdityaSripal, damiannolan, fedekunze and charleenfei as code owners March 30, 2022 13:08

crodriguezvega commented Mar 30, 2022

View reviewed changes

colin-axner reviewed Mar 31, 2022

View reviewed changes

some changes from review comments

34f03df

zavgorodnii mentioned this pull request Apr 4, 2022

sdk 46 and ibc v3 cosmos/wasmd#1

Open

zavgorodnii mentioned this pull request Apr 5, 2022

switched from notional-labs/ibc-go/v3 to cosmos/ibc-go/v3 notional-labs/wasmd#23

Merged

crodriguezvega changed the base branch from carlos/upgrade-sdk-tendermint to carlos/upgrade-sdk-0.46-tendermint-0.35 April 6, 2022 11:54

i-norden mentioned this pull request Apr 6, 2022

Issues with upgrading chiba-clonk to our nascent, smt-compatible, 0.46.0 version of the SDK vulcanize/chiba-clonk#27

Closed

3 tasks

damiannolan mentioned this pull request Apr 11, 2022

build(deps): bump github.com/tendermint/tendermint from 0.34.14 to 0.35.3 #1243

Closed

crodriguezvega mentioned this pull request Apr 18, 2022

build(deps): bump github.com/tendermint/tendermint from 0.34.19 to 0.35.4 #1266

Closed

some review comments

42e8592

colin-axner reviewed Apr 21, 2022

View reviewed changes

modules/apps/27-interchain-accounts/host/ibc_module_test.go Outdated Show resolved Hide resolved

modules/apps/27-interchain-accounts/host/keeper/relay_test.go Show resolved Hide resolved

modules/core/legacy/v100/genesis_test.go Outdated Show resolved Hide resolved

crodriguezvega mentioned this pull request Apr 25, 2022

Migrate governance proposals from v1beta1 to v1 #1282

Closed

8 tasks

colin-axner and others added 2 commits April 25, 2022 15:11

more review comments.

c4f8fe1

Carlos Rodriguez added 2 commits April 26, 2022 10:19

another review comment

f085de8

remove tests since legacy REST endpoints have been removed in SDK 0.46

378234d

colin-axner reviewed May 10, 2022

View reviewed changes

seantking reviewed May 12, 2022

View reviewed changes

colin-axner approved these changes May 12, 2022

View reviewed changes

okwme reviewed May 13, 2022

View reviewed changes

go.mod Outdated Show resolved Hide resolved

okwme and others added 11 commits May 15, 2022 16:28

chore: update sdk to v0.46.0-beta2

0daf1c3

refactor: ics27 indicator tests of deterministic error codes and mess…

5ac1441

…age responses (#1349) * begin refactoring ack_test * fix test due to delayed block execution * refactor: switch ics27 response creation to use new SDK version, update tests * fix import

review comment

9c6d64d

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

review comment.

1b47817

Merge branch 'carlos/upgrade-pr-branch' of https://github.com/cosmos/…

44f074c

…ibc-go into carlos/upgrade-pr-branch

pass nil context

2b5373f

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

review comment

dc048ea

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

remove unused import

e340c2f

remove unused import

288f8a4

fix for race condition in tests

5203e6d

remove replace directive to make it build in pre-monterrey mac OS X

44a057b

crodriguezvega merged commit c4ce2b9 into carlos/upgrade-sdk-0.46-tendermint-0.35 May 17, 2022

crodriguezvega deleted the carlos/upgrade-pr-branch branch May 17, 2022 19:00

gsk967 mentioned this pull request May 18, 2022

upgrade: upgrade to vulcanize cosmos v0.46 SMT vulcanize/chiba-clonk#35

Merged

11 tasks

colin-axner mentioned this pull request May 19, 2022

Sdk 46 ibcv3 #1274

Closed

9 tasks

This was referenced May 20, 2022

Craft Middleware refactor notional-labs/craft#114

Closed

Cosmos SDK v46 CosmWasm/wasmd#863

Closed

faddat mentioned this pull request Jul 20, 2022

ibc-go v5: cosmos-sdk 46 #1653

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

deps: upgrade of SDK to 0.46 and tendermint to 0.35 #1205

deps: upgrade of SDK to 0.46 and tendermint to 0.35 #1205

crodriguezvega commented Mar 30, 2022

fedekunze commented Mar 30, 2022

crodriguezvega commented Mar 30, 2022 •

edited

Loading

codecov-commenter commented Mar 30, 2022 •

edited

Loading

crodriguezvega Mar 30, 2022

crodriguezvega commented Mar 30, 2022

colin-axner left a comment

zavgorodnii commented Apr 4, 2022 •

edited

Loading

amaury1093 commented Apr 4, 2022 •

edited

Loading

zavgorodnii commented Apr 4, 2022

faddat commented Apr 15, 2022

crodriguezvega commented Apr 21, 2022

colin-axner left a comment

seantking May 12, 2022

colin-axner left a comment

crodriguezvega commented May 17, 2022

		@@ -4,119 +4,142 @@ module github.com/cosmos/ibc-go/v3

		replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1

		replace github.com/zondax/hid => github.com/zondax/hid v0.9.0

deps: upgrade of SDK to 0.46 and tendermint to 0.35 #1205

deps: upgrade of SDK to 0.46 and tendermint to 0.35 #1205

Conversation

crodriguezvega commented Mar 30, 2022

Description

fedekunze commented Mar 30, 2022

crodriguezvega commented Mar 30, 2022 • edited Loading

codecov-commenter commented Mar 30, 2022 • edited Loading

Codecov Report

crodriguezvega Mar 30, 2022

Choose a reason for hiding this comment

crodriguezvega commented Mar 30, 2022

colin-axner left a comment

Choose a reason for hiding this comment

zavgorodnii commented Apr 4, 2022 • edited Loading

amaury1093 commented Apr 4, 2022 • edited Loading

zavgorodnii commented Apr 4, 2022

faddat commented Apr 15, 2022

crodriguezvega commented Apr 21, 2022

colin-axner left a comment

Choose a reason for hiding this comment

seantking May 12, 2022

Choose a reason for hiding this comment

colin-axner left a comment

Choose a reason for hiding this comment

crodriguezvega commented May 17, 2022

crodriguezvega commented Mar 30, 2022 •

edited

Loading

codecov-commenter commented Mar 30, 2022 •

edited

Loading

zavgorodnii commented Apr 4, 2022 •

edited

Loading

amaury1093 commented Apr 4, 2022 •

edited

Loading