Feature/multi wallet

core/client/http.go

@@ -154,7 +154,7 @@
 	if len(clientIDs) > 0 {
 		clientID = clientIDs[0]
 	} else {
-		clientID = ClientID()
+		clientID = Id()
 	}
 
 	if res, err = MakeSCRestAPICall("", GetBalance, map[string]string{

core/transaction/entity.go

@@ -162,7 +162,7 @@ const (
 	FEES_TABLE                = `/v1/fees_table`
 )
 
-type SignFunc = func(msg string) (string, error)
+type SignFunc = func(msg string, clientId ...string) (string, error)
 type VerifyFunc = func(publicKey, signature, msgHash string) (bool, error)
 type SignWithWallet = func(msg string, wallet interface{}) (string, error)
 
@@ -466,29 +466,34 @@ func GetFeesTable(miners []string, reqPercent ...float32) (map[string]map[string
 	return nil, errors.New("failed to get fees table", strings.Join(errs, ","))
 }
 
-func SmartContractTxn(scAddress string, sn SmartContractTxnData, toClient ...string) (
+func SmartContractTxn(scAddress string, sn SmartContractTxnData, clients ...string) (
 	hash, out string, nonce int64, txn *Transaction, err error) {
-	return SmartContractTxnValue(scAddress, sn, 0, toClient...)
+	return SmartContractTxnValue(scAddress, sn, 0, clients...)
 }
 
-func SmartContractTxnValue(scAddress string, sn SmartContractTxnData, value uint64, toClient ...string) (
+func SmartContractTxnValue(scAddress string, sn SmartContractTxnData, value uint64, clients ...string) (
 	hash, out string, nonce int64, txn *Transaction, err error) {
 
-	return SmartContractTxnValueFeeWithRetry(scAddress, sn, value, client.TxnFee(), toClient...)
+	return SmartContractTxnValueFeeWithRetry(scAddress, sn, value, client.TxnFee(), clients...)
 }
 
 func SmartContractTxnValueFeeWithRetry(scAddress string, sn SmartContractTxnData,
-	value, fee uint64, toClient ...string) (hash, out string, nonce int64, t *Transaction, err error) {
-	hash, out, nonce, t, err = SmartContractTxnValueFee(scAddress, sn, value, fee, toClient...)
+	value, fee uint64, clients ...string) (hash, out string, nonce int64, t *Transaction, err error) {
+	hash, out, nonce, t, err = SmartContractTxnValueFee(scAddress, sn, value, fee, clients...)
 
 	if err != nil && strings.Contains(err.Error(), "invalid transaction nonce") {
-		return SmartContractTxnValueFee(scAddress, sn, value, fee)
+		return SmartContractTxnValueFee(scAddress, sn, value, fee, clients...)
 	}
 	return
 }
 
 func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
-	value, fee uint64, toClient ...string) (hash, out string, nonce int64, t *Transaction, err error) {
+	value, fee uint64, clients ...string) (hash, out string, nonce int64, t *Transaction, err error) {
+
+	clientId := client.Id(clients...)
+	if len(clients) > 0 && clients[0] != "" {
+		clientId = clients[0]
+	}
 
 	var requestBytes []byte
 	if requestBytes, err = json.Marshal(sn); err != nil {
@@ -505,17 +510,20 @@ func SmartContractTxnValueFee(scAddress string, sn SmartContractTxnData,
 		return
 	}
 
-	txn := NewTransactionEntity(client.ClientID(),
-		cfg.ChainID, client.PublicKey(), nonce)
+	txn := NewTransactionEntity(client.Id(clientId),
+		cfg.ChainID, client.PublicKey(clientId), nonce)
 
 	txn.TransactionData = string(requestBytes)
 	txn.ToClientID = scAddress
 	txn.Value = value
 	txn.TransactionFee = fee
 	txn.TransactionType = TxnTypeSmartContract
 
-	if len(toClient) > 0 {
-		txn.ToClientID = toClient[0]
+	if len(clients) > 0 {
+		txn.ClientID = clients[0]
+	}
+	if len(clients) > 1 {
+		txn.ToClientID = clients[1]
 		txn.TransactionType = TxnTypeSend
 	}
 

mobilesdk/zboxapi/client.go

@@ -13,9 +13,9 @@
 	"context"
 	"errors"
 
+	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/core/logger"
 	"github.com/0chain/gosdk/zboxapi"
-	"github.com/0chain/gosdk/core/client"
 	"go.uber.org/zap"
 )
 
@@ -33,7 +33,7 @@
 	zboxApiClient = zboxapi.NewClient()
 	zboxApiClient.SetRequest(baseUrl, appType)
 
-	err := SetWallet(client.ClientID(), client.PrivateKey(), client.PublicKey()) //nolint: errcheck
+	err := SetWallet(client.Id(), client.PrivateKey(), client.PublicKey()) //nolint: errcheck
 	if err != nil {
 		logging.Error("SetWallet", zap.Error(err))
 	}

winsdk/zboxapi.go

@@ -39,7 +39,7 @@ func InitZBox(zboxHost, zboxAppType *C.char) {
 	}
 
 	zboxApiClient.SetRequest(C.GoString(zboxHost), C.GoString(zboxAppType))
-	zboxApiClient.SetWallet(client.ClientID(), client.PrivateKey(), client.PublicKey())
+	zboxApiClient.SetWallet(client.Id(), client.PrivateKey(), client.PublicKey())
 }
 
 // SetZBoxWallet set wallet on zbox api

zboxcore/allocationchange/updatefile.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/0chain/errors"
+	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/core/pathutil"
-	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/zboxcore/fileref"
 )
 

zboxcore/marker/deletetoken.go

@@ -3,8 +3,8 @@ package marker
 import (
 	"fmt"
 
-	"github.com/0chain/gosdk/core/encryption"
 	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/core/encryption"
 )
 
 type DeleteToken struct {
@@ -25,6 +25,6 @@ func (dt *DeleteToken) GetHash() string {
 
 func (dt *DeleteToken) Sign() error {
 	var err error
-	dt.Signature, err = client.Sign(dt.GetHash())
+	dt.Signature, err = client.Sign(dt.GetHash(), dt.ClientID)
 	return err
 }

zboxcore/marker/writemarker.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/0chain/errors"
+	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/core/encryption"
 	"github.com/0chain/gosdk/core/sys"
-	"github.com/0chain/gosdk/core/client"
 )
 
 type WriteMarker struct {
@@ -48,7 +48,7 @@ func (wm *WriteMarker) GetHash() string {
 
 func (wm *WriteMarker) Sign() error {
 	var err error
-	wm.Signature, err = client.Sign(wm.GetHash())
+	wm.Signature, err = client.Sign(wm.GetHash(), wm.ClientID)
 	return err
 }
 

zboxcore/sdk/allocation.go

@@ -389,7 +389,7 @@ func (a *Allocation) GetBlobberStats() map[string]*BlobberAllocationStats {
 	wg.Add(numList)
 	rspCh := make(chan *BlobberAllocationStats, numList)
 	for _, blobber := range a.Blobbers {
-		go getAllocationDataFromBlobber(blobber, a.ID, a.Tx, rspCh, wg)
+		go getAllocationDataFromBlobber(blobber, a.ID, a.Tx, rspCh, wg, a.Owner)
 	}
 	wg.Wait()
 	result := make(map[string]*BlobberAllocationStats, len(a.Blobbers))
@@ -848,7 +848,7 @@ func (a *Allocation) GetCurrentVersion() (bool, error) {
 		go func(blobber *blockchain.StorageNode) {
 
 			defer wg.Done()
-			wr, err := GetWritemarker(a.ID, a.Tx, a.sig, blobber.ID, blobber.Baseurl)
+			wr, err := GetWritemarker(a.ID, a.Tx, a.sig, blobber.ID, blobber.Baseurl, a.Owner)
 			if err != nil {
 				atomic.AddInt32(&errCnt, 1)
 				logger.Logger.Error("error during getWritemarke", zap.Error(err))
@@ -857,6 +857,7 @@ func (a *Allocation) GetCurrentVersion() (bool, error) {
 				markerChan <- nil
 			} else {
 				markerChan <- &RollbackBlobber{
+					ClientId:     a.Owner,
 					blobber:      blobber,
 					lpm:          wr,
 					commitResult: &CommitResult{},
@@ -952,6 +953,7 @@ func (a *Allocation) RepairRequired(remotepath string) (zboxutil.Uint128, zboxut
 	}
 
 	listReq := &ListRequest{Consensus: Consensus{RWMutex: &sync.RWMutex{}}}
+	listReq.ClientId = a.Owner
 	listReq.allocationID = a.ID
 	listReq.allocationTx = a.Tx
 	listReq.sig = a.sig
@@ -1561,6 +1563,7 @@ func (a *Allocation) ListDirFromAuthTicket(authTicket string, lookupHash string,
 	}
 
 	listReq := &ListRequest{Consensus: Consensus{RWMutex: &sync.RWMutex{}}}
+	listReq.ClientId = a.Owner
 	listReq.allocationID = a.ID
 	listReq.allocationTx = a.Tx
 	listReq.sig = a.sig
@@ -1601,6 +1604,7 @@ func (a *Allocation) ListDir(path string, opts ...ListRequestOptions) (*ListResu
 		return nil, errors.New("invalid_path", "Path should be valid and absolute")
 	}
 	listReq := &ListRequest{Consensus: Consensus{RWMutex: &sync.RWMutex{}}}
+	listReq.ClientId = a.Owner
 	listReq.allocationID = a.ID
 	listReq.allocationTx = a.Tx
 	listReq.sig = a.sig
@@ -1629,6 +1633,7 @@ func (a *Allocation) getRefs(path, pathHash, authToken, offsetPath, updatedDate,
 	}
 
 	oTreeReq := &ObjectTreeRequest{
+		ClientId:       a.Owner,
 		allocationID:   a.ID,
 		allocationTx:   a.Tx,
 		sig:            a.sig,
@@ -1850,6 +1855,7 @@ func (a *Allocation) GetRecentlyAddedRefs(page int, fromDate int64, pageLimit in
 
 	offset := int64(page-1) * int64(pageLimit)
 	req := &RecentlyAddedRefRequest{
+		ClientId:     a.Owner,
 		allocationID: a.ID,
 		allocationTx: a.Tx,
 		sig:          a.sig,
@@ -1878,6 +1884,7 @@ func (a *Allocation) GetFileMeta(path string) (*ConsolidatedFileMeta, error) {
 
 	result := &ConsolidatedFileMeta{}
 	listReq := &ListRequest{Consensus: Consensus{RWMutex: &sync.RWMutex{}}}
+	listReq.ClientId = a.Owner
 	listReq.allocationID = a.ID
 	listReq.allocationTx = a.Tx
 	listReq.sig = a.sig
@@ -1997,6 +2004,7 @@ func (a *Allocation) GetFileMetaFromAuthTicket(authTicket string, lookupHash str
 	}
 
 	listReq := &ListRequest{Consensus: Consensus{RWMutex: &sync.RWMutex{}}}
+	listReq.ClientId = a.Owner
 	listReq.allocationID = a.ID
 	listReq.allocationTx = a.Tx
 	listReq.sig = a.sig
@@ -2179,7 +2187,7 @@ func (a *Allocation) RevokeShare(path string, refereeClientID string) error {
 		query.Add("path", path)
 		query.Add("refereeClientID", refereeClientID)
 
-		httpreq, err := zboxutil.NewRevokeShareRequest(baseUrl, a.ID, a.Tx, a.sig, query)
+		httpreq, err := zboxutil.NewRevokeShareRequest(baseUrl, a.ID, a.Tx, a.sig, query, a.Owner)
 		if err != nil {
 			return err
 		}
@@ -2272,6 +2280,7 @@ func (a *Allocation) GetAuthTicket(path, filename string,
 	}
 
 	shareReq := &ShareRequest{
+		ClientId:          a.Owner,
 		expirationSeconds: expiration,
 		allocationID:      a.ID,
 		allocationTx:      a.Tx,
@@ -2342,7 +2351,7 @@ func (a *Allocation) UploadAuthTicketToBlobber(authTicket string, clientEncPubKe
 		if err := formWriter.Close(); err != nil {
 			return err
 		}
-		httpreq, err := zboxutil.NewShareRequest(url, a.ID, a.Tx, a.sig, body)
+		httpreq, err := zboxutil.NewShareRequest(url, a.ID, a.Tx, a.sig, body, a.Owner)
 		if err != nil {
 			return err
 		}

zboxcore/sdk/allocation_file_delete_test.go

@@ -50,6 +50,7 @@ func TestAllocation_DeleteFile(t *testing.T) {
 		DataShards:   2,
 		ParityShards: 2,
 		FileOptions:  63,
+		Owner:        mockClientId,
 	}
 	a.InitAllocation()
 	client.SetSdkInitialized(true)
@@ -166,6 +167,7 @@ func TestAllocation_deleteFile(t *testing.T) {
 				DataShards:   2,
 				ParityShards: 2,
 				FileOptions:  63,
+				Owner:        mockClientId,
 			}
 			a.InitAllocation()
 			client.SetSdkInitialized(true)

zboxcore/sdk/allocation_file_test.go

@@ -220,6 +220,7 @@ func TestAllocation_UpdateFile(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 	setupMockAllocation(t, a)
 
@@ -289,6 +290,7 @@ func TestAllocation_UploadFile(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 
 	setupMockAllocation(t, a)
@@ -327,6 +329,7 @@ func TestAllocation_UpdateFileWithThumbnail(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 	setupMockAllocation(t, a)
 
@@ -406,6 +409,7 @@ func TestAllocation_UploadFileWithThumbnail(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 
 	setupMockAllocation(t, a)
@@ -441,6 +445,7 @@ func TestAllocation_EncryptAndUpdateFile(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 	setupMockAllocation(t, a)
 
@@ -512,6 +517,7 @@ func TestAllocation_EncryptAndUploadFile(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 
 	setupMockAllocation(t, a)
@@ -560,6 +566,7 @@ func TestAllocation_EncryptAndUpdateFileWithThumbnail(t *testing.T) {
 		ParityShards: 2,
 		DataShards:   2,
 		Size:         2 * GB,
+		Owner:        mockClientId,
 	}
 
 	setupMockAllocation(t, a)
@@ -636,6 +643,7 @@ func TestAllocation_EncryptAndUploadFileWithThumbnail(t *testing.T) {
 		DataShards:   2,
 		Size:         2 * GB,
 		ctx:          context.TODO(),
+		Owner:        mockClientId,
 	}
 
 	setupMockAllocation(t, a)
@@ -889,6 +897,7 @@ func TestAllocation_RepairFile(t *testing.T) {
 				ParityShards: tt.numBlobbers / 2,
 				DataShards:   tt.numBlobbers / 2,
 				Size:         2 * GB,
+				Owner:        mockClientId,
 			}
 			a.downloadChan = make(chan *DownloadRequest, 10)
 			a.repairChan = make(chan *RepairRequest, 1)

zboxcore/sdk/blockdownloadworker.go

@@ -182,7 +182,7 @@ func (req *BlockDownloadRequest) downloadBlobberBlock(fastClient *fasthttp.Clien
 
 			var rspData downloadBlock
 			if statuscode != http.StatusOK {
-				zlogger.Logger.Error(fmt.Sprintf("downloadBlobberBlock FAIL - blobberID: %v, clientID: %v, blockNum: %d, retry: %d, response: %v", req.blobber.ID, client.ClientID(), header.BlockNum, retry, string(respBuf)))
+				zlogger.Logger.Error(fmt.Sprintf("downloadBlobberBlock FAIL - blobberID: %v, clientID: %v, blockNum: %d, retry: %d, response: %v", req.blobber.ID, client.Id(), header.BlockNum, retry, string(respBuf)))
 				if err = json.Unmarshal(respBuf, &rspData); err == nil {
 					return errors.New("download_error", fmt.Sprintf("Response status: %d, Error: %v,", statuscode, rspData.err))
 				}
@@ -232,7 +232,7 @@ func (req *BlockDownloadRequest) downloadBlobberBlock(fastClient *fasthttp.Clien
 				rspData.BlockChunks = splitData(dR.Data, req.chunkSize)
 			}
 
-			zlogger.Logger.Debug(fmt.Sprintf("downloadBlobberBlock 200 OK: blobberID: %v, clientID: %v, blockNum: %d", req.blobber.ID, client.ClientID(), header.BlockNum))
+			zlogger.Logger.Debug(fmt.Sprintf("downloadBlobberBlock 200 OK: blobberID: %v, clientID: %v, blockNum: %d", req.blobber.ID, client.Id(), header.BlockNum))
 
 			req.result <- &rspData
 			return nil

zboxcore/sdk/chunked_upload_bench_test.go

@@ -89,6 +89,7 @@ func BenchmarkChunkedUpload(b *testing.B) {
 				DataShards:   2,
 				ParityShards: 1,
 				ctx:          context.TODO(),
+				Owner:        mockClientId,
 			}
 			a.fullconsensus, a.consensusThreshold = a.getConsensuses()
 			for i := 0; i < (a.DataShards + a.ParityShards); i++ {