fix: Evm abi don't support bytes hex string

--story=1011659

fix: Evm abi don't support bytes hex string
--story=1011659
596c52a4 · Devin Zeng · 47574eda · 596c52a4
Commit 596c52a4 authored 2 years ago by Devin Zeng
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

evmutils/abi/burrow/abi/primitives.go evmutils/abi/burrow/abi/primitives.go +9 -1

No files found.
--- a/evmutils/abi/burrow/abi/primitives.go
+++ b/evmutils/abi/burrow/abi/primitives.go
@@ -2,6 +2,7 @@ package abi

 import (
 	"encoding/binary"
+	"encoding/hex"
 	"fmt"
 	"math/big"
 	"reflect"
@@ -613,12 +614,19 @@ func (e EVMBytes) getGoType() interface{} {
 	return &v
 }

+var reghex = regexp.MustCompile("0[xX][0-9a-fA-F]+")
+
 func (e EVMBytes) pack(v interface{}) ([]byte, error) {
 	b, ok := v.([]byte)
 	if !ok {
 		s, ok := v.(string)
 		if ok {
-			b = []byte(s)
+			//如果是16进制，则进行转换
+			if reghex.MatchString(s) {
+				b, _ = hex.DecodeString(s[2:])
+			} else {
+				b = []byte(s)
+			}
 		} else {
 			return nil, fmt.Errorf("cannot map from %s to EVM bytes", reflect.ValueOf(v).Kind().String())
 		}