Multi wallet additional

core/client/zauth.go

@@ -535,14 +535,22 @@ func CallZvaultRetrieveSharedWallets(serverAddr, token string) (string, error) {
 
 // ZauthSignTxn returns a function that sends a txn signing request to the zauth server
 func ZauthSignTxn(serverAddr string) sys.AuthorizeFunc {
-	return func(msg string) (string, error) {
+	return func(msg string, keys ...string) (string, error) {
 		req, err := http.NewRequest("POST", serverAddr+"/sign/txn", bytes.NewBuffer([]byte(msg)))
 		if err != nil {
 			return "", errors.Wrap(err, "failed to create HTTP request")
 		}
 		req.Header.Set("Content-Type", "application/json")
 		c := GetClient()
 		pubkey := c.Keys[0].PublicKey
+		if len(keys) > 0 {
+			c = GetWalletByKey(keys[0])
+			if c == nil {
+				return "", errors.Errorf("wallet not found for pubkey: %s", keys[0])
+			}
+			pubkey = c.Keys[0].PublicKey
+		}
+
 		req.Header.Set("X-Peer-Public-Key", pubkey)
 
 		client := &http.Client{}
@@ -572,14 +580,22 @@ func ZauthSignTxn(serverAddr string) sys.AuthorizeFunc {
 }
 
 func ZauthAuthCommon(serverAddr string) sys.AuthorizeFunc {
-	return func(msg string) (string, error) {
+	return func(msg string, keys ...string) (string, error) {
 		req, err := http.NewRequest("POST", serverAddr+"/sign/msg", bytes.NewBuffer([]byte(msg)))
 		if err != nil {
 			return "", errors.Wrap(err, "failed to create HTTP request")
 		}
 
 		c := GetClient()
 		pubkey := c.Keys[0].PublicKey
+		if len(keys) > 0 {
+			c = GetWalletByKey(keys[0])
+			if c == nil {
+				return "", errors.Errorf("multi-wallet-settings err: %v", keys[0])
+			}
+			pubkey = c.Keys[0].PublicKey
+		}
+
 		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set("X-Peer-Public-Key", pubkey)
 

core/sys/sign.go

@@ -9,8 +9,11 @@ type KeyPair struct {
 // SignFunc sign method for request verification
 type SignFunc func(hash string, signatureScheme string, keys []KeyPair) (string, error)
 
+// SignFunc sign method for request verification
+type SignWithAuthFunc func(hash string, signatureScheme string, keys []KeyPair, pubkeys ...string) (string, error)
+
 type VerifyFunc func(signature string, msg string) (bool, error)
 
 type VerifyWithFunc func(pk, signature string, msg string) (bool, error)
 
-type AuthorizeFunc func(msg string) (string, error)
+type AuthorizeFunc func(msg string, pubkeys... string) (string, error)

core/sys/vars.go

@@ -15,7 +15,7 @@ var (
 
 	// Sign sign method. it should be initialized on different platform.
 	Sign         SignFunc
-	SignWithAuth SignFunc
+	SignWithAuth SignWithAuthFunc
 
 	// Verify verify method. it should be initialized on different platform.
 	Verify VerifyFunc

core/transaction/entity.go

@@ -166,7 +166,7 @@ const (
 	FEES_TABLE                = `/v1/fees_table`
 )
 
-type SignFunc = func(msg string) (string, error)
+type SignFunc = func(msg string, keys ...string) (string, error)
 type VerifyFunc = func(publicKey, signature, msgHash string) (bool, error)
 type SignWithWallet = func(msg string, wallet interface{}) (string, error)
 
@@ -211,6 +211,14 @@ func (t *Transaction) getAuthorize() (string, error) {
 		return "", errors.New("not_initialized", "no authorize func is set, define it in native code and set in sys")
 	}
 
+	if t.MultiWalletSupportKey != "" {
+		authorize, err := sys.Authorize(string(jsonByte), t.MultiWalletSupportKey)
+		if err != nil {
+			return "", err
+		}
+		return authorize, nil
+	}
+
 	authorize, err := sys.Authorize(string(jsonByte))
 	if err != nil {
 		return "", err
@@ -222,7 +230,7 @@ func (t *Transaction) getAuthorize() (string, error) {
 func (t *Transaction) ComputeHashAndSign(signHandler SignFunc) error {
 	t.ComputeHashData()
 	var err error
-	t.Signature, err = signHandler(t.Hash)
+	t.Signature, err = signHandler(t.Hash, t.MultiWalletSupportKey)
 	if err != nil {
 		return err
 	}
@@ -270,7 +278,7 @@ func (t *Transaction) VerifySigWith(pubkey string, verifyHandler VerifyFunc) (bo
 }
 
 func SendTransactionSync(txn *Transaction, miners []string) error {
-	const requestTimeout = 3 * time.Second // Timeout for each request
+	const requestTimeout = 12 * time.Second // Timeout for each request
 
 	fails := make(chan error, len(miners))
 	var wg sync.WaitGroup
@@ -282,7 +290,7 @@ func SendTransactionSync(txn *Transaction, miners []string) error {
 		go func(url string) {
 			defer wg.Done()
 
-			// Create a context with a 30-second timeout for each request
+			// Create a context with a 12-second timeout for each request
 			ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
 			defer cancel()
 
@@ -320,6 +328,13 @@ func SendTransactionSync(txn *Transaction, miners []string) error {
 		}
 	}
 
+	// Reset stable miners list if any miner failed
+	if failureCount > 0 {
+		if nodeClient, err := client.GetNode(); err == nil {
+			nodeClient.ResetStableMiners()
+		}
+	}
+
 	if failureCount == len(miners) {
 		return fmt.Errorf(dominantErr)
 	}
@@ -523,22 +538,21 @@ func SmartContractTxnValue(scAddress string, sn SmartContractTxnData, value uint
 }
 
 func SmartContractTxnValueFeeWithRetry(scAddress string, sn SmartContractTxnData,
-	value, fee uint64, verifyTxn bool, clients ...string) (hash, out string, nonce int64, t *Transaction, err error) {
-	hash, out, nonce, t, err = SmartContractTxnValueFee(scAddress, sn, value, fee, verifyTxn, clients...)
+	value, fee uint64, verifyTxn bool, keys ...string) (hash, out string, nonce int64, t *Transaction, err error) {
+	hash, out, nonce, t, err = SmartContractTxnValueFee(scAddress, sn, value, fee, verifyTxn, keys...)
 
 	if err != nil && (strings.Contains(err.Error(), "invalid transaction nonce") || strings.Contains(err.Error(), "invalid future transaction")) {
-		return SmartContractTxnValueFee(scAddress, sn, value, fee, verifyTxn, clients...)
+		return SmartContractTxnValueFee(scAddress, sn, value, fee, verifyTxn, keys...)
 	}
 	return
 }
 
 func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
-	value, fee uint64, verifyTxn bool, clients ...string) (hash, out string, nonce int64, t *Transaction, err error) {
+	value, fee uint64, verifyTxn bool, keys ...string) (hash, out string, nonce int64, t *Transaction, err error) {
 
-	clientId := client.Id()
-	if len(clients) > 0 && clients[0] != "" {
-		clientId = clients[0]
-	}
+	// Determine client identifier/public key to use for signing. If an explicit key is
+	// provided in keys varargs, prefer it; otherwise default to SDK client id.
+	clientId := client.Id(keys...)
 
 	var requestBytes []byte
 	if requestBytes, err = json.Marshal(sn); err != nil {
@@ -555,8 +569,8 @@ func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
 		return
 	}
 
-	txn := NewTransactionEntity(client.Id(clientId),
-		cfg.ChainID, client.PublicKey(clientId), nonce)
+	txn := NewTransactionEntity(clientId,
+		cfg.ChainID, client.PublicKey(keys...), nonce)
 
 	txn.TransactionData = string(requestBytes)
 	txn.ToClientID = scAddress
@@ -565,8 +579,8 @@ func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
 	txn.TransactionType = TxnTypeSmartContract
 	txn.ClientID = clientId
 
-	if len(clients) > 1 {
-		txn.ToClientID = clients[1]
+	if len(keys) > 1 {
+		txn.ToClientID = keys[1]
 		txn.TransactionType = TxnTypeSend
 	}
 
@@ -586,12 +600,20 @@ func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
 		txn.TransactionNonce = client.Cache.GetNextNonce(txn.ClientID)
 	}
 
+	if len(keys) > 0 && keys[0] != "" {
+		txn.MultiWalletSupportKey = keys[0]
+	}
+
 	err = txn.ComputeHashAndSign(client.SignFn)
 	if err != nil {
 		return
 	}
-
-	if client.GetClient().IsSplit {
+
+	isSplit, err := client.IsWalletSplit(keys...)
+	if err != nil {
+		return
+	}
+	if isSplit {
 		txn.Signature, err = txn.getAuthorize()
 		if err != nil {
 			return

core/transaction/transaction.go

@@ -2,20 +2,25 @@ package transaction
 
 // Transaction entity that encapsulates the transaction related data and meta data
 type Transaction struct {
-	Hash              string `json:"hash,omitempty"`
-	Version           string `json:"version,omitempty"`
-	ClientID          string `json:"client_id,omitempty"`
-	PublicKey         string `json:"public_key,omitempty"`
-	ToClientID        string `json:"to_client_id,omitempty"`
-	ChainID           string `json:"chain_id,omitempty"`
-	TransactionData   string `json:"transaction_data"`
-	Value             uint64 `json:"transaction_value"`
-	Signature         string `json:"signature,omitempty"`
-	CreationDate      int64  `json:"creation_date,omitempty"`
-	TransactionType   int    `json:"transaction_type"`
-	TransactionOutput string `json:"transaction_output,omitempty"`
-	TransactionFee    uint64 `json:"transaction_fee"`
-	TransactionNonce  int64  `json:"transaction_nonce"`
-	OutputHash        string `json:"txn_output_hash"`
-	Status            int    `json:"transaction_status"`
+	Hash      string `json:"hash,omitempty"`
+	Version   string `json:"version,omitempty"`
+	ClientID  string `json:"client_id,omitempty"`
+	PublicKey string `json:"public_key,omitempty"`
+	// MultiWalletSupportKey is set when the transaction needs external
+	// authorization (split-key wallets). It is embedded in the marshaled
+	// transaction so the external authorizer (sys.Authorize) can know which
+	// public key the signature should be associated with.
+	MultiWalletSupportKey string `json:"authorizer_public_key,omitempty"`
+	ToClientID            string `json:"to_client_id,omitempty"`
+	ChainID               string `json:"chain_id,omitempty"`
+	TransactionData       string `json:"transaction_data"`
+	Value                 uint64 `json:"transaction_value"`
+	Signature             string `json:"signature,omitempty"`
+	CreationDate          int64  `json:"creation_date,omitempty"`
+	TransactionType       int    `json:"transaction_type"`
+	TransactionOutput     string `json:"transaction_output,omitempty"`
+	TransactionFee        uint64 `json:"transaction_fee"`
+	TransactionNonce      int64  `json:"transaction_nonce"`
+	OutputHash            string `json:"txn_output_hash"`
+	Status                int    `json:"transaction_status"`
 }

core/util/httpnet.go

@@ -85,18 +85,27 @@ func init() {
 
 func httpDo(req *http.Request, ctx context.Context, cncl context.CancelFunc, f func(*http.Response, error) error) error {
 	c := make(chan error, 1)
+	done := make(chan struct{})
 
-	go func() { c <- f(Client.Do(req.WithContext(ctx))) }()
+	go func() {
+        select {
+        case c <- f(Client.Do(req.WithContext(ctx))):
+            // normal completion
+        case <-done:
+            // context cancelled, do not call f
+        }
+    }()
 
 	select {
-	case <-ctx.Done():
-		// Use the cancel function only after trying to get the result.
-		<-c // Wait for f to return.
-		return ctx.Err()
-	case err := <-c:
-		// Ensure that we call cncl after we are done with the response
-		defer cncl() // Move this here to ensure we cancel after processing
-		return err
+		case <-ctx.Done():
+			// Use the cancel function only after trying to get the result.
+			close(done)
+			cncl()
+			return ctx.Err()
+		case err := <-c:
+			// Ensure that we call cncl after we are done with the response
+			defer cncl() // Move this here to ensure we cancel after processing
+			return err
 	}
 }
 

core/version/version.go

@@ -1,5 +1,6 @@
+
 //====== THIS IS AUTOGENERATED FILE. DO NOT MODIFY ========
 
 package version
+const VERSIONSTR = "v1.20.6-1-gafade4fb"
 
-const VERSIONSTR = "v1.17.11-269-g7fd90660"

core/zcncrypto/bls0chain_wasm.go

@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	Sign func(hash string) (string, error)
+	Sign func(hash string, keys ...string) (string, error)
 )
 
 // WasmScheme - a signature scheme for BLS0Chain Signature

mobilesdk/sdk/sdk.go

@@ -508,5 +508,8 @@ func decodeTicket(ticket string) (string, string, uint64, error) {
 //		}
 //	}
 func RegisterAuthorizer(auth Autorizer) {
-	sys.Authorize = auth.Auth
+	sys.Authorize = func(msg string, clientIDs ...string) (string, error) {
+		// clientIDs are ignored as the interface only accepts msg
+		return auth.Auth(msg)
+	}
 }