wasm refactor

wasmsdk/README.md

@@ -3,7 +3,7 @@
 # wasmsdk
 
 ```go
-import "github.com/0chain/gosdk_common/wasmsdk"
+import "github.com/0chain/gosdk/wasmsdk"
 ```
 
 ## Index

wasmsdk/allocation.go

@@ -13,9 +13,9 @@ import (
 	"sync"
 	"syscall/js"
 
+	"github.com/0chain/gosdk/core/transaction"
+	"github.com/0chain/gosdk/wasmsdk/jsbridge"
 	"github.com/0chain/gosdk/zboxcore/sdk"
-	"github.com/0chain/gosdk_common/core/transaction"
-	"github.com/0chain/gosdk_common/wasmsdk/jsbridge"
 )
 
 const TOKEN_UNIT int64 = 1e10
@@ -68,7 +68,7 @@ func getAllocationBlobbers(preferredBlobberURLs []string,
 		return sdk.GetBlobberIds(preferredBlobberURLs)
 	}
 
-	return sdk.GetAllocationBlobbers(dataShards, parityShards, size, isRestricted, sdk.PriceRange{
+	return sdk.GetAllocationBlobbers(sdk.StorageV2, dataShards, parityShards, size, isRestricted, sdk.PriceRange{
 		Min: uint64(minReadPrice),
 		Max: uint64(maxReadPrice),
 	}, sdk.PriceRange{
@@ -88,7 +88,7 @@ func getAllocationBlobbers(preferredBlobberURLs []string,
 //   - lock is the lock value to add to the allocation.
 //   - blobberIds is the list of blobber ids.
 //   - blobberAuthTickets is the list of blobber auth tickets in case of using restricted blobbers.
-func createAllocation(datashards, parityshards int, size int64,
+func createAllocation(datashards, parityshards int, size, authRoundExpiry int64,
 	minReadPrice, maxReadPrice, minWritePrice, maxWritePrice int64, lock int64, blobberIds, blobberAuthTickets []string, setThirdPartyExtendable, IsEnterprise, force bool) (
 	*transaction.Transaction, error) {
 
@@ -108,8 +108,10 @@ func createAllocation(datashards, parityshards int, size int64,
 		BlobberIds:           blobberIds,
 		ThirdPartyExtendable: setThirdPartyExtendable,
 		IsEnterprise:         IsEnterprise,
+		StorageVersion:       sdk.StorageV2,
 		BlobberAuthTickets:   blobberAuthTickets,
 		Force:                force,
+		AuthRoundExpiry:      authRoundExpiry,
 	}
 
 	sdkLogger.Info(options)
@@ -160,14 +162,17 @@ func transferAllocation(allocationID, newOwnerId, newOwnerPublicKey string) erro
 func UpdateForbidAllocation(allocationID string, forbidupload, forbiddelete, forbidupdate, forbidmove, forbidcopy, forbidrename bool) (string, error) {
 
 	hash, _, err := sdk.UpdateAllocation(
-		0,            //size,
+		0, //size,
+		0,
 		false,        //extend,
 		allocationID, // allocID,
 		0,            //lock,
 		"",           //addBlobberId,
 		"",           //addBlobberAuthTicket
 		"",           //removeBlobberId,
-		false,        //thirdPartyExtendable,
+		"",           //owner,
+		"",           //ownerSigninPublicKey
+		false,        // thirdPartyExtendable
 		&sdk.FileOptionsParameters{
 			ForbidUpload: sdk.FileOptionParam{Changed: forbidupload, Value: forbidupload},
 			ForbidDelete: sdk.FileOptionParam{Changed: forbiddelete, Value: forbiddelete},
@@ -176,6 +181,7 @@ func UpdateForbidAllocation(allocationID string, forbidupload, forbiddelete, for
 			ForbidCopy:   sdk.FileOptionParam{Changed: forbidcopy, Value: forbidcopy},
 			ForbidRename: sdk.FileOptionParam{Changed: forbidrename, Value: forbidrename},
 		},
+		"",
 	)
 
 	return hash, err
@@ -188,14 +194,17 @@ func UpdateForbidAllocation(allocationID string, forbidupload, forbiddelete, for
 func freezeAllocation(allocationID string) (string, error) {
 
 	hash, _, err := sdk.UpdateAllocation(
-		0,            //size,
+		0, //size,
+		0,
 		false,        //extend,
 		allocationID, // allocID,
 		0,            //lock,
 		"",           //addBlobberId,
 		"",           //addBlobberAuthTicket
 		"",           //removeBlobberId,
-		false,        //thirdPartyExtendable,
+		"",           //owner,
+		"",           //ownerSigninPublicKey
+		false,        // thirdPartyExtendable
 		&sdk.FileOptionsParameters{
 			ForbidUpload: sdk.FileOptionParam{Changed: true, Value: true},
 			ForbidDelete: sdk.FileOptionParam{Changed: true, Value: true},
@@ -204,6 +213,7 @@ func freezeAllocation(allocationID string) (string, error) {
 			ForbidCopy:   sdk.FileOptionParam{Changed: true, Value: true},
 			ForbidRename: sdk.FileOptionParam{Changed: true, Value: true},
 		},
+		"",
 	)
 
 	if err == nil {
@@ -238,10 +248,10 @@ func cancelAllocation(allocationID string) (string, error) {
 //   - addBlobberAuthTicket: blobber auth ticket to add to the allocation, in case of restricted blobbers
 //   - removeBlobberId: blobber ID to remove from the allocation
 func updateAllocationWithRepair(allocationID string,
-	size int64,
+	size, authRoundExpiry int64,
 	extend bool,
 	lock int64,
-	addBlobberId, addBlobberAuthTicket, removeBlobberId, callbackFuncName string) (string, error) {
+	addBlobberId, addBlobberAuthTicket, removeBlobberId, ownerSigninPublicKey, updateAllocTicket, callbackFuncName string) (string, error) {
 	sdk.SetWasm()
 	allocationObj, err := sdk.GetAllocation(allocationID)
 	if err != nil {
@@ -258,7 +268,7 @@ func updateAllocationWithRepair(allocationID string,
 		}
 	}
 
-	alloc, hash, isRepairRequired, err := allocationObj.UpdateWithStatus(size, extend, uint64(lock), addBlobberId, addBlobberAuthTicket, removeBlobberId, false, &sdk.FileOptionsParameters{}, statusBar)
+	alloc, hash, isRepairRequired, err := allocationObj.UpdateWithStatus(size, authRoundExpiry, extend, uint64(lock), addBlobberId, addBlobberAuthTicket, removeBlobberId, ownerSigninPublicKey, false, &sdk.FileOptionsParameters{}, updateAllocTicket)
 	if err != nil {
 		return hash, err
 	}
@@ -292,10 +302,10 @@ func updateAllocationWithRepair(allocationID string,
 //   - removeBlobberId: blobber ID to remove from the allocation
 //   - setThirdPartyExtendable: third party extendable flag, if true, the allocation can be extended (in terms of size) by a non-owner client
 func updateAllocation(allocationID string,
-	size int64, extend bool,
+	size, authRoundExpiry int64, extend bool,
 	lock int64,
-	addBlobberId, addBlobberAuthTicket, removeBlobberId string, setThirdPartyExtendable bool) (string, error) {
-	hash, _, err := sdk.UpdateAllocation(size, extend, allocationID, uint64(lock), addBlobberId, addBlobberAuthTicket, removeBlobberId, setThirdPartyExtendable, &sdk.FileOptionsParameters{})
+	addBlobberId, addBlobberAuthTicket, removeBlobberId, ownerSigninPublicKey string, setThirdPartyExtendable bool) (string, error) {
+	hash, _, err := sdk.UpdateAllocation(size, authRoundExpiry, extend, allocationID, uint64(lock), addBlobberId, addBlobberAuthTicket, removeBlobberId, "", ownerSigninPublicKey, setThirdPartyExtendable, &sdk.FileOptionsParameters{}, "")
 
 	if err == nil {
 		clearAllocation(allocationID)
@@ -304,6 +314,14 @@ func updateAllocation(allocationID string,
 	return hash, err
 }
 
+func getUpdateAllocTicket(allocationID, userID, operationType string, roundExpiry int64) (string, error) {
+	sign, err := sdk.GetUpdateAllocTicket(allocationID, userID, operationType, roundExpiry)
+	if err != nil {
+		return "", err
+	}
+	return sign, err
+}
+
 // getAllocationMinLock retrieves the minimum lock value for the allocation creation, as calculated by the network.
 // Lock value is the amount of tokens that the client needs to lock in the allocation's write pool
 // to be able to pay for the write operations.
@@ -398,8 +416,8 @@ func lockStakePool(providerType, tokens, fee uint64, providerID string) (string,
 //   - providerType: provider type (1: miner, 2:sharder, 3:blobber, 4:validator, 5:authorizer)
 //   - fee: transaction fees (in SAS)
 //   - providerID: provider id
-func unlockStakePool(providerType, fee uint64, providerID string) (int64, error) {
-	unstake, _, err := sdk.StakePoolUnlock(sdk.ProviderType(providerType), providerID, fee)
+func unlockStakePool(providerType, fee uint64, providerID, clientID string) (int64, error) {
+	unstake, _, err := sdk.StakePoolUnlock(sdk.ProviderType(providerType), providerID, clientID, fee)
 	return unstake, err
 }
 

wasmsdk/auth_txn.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"syscall/js"
 
-	"github.com/0chain/gosdk_common/core/sys"
-	"github.com/0chain/gosdk_common/wasmsdk/jsbridge"
-	"github.com/0chain/gosdk_common/zcncore"
+	"github.com/0chain/gosdk/core/sys"
+	"github.com/0chain/gosdk/wasmsdk/jsbridge"
+	"github.com/0chain/gosdk/zcncore"
 )
 
 type AuthCallbackFunc func(msg string) string

wasmsdk/blobber.go

@@ -15,18 +15,19 @@ import (
 	"syscall/js"
 	"time"
 
-	"github.com/0chain/gosdk_common/constants"
-	"github.com/0chain/gosdk_common/core/common"
-	"github.com/0chain/gosdk_common/core/encryption"
-	"github.com/0chain/gosdk_common/core/pathutil"
-	"github.com/0chain/gosdk_common/core/sys"
+	"github.com/0chain/gosdk/constants"
+	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/core/common"
+	"github.com/0chain/gosdk/core/encryption"
+	"github.com/0chain/gosdk/core/pathutil"
+	"github.com/0chain/gosdk/core/sys"
 	"github.com/hack-pad/safejs"
 
+	"github.com/0chain/gosdk/core/transaction"
+	"github.com/0chain/gosdk/wasmsdk/jsbridge"
+	"github.com/0chain/gosdk/zboxcore/fileref"
 	"github.com/0chain/gosdk/zboxcore/sdk"
-	"github.com/0chain/gosdk_common/core/transaction"
-	"github.com/0chain/gosdk_common/wasmsdk/jsbridge"
-	"github.com/0chain/gosdk_common/zboxcore/fileref"
-	"github.com/0chain/gosdk_common/zboxcore/zboxutil"
+	"github.com/0chain/gosdk/zboxcore/zboxutil"
 
 	"github.com/hack-pad/go-webworkers/worker"
 )
@@ -478,7 +479,9 @@ func multiDownload(allocationID, jsonMultiDownloadOptions, authTicket, callbackF
 		}
 		var mf sys.File
 		if option.DownloadToDisk {
-			terminateWorkersWithAllocation(alloc)
+			if option.SuggestedName != "" {
+				fileName = option.SuggestedName
+			}
 			mf, err = jsbridge.NewFileWriter(fileName)
 			if err != nil {
 				PrintError(err.Error())
@@ -589,6 +592,7 @@ type MultiDownloadOption struct {
 	RemoteFileName   string `json:"remoteFileName"`             //Required only for file download with auth ticket
 	RemoteLookupHash string `json:"remoteLookupHash,omitempty"` //Required only for file download with auth ticket
 	DownloadToDisk   bool   `json:"downloadToDisk"`
+	SuggestedName    string `json:"suggestedName,omitempty"` //Suggested name for the file when downloading to disk, if empty will use base of remote path
 }
 
 // MultiOperation do copy, move, delete and createdir operation together
@@ -1133,6 +1137,9 @@ func checkAllocStatus(allocationID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	if client.Wallet().ClientID != alloc.Owner {
+		return "", errors.New("client id does not match with the allocation owner")
+	}
 	status, blobberStatus, err := alloc.CheckAllocStatus()
 	var statusStr string
 	switch status {
@@ -1245,6 +1252,14 @@ func cancelDownloadDirectory(remotePath string) {
 	downloadDirLock.Unlock()
 }
 
+func cancelDownloadBlocks(allocationID, remotePath string, start, end int64) error {
+	alloc, err := getAllocation(allocationID)
+	if err != nil {
+		return err
+	}
+	return alloc.CancelDownloadBlocks(remotePath, start, end)
+}
+
 func startListener(respChan chan string) error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

wasmsdk/bridge.go

@@ -4,18 +4,17 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/zcnbridge"
+	"github.com/0chain/gosdk/zcnbridge/errors"
+	"github.com/0chain/gosdk/zcnbridge/log"
+	"github.com/0chain/gosdk/zcncore"
+	"github.com/ethereum/go-ethereum/ethclient"
 	"path"
 	"strconv"
-
-	"github.com/0chain/gosdk_common/core/client"
-	"github.com/0chain/gosdk_common/zcnbridge"
-	"github.com/0chain/gosdk_common/zcnbridge/errors"
-	"github.com/0chain/gosdk_common/zcnbridge/log"
-	"github.com/0chain/gosdk_common/zcncore"
-	"github.com/ethereum/go-ethereum/ethclient"
 )
 
-var bridge *zcnbridge.BridgeClient
+var bridge *zcnbridge.BridgeClient //nolint:unused
 
 // initBridge initializes the bridge client
 //   - ethereumAddress: ethereum address of the wallet owner
@@ -26,7 +25,7 @@ var bridge *zcnbridge.BridgeClient
 //   - gasLimit: gas limit for the transactions
 //   - value: value to be sent with the transaction (unused)
 //   - consensusThreshold: consensus threshold for the transactions
-func initBridge(
+func initBridge( //nolint:unused
 	ethereumAddress string,
 	bridgeAddress string,
 	authorizersAddress string,
@@ -84,7 +83,9 @@ func burnZCN(amount uint64) string { //nolint
 //   - burnTrxHash: hash of the burn transaction
 //   - timeout: timeout in seconds
 func mintZCN(burnTrxHash string, timeout int) string { //nolint
-	mintPayload, err := bridge.QueryZChainMintPayload(burnTrxHash)
+	mintPayload,
+
+		err := bridge.QueryZChainMintPayload(burnTrxHash)
 	if err != nil {
 		return errors.Wrap("mintZCN", "failed to QueryZChainMintPayload", err).Error()
 	}
@@ -114,19 +115,18 @@ func getMintWZCNPayload(burnTrxHash string) string { //nolint:unused
 }
 
 // getNotProcessedWZCNBurnEvents returns all not processed WZCN burn events from the Ethereum network
-func getNotProcessedWZCNBurnEvents() string {
+func getNotProcessedWZCNBurnEvents() string { //nolint:unused
 	var (
 		mintNonce int64
 		res       []byte
 		err       error
 	)
-
 	if res, err = zcncore.GetMintNonce(); err != nil {
 		return errors.Wrap("getNotProcessedWZCNBurnEvents", "failed to retreive last ZCN processed mint nonce", err).Error()
 	}
 
 	if err = json.Unmarshal(res, &mintNonce); err != nil {
-		return errors.New("getNotProcessedWZCNBurnEvents", "failed to unmarshall last ZCN processed mint nonce").Error()
+		return errors.Wrap("getNotProcessedWZCNBurnEvents", "failed to unmarshal last ZCN processed mint nonce", err).Error()
 	}
 
 	log.Logger.Debug("MintNonce = " + strconv.Itoa(int(mintNonce)))
@@ -162,7 +162,7 @@ func getNotProcessedZCNBurnTickets() string { //nolint:unused
 	}
 
 	if err = json.Unmarshal(res, &burnTickets); err != nil {
-		return errors.New("getNotProcessedZCNBurnTickets", "failed to unmarshall ZCN burn tickets").Error()
+		return errors.Wrap("getNotProcessedZCNBurnTickets", "failed to unmarshal ZCN burn tickets", err).Error()
 	}
 
 	var result []byte

wasmsdk/cache.go

@@ -8,9 +8,9 @@ import (
 	"errors"
 	"time"
 
+	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/wasmsdk/jsbridge"
 	"github.com/0chain/gosdk/zboxcore/sdk"
-	"github.com/0chain/gosdk_common/core/client"
-	"github.com/0chain/gosdk_common/wasmsdk/jsbridge"
 	lru "github.com/hashicorp/golang-lru/v2"
 )
 

wasmsdk/chunked_upload_progress_storer.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/0chain/gosdk/zboxcore/sdk"
-	"github.com/0chain/gosdk_common/zboxcore/zboxutil"
+	"github.com/0chain/gosdk/zboxcore/zboxutil"
 )
 
 // chunkedUploadProgressStorer load and save upload progress

wasmsdk/common.go

@@ -7,8 +7,8 @@ import (
 	"errors"
 	"syscall/js"
 
+	"github.com/0chain/gosdk/wasmsdk/jsbridge"
 	"github.com/0chain/gosdk/zboxcore/sdk"
-	"github.com/0chain/gosdk_common/wasmsdk/jsbridge"
 )
 
 // PrintError is to print to stderr
@@ -89,11 +89,3 @@ func (h *hasher) WriteToValidationMT(_ []byte) error {
 func (h *hasher) Finalize() error {
 	return nil
 }
-
-func (h *hasher) GetBlockHash() (string, error) {
-	return "", nil
-}
-
-func (h *hasher) WriteToBlockHasher(buf []byte) error {
-	return nil
-}