Enable larger wasm bytecode upload for gov proposals #1095

pinosu · 2022-11-17T10:41:59Z

Resolves #1038

codecov · 2022-11-17T10:57:30Z

Codecov Report

Merging #1095 (af91fdb) into main (48ef13d) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1095      +/-   ##
==========================================
+ Coverage   59.79%   59.82%   +0.02%     
==========================================
  Files          54       54              
  Lines        7273     7273              
==========================================
+ Hits         4349     4351       +2     
+ Misses       2612     2611       -1     
+ Partials      312      311       -1

Impacted Files	Coverage Δ
x/wasm/types/genesis.go	`87.87% <100.00%> (ø)`
x/wasm/types/proposal.go	`55.52% <100.00%> (ø)`
x/wasm/types/tx.go	`48.76% <100.00%> (ø)`
x/wasm/types/validation.go	`100.00% <100.00%> (ø)`
x/wasm/keeper/keeper.go	`87.71% <0.00%> (+0.31%)`	⬆️

alpe

Very nice!
One minor issue and some feedback on the max value for gov content would be great.

alpe · 2022-11-17T11:05:24Z

x/wasm/types/validation.go

 )

-func validateWasmCode(s []byte) error {
+func validateWasmCode(s []byte, maxSize int) error {


good adoption of function!

alpe · 2022-11-17T11:13:53Z

x/wasm/types/validation.go

@@ -13,14 +13,17 @@ var (

 	// MaxWasmSize is the largest a compiled contract code can be when storing code on chain
 	MaxWasmSize = 800 * 1024 // extension point for chains to customize via compile flag.
+
+	// MaxProposalWasmSize is the largest a gov proposal compiled contract code can be when storing code on chain
+	MaxProposalWasmSize = 4 * 1024 * 1024 // extension point for chains to customize via compile flag.


Good to have this as a variable, too. I am not fully convinced that 4mb is a good value, given the spam case. 2mb feels a bit more conservative but it is also a random value

gov proposals charge like 3x gas for the proposal size (than just raw tx size), but yes it is written to state

It is easy to get 1.5MB contracts, maybe 2.5MB or 3MB if you want to be a bit conservative but still allow more complexity (like a js interpreter)

Also, we could just charge extra gas for every byte above the base (800kb) level up to this hard cap, but that might be too confusing/complex

If chains can override, we just need a reasonable default. I am fine with 3MB. Feel 2MB is a bit tight (I got a demo contract I could only trim to 1.8MB and could easily grow a bit if I added any features)

alpe · 2022-11-17T11:16:01Z

x/wasm/types/genesis.go

@@ -47,7 +47,7 @@ func (c Code) ValidateBasic() error {
 	if err := c.CodeInfo.ValidateBasic(); err != nil {
 		return sdkerrors.Wrap(err, "code info")
 	}
-	if err := validateWasmCode(c.CodeBytes); err != nil {
+	if err := validateWasmCode(c.CodeBytes, MaxWasmSize); err != nil {


This needs to be raised or an import fails for gov contracts

Suggested change

if err := validateWasmCode(c.CodeBytes, MaxWasmSize); err != nil {

if err := validateWasmCode(c.CodeBytes, MaxProposalWasmSize); err != nil {

alpe

👍 thanks for the updates 🏄

ethanfrey · 2022-11-17T17:43:54Z

Great. Thank you for this!

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

…proposal message (#1072) * Provide source, builder and codehash information in store code proposal message * Make linter happy * Update x/wasm/simulation/proposals.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Update x/wasm/client/cli/gov_tx.go * Update x/wasm/client/cli/gov_tx.go * Bump github.com/cosmos/gogoproto from 1.4.2 to 1.4.3 Bumps [github.com/cosmos/gogoproto](https://github.com/cosmos/gogoproto) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/cosmos/gogoproto/releases) - [Changelog](https://github.com/cosmos/gogoproto/blob/main/CHANGELOG.md) - [Commits](cosmos/gogoproto@v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/cosmos/gogoproto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update authz grant examples * Enable larger wasm bytecode upload for gov proposals (#1095) * Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB * Bump SDK to v0.45.11 * Fix license head * Fix README header * Bump version go to 1.19 (#1044) * bump go 1.19 * add change log * correct change log * Provide source, builder and codehash information in store code proposal message * Implement source, builder, code_info for StoreAndInstantiateProposal * Apply review recommendations * Make linter happy * Fix tests * Formatting only Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Giancarlos Salas <giansalex@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: GNaD13 <89174180+GNaD13@users.noreply.github.com>

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

…proposal message (CosmWasm#1072) * Provide source, builder and codehash information in store code proposal message * Make linter happy * Update x/wasm/simulation/proposals.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Update x/wasm/client/cli/gov_tx.go * Update x/wasm/client/cli/gov_tx.go * Bump github.com/cosmos/gogoproto from 1.4.2 to 1.4.3 Bumps [github.com/cosmos/gogoproto](https://github.com/cosmos/gogoproto) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/cosmos/gogoproto/releases) - [Changelog](https://github.com/cosmos/gogoproto/blob/main/CHANGELOG.md) - [Commits](cosmos/gogoproto@v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/cosmos/gogoproto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update authz grant examples * Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095) * Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB * Bump SDK to v0.45.11 * Fix license head * Fix README header * Bump version go to 1.19 (CosmWasm#1044) * bump go 1.19 * add change log * correct change log * Provide source, builder and codehash information in store code proposal message * Implement source, builder, code_info for StoreAndInstantiateProposal * Apply review recommendations * Make linter happy * Fix tests * Formatting only Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Giancarlos Salas <giansalex@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: GNaD13 <89174180+GNaD13@users.noreply.github.com>

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

…proposal message (CosmWasm#1072) * Provide source, builder and codehash information in store code proposal message * Make linter happy * Update x/wasm/simulation/proposals.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Update x/wasm/client/cli/gov_tx.go * Update x/wasm/client/cli/gov_tx.go * Bump github.com/cosmos/gogoproto from 1.4.2 to 1.4.3 Bumps [github.com/cosmos/gogoproto](https://github.com/cosmos/gogoproto) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/cosmos/gogoproto/releases) - [Changelog](https://github.com/cosmos/gogoproto/blob/main/CHANGELOG.md) - [Commits](cosmos/gogoproto@v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/cosmos/gogoproto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update authz grant examples * Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095) * Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB * Bump SDK to v0.45.11 * Fix license head * Fix README header * Bump version go to 1.19 (CosmWasm#1044) * bump go 1.19 * add change log * correct change log * Provide source, builder and codehash information in store code proposal message * Implement source, builder, code_info for StoreAndInstantiateProposal * Apply review recommendations * Make linter happy * Fix tests * Formatting only Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Giancarlos Salas <giansalex@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: GNaD13 <89174180+GNaD13@users.noreply.github.com>

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

…proposal message (CosmWasm#1072) * Provide source, builder and codehash information in store code proposal message * Make linter happy * Update x/wasm/simulation/proposals.go Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> * Update x/wasm/client/cli/gov_tx.go * Update x/wasm/client/cli/gov_tx.go * Bump github.com/cosmos/gogoproto from 1.4.2 to 1.4.3 Bumps [github.com/cosmos/gogoproto](https://github.com/cosmos/gogoproto) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/cosmos/gogoproto/releases) - [Changelog](https://github.com/cosmos/gogoproto/blob/main/CHANGELOG.md) - [Commits](cosmos/gogoproto@v1.4.2...v1.4.3) --- updated-dependencies: - dependency-name: github.com/cosmos/gogoproto dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update authz grant examples * Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095) * Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB * Bump SDK to v0.45.11 * Fix license head * Fix README header * Bump version go to 1.19 (CosmWasm#1044) * bump go 1.19 * add change log * correct change log * Provide source, builder and codehash information in store code proposal message * Implement source, builder, code_info for StoreAndInstantiateProposal * Apply review recommendations * Make linter happy * Fix tests * Formatting only Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alexander Peters <alpe@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Giancarlos Salas <giansalex@gmail.com> Co-authored-by: pinosu <95283998+pinosu@users.noreply.github.com> Co-authored-by: GNaD13 <89174180+GNaD13@users.noreply.github.com>

Enable larger wasm bytecode upload for gov proposals

3ce27e1

pinosu requested a review from alpe as a code owner November 17, 2022 10:41

alpe reviewed Nov 17, 2022

View reviewed changes

Set max proposal wasm code size to 3MB

af91fdb

alpe approved these changes Nov 17, 2022

View reviewed changes

pinosu force-pushed the 1038-gov_proposal_larger_bytecode branch from 69ce1ac to af91fdb Compare November 17, 2022 12:10

pinosu merged commit ab4ffa5 into main Nov 17, 2022

orkunkl pushed a commit that referenced this pull request Nov 21, 2022

Enable larger wasm bytecode upload for gov proposals (#1095)

b0c7402

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

NoahSaso pushed a commit to NoahSaso/wasmd that referenced this pull request Dec 2, 2022

Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095)

72ebd4d

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

Magicloud pushed a commit to fpco/wasmd that referenced this pull request Jan 13, 2023

Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095)

440f7a0

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

conorpp pushed a commit to wormhole-foundation/wasmd that referenced this pull request Feb 1, 2023

Enable larger wasm bytecode upload for gov proposals (CosmWasm#1095)

57a39ea

* Enable larger wasm bytecode upload for gov proposals * Set max proposal wasm code size to 3MB

alpe deleted the 1038-gov_proposal_larger_bytecode branch May 10, 2023 08:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable larger wasm bytecode upload for gov proposals #1095

Enable larger wasm bytecode upload for gov proposals #1095

pinosu commented Nov 17, 2022

codecov bot commented Nov 17, 2022 •

edited

Loading

alpe left a comment

alpe Nov 17, 2022

alpe Nov 17, 2022

ethanfrey Nov 17, 2022

ethanfrey Nov 17, 2022

alpe Nov 17, 2022

alpe left a comment

ethanfrey commented Nov 17, 2022

	if err := validateWasmCode(c.CodeBytes, MaxWasmSize); err != nil {
	if err := validateWasmCode(c.CodeBytes, MaxProposalWasmSize); err != nil {

Enable larger wasm bytecode upload for gov proposals #1095

Enable larger wasm bytecode upload for gov proposals #1095

Conversation

pinosu commented Nov 17, 2022

codecov bot commented Nov 17, 2022 • edited Loading

Codecov Report

alpe left a comment

Choose a reason for hiding this comment

alpe Nov 17, 2022

Choose a reason for hiding this comment

alpe Nov 17, 2022

Choose a reason for hiding this comment

ethanfrey Nov 17, 2022

Choose a reason for hiding this comment

ethanfrey Nov 17, 2022

Choose a reason for hiding this comment

alpe Nov 17, 2022

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

ethanfrey commented Nov 17, 2022

codecov bot commented Nov 17, 2022 •

edited

Loading