Enterprise blobber

.github/workflows/build-sdks.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: 1.22.5
 
       - name: Clean build
         run: make clean-mobilesdk
@@ -99,7 +99,7 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: 1.22.5
 
       - name: Install deps
         run: |
@@ -202,7 +202,7 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: 1.22.5
 
       - name: Clean build
         run: make clean-mobilesdk
@@ -274,7 +274,7 @@ jobs:
       - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.22
+          go-version: 1.22.5
 
       - name: Install deps
         run: |
@@ -338,7 +338,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22.5
 
       - name: Checkout
         uses: actions/checkout@v2
@@ -349,7 +349,7 @@ jobs:
           sudo apt-get -y install build-essential nghttp2 libnghttp2-dev libssl-dev wget
 
       - name: Build
-        run:  docker run --rm -v $PWD:/gosdk -w /gosdk golang:1.21.5 make wasm-build
+        run:  docker run --rm -v $PWD:/gosdk -w /gosdk golang:1.22.5 make wasm-build
 
       - name: 'Upload Artifact'
         uses: actions/upload-artifact@v3

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22.5
 
       - uses: actions/checkout@v3
 
@@ -51,7 +51,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22.5
 
       - name: Install deps
         run: |
@@ -170,7 +170,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22.5
 
       - uses: actions/setup-node@v2
         with:

go.mod

@@ -1,6 +1,6 @@
 module github.com/0chain/gosdk
 
-go 1.21
+go 1.22.5
 
 require (
 	github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565

wasmsdk/common.go

@@ -89,3 +89,11 @@ 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
+}

wasmsdk/jsbridge/template_data.go

@@ -51,7 +51,7 @@ func buildJS(args, env []string, wasmPath string, tpl []byte) (string, error) {
 	if suffix == "" {
 		suffix = "dev"
 	}
-	cdnPath := fmt.Sprintf("https://d2os1u2xwjukgr.cloudfront.net/%s/zcn.wasm", suffix)
+	cdnPath := fmt.Sprintf("https://webapps-staticfiles.s3.us-east-2.amazonaws.com/%s/enterprise-zcn.wasm", suffix)
 	data := templateData{
 		Path:         cdnPath,
 		Args:         args,

wasmsdk/jsbridge/webworker.go

@@ -81,7 +81,7 @@ func NewWasmWebWorker(blobberID, blobberURL, clientID, clientKey, peerPublicKey,
 			"IS_SPLIT=" + strconv.FormatBool(isSplit),
 			"MNEMONIC=" + mnemonic,
 			"ZAUTH_SERVER=" + gZauthServer},
-		Path:        "zcn.wasm",
+		Path:        "enterprise-zcn.wasm",
 		subscribers: make(map[string]chan worker.MessageEvent),
 	}
 

wasmsdk/jsbridge/zcnworker.js.tpl

@@ -1,4 +1,4 @@
-importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.21.5/misc/wasm/wasm_exec.js','https://cdn.jsdelivr.net/gh/herumi/[email protected]/browser/bls.js');
+importScripts('https://cdn.jsdelivr.net/gh/golang/go@go1.22.5/misc/wasm/wasm_exec.js','https://cdn.jsdelivr.net/gh/herumi/[email protected]/browser/bls.js');
 
 const go = new Go();
 go.argv = {{.ArgsToJS}}

wasmsdk/proxy.go

@@ -216,6 +216,7 @@ func main() {
 				"getLookupHash":          getLookupHash,
 				"createThumbnail":        createThumbnail,
 				"makeSCRestAPICall":      makeSCRestAPICall,
+				"getWasmType":            getWasmType,
 
 				//blobber
 				"delete":                    Delete,
@@ -340,6 +341,7 @@ func main() {
 
 			fmt.Println("__wasm_initialized__ = true;")
 			zcn.Set("__wasm_initialized__", true)
+			zcn.Set("wasmType", "enterprise")
 		} else {
 			PrintError("__zcn_wasm__.sdk is not installed yet")
 		}
@@ -350,6 +352,7 @@ func main() {
 	}
 
 	if mode != "" {
+		fmt.Println("enterprise wasm sdk")
 		respChan := make(chan string, 1)
 		jsProxy := window.Get("__zcn_worker_wasm__")
 		if !(jsProxy.IsNull() || jsProxy.IsUndefined()) {

wasmsdk/sdk.go

@@ -69,6 +69,10 @@ func getVersion() string {
 	return sdk.GetVersion()
 }
 
+func getWasmType() string {
+	return "enterprise"
+}
+
 var sdkLogger *logger.Logger
 var zcnLogger *logger.Logger
 var logEnabled = false

zboxcore/allocationchange/newfile.go

@@ -35,23 +35,12 @@ func (ch *NewFileChange) ProcessChange(rootRef *fileref.Ref, fileIDMeta map[stri
 		return
 	}
 
-	if ch.File.ValidationRoot == "" {
-		err = errors.New("empty validation root field")
-		return
-	}
-
 	fileHashSign, err := client.Sign(ch.File.ActualFileHash)
 	if err != nil {
 		return
 	}
 
-	validationRootSign, err := client.Sign(fileHashSign + ch.File.ValidationRoot)
-	if err != nil {
-		return
-	}
-
 	ch.File.ActualFileHashSignature = fileHashSign
-	ch.File.ValidationRootSignature = validationRootSign
 
 	rootRef.HashToBeComputed = true
 	dirRef := rootRef

zboxcore/allocationchange/updatefile.go

@@ -23,23 +23,12 @@ func (ch *UpdateFileChange) ProcessChange(rootRef *fileref.Ref, _ map[string]str
 		return
 	}
 
-	if ch.NewFile.ValidationRoot == "" {
-		err = fmt.Errorf("empty validation root field")
-		return
-	}
-
 	fileHashSign, err := client.Sign(ch.NewFile.ActualFileHash)
 	if err != nil {
 		return
 	}
 
-	validationRootSign, err := client.Sign(fileHashSign + ch.NewFile.ValidationRoot)
-	if err != nil {
-		return
-	}
-
 	ch.NewFile.ActualFileHashSignature = fileHashSign
-	ch.NewFile.ValidationRootSignature = validationRootSign
 
 	fields, err := common.GetPathFields(pathutil.Dir(ch.NewFile.Path))
 

zboxcore/blockchain/entity.go

@@ -84,8 +84,9 @@ type UpdateValidationNode struct {
 
 // StorageNode represents a storage node (blobber)
 type StorageNode struct {
-	ID      string `json:"id"`
-	Baseurl string `json:"url"`
+	ID                string `json:"id"`
+	Baseurl           string `json:"url"`
+	AllocationVersion int64  `json:"-"`
 
 	skip uint64 `json:"-"` // skip on error
 }

zboxcore/fileref/fileref.go

@@ -33,16 +33,13 @@ type Collaborator struct {
 }
 
 type FileRef struct {
-	Ref            `mapstructure:",squash"`
-	CustomMeta     string `json:"custom_meta" mapstructure:"custom_meta"`
-	ValidationRoot string `json:"validation_root" mapstructure:"validation_root"`
+	Ref        `mapstructure:",squash"`
+	CustomMeta string `json:"custom_meta" mapstructure:"custom_meta"`
 	// ValidationRootSignature is signature signed by client for hash_of(ActualFileHashSignature + ValidationRoot)
-	ValidationRootSignature string `json:"validation_root_signature" mapstructure:"validation_root_signature"`
-	FixedMerkleRoot         string `json:"fixed_merkle_root" mapstructure:"fixed_merkle_root"`
-	ThumbnailSize           int64  `json:"thumbnail_size" mapstructure:"thumbnail_size"`
-	ThumbnailHash           string `json:"thumbnail_hash" mapstructure:"thumbnail_hash"`
-	ActualFileSize          int64  `json:"actual_file_size" mapstructure:"actual_file_size"`
-	ActualFileHash          string `json:"actual_file_hash" mapstructure:"actual_file_hash"`
+	ThumbnailSize  int64  `json:"thumbnail_size" mapstructure:"thumbnail_size"`
+	ThumbnailHash  string `json:"thumbnail_hash" mapstructure:"thumbnail_hash"`
+	ActualFileSize int64  `json:"actual_file_size" mapstructure:"actual_file_size"`
+	ActualFileHash string `json:"actual_file_hash" mapstructure:"actual_file_hash"`
 	// ActualFileHashSignature is signature signed by client for ActualFileHash
 	ActualFileHashSignature string         `json:"actual_file_hash_signature" mapstructure:"actual_file_hash_signature"`
 	ActualThumbnailSize     int64          `json:"actual_thumbnail_size" mapstructure:"actual_thumbnail_size"`
@@ -75,6 +72,7 @@ type RefEntity interface {
 	GetFileID() string
 	GetCreatedAt() common.Timestamp
 	GetUpdatedAt() common.Timestamp
+	GetAllocationVersion() int64
 }
 
 type Ref struct {
@@ -95,6 +93,8 @@ type Ref struct {
 	ThumbnailSize       int64  `json:"thumbnail_size" mapstructure:"thumbnail_size"`
 	ActualThumbnailHash string `json:"actual_thumbnail_hash" mapstructure:"actual_thumbnail_hash"`
 	ActualThumbnailSize int64  `json:"actual_thumbnail_size" mapstructure:"actual_thumbnail_size"`
+	IsEmpty             bool   `json:"is_empty" mapstructure:"is_empty"`
+	AllocationVersion   int64  `json:"allocation_version" mapstructure:"allocation_version"`
 	HashToBeComputed    bool
 	ChildrenLoaded      bool
 	Children            []RefEntity      `json:"-" mapstructure:"-"`
@@ -240,6 +240,10 @@ func (r *Ref) RemoveChild(idx int) {
 	r.Children = append(r.Children[:idx], r.Children[idx+1:]...)
 }
 
+func (r *Ref) GetAllocationVersion() int64 {
+	return r.AllocationVersion
+}
+
 func (fr *FileRef) GetFileMetaHash() string {
 	return fr.FileMetaHash
 }
@@ -252,14 +256,12 @@ func (fr *FileRef) GetFileMetaHashData() string {
 
 func (fr *FileRef) GetHashData() string {
 	return fmt.Sprintf(
-		"%s:%s:%s:%s:%d:%s:%s:%d:%s:%d:%s",
+		"%s:%s:%s:%s:%d:%d:%s:%d:%s",
 		fr.AllocationID,
 		fr.Type, // don't need to add it as well
 		fr.Name, // don't see any utility as fr.Path below has name in it
 		fr.Path,
 		fr.Size,
-		fr.ValidationRoot,
-		fr.FixedMerkleRoot,
 		fr.ActualFileSize,
 		fr.ActualFileHash,
 		fr.ChunkSize,

zboxcore/marker/versionmarker.go

@@ -0,0 +1,50 @@
+package marker
+
+import (
+	"fmt"
+
+	"github.com/0chain/errors"
+	"github.com/0chain/gosdk/core/encryption"
+	"github.com/0chain/gosdk/core/sys"
+	"github.com/0chain/gosdk/zboxcore/client"
+)
+
+type VersionMarker struct {
+	ClientID      string `json:"client_id"`
+	BlobberID     string `json:"blobber_id"`
+	AllocationID  string `json:"allocation_id"`
+	Version       int64  `json:"version"`
+	Timestamp     int64  `json:"timestamp"`
+	Signature     string `json:"signature"`
+	IsRepair      bool   `json:"is_repair"`
+	RepairVersion int64  `json:"repair_version"`
+	RepairOffset  string `json:"repair_offset"`
+}
+
+func (vm *VersionMarker) GetHashData() string {
+	return fmt.Sprintf("%s:%s:%s:%d:%d", vm.AllocationID, vm.ClientID, vm.BlobberID, vm.Version, vm.Timestamp)
+}
+
+func (vm *VersionMarker) GetHash() string {
+	sigData := vm.GetHashData()
+	return encryption.Hash(sigData)
+}
+
+func (vm *VersionMarker) Sign() error {
+	var err error
+	vm.Signature, err = client.Sign(vm.GetHash())
+	return err
+}
+
+func (vm *VersionMarker) VerifySignature(clientPublicKey string) error {
+	hashData := vm.GetHashData()
+	signatureHash := encryption.Hash(hashData)
+	sigOK, err := sys.Verify(vm.Signature, signatureHash)
+	if err != nil {
+		return errors.New("write_marker_validation_failed", "Error during verifying signature. "+err.Error())
+	}
+	if !sigOK {
+		return errors.New("write_marker_validation_failed", "Write marker signature is not valid")
+	}
+	return nil
+}