Merge pull request #45 from 15000785133/qa

add tx_signature and ipfs function

Author: garyxiong123

accounts/seed_generator.go

@@ -0,0 +1,27 @@
+package accounts
+
+import (
+	"fmt"
+	"github.com/bnb-chain/zkbnb-go-sdk/signer"
+	"strings"
+)
+
+const SEED_FORMAT = "Access zkbnb account.\n\nOnly sign this message for a trusted client!\nChain ID: %d."
+
+func GenerateSeed(privateKey string, chainId uint64) (string, error) {
+	signer, err := signer.NewL1Singer(privateKey)
+	if err != nil {
+		return "", err
+	}
+
+	messageText := fmt.Sprintf(SEED_FORMAT, chainId)
+	seedString, err := signer.Sign(messageText)
+	// if seedString starts with 0x as the prefix, directly trim the 0x prefix
+	if strings.HasPrefix(seedString, "0x") {
+		seedString = seedString[2:]
+	}
+	if err != nil {
+		return "", err
+	}
+	return seedString, nil
+}

client/api.go

@@ -1,10 +1,10 @@
 package client
 
 import (
-	"math/big"
-
+	"github.com/bnb-chain/zkbnb-go-sdk/signer"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
+	"math/big"
 
 	"github.com/bnb-chain/zkbnb-go-sdk/accounts"
 	"github.com/bnb-chain/zkbnb-go-sdk/client/abi"
@@ -120,43 +120,59 @@ type ZkBNBQuerier interface {
 
 	// GetNftsByAccountIndex returns nfts by account index
 	GetNftsByAccountIndex(accountIndex, offset, limit int64) (*types.Nfts, error)
+
+	// GetRollbacks returns tx rollback info
+	GetRollbacks(fromBlockHeight, offset, limit int64) (total uint32, rollbacks []*types.Rollback, err error)
+
+	// GetMaxCollectionId returns max collection id  by accountIndex
+	GetMaxCollectionId(accountIndex int64) (*types.MaxCollectionId, error)
+
+	// GetNftByTxHash returns nfts by txHash
+	GetNftByTxHash(txHash string) (*types.NftIndex, error)
+
+	// UpdateNftByIndex updates mutable attribute by NftIndex
+	UpdateNftByIndex(privateKey string, nft *types.UpdateNftReq) (*types.Mutable, error)
 }
 
 type ZkBNBTxSender interface {
-	// SetKeyManager sets the key manager for signing txs.
-	SetKeyManager(keyManager accounts.KeyManager)
 
 	// KeyManager returns the key manager for signing txs.
 	KeyManager() accounts.KeyManager
 
 	// SendRawTx sends signed raw transaction and returns tx hash
-	SendRawTx(txType uint32, txInfo string) (string, error)
+	SendRawTx(txType uint32, txInfo string, signature string) (string, error)
+
+	// GenerateSignBody generates the signature body for caller to calculate signature
+	GenerateSignBody(txData interface{}) (string, error)
+
+	// GenerateSignature generates the signature for l1 identifier validation
+	GenerateSignature(privateKey string, txData interface{}) (string, error)
 
 	// NOTE: You need to call SetKeyManager first before using following functions
 
 	// MintNft will sign tx with key manager and send signed transaction
-	MintNft(tx *types.MintNftTxReq, ops *types.TransactOpts) (string, error)
+	MintNft(tx *types.MintNftTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// CreateCollection will sign tx with key manager and send signed transaction
-	CreateCollection(tx *types.CreateCollectionReq, ops *types.TransactOpts) (string, error)
+	CreateCollection(tx *types.CreateCollectionTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// CancelOffer will sign tx with key manager and send signed transaction
-	CancelOffer(tx *types.CancelOfferReq, ops *types.TransactOpts) (string, error)
+	CancelOffer(tx *types.CancelOfferTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// AtomicMatch will sign tx with key manager and send signed transaction
-	AtomicMatch(tx *types.AtomicMatchTxReq, ops *types.TransactOpts) (string, error)
+	AtomicMatch(tx *types.AtomicMatchTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// WithdrawNft will sign tx with key manager and send signed transaction
-	WithdrawNft(tx *types.WithdrawNftTxReq, ops *types.TransactOpts) (string, error)
+	WithdrawNft(tx *types.WithdrawNftTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// TransferNft will sign tx with key manager and send signed transaction
-	TransferNft(tx *types.TransferNftTxReq, ops *types.TransactOpts) (string, error)
+	TransferNft(tx *types.TransferNftTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// Transfer will sign tx with key manager and send signed transaction
-	Transfer(tx *types.TransferTxReq, ops *types.TransactOpts) (string, error)
+	Transfer(tx *types.TransferTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 
 	// Withdraw will sign tx with key manager and send signed transaction
-	Withdraw(tx *types.WithdrawReq, ops *types.TransactOpts) (string, error)
+	Withdraw(tx *types.WithdrawTxReq, ops *types.TransactOpts, signatureList ...string) (string, error)
 }
 
 type ZkBNBL1Client interface {
@@ -182,10 +198,42 @@ type ZkBNBL1Client interface {
 	RequestFullExitNft(accountName string, nftIndex uint32) (common.Hash, error)
 }
 
-func NewZkBNBClient(url string) ZkBNBClient {
+func NewZkBNBClientWithPrivateKey(url, privateKey string, chainId uint64) (ZkBNBClient, error) {
+	l1Signer, err := signer.NewL1Singer(privateKey)
+	if err != nil {
+		return nil, err
+	}
+	seed, err := accounts.GenerateSeed(privateKey, chainId)
+	if err != nil {
+		return nil, err
+	}
+	keyManager, err := accounts.NewSeedKeyManager(seed)
+	if err != nil {
+		return nil, err
+	}
+
 	return &l2Client{
-		endpoint: url,
+		endpoint:   url,
+		privateKey: privateKey,
+		chainId:    chainId,
+		l1Signer:   l1Signer,
+		keyManager: keyManager,
+	}, nil
+}
+
+func NewZkBNBClientWithSeed(url, seed string, chainId uint64) (ZkBNBClient, error) {
+	keyManager, err := accounts.NewSeedKeyManager(seed)
+	if err != nil {
+		return nil, err
 	}
+
+	return &l2Client{
+		endpoint:   url,
+		privateKey: "",
+		chainId:    chainId,
+		l1Signer:   nil,
+		keyManager: keyManager,
+	}, nil
 }
 
 func NewZkBNBL1Client(provider, zkbnbContract string) (ZkBNBL1Client, error) {

client/l1_client_test.go

@@ -15,14 +15,28 @@ var l1Endpoint = "https://data-seed-prebsc-1-s1.binance.org:8545"
 var zkbnbContract = "0x308fC6afE1A0738C8BAD2cAf5255c47A051e000e"
 var l1PrivateKey = "acbaa269bd7573ff12361be4b97201aef019776ea13384681d4e5ba6a88367d9"
 var l1Address = "0x8b2C5A5744F42AA9269BaabDd05933a96D8EF911"
+var chainNetworkId uint64 = 97
 
-// Random seed
-var l2KeyManager, _ = accounts.NewSeedKeyManager("30e1a3762ff9944e9a4ad79477b756ef0aff3d2af76f0f40a0c3ec6ca76cf24b")
-var l2Name = "walt.legend"
+var l2Name = "walt.zkbnb"
+
+func InitSeedKeyManager() (accounts.KeyManager, error) {
+	seed, err := accounts.GenerateSeed(l1PrivateKey, chainNetworkId)
+	if err != nil {
+		return nil, err
+	}
+	keyManager, err := accounts.NewSeedKeyManager(seed)
+	if err != nil {
+		return nil, err
+	}
+	return keyManager, nil
+}
 
 func TestRegisterZNS(t *testing.T) {
+	l2KeyManager, err := InitSeedKeyManager()
+	assert.NoError(t, err)
+
 	client, _ := NewZkBNBL1Client(l1Endpoint, zkbnbContract)
-	err := client.SetPrivateKey(l1PrivateKey)
+	err = client.SetPrivateKey(l1PrivateKey)
 	assert.NoError(t, err)
 	pk := l2KeyManager.PubKeyPoint()
 	fmt.Println(pk[0])