sdk 50 #3808

faddat · 2023-06-09T20:22:02Z

This is a very rough draft pr that upgrades ibc-go to sdk v0.50.x -- the idea is to have
this software available to speed up deployment on chains and in common ecosystem
libraries like wasmd.

sdk 50 first go
add go workspace

testing/chain.go

@@ -211,7 +212,7 @@
 // QueryProofForStore performs an abci query with the given key and returns the proto encoded merkle proof
 // for the query and the height at which the proof will succeed on a tendermint verifier.
 func (chain *TestChain) QueryProofForStore(storeKey string, key []byte, height int64) ([]byte, clienttypes.Height) {
-	res := chain.App.Query(abci.RequestQuery{
+	res, err := chain.App.Query(abci.RequestQuery{


testing/chain.go

@@ -235,7 +236,7 @@
 // QueryUpgradeProof performs an abci query with the given key and returns the proto encoded merkle proof
 // for the query and the height at which the proof will succeed on a tendermint verifier.
 func (chain *TestChain) QueryUpgradeProof(key []byte, height uint64) ([]byte, clienttypes.Height) {
-	res := chain.App.Query(abci.RequestQuery{
+	res, err := chain.App.Query(abci.RequestQuery{


testing/simapp/export.go

This reverts commit 4580f76.

testing/simapp/export.go

@@ -103,12 +103,12 @@
 	// reinitialize all validators
 	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
 		// donate any unwithdrawn outstanding reward fraction tokens to the community pool
-		scraps := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator())
-		feePool := app.DistrKeeper.GetFeePool(ctx)
+		scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator())


testing/simapp/export.go

-		scraps := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator())
-		feePool := app.DistrKeeper.GetFeePool(ctx)
+		scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator())
+		feePool, err := app.DistrKeeper.FeePool.Get(ctx)


testing/simapp/app.go

@@ -329,14 +345,16 @@

 	// SDK module keepers

-	app.AccountKeeper = authkeeper.NewAccountKeeper(appCodec, keys[authtypes.StoreKey], authtypes.ProtoBaseAccount, maccPerms, sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String())
+	// add keepers
+	app.AccountKeeper = authkeeper.NewAccountKeeper(appCodec, runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, maccPerms, sdk.Bech32MainPrefix, authtypes.NewModuleAddress(govtypes.ModuleName).String())


testing/simapp/export.go

@@ -28,7 +28,7 @@
 		app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}

-	genState := app.mm.ExportGenesis(ctx, app.appCodec)
+	genState, err := app.ModuleManager.ExportGenesis(ctx, app.appCodec)


… sdk-50

faddat · 2023-06-15T05:48:36Z

Hey, the biggest remaining issue is this:

    /Users/faddat/ibc-go/modules/apps/transfer/keeper/suite.go:87: test panicked: type_url /ibc.applications.fee.v1.MsgRegisterPayee has not been registered yet. Before calling RegisterService, you must register all interfaces by calling the `RegisterInterfaces` method on module.BasicManager. Each module should call `msgservice.RegisterMsgServiceDesc` inside its `RegisterInterfaces` method with the `_Msg_serviceDesc` generated by proto-gen

And interestingly I have hit this several times recently, always when dealing with situations where I've rebuilt / redid protos. Anyone have any ideas?

Resolved, by addint the modulebasic manager to app.go

… sdk-50

faddat · 2023-06-15T07:03:00Z

The next most frequent error is:

                Error:          Received unexpected error:
                                invalid height: 1; expected: 2
                Test:           TestTypesTestSuite/TestMarshalClientUpdateProposalProposal
    --- FAIL: TestTypesTestSuite/TestMarshalConsensusStateWithHeight (0.06s)
        chain.go:292: 
                Error Trace:    /Users/faddat/ibc-go/testing/chain.go:292
                                                        /Users/faddat/ibc-go/testing/coordinator.go:185
                                                        /Users/faddat/ibc-go/testing/chain.go:158
                                                        /Users/faddat/ibc-go/testing/chain.go:187
                                                        /Users/faddat/ibc-go/testing/coordinator.go:40
                                                        /Users/faddat/ibc-go/modules/core/02-client/types/msgs_test.go:28
                                                        /Users/faddat/go/pkg/mod/github.com/stretchr/[email protected]/suite/suite.go:187

Anyone know where we set expected for this?

tac0turtle · 2023-06-15T12:36:45Z

after looking through the cosmos-sdk, it seems like we should get the validator set updates from the endblocker.

Is that correct?

updating the docs here cosmos/cosmos-sdk#16501. just about done but it has the begin and endblocker changes

modules/capability/go.mod

faddat · 2023-06-16T12:58:48Z

My most recent commit breaks a lot of things. I think there may be a design question for @crodriguezvega & the IBC team -- The thing that this seems to break most is the testing style that is used here in ibc-go.

Maybe we line up a call?

Note: I made this commit in part by using the goland side by side view and looking at the diff between the SDK's simapp. Where possible, I made ibc's simapp look like sdk's simapp.

faddat · 2023-06-16T13:56:54Z

nb:

https://github.com/cosmos/cosmos-sdk/blob/13e61bd0c5c7950d137bbdfb171f95d87179ed29/CHANGELOG.md?plain=1#L43

This is at a minimum going to affect how we work with packet.go

// GetBytes returns the JSON marshalled interchain account packet data.
func (iapd InterchainAccountPacketData) GetBytes() []byte {
	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&iapd))
}

// GetBytes returns the JSON marshalled interchain account CosmosTx.
func (ct CosmosTx) GetBytes() []byte {
	return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&ct))
}

I assume that is a determinsim hack to ensure all nodes see the same thing?

For now I am going to do like:

// Deprecated: please delete this code eventually.
func mustSortJSON(bz []byte) []byte {
	var c any
	err := json.Unmarshal(bz, &c)
	if err != nil {
		panic(err)
	}
	js, err := json.Marshal(c)
	if err != nil {
		panic(err)
	}
	return js
}

but please note that the way I am doing it feels hacky violates DRY and should probably be changed at some point.

faddat · 2023-06-17T05:14:53Z

Yesterday I did a pretty interesting exercise where I tried to make the simapp folder match the SDK's as closely as I could.

I am going to do the same today, but with the main branch.

I think this will reduce the changeset.

faddat · 2023-06-17T05:15:22Z

Also might start this branch over, depends on findings from that.

… Manager

faddat · 2023-06-17T18:22:09Z

@crodriguezvega hey, I think that what I will do here, is cherry pick commits beginning iwth the upgrade-sdk-v0.50 branch, just to keep this cleaner. I have merged main here, for example and I don't think that is desired.

faddat · 2023-06-17T19:06:42Z

closing in favor of a new branch

faddat added 3 commits June 10, 2023 04:20

sdk 50 first go

5475dfb

add go workspace

429d933

make proto-gen, cleanup

7b82e42

faddat mentioned this pull request Jun 9, 2023

notes for docs from upgrading ibc cosmos/cosmos-sdk#16487

Closed

faddat added 2 commits June 10, 2023 05:19

additiona cleanup of imports

0ea95e9

updates...

8a22326

github-advanced-security bot found potential problems Jun 9, 2023

View reviewed changes

faddat added 7 commits June 10, 2023 11:51

handle expedited proposal bools

5da60cb

restructure modules

4580f76

pre revert commit

731dc38

Revert "restructure modules"

5f9b832

This reverts commit 4580f76.

correctly migrate modules

d9ddc54

migrate parameter store

2f76d3f

fix calls to NewContext

8ca6678

github-advanced-security bot found potential problems Jun 10, 2023

View reviewed changes

faddat added 6 commits June 10, 2023 15:03

tidy and enable thelper

428c09e

use thelper and disable depguard

fc0e782

use latest golangci-lint in ci

1bae599

upgrade to go 1.20 and newer protobuf builder to reduce v50 changeset

635a62e

Merge remote-tracking branch 'fork/go1.20' into sdk-50

ac1c6a6

Merge remote-tracking branch 'fork/use-thelper' into sdk-50

3b34fe1

github-advanced-security bot found potential problems Jun 10, 2023

View reviewed changes

faddat added 6 commits June 10, 2023 16:09

more cleanup, 5% of tests pass

d90ce0b

add go work

e128eba

bumps

2598fd1

bump go in an additional place

20b10e9

Merge branch 'go1.20' of https://github.com/faddat/ibc-go into go1.20

2464581

set up rootmultistore in the new way and address WrongArgCount lints

a798db8

github-advanced-security bot found potential problems Jun 10, 2023

View reviewed changes

faddat force-pushed the sdk-50 branch from 6ce3b7c to a798db8 Compare June 10, 2023 13:06

Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into…

6d2dc6a

… sdk-50

faddat and others added 5 commits June 15, 2023 13:56

register modulebasicmanager in app.go

97a402e

add module register in app.go

749db69

Merge branch 'sdk-50' of https://github.com/notional-labs/ibc-go into…

fd5367d

… sdk-50

fix the upgrade module's return

55d10b3

all errors now checked

df0d6fe

update FinalizeBlock height input

f0eaa04

alpe reviewed Jun 15, 2023

View reviewed changes

modules/capability/go.mod Outdated Show resolved Hide resolved

faddat added 3 commits June 16, 2023 15:42

revert changes to the capability module path

5e59727

add circuit breaker

6e16d62

Begin to use modulebasicmanager

30e82a8

rename Marshaler to Codec

9fd734d

faddat added 4 commits June 16, 2023 22:23

account for modulebasicmanager

f28d925

fix setup()

14bf431

fix import cycle

8ea5264

use appcodec for setuptestingapp

7323ad1

sontrinh16 added 2 commits June 17, 2023 18:42

add missing IBCKeeper initialize and remove unused module from module…

cf9f253

… Manager

update SetupWithGenesisValSet func

3d58b82

faddat closed this Jun 17, 2023

This was referenced Jun 18, 2023

imp: refactor simapp to more closely resemble the style used in cosmos-sdk #3874

Merged

deps: sdk v0.50-alpha #3883

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sdk 50 #3808

sdk 50 #3808

faddat commented Jun 9, 2023

faddat commented Jun 15, 2023 •

edited

Loading

faddat commented Jun 15, 2023

tac0turtle commented Jun 15, 2023

faddat commented Jun 16, 2023

faddat commented Jun 16, 2023 •

edited

Loading

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

sdk 50 #3808

sdk 50 #3808

Conversation

faddat commented Jun 9, 2023

faddat commented Jun 15, 2023 • edited Loading

faddat commented Jun 15, 2023

tac0turtle commented Jun 15, 2023

faddat commented Jun 16, 2023

faddat commented Jun 16, 2023 • edited Loading

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

faddat commented Jun 17, 2023

faddat commented Jun 15, 2023 •

edited

Loading

faddat commented Jun 16, 2023 •

edited

Loading