Hotfix: added supported type for transaction creation method for mobi…

…le (#1616) * fix: added supported type for transaction creation method * fix: fixed bugs * Updated go version for andriod build in build-sdks.yml * fix: fixed bugs * fix: fixed bugs * fix: provided separation for blobber operation * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * fix: fixed bugs * update go in build-sdks.yml --------- Co-authored-by: shahnawaz-creator <[email protected]>
0chain · Sep 21, 2024 · 293cd4a · 293cd4a
1 parent 21ce33a
commit 293cd4a
Show file tree

Hide file tree

Showing 12 changed files with 992 additions and 446 deletions.
diff --git a/.github/workflows/build-sdks.yml b/.github/workflows/build-sdks.yml
@@ -24,10 +24,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.x
+      - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22
 
       - name: Clean build
         run: make clean-mobilesdk
@@ -96,10 +96,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.x
+      - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22
 
       - name: Install deps
         run: |
@@ -199,10 +199,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.x
+      - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22
 
       - name: Clean build
         run: make clean-mobilesdk
@@ -271,10 +271,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Set up Go 1.x
+      - name: Set up Go 1.22
         uses: actions/setup-go@v3
         with:
-          go-version: 1.21.5
+          go-version: 1.22
 
       - name: Install deps
         run: |

diff --git a/mobilesdk/sdk/sdk.go b/mobilesdk/sdk/sdk.go
@@ -343,8 +343,8 @@ func (s *StorageSDK) GetReadPoolInfo(clientID string) (string, error) {
 func (s *StorageSDK) WritePoolLock(durInSeconds int64, tokens, fee float64, allocID string) error {
 	_, _, err := sdk.WritePoolLock(
 		allocID,
-		zcncore.ConvertTokenToSAS(tokens),
-		zcncore.ConvertTokenToSAS(fee))
+		strconv.FormatUint(zcncore.ConvertTokenToSAS(tokens), 10),
+		strconv.FormatUint(zcncore.ConvertTokenToSAS(fee), 10))
 	return err
 }
 
@@ -406,7 +406,7 @@ func (s *StorageSDK) RedeemFreeStorage(ticket string) (string, error) {
 		return "", fmt.Errorf("invalid_free_marker: free marker is not assigned to your wallet")
 	}
 
-	hash, _, err := sdk.CreateFreeAllocation(marker, lock)
+	hash, _, err := sdk.CreateFreeAllocation(marker, strconv.FormatUint(lock, 10))
 	return hash, err
 }
 

diff --git a/mobilesdk/zcn/readpool.go b/mobilesdk/zcn/readpool.go
@@ -4,7 +4,6 @@
 package zcn
 
 import (
-	"github.com/0chain/gosdk/core/util"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 )
 
@@ -13,29 +12,16 @@ import (
 //   - tokens:  sas tokens
 //   - fee: sas tokens
 func ReadPoolLock(tokens, fee string) (string, error) {
-	t, err := util.ParseCoinStr(tokens)
-	if err != nil {
-		return "", err
-	}
+	hash, _, err := sdk.ReadPoolLock(tokens, fee)
 
-	f, err := util.ParseCoinStr(fee)
-	if err != nil {
-		return "", err
-	}
-
-	hash, _, err := sdk.ReadPoolLock(t, f)
 	return hash, err
 }
 
 // ReadPoolUnLock unlocks all the tokens in the readpool associated with the current wallet.
 // ## Inputs
 //   - fee: sas tokens
 func ReadPoolUnLock(fee string) (string, error) {
-	f, err := util.ParseCoinStr(fee)
-	if err != nil {
-		return "", err
-	}
+	hash, _, err := sdk.ReadPoolUnlock(fee)
 
-	hash, _, err := sdk.ReadPoolUnlock(f)
 	return hash, err
 }
diff --git a/mobilesdk/zcn/smartcontract.go b/mobilesdk/zcn/smartcontract.go
@@ -6,7 +6,6 @@ package zcn
 import (
 	"encoding/json"
 	"fmt"
-	"strconv"
 	"sync"
 
 	"github.com/0chain/gosdk/zcncore"
@@ -17,22 +16,17 @@ func Faucet(methodName, jsonInput string, zcnToken float64) (string, error) {
 	return ExecuteSmartContract(zcncore.FaucetSmartContractAddress, methodName, jsonInput, zcncore.ConvertToValue(zcnToken))
 }
 
-func ExecuteSmartContract(address, methodName, input string, sasToken string) (string, error) {
+func ExecuteSmartContract(address, methodName, input, sasToken string) (string, error) {
 	wg := &sync.WaitGroup{}
 	cb := &transactionCallback{wg: wg}
-	txn, err := zcncore.NewTransaction(cb, 0, 0)
+	txn, err := zcncore.NewTransaction(cb, "0", 0)
 	if err != nil {
 		return "", err
 	}
 
 	wg.Add(1)
 
-	v, err := strconv.ParseUint(sasToken, 10, 64)
-	if err != nil {
-		return "", fmt.Errorf("invalid token value: %v, err: %v", sasToken, err)
-	}
-
-	_, err = txn.ExecuteSmartContract(address, methodName, input, v)
+	_, err = txn.ExecuteSmartContract(address, methodName, input, sasToken)
 	if err != nil {
 		return "", err
 

diff --git a/mobilesdk/zcn/writepool.go b/mobilesdk/zcn/writepool.go
@@ -4,7 +4,6 @@
 package zcn
 
 import (
-	"github.com/0chain/gosdk/core/util"
 	"github.com/0chain/gosdk/zboxcore/sdk"
 )
 
@@ -14,13 +13,7 @@ import (
 //   - tokens:  sas tokens
 //   - fee: sas tokens
 func WritePoolLock(allocID string, tokens, fee string) (string, error) {
-	t, err := util.ParseCoinStr(tokens)
-	if err != nil {
-		return "", err
-	}
-
-	f, err := util.ParseCoinStr(fee)
-	hash, _, err := sdk.WritePoolLock(allocID, t, f)
+	hash, _, err := sdk.WritePoolLock(allocID, tokens, fee)
 
 	return hash, err
 }