fix: use accAddress to compare in validatebasic function in collection & token modules

CHANGELOG.md

@@ -57,6 +57,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/auth) [#1274](https://github.com/Finschia/finschia-sdk/pull/1274) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking.
 * (x/collection) [\#1276](https://github.com/Finschia/finschia-sdk/pull/1276) eliminates potential risk for Insufficient Sanity Check of tokenID in Genesis 
 * (x/foundation) [\#1277](https://github.com/Finschia/finschia-sdk/pull/1277) add init logic of foundation module accounts to InitGenesis in order to eliminate potential panic
+* (x/collection, x/token) [\#1288](https://github.com/Finschia/finschia-sdk/pull/1288) use accAddress to compare in validatebasic function in collection & token modules
 
 ### Removed
 

x/collection/msgs.go

@@ -428,14 +428,17 @@ func (m MsgAuthorizeOperator) ValidateBasic() error {
 		return err
 	}
 
-	if _, err := sdk.AccAddressFromBech32(m.Holder); err != nil {
+	holderAcc, err := sdk.AccAddressFromBech32(m.Holder)
+	if err != nil {
 		return sdkerrors.ErrInvalidAddress.Wrapf("invalid holder address: %s", m.Holder)
 	}
-	if _, err := sdk.AccAddressFromBech32(m.Operator); err != nil {
+
+	operatorAcc, err := sdk.AccAddressFromBech32(m.Operator)
+	if err != nil {
 		return sdkerrors.ErrInvalidAddress.Wrapf("invalid operator address: %s", m.Operator)
 	}
 
-	if m.Operator == m.Holder {
+	if holderAcc.Equals(operatorAcc) {
 		return ErrApproverProxySame
 	}
 

x/collection/msgs_test.go

@@ -376,15 +376,15 @@ func TestMsgOperatorSendNFT(t *testing.T) {
 }
 
 func TestMsgAuthorizeOperator(t *testing.T) {
-	addrs := make([]sdk.AccAddress, 2)
+	addrs := make([]string, 2)
 	for i := range addrs {
-		addrs[i] = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
+		addrs[i] = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()).String()
 	}
 
 	testCases := map[string]struct {
 		contractID string
-		holder     sdk.AccAddress
-		operator   sdk.AccAddress
+		holder     string
+		operator   string
 		err        error
 	}{
 		"valid msg": {
@@ -407,22 +407,34 @@ func TestMsgAuthorizeOperator(t *testing.T) {
 			holder:     addrs[0],
 			err:        sdkerrors.ErrInvalidAddress,
 		},
+		"proxy and approver should be different": {
+			contractID: "deadbeef",
+			holder:     addrs[0],
+			operator:   addrs[0],
+			err:        collection.ErrApproverProxySame,
+		},
+		"proxy and approver should be different (uppercase)": {
+			contractID: "deadbeef",
+			holder:     addrs[0],
+			operator:   strings.ToUpper(addrs[0]),
+			err:        collection.ErrApproverProxySame,
+		},
 	}
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			msg := collection.MsgAuthorizeOperator{
 				ContractId: tc.contractID,
-				Holder:     tc.holder.String(),
-				Operator:   tc.operator.String(),
+				Holder:     tc.holder,
+				Operator:   tc.operator,
 			}
 
 			require.ErrorIs(t, msg.ValidateBasic(), tc.err)
 			if tc.err != nil {
 				return
 			}
 
-			require.Equal(t, []sdk.AccAddress{tc.holder}, msg.GetSigners())
+			require.Equal(t, []sdk.AccAddress{sdk.MustAccAddressFromBech32(tc.holder)}, msg.GetSigners())
 		})
 	}
 }

x/token/msgs.go

@@ -146,14 +146,17 @@ func (m MsgAuthorizeOperator) ValidateBasic() error {
 		return err
 	}
 
-	if _, err := sdk.AccAddressFromBech32(m.Holder); err != nil {
+	holderAcc, err := sdk.AccAddressFromBech32(m.Holder)
+	if err != nil {
 		return sdkerrors.ErrInvalidAddress.Wrapf("invalid holder address: %s", m.Holder)
 	}
-	if _, err := sdk.AccAddressFromBech32(m.Operator); err != nil {
+
+	operatorAcc, err := sdk.AccAddressFromBech32(m.Operator)
+	if err != nil {
 		return sdkerrors.ErrInvalidAddress.Wrapf("invalid operator address: %s", m.Operator)
 	}
 
-	if m.Operator == m.Holder {
+	if holderAcc.Equals(operatorAcc) {
 		return ErrApproverProxySame
 	}
 

x/token/msgs_test.go

@@ -221,15 +221,15 @@ func TestMsgRevokeOperator(t *testing.T) {
 }
 
 func TestMsgAuthorizeOperator(t *testing.T) {
-	addrs := make([]sdk.AccAddress, 2)
+	addrs := make([]string, 2)
 	for i := range addrs {
-		addrs[i] = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address())
+		addrs[i] = sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()).String()
 	}
 
 	testCases := map[string]struct {
 		contractID string
-		holder     sdk.AccAddress
-		operator   sdk.AccAddress
+		holder     string
+		operator   string
 		err        error
 	}{
 		"valid msg": {
@@ -258,14 +258,20 @@ func TestMsgAuthorizeOperator(t *testing.T) {
 			operator:   addrs[0],
 			err:        token.ErrApproverProxySame,
 		},
+		"proxy and approver should be different (uppercase)": {
+			contractID: "deadbeef",
+			holder:     addrs[0],
+			operator:   strings.ToUpper(addrs[0]),
+			err:        token.ErrApproverProxySame,
+		},
 	}
 
 	for name, tc := range testCases {
 		t.Run(name, func(t *testing.T) {
 			msg := token.MsgAuthorizeOperator{
 				ContractId: tc.contractID,
-				Holder:     tc.holder.String(),
-				Operator:   tc.operator.String(),
+				Holder:     tc.holder,
+				Operator:   tc.operator,
 			}
 
 			err := msg.ValidateBasic()
@@ -274,7 +280,7 @@ func TestMsgAuthorizeOperator(t *testing.T) {
 				return
 			}
 
-			require.Equal(t, []sdk.AccAddress{tc.holder}, msg.GetSigners())
+			require.Equal(t, []sdk.AccAddress{sdk.MustAccAddressFromBech32(tc.holder)}, msg.GetSigners())
 		})
 	}
 }