Fix review comments and add unit tests

CosmWasm · Dec 16, 2022 · 453b63b · 453b63b
1 parent fc7e0b2
commit 453b63b
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 4 deletions.
diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
@@ -1518,7 +1518,7 @@ MsgUpdateInstantiateConfig updates instantiate config for a smart contract
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `sender` | [string](#string) |  | Sender is the that actor that signed the messages |
-| `code_id` | [uint64](#uint64) |  | CodeID references the new WASM code |
+| `code_id` | [uint64](#uint64) |  | CodeID references the stored WASM code |
 | `new_instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  | NewInstantiatePermission is the new access control |
 
 

diff --git a/proto/cosmwasm/wasm/v1/tx.proto b/proto/cosmwasm/wasm/v1/tx.proto
@@ -182,7 +182,7 @@ message MsgClearAdminResponse {}
 message MsgUpdateInstantiateConfig {
   // Sender is the that actor that signed the messages
   string sender = 1;
-  // CodeID references the new WASM code
+  // CodeID references the stored WASM code
   uint64 code_id = 2 [ (gogoproto.customname) = "CodeID" ];
   // NewInstantiatePermission is the new access control
   AccessConfig new_instantiate_permission = 3;

diff --git a/x/wasm/types/codec.go b/x/wasm/types/codec.go
@@ -19,6 +19,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { //nolint:staticcheck
 	cdc.RegisterConcrete(&MsgMigrateContract{}, "wasm/MsgMigrateContract", nil)
 	cdc.RegisterConcrete(&MsgUpdateAdmin{}, "wasm/MsgUpdateAdmin", nil)
 	cdc.RegisterConcrete(&MsgClearAdmin{}, "wasm/MsgClearAdmin", nil)
+	cdc.RegisterConcrete(&MsgUpdateInstantiateConfig{}, "wasm/MsgUpdateInstantiateConfig", nil)
 
 	cdc.RegisterConcrete(&PinCodesProposal{}, "wasm/PinCodesProposal", nil)
 	cdc.RegisterConcrete(&UnpinCodesProposal{}, "wasm/UnpinCodesProposal", nil)
@@ -61,6 +62,7 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
 		&MsgClearAdmin{},
 		&MsgIBCCloseChannel{},
 		&MsgIBCSend{},
+		&MsgUpdateInstantiateConfig{},
 	)
 	registry.RegisterImplementations(
 		(*govtypes.Content)(nil),

diff --git a/x/wasm/types/tx.go b/x/wasm/types/tx.go
@@ -406,7 +406,15 @@ func (msg MsgUpdateInstantiateConfig) Type() string {
 
 func (msg MsgUpdateInstantiateConfig) ValidateBasic() error {
 	if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil {
-		return err
+		return sdkerrors.Wrap(err, "sender")
+	}
+
+	if msg.CodeID == 0 {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "code id is required")
+	}
+
+	if msg.NewInstantiatePermission == nil {
+		return sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "instantiate permission is required")
 	}
 
 	if err := msg.NewInstantiatePermission.ValidateBasic(); err != nil {

diff --git a/x/wasm/types/tx.pb.go b/x/wasm/types/tx.pb.go
diff --git a/x/wasm/types/tx_test.go b/x/wasm/types/tx_test.go
@@ -679,3 +679,65 @@ func TestMsgJsonSignBytes(t *testing.T) {
 		})
 	}
 }
+
+func TestMsgUpdateInstantiateConfig(t *testing.T) {
+	bad, err := sdk.AccAddressFromHex("012345")
+	require.NoError(t, err)
+	badAddress := bad.String()
+	// proper address size
+	goodAddress := sdk.AccAddress(make([]byte, 20)).String()
+	anotherGoodAddress := sdk.AccAddress(bytes.Repeat([]byte{0x2}, 20)).String()
+
+	specs := map[string]struct {
+		src    MsgUpdateInstantiateConfig
+		expErr bool
+	}{
+		"all good": {
+			src: MsgUpdateInstantiateConfig{
+				Sender:                   goodAddress,
+				CodeID:                   1,
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
+			},
+		},
+		"bad sender": {
+			src: MsgUpdateInstantiateConfig{
+				Sender:                   badAddress,
+				CodeID:                   1,
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
+			},
+			expErr: true,
+		},
+		"invalid NewInstantiatePermission": {
+			src: MsgUpdateInstantiateConfig{
+				Sender:                   goodAddress,
+				CodeID:                   1,
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: badAddress},
+			},
+			expErr: true,
+		},
+		"missing code id": {
+			src: MsgUpdateInstantiateConfig{
+				Sender:                   goodAddress,
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
+			},
+			expErr: true,
+		},
+		"missing NewInstantiatePermission": {
+			src: MsgUpdateInstantiateConfig{
+				Sender: goodAddress,
+				CodeID: 1,
+			},
+			expErr: true,
+		},
+	}
+	for msg, spec := range specs {
+		t.Run(msg, func(t *testing.T) {
+			err := spec.src.ValidateBasic()
+			if spec.expErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}