Remove AccessTypeOnlyAddress for update config msg

CosmWasm · Jan 19, 2023 · a6a48ea · a6a48ea
1 parent 2296048
commit a6a48ea
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go
@@ -65,6 +65,7 @@ func GetTxCmd() *cobra.Command {
 		UpdateContractAdminCmd(),
 		ClearContractAdminCmd(),
 		GrantAuthorizationCmd(),
+		UpdateInstantiateConfigCmd(),
 	)
 	return txCmd
 }

diff --git a/x/wasm/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go
@@ -917,7 +917,7 @@ func TestUpdateInstantiateConfigProposal(t *testing.T) {
 	anyAddress, err := sdk.AccAddressFromBech32("cosmos100dejzacpanrldpjjwksjm62shqhyss44jf5xz")
 	require.NoError(t, err)
 
-	withAddressAccessConfig := types.AccessTypeOnlyAddress.With(anyAddress)
+	withAddressAccessConfig := types.AccessTypeAnyOfAddresses.With(anyAddress)
 	var (
 		nobody      = StoreRandomContractWithAccessConfig(t, ctx, keepers, &mock, &types.AllowNobody)
 		everybody   = StoreRandomContractWithAccessConfig(t, ctx, keepers, &mock, &types.AllowEverybody)

diff --git a/x/wasm/types/tx.go b/x/wasm/types/tx.go
@@ -68,6 +68,8 @@ func (msg MsgStoreCode) ValidateBasic() error {
 		if err := msg.InstantiatePermission.ValidateBasic(); err != nil {
 			return sdkerrors.Wrap(err, "instantiate permission")
 		}
+		// AccessTypeOnlyAddress is still considered valid as legacy instantiation permission
+		// but not for new contracts
 		if msg.InstantiatePermission.Permission == AccessTypeOnlyAddress {
 			return ErrInvalid.Wrap("unsupported type, use AccessTypeAnyOfAddresses instead")
 		}
@@ -423,6 +425,11 @@ func (msg MsgUpdateInstantiateConfig) ValidateBasic() error {
 	if err := msg.NewInstantiatePermission.ValidateBasic(); err != nil {
 		return sdkerrors.Wrap(err, "instantiate permission")
 	}
+	// AccessTypeOnlyAddress is still considered valid as legacy instantiation permission
+	// but not for new contracts
+	if msg.NewInstantiatePermission.Permission == AccessTypeOnlyAddress {
+		return ErrInvalid.Wrap("unsupported type, use AccessTypeAnyOfAddresses instead")
+	}
 
 	return nil
 }

diff --git a/x/wasm/types/tx_test.go b/x/wasm/types/tx_test.go
@@ -693,32 +693,40 @@ func TestMsgUpdateInstantiateConfig(t *testing.T) {
 		expErr bool
 	}{
 		"all good": {
+			src: MsgUpdateInstantiateConfig{
+				Sender:                   goodAddress,
+				CodeID:                   1,
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeAnyOfAddresses, Addresses: []string{anotherGoodAddress}},
+			},
+		},
+		"retained AccessTypeOnlyAddress": {
 			src: MsgUpdateInstantiateConfig{
 				Sender:                   goodAddress,
 				CodeID:                   1,
 				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
 			},
+			expErr: true,
 		},
 		"bad sender": {
 			src: MsgUpdateInstantiateConfig{
 				Sender:                   badAddress,
 				CodeID:                   1,
-				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeAnyOfAddresses, Addresses: []string{anotherGoodAddress}},
 			},
 			expErr: true,
 		},
 		"invalid NewInstantiatePermission": {
 			src: MsgUpdateInstantiateConfig{
 				Sender:                   goodAddress,
 				CodeID:                   1,
-				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: badAddress},
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeAnyOfAddresses, Addresses: []string{badAddress}},
 			},
 			expErr: true,
 		},
 		"missing code id": {
 			src: MsgUpdateInstantiateConfig{
 				Sender:                   goodAddress,
-				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeOnlyAddress, Address: anotherGoodAddress},
+				NewInstantiatePermission: &AccessConfig{Permission: AccessTypeAnyOfAddresses, Addresses: []string{anotherGoodAddress}},
 			},
 			expErr: true,
 		},