From 1db5e16cc6f51ccf6d30d8d2a46d3accf9750b78 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 00:55:52 +0530 Subject: [PATCH 1/6] Fix txn processing --- code/go/0chain.net/blobber/zcn.go | 11 ++++++++++- go.mod | 2 +- go.sum | 6 ++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/code/go/0chain.net/blobber/zcn.go b/code/go/0chain.net/blobber/zcn.go index 2aa6413e1..b74d04dfe 100644 --- a/code/go/0chain.net/blobber/zcn.go +++ b/code/go/0chain.net/blobber/zcn.go @@ -83,7 +83,16 @@ func setupServerChain() error { serverChain := chain.NewChainFromConfig() chain.SetServerChain(serverChain) - err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false) + options := []int{ + config.Configuration.MinConfirmation, // MinConfirmation + config.Configuration.MinSubmit, // MinSubmit + 3, // ConfirmationChainLength + 2, // SharderConsensous + 1, // QuerySleepTime + 1, // VerifyOptimistic + } + + err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false, options...) if err != nil { return err } diff --git a/go.mod b/go.mod index 3ad98263e..c3a32a5a1 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.22.5 require ( github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.18.12-0.20241205003726-a738be4e1f20 + github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500 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 diff --git a/go.sum b/go.sum index 59d519388..acf6f8515 100644 --- a/go.sum +++ b/go.sum @@ -40,10 +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.12-0.20241205003726-a738be4e1f20 h1:wEI5RrWGZAJ5NdPYA2qJGy8Q99igsNr3hS+0+UpGERI= -github.com/0chain/gosdk v1.18.12-0.20241205003726-a738be4e1f20/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= +github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500 h1:SOaVdvAo8CCX6MpQ3jkahzd8hSW5dLWaFqKWPJG3V8M= +github.com/0chain/gosdk v1.18.14-0.20241211191555-7ecfc2009500/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= From 9d8d5d57011f893bf57936f56269f8acb7bd3a42 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 10:29:39 +0530 Subject: [PATCH 2/6] Remove verifyOptimistic --- code/go/0chain.net/blobber/zcn.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/go/0chain.net/blobber/zcn.go b/code/go/0chain.net/blobber/zcn.go index b74d04dfe..64e1bf7a5 100644 --- a/code/go/0chain.net/blobber/zcn.go +++ b/code/go/0chain.net/blobber/zcn.go @@ -89,7 +89,7 @@ func setupServerChain() error { 3, // ConfirmationChainLength 2, // SharderConsensous 1, // QuerySleepTime - 1, // VerifyOptimistic + 0, // VerifyOptimistic } err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false, options...) From 9d9f219fb7b31cd201586412e0a332b24016fb56 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 10:43:08 +0530 Subject: [PATCH 3/6] Debug --- code/go/0chain.net/blobber/zcn.go | 1 + 1 file changed, 1 insertion(+) diff --git a/code/go/0chain.net/blobber/zcn.go b/code/go/0chain.net/blobber/zcn.go index 64e1bf7a5..059fb1019 100644 --- a/code/go/0chain.net/blobber/zcn.go +++ b/code/go/0chain.net/blobber/zcn.go @@ -84,6 +84,7 @@ func setupServerChain() error { chain.SetServerChain(serverChain) options := []int{ + 0, config.Configuration.MinConfirmation, // MinConfirmation config.Configuration.MinSubmit, // MinSubmit 3, // ConfirmationChainLength From 5e20e5bb55024e89623becc8c20597d2708dbcf7 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 11:16:59 +0530 Subject: [PATCH 4/6] Debug --- code/go/0chain.net/blobber/zcn.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/go/0chain.net/blobber/zcn.go b/code/go/0chain.net/blobber/zcn.go index 059fb1019..6b1b70c51 100644 --- a/code/go/0chain.net/blobber/zcn.go +++ b/code/go/0chain.net/blobber/zcn.go @@ -83,17 +83,17 @@ func setupServerChain() error { serverChain := chain.NewChainFromConfig() chain.SetServerChain(serverChain) - options := []int{ - 0, - config.Configuration.MinConfirmation, // MinConfirmation - config.Configuration.MinSubmit, // MinSubmit - 3, // ConfirmationChainLength - 2, // SharderConsensous - 1, // QuerySleepTime - 0, // VerifyOptimistic - } - - err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false, options...) + //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 } From 7d216ea845781c898dc9ffc4346b021453d50f1f Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 11:17:48 +0530 Subject: [PATCH 5/6] Debug --- code/go/0chain.net/blobber/zcn.go | 4 ---- code/go/0chain.net/validator/main.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/code/go/0chain.net/blobber/zcn.go b/code/go/0chain.net/blobber/zcn.go index 6b1b70c51..31a7f9122 100644 --- a/code/go/0chain.net/blobber/zcn.go +++ b/code/go/0chain.net/blobber/zcn.go @@ -103,10 +103,6 @@ func setupServerChain() error { return err } - if client.GetClient().IsSplit { - zcncore.RegisterZauthServer(serverChain.ZauthServer) - } - fmt.Print(" [OK]\n") return nil } diff --git a/code/go/0chain.net/validator/main.go b/code/go/0chain.net/validator/main.go index b12becbac..6d9ac2c3a 100644 --- a/code/go/0chain.net/validator/main.go +++ b/code/go/0chain.net/validator/main.go @@ -243,10 +243,6 @@ func SetupValidatorOnBC(logDir string) error { return err } - if client.GetClient().IsSplit { - zcncore.RegisterZauthServer(serverChain.ZauthServer) - } - go RegisterValidator() return nil From 47b5ef7aa41a1384d2c51a30e51e3cd77b921330 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 12 Dec 2024 12:51:32 +0530 Subject: [PATCH 6/6] Fix --- code/go/0chain.net/core/chain/entity.go | 1 - 1 file changed, 1 deletion(-) diff --git a/code/go/0chain.net/core/chain/entity.go b/code/go/0chain.net/core/chain/entity.go index 0c3adf562..28a71904b 100644 --- a/code/go/0chain.net/core/chain/entity.go +++ b/code/go/0chain.net/core/chain/entity.go @@ -51,7 +51,6 @@ func NewChainFromConfig() *Chain { chain.ID = common.ToKey(config.Configuration.ChainID) chain.OwnerID = viper.GetString("server_chain.owner") chain.BlockWorker = viper.GetString("block_worker") - chain.ZauthServer = viper.GetString("zauth_server") return chain }