remove unpackInput

plugin/dapp/evm/executor/abi/api.go

 package abi
 
 import (
-	"bytes"
 	"errors"
 	"fmt"
 	"math/big"
@@ -154,54 +153,6 @@ func Unpack(data []byte, methodName, abiData string) (output []*Param, err error
 	return
 }
 
-func UnpackInput(data []byte, methodName, abiData string) (output []*Param, err error) {
-	if len(data) <= 4 {
-		log.Info("UnpackInput", "Data len is not correct", len(data), "methodName", methodName)
-		return output, err
-	}
-	// 解析ABI数据结构，获取本次调用的方法对象
-	abi, err := JSON(strings.NewReader(abiData))
-	if err != nil {
-		return output, err
-	}
-
-	var method Method
-	var ok bool
-	if method, ok = abi.Methods[methodName]; !ok {
-		return output, fmt.Errorf("function %v not exists", methodName)
-	}
-
-	if bytes.Compare(method.ID, data[:4]) != 0 {
-		log.Info("UnpackInput", "methodID is not consistent method.ID", common.Bytes2Hex(method.ID),
-			"data[:4]", common.Bytes2Hex(data[:4]))
-		return output, errors.New("Not consistent method")
-	}
-
-	if len(data[4:])%32 != 0 {
-		return output, errors.New("UnpackOutputOrEvent: improperly formatted output")
-	}
-
-	values, err := method.Inputs.UnpackValues(data[4:])
-	if err != nil {
-		return output, err
-	}
-
-	output = []*Param{}
-
-	for i, v := range values {
-		arg := method.Inputs[i]
-		pval := &Param{Name: arg.Name, Type: arg.Type.String(), Value: v}
-		if arg.Type.String() == "address" {
-			pval.Value = v.(common.Hash160Address).ToAddress().String()
-			log.Info("Unpack address", "address", pval.Value)
-		}
-
-		output = append(output, pval)
-	}
-
-	return
-}
-
 //同时支持input,output和event三种数据的unpack
 func UnpackAllTypes(data []byte, name, abiData string) (output []*Param, err error) {
 	if len(data) == 0 {
@@ -226,6 +177,9 @@ func UnpackAllTypes(data []byte, name, abiData string) (output []*Param, err err
 		} else {
 			return output, errors.New("UnpackAllTypes: improperly formatted data")
 		}
+		if arguments.LengthNonIndexed() == 0 {
+			return output, nil
+		}
 	} else if event, ok := abi.Events[name]; ok {
 		values, err = event.Inputs.UnpackValues(data)
 		arguments = event.Inputs

plugin/dapp/evmxgo/executor/parse.go

@@ -35,7 +35,7 @@ func checkMintPara(mint *evmxgotypes.EvmxgoMint, tx2lock *types.Transaction, db
 		return errors.New("Not consistent bridgevmxgo address configured by manager")
 	}
 
-	unpack, err := chain33Abi.UnpackInput(action.Para, LockMethod, bridgevmxgo.BridgeBankABI)
+	unpack, err := chain33Abi.UnpackAllTypes(action.Para, LockMethod, bridgevmxgo.BridgeBankABI)
 	if err != nil {
 		return err
 	}