imp: add not allowed keys to error message of authorization (cosmos#5417

) * imp: add not allowed keys to error message of authorization * alternative to getting the keys from the map
notional-labs · Dec 18, 2023 · d270e75 · d270e75
1 parent 10ac5ff
commit d270e75
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/modules/apps/transfer/types/transfer_authorization.go b/modules/apps/transfer/types/transfer_authorization.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"math/big"
+	"sort"
 	"strings"
 
 	"github.com/cosmos/gogoproto/proto"
@@ -176,10 +177,6 @@ func validateMemo(ctx sdk.Context, memo string, allowedPacketDataList []string)
 		return err
 	}
 
-	if len(jsonObject) > len(allowedPacketDataList) {
-		return errorsmod.Wrapf(ErrInvalidAuthorization, "packet contains more packet data keys than packet allow list has")
-	}
-
 	gasCostPerIteration := ctx.KVGasConfig().IterNextCostFlat
 
 	for _, key := range allowedPacketDataList {
@@ -191,8 +188,14 @@ func validateMemo(ctx sdk.Context, memo string, allowedPacketDataList []string)
 		}
 	}
 
+	var keys []string
+	for k := range jsonObject {
+		keys = append(keys, k)
+	}
+	sort.Strings(keys)
+
 	if len(jsonObject) != 0 {
-		return errorsmod.Wrapf(ErrInvalidAuthorization, "packet data not allowed")
+		return errorsmod.Wrapf(ErrInvalidAuthorization, "not allowed packet data keys: %s", keys)
 	}
 
 	return nil

diff --git a/modules/apps/transfer/types/transfer_authorization_test.go b/modules/apps/transfer/types/transfer_authorization_test.go
@@ -167,6 +167,7 @@ func (suite *TypesTestSuite) TestTransferAuthorizationAccept() {
 			},
 			func(res authz.AcceptResponse, err error) {
 				suite.Require().Error(err)
+				suite.Require().ErrorContains(err, "not allowed packet data keys: [wasm]")
 			},
 		},
 		{