fix: errors with EIP712 signature (#68)

bnb-chain · Dec 20, 2022 · 344fb72 · 344fb72
1 parent de3874e
commit 344fb72
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/x/auth/tx/eip712.go b/x/auth/tx/eip712.go
@@ -323,17 +323,28 @@ func traverseFields(
 		fieldType := t.Field(i).Type
 		fieldName := jsonNameFromTag(t.Field(i).Tag)
 
+		// TODO will add another limitation: only if the type is anyOf.
+		if fieldName == "" {
+			fieldName = t.Field(i).Name
+			anyWrapper := &cosmosAnyWrapper{
+				Type:  fmt.Sprint(reflect.TypeOf(field.Interface())),
+				Value: field.Interface(),
+			}
+			field = reflect.ValueOf(anyWrapper)
+			fieldType = reflect.TypeOf(anyWrapper)
+		}
+
 		if fieldType == cosmosAnyType {
-			any, ok := field.Interface().(*codectypes.Any)
+			typeAny, ok := field.Interface().(*codectypes.Any)
 			if !ok {
 				return errors.Wrapf(sdkerrors.ErrPackAny, "%T", field.Interface())
 			}
 
 			anyWrapper := &cosmosAnyWrapper{
-				Type: any.TypeUrl,
+				Type: typeAny.TypeUrl,
 			}
 
-			if err := cdc.UnpackAny(any, &anyWrapper.Value); err != nil {
+			if err := cdc.UnpackAny(typeAny, &anyWrapper.Value); err != nil {
 				return errors.Wrap(err, "failed to unpack Any in msg struct")
 			}
 
@@ -384,6 +395,26 @@ func traverseFields(
 
 			fieldType = fieldType.Elem()
 			field = field.Index(0)
+			// Unpack the field into cosmosAnyWrapper rather than the Any type
+			if fieldType == cosmosAnyType {
+				typeAny, ok := field.Interface().(*codectypes.Any)
+				if !ok {
+					return errors.Wrapf(sdkerrors.ErrPackAny, "%T", field.Interface())
+				}
+
+				anyWrapper := &cosmosAnyWrapper{
+					Type: typeAny.TypeUrl,
+				}
+
+				if err := cdc.UnpackAny(typeAny, &anyWrapper.Value); err != nil {
+					return errors.Wrap(err, "failed to unpack Any in msg struct")
+				}
+
+				fieldType = reflect.TypeOf(anyWrapper.Value)
+				field = reflect.ValueOf(anyWrapper.Value)
+
+				// then continue as normal
+			}
 			isCollection = true
 		}
 

diff --git a/x/auth/tx/eip712_test.go b/x/auth/tx/eip712_test.go
@@ -28,7 +28,7 @@ func TestEIP712Handler(t *testing.T) {
 	txBuilder := txConfig.NewTxBuilder()
 
 	chainID := "ethermint_9000"
-	memo := "some test memo"
+	testMemo := "some test memo"
 	msgs := []sdk.Msg{banktypes.NewMsgSend(addr, addr, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(1))))}
 	accNum, accSeq := uint64(1), uint64(2) // Arbitrary account number/sequence
 
@@ -52,7 +52,7 @@ func TestEIP712Handler(t *testing.T) {
 
 	err := txBuilder.SetMsgs(msgs...)
 	require.NoError(t, err)
-	txBuilder.SetMemo(memo)
+	txBuilder.SetMemo(testMemo)
 	txBuilder.SetFeeAmount(fee.Amount)
 	txBuilder.SetFeePayer(feePayerAddr)
 	txBuilder.SetGasLimit(fee.GasLimit)