fix json

yihuang · yihuang · commit d10fdbab0ddf · 2024-04-26T09:28:33.000+08:00
diff --git a/x/evm/types/eth.go b/x/evm/types/eth.go
@@ -49,7 +49,7 @@ func (tx *EthereumTx) Unmarshal(dst []byte) error {
 
 func (tx *EthereumTx) UnmarshalJSON(bz []byte) error {
 	var data hexutil.Bytes
-	if err := json.Unmarshal(bz, &bz); err != nil {
+	if err := json.Unmarshal(bz, &data); err != nil {
 		return err
 	}
 	return tx.UnmarshalBinary(data)
@@ -60,7 +60,7 @@ func (tx EthereumTx) MarshalJSON() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	return json.Marshal(bz)
+	return json.Marshal(hexutil.Bytes(bz))
 }
 
 func (tx EthereumTx) Validate() error {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (tx *EthereumTx) Unmarshal(dst []byte) error {`
`49`	`49`
`50`	`50`	`func (tx *EthereumTx) UnmarshalJSON(bz []byte) error {`
`51`	`51`	`var data hexutil.Bytes`
`52`		`- if err := json.Unmarshal(bz, &bz); err != nil {`
	`52`	`+ if err := json.Unmarshal(bz, &data); err != nil {`
`53`	`53`	`return err`
`54`	`54`	`}`
`55`	`55`	`return tx.UnmarshalBinary(data)`
`@@ -60,7 +60,7 @@ func (tx EthereumTx) MarshalJSON() ([]byte, error) {`
`60`	`60`	`if err != nil {`
`61`	`61`	`return nil, err`
`62`	`62`	`}`
`63`		`- return json.Marshal(bz)`
	`63`	`+ return json.Marshal(hexutil.Bytes(bz))`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func (tx EthereumTx) Validate() error {`