Merge pull request #49 from 15000785133/qa

Merge qa branch into testnet

Author: yq

client/l2_client.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/bnb-chain/zkbnb-crypto/wasm/txtypes"
+	"github.com/consensys/gnark-crypto/ecc/bn254/fr"
 	"io"
 	"math/big"
 	"net"
@@ -1218,7 +1219,11 @@ func (c *l2Client) fullFillDefaultOps(ops *types.TransactOpts) (*types.TransactO
 	}
 	if len(ops.CallDataHash) == 0 {
 		hFunc := mimc.NewMiMC()
-		ops.CallDataHash = hFunc.Sum([]byte(ops.CallData))
+		var x fr.Element
+		_ = x.SetBytes([]byte(ops.CallData))
+		b := x.Bytes()
+		hFunc.Write(b[:])
+		ops.CallDataHash = hFunc.Sum(nil)
 	}
 	if ops.GasFeeAssetAmount == nil {
 		gas, err := c.GetGasFee(ops.GasFeeAssetId, ops.TxType)
@@ -1325,11 +1330,7 @@ func (c *l2Client) constructMintNftTransaction(tx *types.MintNftTxReq, ops *type
 	if err != nil {
 		return nil, err
 	}
-
-	ops, err = c.fullFillToAddrOps(ops, tx.To)
-	if err != nil {
-		return nil, err
-	}
+	ops.ToAccountAddress = tx.To
 
 	txInfo, err := txutils.ConstructMintNftTx(c.keyManager, tx, ops)
 	if err != nil {

go.mod

@@ -5,17 +5,20 @@ go 1.18
 require (
 	github.com/bnb-chain/zkbnb-crypto v0.0.8-0.20230217071307-211b4b7e8923
 	github.com/bnb-chain/zkbnb-eth-rpc v0.0.2
-	github.com/consensys/gnark-crypto v0.7.0
+	github.com/consensys/gnark-crypto v0.9.1
 	github.com/ethereum/go-ethereum v1.10.26
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
 )
 
 require (
-	github.com/consensys/gnark v0.7.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark v0.8.0 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
-	github.com/rs/zerolog v1.26.1 // indirect
-	github.com/x448/float16 v0.8.4 // indirect
+	github.com/rs/zerolog v1.29.0 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
 require (
@@ -34,16 +37,16 @@ require (
 	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.5 // indirect; indirectg
 	github.com/tklauser/numcpus v0.2.2 // indirect
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
-	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/consensys/gnark => github.com/bnb-chain/gnark v0.7.1-0.20230206150652-4e87ef37b4e7
+replace github.com/consensys/gnark => github.com/bnb-chain/gnark v0.7.1-0.20230412065523-4d344ff30ab3
 
-replace github.com/consensys/gnark-crypto => github.com/bnb-chain/gnark-crypto v0.7.1-0.20230203031630-7c643ad11891
+replace github.com/consensys/gnark-crypto => github.com/bnb-chain/gnark-crypto v0.8.1-0.20230412061827-228166c33652
 
-replace github.com/bnb-chain/zkbnb-crypto => github.com/15000785133/zkbnb-crypto v0.0.8-0.20230403144529-4e2e8ffac4bd
+replace github.com/bnb-chain/zkbnb-crypto => github.com/15000785133/zkbnb-crypto v0.0.8-0.20230419115132-7064c667baff
 
 replace github.com/bnb-chain/zkbnb-eth-rpc => github.com/15000785133/zkbnb-eth-rpc v0.0.3-0.20230323082501-ae497b894451