Start cosmos-sdk v0.47 integration #1136

alpe · 2022-12-21T14:35:47Z

Start integration with current dev branches

With this PR the inter-tx authentication module for ICA is deactivated. There is no SDK 47 version available, yet

Adds new modules:

group
nft

Left TODO:

fix linter issues
fix race condition in tests
fix simulations

Note to reviewer: please use squash and merge

x/wasm/keeper/test_common.go

 		authtypes.ProtoBaseAccount, // prototype
 		maccPerms,
+		sdk.Bech32MainPrefix,


app/app.go

+	for acc := range GetMaccPerms() {
+		modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true
+	}


alpe · 2022-12-22T09:37:37Z

@Mergifyio rebase

faddat · 2022-12-26T15:36:08Z

hey :)

do you have any thoughts on adopting the dependency injection style, or on the dependency injection style itself?

also

// proposal flags
	addCommonProposalFlags(cmd)

is a big win! Thanks!

alpe · 2023-01-03T11:38:14Z

@faddat

do you have any thoughts on adopting the dependency injection style, or on the dependency injection style itself?

I want to avoid additional risks and complexity at this stage and focus on integration and support for new modules. Once things are stable and run on production, we can provide both templates in /app for some time to let chain developers decide.

faddat · 2023-01-03T11:58:42Z

ah, super. yeah I am not 100% on weather or not it is the right direction, either.

Thanks for your work on this.

codecov · 2023-01-03T14:05:06Z

Codecov Report

Merging #1136 (f1d2972) into develop_sdk47 (0888758) will increase coverage by 1.81%.
The diff coverage is 65.68%.

@@                Coverage Diff                @@
##           develop_sdk47    #1136      +/-   ##
=================================================
+ Coverage          57.19%   59.01%   +1.81%     
=================================================
  Files                 53       52       -1     
  Lines               7350     7158     -192     
=================================================
+ Hits                4204     4224      +20     
+ Misses              2850     2644     -206     
+ Partials             296      290       -6

Impacted Files	Coverage Δ
app/upgrades.go	`0.00% <0.00%> (ø)`
x/wasm/client/cli/tx.go	`11.01% <0.00%> (-0.45%)`	⬇️
x/wasm/keeper/ibc.go	`77.77% <ø> (ø)`
x/wasm/keeper/query_plugins.go	`81.81% <ø> (ø)`
x/wasm/types/params.go	`71.42% <ø> (ø)`
x/wasm/types/types.go	`59.54% <0.00%> (-4.99%)`	⬇️
app/export.go	`12.00% <12.50%> (-0.13%)`	⬇️
x/wasm/client/cli/gov_tx.go	`13.38% <14.70%> (+0.79%)`	⬆️
x/wasm/module.go	`38.01% <60.00%> (+0.11%)`	⬆️
x/wasm/keeper/snapshotter.go	`65.07% <63.63%> (+0.37%)`	⬆️
... and 21 more

(cherry picked from commit f7f8417)

(cherry picked from commit 35b2a8f)

This reverts commit 218c3c6.

pinosu · 2023-01-10T15:19:06Z

x/wasm/client/proposal_handler.go

@@ -4,22 +4,21 @@ import (
 	govclient "github.com/cosmos/cosmos-sdk/x/gov/client"

 	"github.com/CosmWasm/wasmd/x/wasm/client/cli"
-	"github.com/CosmWasm/wasmd/x/wasm/client/rest" //nolint:staticcheck
+	//nolint:staticcheck


can be removed

x/wasm/module.go

benchmarks/app_test.go

pinosu

Great job! 🥇 I added some minor comments.
On top of this cosmos-sdk proto dependency needs to be upgraded to 0.47.x when available. I have created a new issue for it #1148

sonarcloud · 2023-01-11T08:36:09Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
6 Code Smells

No Coverage information
3.4% Duplication

* Start cosmos-sdk v0.47 integration (#1136) * Upgrade to sdk v0.47 branch * More integration work * SDK version upgrade; fixes * More fixes * Fixes * Deactivate failing tests * SDK + ibc-go version upgrades * limix gas fix (cherry picked from commit f7f8417) * with valset in bench (cherry picked from commit 35b2a8f) * Revert staking query handler; fix tests * Minor cleanup * Rebased * Address linter issues * Set legacy router proper * Deactivate failing test. Race condition needs to handled in SDK * Address some code smells * Bump sdk version * Use gov v1 internally for votes * Activate test after sdk fix * Add group test * Add config template for wasm fields * Add Rust backtrace flag for more debug output on simulations * Set unique node folder for tests * Revert "Add Rust backtrace flag for more debug output on simulations" This reverts commit 218c3c6. * Simulations * Run also im/export + deterministic sims * Add package prefix to interfaces * Add signer annotation (cosmos/cosmos-sdk#10933), minor cleanup * Bump sdk version * Review comments Co-authored-by: vuong <nguyenvuong1122000@gmail.com> * Bump bufbuild/buf-setup-action from 1.11.0 to 1.12.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.11.0 to 1.12.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.11.0...v1.12.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit f490595) * Remove intertx for vanilla ICA * fix msg format in EVENTS.md (cherry picked from commit 38d466a) * Better to sdk coin convertion (#1164) * Better to sdk coin convertion * Review feedback (cherry picked from commit a925a9e) * Disallow only address permission (#1163) * Remove AccessTypeOnlyAddress for store msg * Remove AccessTypeOnlyAddress for update config msg * Review feedback Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> Co-authored-by: Simon Warta <2603011+webmaster128@users.noreply.github.com> (cherry picked from commit 8991633) * Integrate wasmvm v1.2.0 (backport #1161) (#1175) * Integrate wasmvm v1.2.0 (#1161) * Bump wasmvm version * Bump wasm test contracts * Encode weighted votes * Encode instantiate2 * Handle code info query; better wasmvm errors * Fix readme * Make linter happy * add non cgo build * Review comments * Bump wasmvm to release version Co-authored-by: jhernandezb <contact@jhernandez.me> (cherry picked from commit 957b38e) # Conflicts: # x/wasm/keeper/handler_plugin_encoders.go # x/wasm/keeper/handler_plugin_encoders_test.go # x/wasm/keeper/keeper.go # x/wasm/keeper/keeper_test.go * Adress merge conflicts Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Bump bufbuild/buf-setup-action from 1.12.0 to 1.13.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.12.0...v1.13.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit ffa0e5e) * Emit events for setContractAdmin + setAccessConfig (#1179) (cherry picked from commit c9e7830) * Dependency upgrades (#1172) * Bump sdk version to lastest * Bump ibc-go version to lastest * Remove channel hack * Update to ibc-go v7 + protoVer=0.11.5 * Bump bufbuild/buf-setup-action from 1.13.0 to 1.13.1 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.13.0 to 1.13.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.13.0...v1.13.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit de27e7f) * Fix typos (backport #1185) (#1194) * Fix typos (cherry picked from commit c88b819) # Conflicts: # proto/cosmwasm/wasm/v1/tx.proto * Fix merge conflict --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Bump bufbuild/buf-setup-action from 1.13.1 to 1.14.0 (#1200) Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.13.1 to 1.14.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.13.1...v1.14.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit f3fc31c) * list-contract-by-code bugfix (cherry picked from commit 2ccffed) * fix: stargate querier does not reset the state (cherry picked from commit fd03235) * test: add unit test (cherry picked from commit 6d8018a) * Add Windows client support (#1197) * Add Windows client support * Separate server and windows client --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> (cherry picked from commit 8a20779) * Bump bufbuild/buf-setup-action from 1.14.0 to 1.15.0 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit e5fab3d) * Rename windows client binary (cherry picked from commit de09c7f) * Return IBC packet sequence number (backport #1225) (#1233) * Return IBC packet sequence number (#1225) * Return IBC packet sequence number * Fix review feedbacks * Remove names to return values in DispatchMsg method * Fix comments (cherry picked from commit 4f1c57f) # Conflicts: # x/wasm/keeper/handler_plugin.go * Fix merge conflict --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Test rust panic for regression (cherry picked from commit a52e604) * Fix client checksum verification (#1234) * Fix client checksum verification * Review comments (cherry picked from commit 1a8019b) # Conflicts: # x/wasm/client/cli/gov_tx.go * Fix merge conflict * Fix linters * Configure sonarcloud analysis (cherry picked from commit 85cf161) * Bump bufbuild/buf-setup-action from 1.15.0 to 1.15.1 Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/bufbuild/buf-setup-action/releases) - [Commits](bufbuild/buf-setup-action@v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: bufbuild/buf-setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 730ea5a) * Make `CaptureIbcEvents` in ibctesting public. Before this change, it wasn't possible to implement the `chain.SendMsgs` method without [copying](https://github.com/public-awesome/ics721/blob/main/e2e/suite_helpers.go#L81-L98) them over. (cherry picked from commit b64fa07) * Upgrade to wasmvm 1.2.1 (backport #1245) (#1254) * Upgrade to wasmvm 1.2.1 (#1245) * Use wasmvm store adapter * Bump wasmvm to v1.2.1 (cherry picked from commit 850f901) # Conflicts: # go.mod # go.sum # x/wasm/keeper/keeper.go * Resolve conflicts --------- Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * WIP All cometbft (#1244) * Dep upgrade; use CometBft * Remove duplicte message events * Add changelog for v0.31.0 (#1188) * Start changelog for v0.31.0 * Add ICA upgrade * Add proto version link to buf.build * Update changelog (#1239) * Update changelog * Update changelog with latest changes * Set release date --------- Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> (cherry picked from commit bc0e817) * Remove new message type event * Support msg update params gov proposal (#1247) * Add MsgUpdateParams support * Implement UpdateParams msg * Fix test UpdateParams * Add migration test * Fix * Fix lint issues * Revert changes according to review feedback * Remove more x/params dependencies * Remove x/params from genesis test * Formatting * Restore old changes * fix lint * Fix tests and restructure migrations * Rename alias for convention --------- Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Fix test data generator (#1263) * linting 47 pr (#1261) * lint cosmwasm for sdk 47 * fix * remove setGenesis * remove additional unused functions * pass tests * use SDK's errors module * unecessary conversions * unnecessary conversions * remove unneeded event manager * complete linting of tests for 47 * add test for reimportation * check errors * Update x/wasm/keeper/proposal_integration_test.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * apply suggestion * suggestions * lints * don't return error in when making new transactions * no todo's in the code * Fix test data generator * Update x/wasm/types/genesis_test.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * use the full string invalid address (2 words) always --------- Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Regenerate from proto; remove dead code; polish code * Set SDK version to v0.47x.0 (#1262) * Set SDK version to v0.47x.0 * Set chainID * Minor updates * Set chainID for simulations * Buf mod update * Use sdk tag instead of hash in buf * Bump ibc-go to v7.0.0 * faddat/re merge main (#1274) undefined --------- Co-authored-by: vuong <nguyenvuong1122000@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: llllllluc <58892938+llllllluc@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Gjermund Garaba <gjermund@garaba.net> Co-authored-by: Nikhil Suri <nikhilsuri@comcast.net> Co-authored-by: Paul <p22626262@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: ekez <zekemedley@gmail.com> Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>

alpe marked this pull request as draft December 21, 2022 14:46

github-advanced-security bot found potential problems Dec 21, 2022

View reviewed changes

alpe force-pushed the sdk047_start branch from 4a6bed8 to 89d51a5 Compare December 22, 2022 11:05

alpe and others added 20 commits January 6, 2023 15:01

Upgrade to sdk v0.47 branch

c9c96f3

More integration work

9369b15

SDK version upgrade; fixes

63002d5

More fixes

9ea2721

Fixes

8b252ca

Deactivate failing tests

557b898

SDK + ibc-go version upgrades

60794f1

limix gas fix

8f25e84

(cherry picked from commit f7f8417)

with valset in bench

cc7a20b

(cherry picked from commit 35b2a8f)

Revert staking query handler; fix tests

6c53bf1

Minor cleanup

bd823d2

Rebased

9755e70

Address linter issues

98e7e91

Set legacy router proper

24c0a1b

Deactivate failing test. Race condition needs to handled in SDK

ffd625c

Address some code smells

d329a6f

Bump sdk version

ceedf72

Use gov v1 internally for votes

a14efe6

Activate test after sdk fix

52673d8

Add group test

06b715e

alpe force-pushed the sdk047_start branch from 4598d28 to 06b715e Compare January 6, 2023 14:03

Add config template for wasm fields

125f719

alpe added 5 commits January 9, 2023 09:57

Add Rust backtrace flag for more debug output on simulations

218c3c6

Set unique node folder for tests

23917b3

Revert "Add Rust backtrace flag for more debug output on simulations"

150536e

This reverts commit 218c3c6.

Simulations

29f98b0

Run also im/export + deterministic sims

6fd3d4f

alpe mentioned this pull request Jan 9, 2023

sdk 047 #1132

Closed

alpe requested a review from pinosu January 9, 2023 13:06

alpe marked this pull request as ready for review January 9, 2023 13:06

alpe mentioned this pull request Jan 9, 2023

lint tests #1130

Closed

alpe added 3 commits January 9, 2023 15:00

Add package prefix to interfaces

5dc6c8b

Add signer annotation (cosmos/cosmos-sdk#10933), minor cleanup

66913a1

Bump sdk version

88fa13a

pinosu reviewed Jan 10, 2023

View reviewed changes

x/wasm/module.go Outdated Show resolved Hide resolved

pinosu reviewed Jan 10, 2023

View reviewed changes

benchmarks/app_test.go Outdated Show resolved Hide resolved

pinosu approved these changes Jan 10, 2023

View reviewed changes

Review comments

f1d2972

alpe merged commit 76dd72d into develop_sdk47 Jan 11, 2023

alpe deleted the sdk047_start branch January 11, 2023 10:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Start cosmos-sdk v0.47 integration #1136

Start cosmos-sdk v0.47 integration #1136

alpe commented Dec 21, 2022 •

edited

Loading

alpe commented Dec 22, 2022

faddat commented Dec 26, 2022 •

edited

Loading

alpe commented Jan 3, 2023

faddat commented Jan 3, 2023

codecov bot commented Jan 3, 2023 •

edited

Loading

pinosu Jan 10, 2023

pinosu left a comment

sonarcloud bot commented Jan 11, 2023

Start cosmos-sdk v0.47 integration #1136

Start cosmos-sdk v0.47 integration #1136

Conversation

alpe commented Dec 21, 2022 • edited Loading

Left TODO:

alpe commented Dec 22, 2022

faddat commented Dec 26, 2022 • edited Loading

alpe commented Jan 3, 2023

faddat commented Jan 3, 2023

codecov bot commented Jan 3, 2023 • edited Loading

Codecov Report

pinosu Jan 10, 2023

Choose a reason for hiding this comment

pinosu left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jan 11, 2023

alpe commented Dec 21, 2022 •

edited

Loading

faddat commented Dec 26, 2022 •

edited

Loading

codecov bot commented Jan 3, 2023 •

edited

Loading