Fix/refactor zboxcore

.github/workflows/build-zwallet.yaml

@@ -35,13 +35,13 @@ jobs:
           go-version: '1.21' # The Go version to download (if necessary) and use.
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install
         run: make install
 
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: zwallet-linux
           path: zwallet
@@ -80,7 +80,7 @@ jobs:
            go env -w "CC=/mingw64/bin/clang.exe"
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install
         run: make install
@@ -94,7 +94,7 @@ jobs:
           zip zwallet-windows.zip zwallet.exe libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll
 
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: zwallet-windows.zip
           path: zwallet-windows.zip
@@ -115,13 +115,13 @@ jobs:
           go-version: '1.21' # The Go version to download (if necessary) and use.
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install
         run: make install
 
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: zwallet-macos
           path: zwallet

.github/workflows/system_tests.yml

@@ -28,7 +28,7 @@ jobs:
     uses: 0chain/actions/.github/workflows/manual_system_tests.yml@master
     with:
       zwallet_cli_branch: ${{ github.ref_name }}
-      repo_snapshots_branch: ${{ github.event.inputs.repo_snapshots_branch }}
+      repo_snapshots_branch: fix/refactor-zboxcore
       test_file_filter: ${{ github.event.inputs.test_file_filter }}
       skip_tests: ${{ github.event.inputs.skip_tests }}
       run_smoke_tests: ${{ github.event.inputs.run_smoke_tests }}

cmd/auth-register.go

@@ -1,14 +1,12 @@
 package cmd
 
 import (
-	"context"
-	"log"
-	"strings"
-
+	"github.com/0chain/gosdk/core/transaction"
 	"github.com/0chain/gosdk/zcnbridge"
-	"github.com/0chain/gosdk/zcnbridge/transaction"
 	"github.com/0chain/gosdk/zcncore"
 	"github.com/pkg/errors"
+	"log"
+	"strings"
 )
 
 //goland:noinspection ALL
@@ -91,20 +89,20 @@ func registerAuthorizerInChain(bc *zcnbridge.BridgeClient, args ...*Arg) {
 		},
 	}
 
-	trx, err := transaction.AddAuthorizer(context.Background(), input)
+	hash, _, _, txn, err := zcncore.ZCNSCAddAuthorizer(input)
 	if err != nil {
-		log.Fatal(err, "failed to add authorizer with transaction: '%s'", trx.GetHash())
+		log.Fatal(err, "failed to add authorizer with transaction: '%s'", hash)
 	}
 
-	log.Printf("Authorizer submitted OK... " + trx.GetHash())
-	log.Printf("Starting verification: " + trx.GetHash())
+	log.Printf("Authorizer submitted OK... " + hash)
+	log.Printf("Starting verification: " + hash)
 
-	err = trx.Verify(context.Background())
+	txn, err = transaction.VerifyTransaction(hash)
 	if err != nil {
 		if strings.Contains(err.Error(), "already exists") {
 			ExitWithError("Authorizer has already been added to 0Chain...  Continue")
 		} else {
-			ExitWithError(errors.Wrapf(err, "failed to verify transaction: '%s'", trx.GetHash()))
+			ExitWithError(errors.Wrapf(err, "failed to verify transaction: '%s'", txn.Hash))
 		}
 	}
 }

cmd/bridge-auth-config-update.go

@@ -2,21 +2,18 @@ package cmd
 
 import (
 	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"sync"
-
 	"github.com/0chain/gosdk/core/common"
 	"github.com/0chain/gosdk/zcncore"
 	"github.com/spf13/cobra"
+	"log"
+	"strconv"
 )
 
 var updateAuthorizerConfigCmd = &cobra.Command{
-	Use:   "bridge-auth-config-update",
-	Short: "Update ZCNSC authorizer settings by ID",
-	Long:  `Update ZCNSC authorizer settings by ID.`,
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "bridge-auth-config-update",
+	Short:  "Update ZCNSC authorizer settings by ID",
+	Long:   `Update ZCNSC authorizer settings by ID.`,
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		const (
@@ -31,6 +28,7 @@ var updateAuthorizerConfigCmd = &cobra.Command{
 			Fee        string
 			FeeBalance int64
 			URL        string
+			hash       string
 			err        error
 		)
 
@@ -65,46 +63,10 @@ var updateAuthorizerConfigCmd = &cobra.Command{
 			},
 		}
 
-		var wg sync.WaitGroup
-		statusBar := &ZCNStatus{wg: &wg}
-		txn, err := zcncore.NewTransaction(statusBar, getTxnFee(), nonce)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		wg.Add(1)
-		if err = txn.ZCNSCUpdateAuthorizerConfig(node); err != nil {
+		if hash, _, _, _, err = zcncore.ZCNSCUpdateAuthorizerConfig(node); err != nil {
 			log.Fatal(err)
 		}
-		wg.Wait()
-
-		if !statusBar.success {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
-		statusBar.success = false
-		wg.Add(1)
-		if err = txn.Verify(); err != nil {
-			log.Fatal(err)
-		}
-		wg.Wait()
-
-		if statusBar.success {
-			//fmt.Printf("Nonce:%v\n", txn.GetTransactionNonce())
-			switch txn.GetVerifyConfirmationStatus() {
-			case zcncore.ChargeableError:
-				ExitWithError("\n", strings.Trim(txn.GetVerifyOutput(), "\""))
-			case zcncore.Success:
-				fmt.Printf("global settings updated\nHash: %v\n", txn.GetTransactionHash())
-			default:
-				ExitWithError("\nExecute global settings update smart contract failed. Unknown status code: " +
-					strconv.Itoa(int(txn.GetVerifyConfirmationStatus())))
-			}
-			return
-		} else {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
+		fmt.Printf("global settings updated\nHash: %v\n", hash)
 	},
 }
 

cmd/bridge-auth-config.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"log"
 
 	"github.com/0chain/gosdk/zcnbridge"
@@ -9,10 +10,10 @@ import (
 )
 
 var getAuthorizerConfigCmd = &cobra.Command{
-	Use:   "bridge-auth-config",
-	Short: "Show authorizer configurations.",
-	Long:  `Show authorizer configurations.`,
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "bridge-auth-config",
+	Short:  "Show authorizer configurations.",
+	Long:   `Show authorizer configurations.`,
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		var (
@@ -31,12 +32,14 @@ var getAuthorizerConfigCmd = &cobra.Command{
 
 		var (
 			response = new(zcnbridge.AuthorizerResponse)
-			cb       = NewJSONInfoCB(response)
+			res      []byte
 		)
-		if err = zcnbridge.GetAuthorizer(ID, cb); err != nil {
+		if res, err = zcnbridge.GetAuthorizer(ID); err != nil {
 			log.Fatal(err)
 		}
-		if err = cb.Waiting(); err != nil {
+
+		err = json.Unmarshal(res, response)
+		if err != nil {
 			log.Fatal(err)
 		}
 

cmd/bridge-auth-delete.go

@@ -2,20 +2,16 @@ package cmd
 
 import (
 	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"sync"
-
 	"github.com/0chain/gosdk/zcncore"
 	"github.com/spf13/cobra"
+	"log"
 )
 
 var deleteAuthorizerConfigCmd = &cobra.Command{
-	Use:   "bridge-auth-delete",
-	Short: "Delete ZCNSC authorizer by ID",
-	Long:  `Delete ZCNSC authorizer by ID`,
-	Args:  cobra.MinimumNArgs(0),
+	Use:    "bridge-auth-delete",
+	Short:  "Delete ZCNSC authorizer by ID",
+	Long:   `Delete ZCNSC authorizer by ID`,
+	Args:   cobra.MinimumNArgs(0),
 	Hidden: true,
 	Run: func(cmd *cobra.Command, args []string) {
 		const (
@@ -25,6 +21,7 @@ var deleteAuthorizerConfigCmd = &cobra.Command{
 			flags = cmd.Flags()
 			err   error
 			ID    string
+			hash  string
 		)
 
 		if flags.Changed(IDFlag) {
@@ -38,45 +35,10 @@ var deleteAuthorizerConfigCmd = &cobra.Command{
 		payload := &zcncore.DeleteAuthorizerPayload{
 			ID: ID,
 		}
-		var wg sync.WaitGroup
-		statusBar := &ZCNStatus{wg: &wg}
-		txn, err := zcncore.NewTransaction(statusBar, getTxnFee(), nonce)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		wg.Add(1)
-		if err = txn.ZCNSCDeleteAuthorizer(payload); err != nil {
-			log.Fatal(err)
-		}
-		wg.Wait()
-
-		if !statusBar.success {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
-		statusBar.success = false
-		wg.Add(1)
-		if err = txn.Verify(); err != nil {
+		if hash, _, _, _, err = zcncore.ZCNSCDeleteAuthorizer(payload); err != nil {
 			log.Fatal(err)
 		}
-		wg.Wait()
-
-		if statusBar.success {
-			switch txn.GetVerifyConfirmationStatus() {
-			case zcncore.ChargeableError:
-				ExitWithError("\n", strings.Trim(txn.GetVerifyOutput(), "\""))
-			case zcncore.Success:
-				fmt.Printf("global settings updated\nHash: %v\n", txn.GetTransactionHash())
-			default:
-				ExitWithError("\nExecute global settings update smart contract failed. Unknown status code: " +
-					strconv.Itoa(int(txn.GetVerifyConfirmationStatus())))
-			}
-			return
-		} else {
-			log.Fatal("fatal:", statusBar.errMsg)
-		}
-
+		fmt.Printf("global settings updated\nHash: %v\n", hash)
 	},
 }
 

cmd/bridge-burn-zcn.go

@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/0chain/gosdk/zcncore"
@@ -25,18 +24,12 @@ func commandBurnZCN(b *zcnbridge.BridgeClient, args ...*Arg) {
 	amount := GetToken(args)
 
 	fmt.Println("Starting burn transaction")
-	transaction, err := b.BurnZCN(context.Background(), zcncore.ConvertToValue(amount), 0)
+	hash, _, err := b.BurnZCN(zcncore.ConvertToValue(amount))
 	if err == nil {
-		fmt.Printf("Submitted burn transaction %s\n", transaction.GetHash())
+		fmt.Printf("Submitted burn transaction %s\n", hash)
 	} else {
 		ExitWithError(err)
 	}
 
-	fmt.Printf("Starting transaction verification %s\n", transaction.GetHash())
-	err = transaction.Verify(context.Background())
-	if err != nil {
-		ExitWithError(err)
-	}
-
-	fmt.Printf("Transaction completed successfully: %s\n", transaction.GetHash())
+	fmt.Printf("Transaction completed successfully: %s\n", hash)
 }