build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0 #1079

dadamu · 2023-02-02T10:30:41Z

Description

This PR bumps ibc-go to v4.3.0 and wasmd to v0.30.0.

The ibc-go migration is based on this guide, and the wasmd migration references the app.go file.

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

confirmed the correct type prefix in the PR title
confirmed ! in the type prefix if API or client breaking change
confirmed all author checklist items have been addressed
reviewed state machine logic
reviewed API design and naming
reviewed documentation is accurate
reviewed tests and test coverage
manually tested (if applicable)

codecov · 2023-02-02T10:39:58Z

Codecov Report

Base: 80.38% // Head: 80.45% // Increases project coverage by +0.06% 🎉

Coverage data is based on head (aaac09c) compared to base (c30e7a4).
Patch coverage: 84.21% of modified lines in pull request are covered.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #1079      +/-   ##
==========================================
+ Coverage   80.38%   80.45%   +0.06%     
==========================================
  Files         180      180              
  Lines       15735    15746      +11     
==========================================
+ Hits        12649    12668      +19     
+ Misses       2529     2522       -7     
+ Partials      557      556       -1

Impacted Files	Coverage Δ
app/ante.go	`64.70% <ø> (ø)`
x/profiles/client/cli/cli_app_links.go	`43.93% <ø> (ø)`
x/profiles/ibc_module.go	`0.00% <0.00%> (ø)`
x/profiles/keeper/relay_app_links.go	`86.88% <ø> (ø)`
x/profiles/types/genesis.go	`89.39% <ø> (ø)`
x/profiles/types/msgs_app_links.go	`87.32% <ø> (ø)`
app/app.go	`88.63% <95.52%> (+1.28%)`	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

dadamu · 2023-02-02T10:48:31Z

x/profiles/ibc_module.go

 	version string,
-) error {
+) (string, error) {
 	if err := ValidateProfilesChannelParams(ctx, am.keeper, order, portID, channelID); err != nil {
-		return err
+		return "", err
 	}

 	// Claim channel capability passed back by IBC module
 	if err := am.keeper.ClaimCapability(ctx, channelCap, host.ChannelCapabilityPath(portID, channelID)); err != nil {
-		return err
+		return "", err
 	}

-	return nil
+	return version, nil
 }


We didn't define the ibc-profiles port version, so this phase we don't check the version and always return the version from requeset.
See:
https://github.com/cosmos/ibc/blob/0cd3e7de753fc44508f4a76269bc2d71a487c059/spec/core/ics-026-routing-module/README.md#chanopeninit

dadamu · 2023-02-02T12:47:30Z

app/app.go

@@ -372,7 +347,7 @@ func init() {
 func NewDesmosApp(
 	logger log.Logger, db dbm.DB, traceStore io.Writer, loadLatest bool, skipUpgradeHeights map[int64]bool,
 	homePath string, invCheckPeriod uint, encodingConfig simappparams.EncodingConfig,
-	appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp),
+	appOpts servertypes.AppOptions, wasmEnabledProposals []wasm.ProposalType, baseAppOptions ...func(*baseapp.BaseApp),


Add wasmEnabledProposals parameter since wasm sim tests requires enabling all proposal types like:
https://github.com/CosmWasm/wasmd/blob/v0.30.0/app/sim_test.go#L155

dadamu · 2023-02-02T15:04:49Z

app/sim_test.go

+	// delete persistent tx counter value
+	ctxA.KVStore(app.keys[wasm.StoreKey]).Delete(wasmtypes.TXCounterPrefix)


Wasm simulation does not check TxCounter, it must be deleted manually here.
See:
https://github.com/CosmWasm/wasmd/blob/v0.30.0/x/wasm/keeper/ante.go#L24

dadamu · 2023-02-02T15:08:23Z

app/sim_test.go

-	// set sim params to overwrite wasmd default reflect.wasm path
-	simParams := simtypes.AppParams{
-		wasmsim.OpReflectContractPath: json.RawMessage(`"../testutil/wasm/reflect.wasm"`),
-	}
-
-	bz, err := json.Marshal(simParams)
-	if err != nil {
-		return simtypes.Config{}, nil, "", nil, false, sdkerrors.Wrap(err, "marshal sim custom params")
-	}
-	config.ParamsFile = filepath.Join(dir, "sim-params.json")
-	err = ioutil.WriteFile(config.ParamsFile, bz, 0o600)
-	if err != nil {
-		return simtypes.Config{}, nil, "", nil, false, sdkerrors.Wrap(err, "write temp sim params")
-	}


No idea why it was needed. The default path should work properly, and the default one does not require to track the test contract ../testutil/wasm/reflect.wasm version. So I delete it.

dadamu · 2023-02-02T15:47:01Z

go.mod

@@ -1,14 +1,14 @@
 module github.com/desmos-labs/desmos/v4

-go 1.18
+go 1.19


The wasmd 0.30.0 requires go 1.19, Desmos should follow the version now.

…st files

RiccardoM · 2023-02-03T13:49:17Z

app/app.go

 	if loadLatest {
 		if err := app.LoadLatestVersion(); err != nil {
 			tmos.Exit(err.Error())
 		}
-	}
+		ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{})


What is this used for?

It is used for InitializePinnedCodes function, which initializes wasmVM caching contracts codes. See:
https://github.com/CosmWasm/wasmd/blob/88e01a98ab8a87b98dc26c03715e6aef5c92781b/x/wasm/keeper/keeper.go#L885

The pinned codes is defined by the proposals, see:
https://github.com/CosmWasm/docs/blob/1629990736eb934c164dfa693299141fd3c2e14a/docs/04-smart-contracts/12-code-pinning.md

I think it was missing to add this part in Desmos, since it is added in wasmd app here:
https://github.com/CosmWasm/wasmd/blob/v0.30.0/app/app.go#L795-L806

RiccardoM · 2023-02-03T13:50:18Z

app/desmos/cmd/root.go

@@ -274,6 +275,7 @@ func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts serverty
 		cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)),
 		app.MakeTestEncodingConfig(), // Ideally, we would reuse the one created by NewRootCmd.
 		appOpts,
+		wasm.DisableAllProposals,


Shouldn't we get this list from somewhere? Otherwise we will have all proposals always disabled. Or am I missing something?

No, currently it is hard coded, and it requires all the nodes having the same accepted list. Hope they can have the on chain parameter in the future.
Here I use the previous setting which disabled all proposals.

RiccardoM · 2023-02-03T13:51:40Z

go.mod

-	// Our wasmd branch is: https://github.com/desmos-labs/wasmd v0.28.x-desmos
-	github.com/CosmWasm/wasmd => github.com/desmos-labs/wasmd v0.29.0-desmos.2
+	// Our wasmd branch is: https://github.com/desmos-labs/wasmd v0.30.x-desmos
+	github.com/CosmWasm/wasmd => github.com/desmos-labs/wasmd v0.23.1-0.20230202060518-edbdd2dcb064


It's probably better to tag a version here before merging this PR. So we can use v0.30.0-desmos.1 instead of the commit hash

## Description This PR integrates ibc fee middleware for ibc modules, allowing the relayer operators to receive tokens when submit the ibc transactions. This integration follows [this guide](https://ibc.cosmos.network/main/middleware/ics29-fee/integration.html). Note: The channel to support ibc fee middleware should have the version like: ```json {"fee_version": "ics29-1", "app_version": "ics20-1"} ``` If the version does not include `fee_version`, for example `ics20-1`, then the channel will be considered without middleware, then passing the version onto underlying IBC module and also tagging the channel is not `FeeEnabled`. The channel version is set in relayer side. So it should work properly integrate ibc fee in our side app only. See [here](https://github.com/cosmos/ibc-go/blob/v4.3.0/modules/apps/29-fee/ibc_middleware.go#L34-L82). Depends-On: #1079 --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [x] targeted the correct branch (see [PR Targeting](https://github.com/desmos-labs/desmos/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://docs.cosmos.network/v0.44/building-modules/intro.html) - [ ] included the necessary unit and integration [tests](https://github.com/desmos-labs/desmos/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)

dadamu requested a review from a team as a code owner February 2, 2023 10:30

github-actions bot added kind/build Related to the build of the project x/CLI x/profiles Module that allows to create and manage decentralized social profiles x/relationships x/subspaces Issue on the x/subspaces module labels Feb 2, 2023

dadamu commented Feb 2, 2023

View reviewed changes

dadamu marked this pull request as draft February 2, 2023 12:39

dadamu commented Feb 2, 2023

View reviewed changes

dadamu marked this pull request as ready for review February 3, 2023 05:31

dadamu mentioned this pull request Feb 3, 2023

feat: integrate ibc fee middleware #1081

Merged

19 tasks

dadamu added 5 commits February 3, 2023 18:07

build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0

00f7f79

chore: add changeset

421c48b

fix: fix sim tests settings

f1d52ea

fix: remove tx counter value in sim test and remove custom path of te…

b96ea2d

…st files

build(deps): bump go to 1.19

fba6c29

dadamu force-pushed the paul/bump-wasmd-and-ibc branch from 30a8851 to fba6c29 Compare February 3, 2023 10:07

chore: run go mod tidy

0cafa96

dadamu mentioned this pull request Feb 3, 2023

feat: set stargate querier accepted list #1083

Merged

19 tasks

RiccardoM reviewed Feb 3, 2023

View reviewed changes

build(deps): change wasmd version

aaac09c

dadamu requested a review from RiccardoM February 6, 2023 07:47

RiccardoM approved these changes Feb 7, 2023

View reviewed changes

manu0466 requested review from RiccardoM and manu0466 February 7, 2023 15:00

manu0466 approved these changes Feb 7, 2023

View reviewed changes

RiccardoM added the automerge Automatically merge PR once all prerequisites pass label Feb 7, 2023

mergify bot merged commit efbb0b9 into master Feb 7, 2023

mergify bot deleted the paul/bump-wasmd-and-ibc branch February 7, 2023 15:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0 #1079

build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0 #1079

dadamu commented Feb 2, 2023 •

edited by RiccardoM

codecov bot commented Feb 2, 2023 •

edited

dadamu Feb 2, 2023 •

edited

dadamu Feb 2, 2023

dadamu Feb 2, 2023

dadamu Feb 2, 2023

dadamu Feb 2, 2023 •

edited

RiccardoM Feb 3, 2023

dadamu Feb 3, 2023 •

edited

RiccardoM Feb 3, 2023

dadamu Feb 3, 2023

RiccardoM Feb 3, 2023

		// delete persistent tx counter value
		ctxA.KVStore(app.keys[wasm.StoreKey]).Delete(wasmtypes.TXCounterPrefix)

build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0 #1079

build(deps): bump ibc to 4.3.0 and wasmd to 0.30.0 #1079

Conversation

dadamu commented Feb 2, 2023 • edited by RiccardoM

Description

Author Checklist

Reviewers Checklist

codecov bot commented Feb 2, 2023 • edited

Codecov Report

dadamu Feb 2, 2023 • edited

Choose a reason for hiding this comment

dadamu Feb 2, 2023

Choose a reason for hiding this comment

dadamu Feb 2, 2023

Choose a reason for hiding this comment

dadamu Feb 2, 2023

Choose a reason for hiding this comment

dadamu Feb 2, 2023 • edited

Choose a reason for hiding this comment

RiccardoM Feb 3, 2023

Choose a reason for hiding this comment

dadamu Feb 3, 2023 • edited

Choose a reason for hiding this comment

RiccardoM Feb 3, 2023

Choose a reason for hiding this comment

dadamu Feb 3, 2023

Choose a reason for hiding this comment

RiccardoM Feb 3, 2023

Choose a reason for hiding this comment

dadamu commented Feb 2, 2023 •

edited by RiccardoM

codecov bot commented Feb 2, 2023 •

edited

dadamu Feb 2, 2023 •

edited

dadamu Feb 2, 2023 •

edited

dadamu Feb 3, 2023 •

edited