Add StoreAndInstantiateContract gov proposal #1074

pinosu · 2022-11-04T10:01:58Z

Closes #785

codecov · 2022-11-04T10:18:12Z

Codecov Report

Merging #1074 (dfdccd3) into main (a9ce273) will increase coverage by 1.06%.
The diff coverage is 59.45%.

@@            Coverage Diff             @@
##             main    #1074      +/-   ##
==========================================
+ Coverage   59.27%   60.33%   +1.06%     
==========================================
  Files          53       54       +1     
  Lines        6758     7211     +453     
==========================================
+ Hits         4006     4351     +345     
- Misses       2456     2549      +93     
- Partials      296      311      +15

Impacted Files	Coverage Δ
app/app.go	`88.14% <ø> (ø)`
app/test_helpers.go	`0.80% <ø> (+0.01%)`	⬆️
x/wasm/client/cli/gov_tx.go	`6.96% <0.00%> (+0.43%)`	⬆️
x/wasm/client/cli/tx.go	`28.05% <0.00%> (-4.45%)`	⬇️
x/wasm/keeper/legacy_querier.go	`69.89% <ø> (ø)`
x/wasm/keeper/querier.go	`72.07% <ø> (-0.25%)`	⬇️
x/wasm/module.go	`37.90% <ø> (ø)`
x/wasm/types/errors.go	`0.00% <ø> (ø)`
x/wasm/types/proposal.go	`55.52% <28.94%> (-5.79%)`	⬇️
x/wasm/types/genesis.go	`87.87% <42.85%> (-5.57%)`	⬇️
... and 12 more

alpe

Nice start! It looks very complete. I added some minor notes.

From a framework design perspective, we should not expose the CreateAndInstantiate method anywhere. This opens another path into the system. Let's stick with create and instantiate are 2 separate steps in keepers.

alpe · 2022-11-08T11:02:10Z

x/wasm/types/exported_keepers.go

@@ -51,6 +51,16 @@ type ContractOpsKeeper interface {
 		fixMsg bool,
 	) (sdk.AccAddress, []byte, error)

+	CreateAndInstantiate(


No need to export this.

alpe · 2022-11-08T11:03:22Z

x/wasm/types/proposal.go

+	msg RawContractMessage,
+	funds sdk.Coins,
+) *StoreAndInstantiateContractProposal {
+	return &StoreAndInstantiateContractProposal{title, description, runAs, wasmBz, permission, unpinCode, admin, label, msg, funds}


Please use keys to init objects. Golang can generate the constructor for you.

alpe · 2022-11-08T11:05:22Z

x/wasm/keeper/contract_keeper.go

@@ -128,3 +140,15 @@ func (p PermissionedKeeper) SetContractInfoExtension(ctx sdk.Context, contract s
 func (p PermissionedKeeper) SetAccessConfig(ctx sdk.Context, codeID uint64, caller sdk.AccAddress, newConfig types.AccessConfig) error {
 	return p.nested.setAccessConfig(ctx, codeID, caller, newConfig, p.authZPolicy)
 }
+
+func (p PermissionedKeeper) CreateAndInstantiate(


Please remove. No need to expose this

alpe · 2022-11-08T11:05:46Z

x/wasm/keeper/contract_keeper.go

@@ -23,6 +23,18 @@ type decoratedKeeper interface {
 		authZ AuthorizationPolicy,
 	) (sdk.AccAddress, []byte, error)

+	createAndInstantiate(


No need to optimize for this worflow. Let's stick with the existing create and instantiate methods when used as a library

alpe · 2022-11-08T11:15:43Z

proto/cosmwasm/wasm/v1/proposal.proto

+
+// StoreAndInstantiateContractProposal gov proposal content type to store
+// and instantiate the contract.
+message StoreAndInstantiateContractProposal {


👍 This looks complete

x/wasm/types/proposal.go

alpe · 2022-11-08T11:21:06Z

x/wasm/types/proposal.go

+}
+
+// ValidateBasic validates the proposal
+func (p StoreAndInstantiateContractProposal) ValidateBasic() error {


Please add a test for regression

alpe · 2022-11-08T11:23:39Z

x/wasm/types/proposal.go

+  Label:       %s
+  Msg:         %q
+  Funds:       %s
+`, p.Title, p.Description, p.RunAs, p.WASMByteCode, p.Admin, p.Label, p.Msg, p.Funds)


InstantiatePermission and unpinCode are missing.

alpe · 2022-11-08T11:23:52Z

x/wasm/types/proposal.go

+		Admin:                 p.Admin,
+		Label:                 p.Label,
+		Msg:                   string(p.Msg),
+		Funds:                 p.Funds,


unpinCode is missing

alpe · 2022-11-08T11:24:26Z

x/wasm/types/test_fixtures.go

@@ -226,6 +226,41 @@ func InstantiateContractProposalFixture(mutators ...func(p *InstantiateContractP
 	return p
 }

+func StoreAndInstantiateContractProposalFixture(mutators ...func(p *StoreAndInstantiateContractProposal)) *StoreAndInstantiateContractProposal {


👍 good fixture

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

* Add Developer's guide and best practices * Fix comments

* preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <alpe@users.noreply.github.com>

Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

This reverts commit cf81eb8.

…om/prometheus/client_golang-1.14.0 Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0

Return contract history updates on query

* Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <me@giansalex.dev>

alpe

👍 Almost done :-)

After rebasing and fixing the 2 issues in ProposalStoreAndInstantiateContractCmd I was able to submit a proposal via CLI:

wasmd tx gov submit-proposal store-instantiate "x/wasm/keeper/testdata/reflect.wasm" \
  '{}' --label "alex" \
  --title "testing" --description "Testing" --deposit "100ustake" \
  --run-as $(wasmd keys show -a validator) \
  --admin $(wasmd keys show -a validator) \
  --amount 123ustake \
  --from validator --gas auto --gas-adjustment=1.5 -y  --chain-id=testing --node=http://localhost:26657 -b block -o json

and query it via wasmd q gov proposals --node=http://localhost:26657 .

alpe · 2022-11-11T13:19:04Z

x/wasm/client/rest/gov.go

@@ -525,3 +525,12 @@ func toStdTxResponse(cliCtx client.Context, w http.ResponseWriter, data wasmProp
 	}
 	tx.WriteGeneratedTxResponse(cliCtx, w, baseReq, msg)
 }
+
+func EmptyRestHandler(cliCtx client.Context) govrest.ProposalRESTHandler {


alpe · 2022-11-11T13:19:34Z

x/wasm/client/cli/gov_tx.go

@@ -23,7 +23,7 @@ func ProposalStoreCodeCmd() *cobra.Command {
 		Short: "Submit a wasm binary proposal",
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			clientCtx, err := client.GetClientTxContext(cmd)
+			clientCtx, proposalTitle, proposalDescr, deposit, err := getProposalInfo(cmd)


good refactoring. There was lot's of DRY

alpe · 2022-11-11T13:20:13Z

x/wasm/client/cli/gov_tx.go

-		Args:  cobra.ExactArgs(3),
+		Use:   "store-instantiate [wasm file] [json_encoded_init_args] --label [text] --title [text] --description [text] --run-as [address] --admin [address,optional] --amount [coins,optional]",
+		Short: "Submit and instantiate a wasm contract proposal",
+		Args:  cobra.ExactArgs(1),


Need to be 2 or fails

Suggested change

Args: cobra.ExactArgs(1),

Args: cobra.ExactArgs(2),

alpe · 2022-11-11T13:24:55Z

x/wasm/client/cli/gov_tx.go

+	cmd.Flags().String(flagRunAs, "", "The address that is stored as code creator. It is the creator of the contract and passed to the contract as sender on proposal execution")
+	cmd.Flags().String(flagInstantiateByEverybody, "", "Everybody can instantiate a contract from the code, optional")
+	cmd.Flags().String(flagInstantiateNobody, "", "Nobody except the governance process can instantiate a contract from the code, optional")
+	cmd.Flags().String(flagInstantiateByAddress, "", "Only this address can instantiate a contract instance from the code, optional")


Also required to define now:

cmd.Flags().StringSlice(flagInstantiateByAnyOfAddress, []string{}, "Any of the addresses can instantiate a contract from the code, optional")

* Add StoreAndInstantiateContract gov proposal * Add integration tests * Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Remove exposed functions * Add tests * Add Developer's guide and best practices (CosmWasm#1075) * Add Developer's guide and best practices * Fix comments * Change genesis preserving contract history (CosmWasm#1076) * preserve contract created date on genesis import and add query contract created date * add validate created * fix sims test app import export * add preserve contract history * Make proto-all only * Remove ResetFromGenesis * Add validation Co-authored-by: Alex Peters <alpe@users.noreply.github.com> * Return contract history updates * Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](spf13/viper@v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (CosmWasm#1082)" This reverts commit cf81eb8. * Add cli and refactor code * Contract authz - redesign (CosmWasm#1077) * Add contract authz proto * Implement contract autorization * Register contract authz * Add contract-authz tests * Consume gas for contract authz * Add contract authz cli * Update cli usage * Model spike * Add max funds limit * Redesign authz model * Start e2e test * Full e2e test * Test filter and limits * Test accept * Fix description * No linter warning Co-authored-by: Giancarlos Salas <me@giansalex.dev> * Add StoreAndInstantiateContract gov proposal * Add integration tests * Remove exposed functions * Add tests * Add cli and refactor code * Fix comments Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: GNaD13 <89174180+GNaD13@users.noreply.github.com> Co-authored-by: Alex Peters <alpe@users.noreply.github.com> Co-authored-by: Giancarlos Salas <me@giansalex.dev>

Add StoreAndInstantiateContract gov proposal

31942cb

pinosu requested a review from alpe as a code owner November 4, 2022 10:01

ethanfrey added this to the v0.30.0 milestone Nov 4, 2022

Add integration tests

cf09ba6

alpe reviewed Nov 8, 2022

View reviewed changes

dependabot bot and others added 2 commits November 9, 2022 08:03

Remove exposed functions

f4ac252

pinosu force-pushed the 785-add_store_instantiate_gov_proposal branch from 7fb18b2 to f4ac252 Compare November 9, 2022 14:03

Add tests

9b52bd9

pinosu changed the title ~~[WIP] Add StoreAndInstantiateContract gov proposal~~ Add StoreAndInstantiateContract gov proposal Nov 10, 2022

pinosu and others added 9 commits November 11, 2022 09:09

Add Developer's guide and best practices (#1075)

5caaab9

* Add Developer's guide and best practices * Fix comments

Return contract history updates

9cbf64d

Revert "Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (#1082)"

400eff8

This reverts commit cf81eb8.

Merge pull request #1086 from CosmWasm/dependabot/go_modules/github.c…

d094d07

…om/prometheus/client_golang-1.14.0 Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0

Add cli and refactor code

0ab5e31

Merge pull request #1089 from CosmWasm/1076_query

73079d7

Return contract history updates on query

alpe approved these changes Nov 11, 2022

View reviewed changes

alpe mentioned this pull request Nov 11, 2022

feat: Provide source, builder and codehash information in store code proposal message #1072

Merged

pinosu added 7 commits November 11, 2022 15:16

Add StoreAndInstantiateContract gov proposal

3d3635b

Add integration tests

f3dc602

Remove exposed functions

fbfdda2

Add tests

8768a6a

Add cli and refactor code

cdaaff4

Rebase to main branch

04827da

Fix comments

dfdccd3

pinosu merged commit ef9a84d into main Nov 11, 2022

pinosu deleted the 785-add_store_instantiate_gov_proposal branch November 11, 2022 15:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add StoreAndInstantiateContract gov proposal #1074

Add StoreAndInstantiateContract gov proposal #1074

pinosu commented Nov 4, 2022 •

edited by ethanfrey

Loading

codecov bot commented Nov 4, 2022 •

edited

Loading

alpe left a comment

alpe Nov 8, 2022

alpe Nov 8, 2022 •

edited

Loading

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe Nov 8, 2022

alpe left a comment

alpe Nov 11, 2022

alpe Nov 11, 2022

alpe Nov 11, 2022

alpe Nov 11, 2022

Add StoreAndInstantiateContract gov proposal #1074

Add StoreAndInstantiateContract gov proposal #1074

Conversation

pinosu commented Nov 4, 2022 • edited by ethanfrey Loading

codecov bot commented Nov 4, 2022 • edited Loading

Codecov Report

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe Nov 8, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alpe left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pinosu commented Nov 4, 2022 •

edited by ethanfrey

Loading

codecov bot commented Nov 4, 2022 •

edited

Loading

alpe Nov 8, 2022 •

edited

Loading