Merge pull request #6506 from filecoin-project/fix/ethcall-unmarshal

fix: EthCall UnmarshalJSON compatible Input field

Author: tediou5

venus-devtool/state-type-gen/main.go

@@ -125,8 +125,9 @@ var stateTypesOpt = option{
 // venus-shared/actors/types
 var sharedTypesOpt = option{
 	skipStructs: map[string]struct{}{
-		"ActorV5":     {},
-		"TempEthCall": {},
+		"ActorV5":       {},
+		"EthCallDecode": {},
+		"EthCallRaw":    {},
 	},
 	skipAllVar: false,
 	skipVars:   []string{"Eip155ChainID"},

venus-shared/actors/types/eth.go

@@ -308,13 +308,25 @@ func (c *EthCall) ToFilecoinMessage() (*Message, error) {
 }
 
 func (c *EthCall) UnmarshalJSON(b []byte) error {
-	type TempEthCall EthCall
-	var params TempEthCall
+	type EthCallRaw EthCall // Avoid a recursive call.
+	type EthCallDecode struct {
+		// The field should be "input" by spec, but many clients use "data" so we support
+		// both, but prefer "input".
+		Input *EthBytes `json:"input"`
+		EthCallRaw
+	}
 
+	var params EthCallDecode
 	if err := json.Unmarshal(b, &params); err != nil {
 		return err
 	}
-	*c = EthCall(params)
+
+	// If input is specified, prefer it.
+	if params.Input != nil {
+		params.Data = *params.Input
+	}
+
+	*c = EthCall(params.EthCallRaw)
 	return nil
 }