Merge branch 'sprint-1.18' into fix/refactor-zboxcore-mobilesdk-fixes

core/client/set.go

@@ -5,9 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"strings"
-
 	"github.com/0chain/gosdk/core/conf"
+	"strings"
 
 	"github.com/0chain/gosdk/constants"
 	"github.com/0chain/gosdk/core/sys"
@@ -64,7 +63,6 @@ func init() {
 
 	sys.Verify = verifySignature
 	sys.VerifyWith = verifySignatureWith
-	sys.VerifyEd25519With = verifyEd25519With
 }
 
 func signHash(hash string, signatureScheme string, keys []sys.KeyPair) (string, error) {
@@ -106,15 +104,6 @@ func verifySignatureWith(pubKey, signature, hash string) (bool, error) {
 	return sch.Verify(signature, hash)
 }
 
-func verifyEd25519With(pubKey, signature, hash string) (bool, error) {
-	sch := zcncrypto.NewSignatureScheme(constants.ED25519.String())
-	err := sch.SetPublicKey(pubKey)
-	if err != nil {
-		return false, err
-	}
-	return sch.Verify(signature, hash)
-}
-
 func GetClientSysKeys(clients ...string) []sys.KeyPair {
 	var wallet *zcncrypto.Wallet
 	if len(clients) > 0 && clients[0] != "" && client.wallets[clients[0]] != nil {

core/sys/vars.go

@@ -26,8 +26,6 @@ var (
 	Authorize AuthorizeFunc
 
 	AuthCommon AuthorizeFunc
-
-	VerifyEd25519With VerifyWithFunc
 )
 
 // SetAuthorize sets the authorize callback function

zboxcore/fileref/fileref.go

@@ -51,7 +51,6 @@ type FileRef struct {
 	EncryptedKey            string         `json:"encrypted_key" mapstructure:"encrypted_key"`
 	EncryptedKeyPoint       string         `json:"encrypted_key_point" mapstructure:"encrypted_key_point"`
 	Collaborators           []Collaborator `json:"collaborators" mapstructure:"collaborators"`
-	SignatureVersion        int            `json:"signature_version" mapstructure:"signature_version"`
 }
 
 func (fRef *FileRef) MetaID() string {

zboxcore/sdk/allocation.go

@@ -3,11 +3,11 @@ package sdk
 import (
 	"bytes"
 	"context"
-	"crypto/ed25519"
 	"encoding/base64"
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/core/transaction"
 	"io"
 	"math"
 	"mime/multipart"
@@ -22,9 +22,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/0chain/gosdk/core/client"
-	"github.com/0chain/gosdk/core/transaction"
-
 	"github.com/0chain/common/core/currency"
 	"github.com/0chain/errors"
 	thrown "github.com/0chain/errors"
@@ -279,9 +276,6 @@ type Allocation struct {
 
 	StorageVersion int `json:"storage_version"`
 
-	// Owner ecdsa public key
-	OwnerSigningPublicKey string `json:"owner_signing_public_key"`
-
 	// FileOptions to define file restrictions on an allocation for third-parties
 	// default 00000000 for all crud operations suggesting only owner has the below listed abilities.
 	// enabling option/s allows any third party to perform certain ops
@@ -309,9 +303,8 @@ type Allocation struct {
 	// conseususes
 	consensusThreshold int
 	fullconsensus      int
-	sig                string             `json:"-"`
-	allocationRoot     string             `json:"-"`
-	privateSigningKey  ed25519.PrivateKey `json:"-"`
+	sig                string `json:"-"`
+	allocationRoot     string `json:"-"`
 }
 
 // OperationRequest represents an operation request with its related options.
@@ -436,7 +429,6 @@ func (a *Allocation) InitAllocation() {
 			}
 		}
 	}
-	a.generateAndSetOwnerSigningPublicKey()
 	a.startWorker(a.ctx)
 	InitCommitWorker(a.Blobbers)
 	InitBlockDownloader(a.Blobbers, downloadWorkerCount)
@@ -446,21 +438,6 @@ func (a *Allocation) InitAllocation() {
 	a.initialized = true
 }
 
-func (a *Allocation) generateAndSetOwnerSigningPublicKey() {
-	//create ecdsa public key from signature
-	privateSigningKey, err := generateOwnerSigningKey(a.OwnerPublicKey, a.Owner)
-	if err != nil {
-		l.Logger.Error("Failed to generate owner signing key", zap.Error(err))
-		return
-	}
-	if a.OwnerSigningPublicKey == "" {
-		pubKey := privateSigningKey.Public().(ed25519.PublicKey)
-		a.OwnerSigningPublicKey = hex.EncodeToString(pubKey)
-		//TODO: save this public key to blockchain
-	}
-	a.privateSigningKey = privateSigningKey
-}
-
 func (a *Allocation) isInitialized() bool {
 	return a.initialized && client.IsSDKInitialized()
 }
@@ -1362,7 +1339,6 @@ func (a *Allocation) generateDownloadRequest(
 	downloadReq.allocOwnerID = a.Owner
 	downloadReq.sig = a.sig
 	downloadReq.allocOwnerPubKey = a.OwnerPublicKey
-	downloadReq.allocOwnerSigningPubKey = a.OwnerSigningPublicKey
 	downloadReq.ctx, downloadReq.ctxCncl = context.WithCancel(a.ctx)
 	downloadReq.fileHandler = fileHandler
 	downloadReq.localFilePath = localFilePath
@@ -2796,7 +2772,6 @@ func (a *Allocation) downloadFromAuthTicket(fileHandler sys.File, authTicket str
 	downloadReq.sig = a.sig
 	downloadReq.allocOwnerID = a.Owner
 	downloadReq.allocOwnerPubKey = a.OwnerPublicKey
-	downloadReq.allocOwnerSigningPubKey = a.OwnerSigningPublicKey
 	downloadReq.ctx, downloadReq.ctxCncl = context.WithCancel(a.ctx)
 	downloadReq.fileHandler = fileHandler
 	downloadReq.localFilePath = localFilePath

zboxcore/sdk/blobber_operations.go

@@ -1,18 +1,11 @@
 package sdk
 
 import (
-	"crypto/ed25519"
-	"encoding/hex"
 	"encoding/json"
-	"fmt"
-	"math"
-
 	"github.com/0chain/errors"
 	"github.com/0chain/gosdk/core/client"
-	"github.com/0chain/gosdk/core/encryption"
 	"github.com/0chain/gosdk/core/transaction"
-	"github.com/0chain/gosdk/zboxcore/logger"
-	"go.uber.org/zap"
+	"math"
 )
 
 // CreateAllocationForOwner creates a new allocation with the given options (txn: `storagesc.new_allocation_request`).
@@ -55,20 +48,12 @@ func CreateAllocationForOwner(
 		return "", 0, nil, sdkNotInitialized
 	}
 
-	privateSigningKey, err := generateOwnerSigningKey(ownerpublickey, owner)
-	if err != nil {
-		return "", 0, nil, errors.New("failed_generate_owner_signing_key", "failed to generate owner signing key: "+err.Error())
-	}
-	pub := privateSigningKey.Public().(ed25519.PublicKey)
-	pk := hex.EncodeToString(pub)
-
 	allocationRequest["owner_id"] = owner
 	allocationRequest["owner_public_key"] = ownerpublickey
 	allocationRequest["third_party_extendable"] = thirdPartyExtendable
 	allocationRequest["file_options_changed"], allocationRequest["file_options"] = calculateAllocationFileOptions(63 /*0011 1111*/, fileOptionsParams)
 	allocationRequest["is_enterprise"] = IsEnterprise
 	allocationRequest["storage_version"] = StorageV2
-	allocationRequest["owner_signing_public_key"] = pk
 
 	var sn = transaction.SmartContractTxnData{
 		Name:      transaction.NEW_ALLOCATION_REQUEST,
@@ -320,19 +305,3 @@ func WritePoolUnlock(allocID string, fee uint64) (hash string, nonce int64, err
 	hash, _, nonce, _, err = transaction.SmartContractTxnValueFeeWithRetry(STORAGE_SCADDRESS, sn, 0, fee, true)
 	return
 }
-
-func generateOwnerSigningKey(ownerPublicKey, ownerID string) (ed25519.PrivateKey, error) {
-	if ownerPublicKey == "" {
-		return nil, errors.New("owner_public_key_required", "owner public key is required")
-	}
-	hashData := fmt.Sprintf("%s:%s", ownerPublicKey, "owner_signing_public_key")
-	sig, err := client.Sign(encryption.Hash(hashData), ownerID)
-	if err != nil {
-		logger.Logger.Error("error during sign", zap.Error(err))
-		return nil, err
-	}
-	//use this signature as entropy to generate ecdsa key pair
-	decodedSig, _ := hex.DecodeString(sig)
-	privateSigningKey := ed25519.NewKeyFromSeed(decodedSig[:32])
-	return privateSigningKey, nil
-}

zboxcore/sdk/chunked_upload.go

@@ -292,7 +292,7 @@ func CreateChunkedUpload(
 
 	su.chunkReader = cReader
 
-	su.formBuilder = CreateChunkedUploadFormBuilder(su.allocationObj.StorageVersion, su.allocationObj.privateSigningKey)
+	su.formBuilder = CreateChunkedUploadFormBuilder(su.allocationObj.StorageVersion)
 
 	su.isRepair = isRepair
 	uploadWorker, uploadRequest := calculateWorkersAndRequests(su.allocationObj.DataShards, len(su.blobbers), su.chunkNumber)

zboxcore/sdk/chunked_upload_form_builder.go

@@ -2,17 +2,15 @@ package sdk
 
 import (
 	"bytes"
-	"crypto"
-	"crypto/ed25519"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
 	"mime/multipart"
 	"sync"
 
-	"github.com/0chain/gosdk/core/client"
 	"github.com/0chain/gosdk/core/encryption"
+	"github.com/0chain/gosdk/core/client"
 
 	"golang.org/x/crypto/sha3"
 )
@@ -39,16 +37,14 @@ type ChunkedUploadFormMetadata struct {
 }
 
 // CreateChunkedUploadFormBuilder create ChunkedUploadFormBuilder instance
-func CreateChunkedUploadFormBuilder(storageVersion int, privateSigningKey ed25519.PrivateKey) ChunkedUploadFormBuilder {
+func CreateChunkedUploadFormBuilder(storageVersion int) ChunkedUploadFormBuilder {
 	return &chunkedUploadFormBuilder{
 		storageVersion,
-		privateSigningKey,
 	}
 }
 
 type chunkedUploadFormBuilder struct {
-	storageVersion    int
-	privateSigningKey ed25519.PrivateKey
+	storageVersion int
 }
 
 const MAX_BLOCKS = 80 // 5MB(CHUNK_SIZE*80)
@@ -100,10 +96,6 @@ func (b *chunkedUploadFormBuilder) Build(
 		CustomMeta:        fileMeta.CustomMeta,
 	}
 
-	if b.privateSigningKey != nil {
-		formData.SignatureVersion = SignatureV2
-	}
-
 	for i := 0; i < numBodies; i++ {
 
 		startRange := i * MAX_BLOCKS
@@ -176,42 +168,25 @@ func (b *chunkedUploadFormBuilder) Build(
 			for err := range errChan {
 				return res, err
 			}
-			if b.privateSigningKey != nil {
-				decodedHash, _ := hex.DecodeString(fileMeta.ActualHash)
-				sig, err := b.privateSigningKey.Sign(nil, decodedHash, crypto.Hash(0))
-				if err != nil {
-					return res, err
-				}
-				formData.ActualFileHashSignature = hex.EncodeToString(sig)
-			} else {
-				sig, err := client.Sign(fileMeta.ActualHash)
-				if err != nil {
-					return res, err
-				}
-				formData.ActualFileHashSignature = sig
+			actualHashSignature, err := client.Sign(fileMeta.ActualHash)
+			if err != nil {
+				return res, err
 			}
-			hash := formData.ActualFileHashSignature + formData.ValidationRoot
+			hash := actualHashSignature + formData.ValidationRoot
 			if b.storageVersion == StorageV2 {
 				hashData := fmt.Sprintf("%s:%s:%s:%s", fileMeta.ActualHash, formData.ValidationRoot, formData.FixedMerkleRoot, blobberID)
 				hash = encryption.Hash(hashData)
 			}
-			if b.privateSigningKey != nil {
-				decodedHash, _ := hex.DecodeString(hash)
-				sig, err := b.privateSigningKey.Sign(nil, decodedHash, crypto.Hash(0))
-				if err != nil {
-					return res, err
-				}
-				formData.ValidationRootSignature = hex.EncodeToString(sig)
-			} else {
-				rootSig, err := client.Sign(hash)
-				if err != nil {
-					return res, err
-				}
-				formData.ValidationRootSignature = rootSig
+			validationRootSignature, err := client.Sign(hash)
+			if err != nil {
+				return res, err
 			}
 
 			formData.ActualHash = fileMeta.ActualHash
+			formData.ActualFileHashSignature = actualHashSignature
+			formData.ValidationRootSignature = validationRootSignature
 			formData.ActualSize = fileMeta.ActualSize
+
 		}
 
 		thumbnailSize := len(thumbnailChunkData)

zboxcore/sdk/chunked_upload_form_builder_bench_test.go

@@ -53,7 +53,7 @@ func BenchmarkChunkedUploadFormBuilder(b *testing.B) {
 
 			for i := 0; i < b.N; i++ {
 
-				builder := CreateChunkedUploadFormBuilder(0, nil)
+				builder := CreateChunkedUploadFormBuilder(0)
 
 				isFinal := false
 

zboxcore/sdk/chunked_upload_model.go

@@ -20,8 +20,6 @@ import (
 	"golang.org/x/crypto/sha3"
 )
 
-const SignatureV2 = 1
-
 // ChunkedUpload upload manager with chunked upload feature
 type ChunkedUpload struct {
 	consensus Consensus
@@ -166,13 +164,13 @@ type UploadFormData struct {
 	EncryptedKey      string `json:"encrypted_key,omitempty"`
 	EncryptedKeyPoint string `json:"encrypted_key_point,omitempty"`
 
-	IsFinal          bool  `json:"is_final,omitempty"`          // all of chunks are uploaded
-	ChunkStartIndex  int   `json:"chunk_start_index,omitempty"` // start index of chunks.
-	ChunkEndIndex    int   `json:"chunk_end_index,omitempty"`   // end index of chunks. all chunks MUST be uploaded one by one because of streaming merkle hash
-	ChunkSize        int64 `json:"chunk_size,omitempty"`        // the size of a chunk. 64*1024 is default
-	UploadOffset     int64 `json:"upload_offset,omitempty"`     // It is next position that new incoming chunk should be append to
-	Size             int64 `json:"size"`                        // total size of shard
-	SignatureVersion int   `json:"signature_version,omitempty"`
+	IsFinal         bool  `json:"is_final,omitempty"`          // all of chunks are uploaded
+	ChunkStartIndex int   `json:"chunk_start_index,omitempty"` // start index of chunks.
+	ChunkEndIndex   int   `json:"chunk_end_index,omitempty"`   // end index of chunks. all chunks MUST be uploaded one by one because of streaming merkle hash
+	ChunkSize       int64 `json:"chunk_size,omitempty"`        // the size of a chunk. 64*1024 is default
+	UploadOffset    int64 `json:"upload_offset,omitempty"`     // It is next position that new incoming chunk should be append to
+	Size            int64 `json:"size"`                        // total size of shard
+
 }
 
 // UploadProgress progress of upload

zboxcore/sdk/chunked_upload_process_js.go

@@ -6,7 +6,6 @@ package sdk
 import (
 	"bytes"
 	"context"
-	"crypto/ed25519"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -55,7 +54,6 @@ type ChunkedUploadFormInfo struct {
 	AllocationTx      string
 	OnlyHash          bool
 	StorageVersion    int
-	PrivateSigningKey ed25519.PrivateKey
 }
 
 // createUploadProgress create a new UploadProgress
@@ -120,7 +118,6 @@ func (su *ChunkedUpload) processUpload(chunkStartIndex, chunkEndIndex int,
 		AllocationTx:      su.allocationObj.Tx,
 		OnlyHash:          chunkEndIndex <= su.progress.ChunkIndex,
 		StorageVersion:    su.allocationObj.StorageVersion,
-		PrivateSigningKey: su.allocationObj.privateSigningKey,
 	}
 	formInfoJSON, err := json.Marshal(formInfo)
 	if err != nil {
@@ -458,7 +455,7 @@ func ProcessEventData(data safejs.Value) {
 		defer delete(hasherMap, fileMeta.RemotePath)
 	}
 	blobberID := os.Getenv("BLOBBER_ID")
-	formBuilder := CreateChunkedUploadFormBuilder(formInfo.StorageVersion, formInfo.PrivateSigningKey)
+	formBuilder := CreateChunkedUploadFormBuilder(formInfo.StorageVersion)
 	uploadData, err := formBuilder.Build(fileMeta, wp.hasher, formInfo.ConnectionID, blobberID, formInfo.ChunkSize, formInfo.ChunkStartIndex, formInfo.ChunkEndIndex, formInfo.IsFinal, formInfo.EncryptedKey, formInfo.EncryptedKeyPoint,
 		fileShards, thumbnailChunkData, formInfo.ShardSize)
 	if err != nil {