Merge branch '0chain:feat/enterprise-blobber' into feat/enterprise-bl…

…obber
0chain · Nov 8, 2024 · 2b8606c · 2b8606c
2 parents 918f6ef + 655bacd
commit 2b8606c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/build-sdks.yml b/.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

diff --git a/.github/workflows/tests.yml b/.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:

diff --git a/go.mod b/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

diff --git a/wasmsdk/jsbridge/template_data.go b/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,

diff --git a/wasmsdk/jsbridge/webworker.go b/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),
 	}
 

diff --git a/wasmsdk/jsbridge/zcnworker.js.tpl b/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}}

diff --git a/wasmsdk/proxy.go b/wasmsdk/proxy.go
@@ -350,6 +350,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()) {