Add/Remove addresses for code upload params (#1493)

* Start implementation

* Add tests

* Add fix

* Fix comments

* Minor chore (#1522)

* Minor chore

* Remove duplicate tests

---------

Co-authored-by: Alexander Peters <[email protected]>

docs/proto/proto-docs.md

@@ -82,6 +82,8 @@
     - [Query](#cosmwasm.wasm.v1.Query)
 
 - [cosmwasm/wasm/v1/tx.proto](#cosmwasm/wasm/v1/tx.proto)
+    - [MsgAddCodeUploadParamsAddresses](#cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddresses)
+    - [MsgAddCodeUploadParamsAddressesResponse](#cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddressesResponse)
     - [MsgClearAdmin](#cosmwasm.wasm.v1.MsgClearAdmin)
     - [MsgClearAdminResponse](#cosmwasm.wasm.v1.MsgClearAdminResponse)
     - [MsgExecuteContract](#cosmwasm.wasm.v1.MsgExecuteContract)
@@ -94,6 +96,8 @@
     - [MsgMigrateContractResponse](#cosmwasm.wasm.v1.MsgMigrateContractResponse)
     - [MsgPinCodes](#cosmwasm.wasm.v1.MsgPinCodes)
     - [MsgPinCodesResponse](#cosmwasm.wasm.v1.MsgPinCodesResponse)
+    - [MsgRemoveCodeUploadParamsAddresses](#cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddresses)
+    - [MsgRemoveCodeUploadParamsAddressesResponse](#cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddressesResponse)
     - [MsgStoreAndInstantiateContract](#cosmwasm.wasm.v1.MsgStoreAndInstantiateContract)
     - [MsgStoreAndInstantiateContractResponse](#cosmwasm.wasm.v1.MsgStoreAndInstantiateContractResponse)
     - [MsgStoreCode](#cosmwasm.wasm.v1.MsgStoreCode)
@@ -1333,6 +1337,34 @@ Query provides defines the gRPC querier service
 
 
 
+<a name="cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddresses"></a>
+
+### MsgAddCodeUploadParamsAddresses
+MsgAddCodeUploadParamsAddresses is the
+MsgAddCodeUploadParamsAddresses request type.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `authority` | [string](#string) |  | Authority is the address of the governance account. |
+| `addresses` | [string](#string) | repeated |  |
+
+
+
+
+
+
+<a name="cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddressesResponse"></a>
+
+### MsgAddCodeUploadParamsAddressesResponse
+MsgAddCodeUploadParamsAddressesResponse defines the response
+structure for executing a MsgAddCodeUploadParamsAddresses message.
+
+
+
+
+
+
 <a name="cosmwasm.wasm.v1.MsgClearAdmin"></a>
 
 ### MsgClearAdmin
@@ -1532,6 +1564,34 @@ Since: 0.40
 
 
 
+<a name="cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddresses"></a>
+
+### MsgRemoveCodeUploadParamsAddresses
+MsgRemoveCodeUploadParamsAddresses is the
+MsgRemoveCodeUploadParamsAddresses request type.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `authority` | [string](#string) |  | Authority is the address of the governance account. |
+| `addresses` | [string](#string) | repeated |  |
+
+
+
+
+
+
+<a name="cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddressesResponse"></a>
+
+### MsgRemoveCodeUploadParamsAddressesResponse
+MsgRemoveCodeUploadParamsAddressesResponse defines the response
+structure for executing a MsgRemoveCodeUploadParamsAddresses message.
+
+
+
+
+
+
 <a name="cosmwasm.wasm.v1.MsgStoreAndInstantiateContract"></a>
 
 ### MsgStoreAndInstantiateContract
@@ -1803,6 +1863,8 @@ Since: 0.40 | |
 | `StoreAndInstantiateContract` | [MsgStoreAndInstantiateContract](#cosmwasm.wasm.v1.MsgStoreAndInstantiateContract) | [MsgStoreAndInstantiateContractResponse](#cosmwasm.wasm.v1.MsgStoreAndInstantiateContractResponse) | StoreAndInstantiateContract defines a governance operation for storing and instantiating the contract. The authority is defined in the keeper.
 
 Since: 0.40 | |
+| `RemoveCodeUploadParamsAddresses` | [MsgRemoveCodeUploadParamsAddresses](#cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddresses) | [MsgRemoveCodeUploadParamsAddressesResponse](#cosmwasm.wasm.v1.MsgRemoveCodeUploadParamsAddressesResponse) | RemoveCodeUploadParamsAddresses defines a governance operation for removing addresses from code upload params. The authority is defined in the keeper. | |
+| `AddCodeUploadParamsAddresses` | [MsgAddCodeUploadParamsAddresses](#cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddresses) | [MsgAddCodeUploadParamsAddressesResponse](#cosmwasm.wasm.v1.MsgAddCodeUploadParamsAddressesResponse) | AddCodeUploadParamsAddresses defines a governance operation for adding addresses to code upload params. The authority is defined in the keeper. | |
 
  <!-- end services -->
 

proto/cosmwasm/wasm/v1/tx.proto

@@ -60,6 +60,16 @@ service Msg {
   // Since: 0.40
   rpc StoreAndInstantiateContract(MsgStoreAndInstantiateContract)
       returns (MsgStoreAndInstantiateContractResponse);
+  // RemoveCodeUploadParamsAddresses defines a governance operation for
+  // removing addresses from code upload params.
+  // The authority is defined in the keeper.
+  rpc RemoveCodeUploadParamsAddresses(MsgRemoveCodeUploadParamsAddresses)
+      returns (MsgRemoveCodeUploadParamsAddressesResponse);
+  // AddCodeUploadParamsAddresses defines a governance operation for
+  // adding addresses to code upload params.
+  // The authority is defined in the keeper.
+  rpc AddCodeUploadParamsAddresses(MsgAddCodeUploadParamsAddresses)
+      returns (MsgAddCodeUploadParamsAddressesResponse);
 }
 
 // MsgStoreCode submit Wasm code to the system
@@ -388,4 +398,36 @@ message MsgStoreAndInstantiateContractResponse {
   string address = 1;
   // Data contains bytes to returned from the contract
   bytes data = 2;
-}
+}
+
+// MsgAddCodeUploadParamsAddresses is the
+// MsgAddCodeUploadParamsAddresses request type.
+message MsgAddCodeUploadParamsAddresses {
+  option (amino.name) = "wasm/MsgAddCodeUploadParamsAddresses";
+  option (cosmos.msg.v1.signer) = "authority";
+
+  // Authority is the address of the governance account.
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  repeated string addresses = 2 [ (gogoproto.moretags) = "yaml:\"addresses\"" ];
+}
+
+// MsgAddCodeUploadParamsAddressesResponse defines the response
+// structure for executing a MsgAddCodeUploadParamsAddresses message.
+message MsgAddCodeUploadParamsAddressesResponse {}
+
+// MsgRemoveCodeUploadParamsAddresses is the
+// MsgRemoveCodeUploadParamsAddresses request type.
+message MsgRemoveCodeUploadParamsAddresses {
+  option (amino.name) = "wasm/MsgRemoveCodeUploadParamsAddresses";
+  option (cosmos.msg.v1.signer) = "authority";
+
+  // Authority is the address of the governance account.
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  repeated string addresses = 2 [ (gogoproto.moretags) = "yaml:\"addresses\"" ];
+}
+
+// MsgRemoveCodeUploadParamsAddressesResponse defines the response
+// structure for executing a MsgRemoveCodeUploadParamsAddresses message.
+message MsgRemoveCodeUploadParamsAddressesResponse {}

x/wasm/client/cli/gov_tx.go

@@ -48,6 +48,8 @@ func SubmitProposalCmd() *cobra.Command {
 		ProposalPinCodesCmd(),
 		ProposalUnpinCodesCmd(),
 		ProposalUpdateInstantiateConfigCmd(),
+		ProposalAddCodeUploadParamsAddresses(),
+		ProposalRemoveCodeUploadParamsAddresses(),
 	)
 	return cmd
 }
@@ -805,6 +807,90 @@ $ %s tx gov submit-proposal update-instantiate-config 1:nobody 2:everybody 3:%s1
 	return cmd
 }
 
+func ProposalAddCodeUploadParamsAddresses() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "add-code-upload-params-addresses [addresses] --title [text] --summary [text] --authority [address]",
+		Short: "Submit an add code upload params addresses proposal to add addresses to code upload config params",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, proposalTitle, summary, deposit, err := getProposalInfo(cmd)
+			if err != nil {
+				return err
+			}
+
+			authority, err := cmd.Flags().GetString(flagAuthority)
+			if err != nil {
+				return fmt.Errorf("authority: %s", err)
+			}
+
+			if len(authority) == 0 {
+				return errors.New("authority address is required")
+			}
+
+			msg := types.MsgAddCodeUploadParamsAddresses{
+				Authority: authority,
+				Addresses: args,
+			}
+
+			proposalMsg, err := v1.NewMsgSubmitProposal([]sdk.Msg{&msg}, deposit, clientCtx.GetFromAddress().String(), "", proposalTitle, summary)
+			if err != nil {
+				return err
+			}
+			if err = proposalMsg.ValidateBasic(); err != nil {
+				return err
+			}
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), proposalMsg)
+		},
+		SilenceUsage: true,
+	}
+	// proposal flags
+	addCommonProposalFlags(cmd)
+	return cmd
+}
+
+func ProposalRemoveCodeUploadParamsAddresses() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "remove-code-upload-params-addresses [addresses] --title [text] --summary [text] --authority [address]",
+		Short: "Submit a remove code upload params addresses proposal to remove addresses from code upload config params",
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, proposalTitle, summary, deposit, err := getProposalInfo(cmd)
+			if err != nil {
+				return err
+			}
+
+			authority, err := cmd.Flags().GetString(flagAuthority)
+			if err != nil {
+				return fmt.Errorf("authority: %s", err)
+			}
+
+			if len(authority) == 0 {
+				return errors.New("authority address is required")
+			}
+
+			msg := types.MsgRemoveCodeUploadParamsAddresses{
+				Authority: authority,
+				Addresses: args,
+			}
+
+			proposalMsg, err := v1.NewMsgSubmitProposal([]sdk.Msg{&msg}, deposit, clientCtx.GetFromAddress().String(), "", proposalTitle, summary)
+			if err != nil {
+				return err
+			}
+			if err = proposalMsg.ValidateBasic(); err != nil {
+				return err
+			}
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), proposalMsg)
+		},
+		SilenceUsage: true,
+	}
+	// proposal flags
+	addCommonProposalFlags(cmd)
+	return cmd
+}
+
 func addCommonProposalFlags(cmd *cobra.Command) {
 	flags.AddTxFlagsToCmd(cmd)
 	cmd.Flags().String(cli.FlagTitle, "", "Title of proposal")

x/wasm/keeper/msg_server.go

@@ -357,6 +357,81 @@ func (m msgServer) StoreAndInstantiateContract(goCtx context.Context, req *types
 	}, nil
 }
 
+// AddCodeUploadParamsAddresses adds addresses to code upload params
+func (m msgServer) AddCodeUploadParamsAddresses(goCtx context.Context, req *types.MsgAddCodeUploadParamsAddresses) (*types.MsgAddCodeUploadParamsAddressesResponse, error) {
+	if err := req.ValidateBasic(); err != nil {
+		return nil, err
+	}
+	authority := m.keeper.GetAuthority()
+	if authority != req.Authority {
+		return nil, errorsmod.Wrapf(types.ErrInvalid, "invalid authority; expected %s, got %s", authority, req.Authority)
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	params := m.keeper.GetParams(ctx)
+	if params.CodeUploadAccess.Permission != types.AccessTypeAnyOfAddresses {
+		return nil, errorsmod.Wrap(types.ErrInvalid, "permission")
+	}
+
+	addresses := params.CodeUploadAccess.Addresses
+	for _, newAddr := range req.Addresses {
+		if !contains(addresses, newAddr) {
+			addresses = append(addresses, newAddr)
+		}
+	}
+
+	params.CodeUploadAccess.Addresses = addresses
+	if err := m.keeper.SetParams(ctx, params); err != nil {
+		return nil, err
+	}
+
+	return &types.MsgAddCodeUploadParamsAddressesResponse{}, nil
+}
+
+// RemoveCodeUploadParamsAddresses removes addresses to code upload params
+func (m msgServer) RemoveCodeUploadParamsAddresses(goCtx context.Context, req *types.MsgRemoveCodeUploadParamsAddresses) (*types.MsgRemoveCodeUploadParamsAddressesResponse, error) {
+	if err := req.ValidateBasic(); err != nil {
+		return nil, err
+	}
+	authority := m.keeper.GetAuthority()
+	if authority != req.Authority {
+		return nil, errorsmod.Wrapf(types.ErrInvalid, "invalid authority; expected %s, got %s", authority, req.Authority)
+	}
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	params := m.keeper.GetParams(ctx)
+	if params.CodeUploadAccess.Permission != types.AccessTypeAnyOfAddresses {
+		return nil, errorsmod.Wrap(types.ErrInvalid, "permission")
+	}
+	addresses := params.CodeUploadAccess.Addresses
+	newAddresses := make([]string, 0)
+	for _, addr := range addresses {
+		if contains(req.Addresses, addr) {
+			continue
+		}
+		newAddresses = append(newAddresses, addr)
+	}
+
+	params.CodeUploadAccess.Addresses = newAddresses
+
+	if err := m.keeper.SetParams(ctx, params); err != nil {
+		return nil, err
+	}
+
+	return &types.MsgRemoveCodeUploadParamsAddressesResponse{}, nil
+}
+
+func contains[T comparable](src []T, o T) bool {
+	for _, v := range src {
+		if v == o {
+			return true
+		}
+	}
+	return false
+}
+
 func (m msgServer) selectAuthorizationPolicy(ctx sdk.Context, actor string) types.AuthorizationPolicy {
 	if actor == m.keeper.GetAuthority() {
 		return newGovAuthorizationPolicy(m.keeper.propagateGovAuthorization)