Merge branch 'staging' into sprint-1.19

Author: Jayashsatolia403

.github/workflows/build-&-publish-docker-image.yml

@@ -234,19 +234,6 @@ jobs:
             version: '1.7'
             force: 'false'
 
-      - name: "Create Tenderly virtual testnet"
-        run: |
-          echo "TENDERLY_CREATION_INFO=$(curl -X POST \
-           -H "x-access-key: ${{ secrets.TENDERLY_SECRET }}" \
-           -H "Content-Type: application/json" \
-           -d '{"slug":"mainnet-dev-${{ env.RUNNER_NUMBER }}-${{ github.run_id }}","displayName":"mainnet-dev-${{ env.RUNNER_NUMBER }}-${{ github.run_id }}","description":"","visibility":"TEAM","tags":{"purpose":"development"},"networkConfig":{"networkId":"1","blockNumber":"18512782","chainConfig":{"chainId":"1"},"baseFeePerGas":"1"},"explorerConfig":{"enabled":false,"verificationVisibility":"bytecode"},"syncState":false}' \
-           https://api.tenderly.co/api/v1/account/zus_network/project/project/testnet/container)" >> $GITHUB_ENV
-
-      - name: "Parse Tenderly virtual testnet creation transaction result"
-        run: |
-          echo "TENDERLY_VIRTUAL_TESTNET_ID=$(echo '${{ env.TENDERLY_CREATION_INFO }}' | jq -r '.container.id')" >> $GITHUB_ENV
-          echo "TENDERLY_VIRTUAL_TESTNET_RPC_ID=$(echo '${{ env.TENDERLY_CREATION_INFO }}' | jq -r '.container.connectivityConfig.endpoints[0].id')" >> $GITHUB_ENV
-
       - name: "Deploy 0Chain"
         uses: 0chain/actions/deploy-0chain@master
         with:
@@ -256,10 +243,10 @@ jobs:
           blobber_image: ${{ env.TAG }}-${{ env.SHORT_SHA }}
           validator_image: ${{ env.TAG }}-${{ env.SHORT_SHA }}
           SUBGRAPH_API_URL: ${{ secrets.SUBGRAPH_API_URL }}
-          TENDERLY_VIRTUAL_TESTNET_RPC_ID: ${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
+          TENDERLY_VIRTUAL_TESTNET_RPC_ID: ""
           graphnode_sc: ${{ secrets.GRAPHNODE_SC }}
           graphnode_network: ${{ secrets.GRAPHNODE_NETWORK }}
-          graphnode_ethereum_node_url: https://virtual.mainnet.rpc.tenderly.co/${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
+          graphnode_ethereum_node_url: ""
           svc_account_secret: ${{ secrets.SVC_ACCOUNT_SECRET }}
 
       - name: "Run System tests"
@@ -273,19 +260,11 @@ jobs:
           run_flaky_tests: false
           retry_failures: true
           run_smoke_tests: ${{ github.ref != 'refs/heads/staging' && github.base_ref != 'staging' && github.ref != 'refs/heads/master' && github.base_ref != 'master' }}
-          TENDERLY_VIRTUAL_TESTNET_RPC_ID: ${{ env.TENDERLY_VIRTUAL_TESTNET_RPC_ID }}
+          TENDERLY_VIRTUAL_TESTNET_RPC_ID: ""
           DEVOPS_CHANNEL_WEBHOOK_URL: ${{ secrets.DEVOPS_CHANNEL_WEBHOOK_URL }}
           S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
           S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
 
-      - name: "Remove Tenderly virtual testnet"
-        if: always()
-        run: |
-          curl -X DELETE \
-            -H "x-access-key: ${{ secrets.TENDERLY_SECRET }}" \
-            -H "Content-Type: application/json" \
-            https://api.tenderly.co/api/v1/account/zus_network/project/project/testnet/container/${{ env.TENDERLY_VIRTUAL_TESTNET_ID }}
-
       - name: "Set PR status as ${{ job.status }}"
         if: ${{ (success() || failure()) && steps.findPr.outputs.number }}
         uses: 0chain/actions/set-pr-status@master

code/go/0chain.net/blobber/zcn.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/config"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore"
 	"github.com/0chain/blobber/code/go/0chain.net/blobbercore/handler"
@@ -11,8 +13,8 @@ import (
 	"github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	"github.com/0chain/blobber/code/go/0chain.net/core/node"
 	"github.com/0chain/gosdk/core/client"
+	"github.com/0chain/gosdk/zcncore"
 	"go.uber.org/zap"
-	"time"
 )
 
 func registerOnChain() error {
@@ -81,8 +83,23 @@ func setupServerChain() error {
 	serverChain := chain.NewChainFromConfig()
 	chain.SetServerChain(serverChain)
 
-	if err := client.InitSDK(node.Self.GetWalletString(), serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme,
-		0, false, true); err != nil {
+	//options := []int{
+	//	0,
+	//	10, // MinConfirmation
+	//	20, // MinSubmit
+	//	3,  // ConfirmationChainLength
+	//	3,  // SharderConsensous
+	//	1,  // QuerySleepTime
+	//	0,  // VerifyOptimistic
+	//}
+
+	err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false)
+	if err != nil {
+		return err
+	}
+
+	err = zcncore.SetGeneralWalletInfo(node.Self.GetWalletString(), config.Configuration.SignatureScheme)
+	if err != nil {
 		return err
 	}
 

code/go/0chain.net/blobbercore/allocation/renamefilechange_test.go

@@ -82,10 +82,6 @@ func setup(t *testing.T) {
 			},
 		),
 	)
-
-	//if err := client.InitSDK(server.URL, "ed25519"); err != nil {
-	//	t.Fatal(err)
-	//}
 }
 func setupMockForFileManagerInit(mock sqlmock.Sqlmock) {
 	mock.ExpectBegin()

code/go/0chain.net/blobbercore/handler/handler_common.go

@@ -94,17 +94,19 @@ func HomepageHandler(w http.ResponseWriter, r *http.Request) {
 		node.Self.ID, node.Self.PublicKey, build.BuildTag,
 	)
 
-	fmt.Fprintf(w, "<div>Miners ...\n")
-	network, _ := client.GetNetwork(context.Background())
-	for _, miner := range network.Miners {
-		fmt.Fprintf(w, "%v\n", miner)
-	}
-	fmt.Fprintf(w, "</div>\n")
-	fmt.Fprintf(w, "<div>Sharders ...\n")
-	for _, sharder := range network.Sharders {
-		fmt.Fprintf(w, "%v\n", sharder)
+	network, err := client.GetNetwork(context.Background())
+	if err == nil {
+		fmt.Fprintf(w, "<div>Miners ...\n")
+		for _, miner := range network.Miners {
+			fmt.Fprintf(w, "%v\n", miner)
+		}
+		fmt.Fprintf(w, "</div>\n")
+		fmt.Fprintf(w, "<div>Sharders ...\n")
+		for _, sharder := range network.Sharders {
+			fmt.Fprintf(w, "%v\n", sharder)
+		}
+		fmt.Fprintf(w, "</div>\n")
 	}
-	fmt.Fprintf(w, "</div>\n")
 	fmt.Fprintf(w, "</br>")
 	fmt.Fprintf(w, "<div>Running since %v (Total elapsed time: %v)</div>\n", StartTime.Format(common.DateTimeFormat), time.Since(StartTime))
 	fmt.Fprintf(w, "</br>")
@@ -187,11 +189,13 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 
 		if blobberRes, ok := resp.(*blobberhttp.CommitResult); ok {
 			// Save the write marker data
-			writemarker.SaveMarkerData(allocationID, blobberRes.WriteMarker.WM.Timestamp, blobberRes.WriteMarker.WM.ChainLength)
-			trie := blobberRes.Trie
-			if trie != nil {
-				_ = trie.DeleteNodes()
-				blobberRes.Trie = nil
+			if blobberRes.WriteMarker != nil {
+				writemarker.SaveMarkerData(allocationID, blobberRes.WriteMarker.WM.Timestamp, blobberRes.WriteMarker.WM.ChainLength)
+				trie := blobberRes.Trie
+				if trie != nil {
+					_ = trie.DeleteNodes()
+					blobberRes.Trie = nil
+				}
 			}
 		} else {
 			Logger.Error("Invalid response type for commit handler")

code/go/0chain.net/blobbercore/handler/object_operation_handler.go

@@ -646,13 +646,17 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b
 		Logger.Error("Error checking pending markers", zap.Error(err))
 		return nil, common.NewError("pending_markers", "previous marker is still pending to be redeemed")
 	}
-
+	var result blobberhttp.CommitResult
 	connectionObj, err := allocation.GetAllocationChanges(ctx, connectionID, allocationID, clientID)
 	if err != nil {
 		// might be good to check if blobber already has stored writemarker
 		return nil, common.NewErrorf("invalid_parameters",
 			"Invalid connection id. Connection id was not found: %v", err)
 	}
+	if connectionObj.Status == allocation.CommittedConnection {
+		result.Success = true
+		return &result, nil
+	}
 	if len(connectionObj.Changes) == 0 {
 		if connectionObj.Status == allocation.NewConnection {
 			return nil, common.NewError("invalid_parameters",
@@ -680,7 +684,6 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b
 			err)
 	}
 
-	var result blobberhttp.CommitResult
 	var latestWriteMarkerEntity *writemarker.WriteMarkerEntity
 	if allocationObj.AllocationRoot == "" {
 		latestWriteMarkerEntity = nil
@@ -867,7 +870,6 @@ func (fsh *StorageHandler) CommitWrite(ctx context.Context, r *http.Request) (*b
 
 	//Delete connection object and its changes
 
-	db.Delete(connectionObj)
 	go allocation.DeleteConnectionObjEntry(connectionID)
 	go AddWriteMarkerCount(clientID, connectionObj.Size <= 0)
 
@@ -936,13 +938,17 @@ func (fsh *StorageHandler) CommitWriteV2(ctx context.Context, r *http.Request) (
 		Logger.Error("Error checking pending markers", zap.Error(err))
 		return nil, common.NewError("pending_markers", "previous marker is still pending to be redeemed")
 	}
-
+	var result blobberhttp.CommitResult
 	connectionObj, err := allocation.GetAllocationChanges(ctx, connectionID, allocationID, clientID)
 	if err != nil {
 		// might be good to check if blobber already has stored writemarker
 		return nil, common.NewErrorf("invalid_parameters",
 			"Invalid connection id. Connection id was not found: %v", err)
 	}
+	if connectionObj.Status == allocation.CommittedConnection {
+		result.Success = true
+		return &result, nil
+	}
 	if len(connectionObj.Changes) == 0 {
 		if connectionObj.Status == allocation.NewConnection {
 			return nil, common.NewError("invalid_parameters",
@@ -970,7 +976,6 @@ func (fsh *StorageHandler) CommitWriteV2(ctx context.Context, r *http.Request) (
 			err)
 	}
 
-	var result blobberhttp.CommitResult
 	var latestWriteMarkerEntity *writemarker.WriteMarkerEntity
 	if allocationObj.AllocationRoot == "" {
 		latestWriteMarkerEntity = nil
@@ -1193,8 +1198,6 @@ func (fsh *StorageHandler) CommitWriteV2(ctx context.Context, r *http.Request) (
 	commitSuccess = true
 
 	//Delete connection object and its changes
-
-	db.Delete(connectionObj)
 	go allocation.DeleteConnectionObjEntry(connectionID)
 	go AddWriteMarkerCount(clientID, connectionObj.Size <= 0)
 

code/go/0chain.net/core/chain/entity.go

@@ -29,6 +29,7 @@ type Chain struct {
 	OwnerID       string
 	ParentChainID string
 	BlockWorker   string
+	ZauthServer   string
 
 	GenesisBlockHash string
 }
@@ -44,7 +45,7 @@ func (c *Chain) Validate(ctx context.Context) error {
 	return nil
 }
 
-//NewChainFromConfig - create a new chain from config
+// NewChainFromConfig - create a new chain from config
 func NewChainFromConfig() *Chain {
 	chain := Provider()
 	chain.ID = common.ToKey(config.Configuration.ChainID)

code/go/0chain.net/validator/main.go

@@ -4,8 +4,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"github.com/0chain/gosdk/core/client"
-	coreTxn "github.com/0chain/gosdk/core/transaction"
 	"log"
 	"net/http"
 	"os"
@@ -14,6 +12,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/0chain/gosdk/core/client"
+	coreTxn "github.com/0chain/gosdk/core/transaction"
+
 	"github.com/0chain/blobber/code/go/0chain.net/core/build"
 	"github.com/0chain/blobber/code/go/0chain.net/core/chain"
 	"github.com/0chain/blobber/code/go/0chain.net/core/common/handler"
@@ -231,11 +232,19 @@ func SetupValidatorOnBC(logDir string) error {
 	var logName = logDir + "/validator.log"
 	zcncore.SetLogFile(logName, false)
 	zcncore.SetLogLevel(3)
-	if err := client.InitSDK(node.Self.GetWalletString(), serverChain.BlockWorker,
-		config.Configuration.ChainID, config.Configuration.SignatureScheme, int64(0), false, true); err != nil {
+
+	err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, int64(0), false)
+	if err != nil {
 		return err
 	}
+
+	err = zcncore.SetGeneralWalletInfo(node.Self.GetWalletString(), config.Configuration.SignatureScheme)
+	if err != nil {
+		return err
+	}
+
 	go RegisterValidator()
+
 	return nil
 }
 

go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.5
 
 require (
 	github.com/0chain/errors v1.0.3
-	github.com/0chain/gosdk v1.18.0
+	github.com/0chain/gosdk v1.18.15
 	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/didip/tollbooth/v6 v6.1.2
 	github.com/go-openapi/runtime v0.26.0

go.sum

@@ -40,8 +40,8 @@ github.com/0chain/common v1.18.3 h1:42dYOv2KyMTSanuS67iDtfv+ErbSRqR8NJ3MG72MwaI=
 github.com/0chain/common v1.18.3/go.mod h1:Lapu2Tj7z5Sm4r+X141e7vsz4NDODTEypeElYAP3iSw=
 github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM=
 github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc=
-github.com/0chain/gosdk v1.18.0 h1:6mSiUFb4liT50wdsx59tEWMHKWkKQUlZT91ouQAeKcc=
-github.com/0chain/gosdk v1.18.0/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
+github.com/0chain/gosdk v1.18.15 h1:jujBBRAv2xendebjdoC6nMmoVl5w+uhDrKBqokIvxKI=
+github.com/0chain/gosdk v1.18.15/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=