From 054670e3c595f9fcdaf53ccbd46302dc97bfb227 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Wed, 5 Feb 2025 22:54:47 +0530 Subject: [PATCH 1/7] Fix managing wallet 0box --- code/go/0chain.net/blobbercore/handler/protocol.go | 2 ++ code/go/0chain.net/core/common/admin.go | 3 ++- code/go/0chain.net/core/transaction/entity.go | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index 34b788fe8..4035a56af 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -70,6 +70,8 @@ func getStorageNode() (*transaction.StorageNode, error) { sn.IsEnterprise = config.Configuration.IsEnterprise sn.StorageVersion = allocation.StorageV2 + sn.ManagingWallet = common.ClientId0box + return sn, nil } diff --git a/code/go/0chain.net/core/common/admin.go b/code/go/0chain.net/core/common/admin.go index f538d3969..d8aba7ba4 100644 --- a/code/go/0chain.net/core/common/admin.go +++ b/code/go/0chain.net/core/common/admin.go @@ -11,7 +11,7 @@ import ( // global username and password used to access endpoints only by admin var gUsername, gPassword string var isDevelopment bool -var PublicKey0box string +var ClientId0box, PublicKey0box string func SetAdminCredentials(devMode bool) { gUsername = viper.GetString("admin.username") @@ -42,6 +42,7 @@ func AuthenticateAdmin(handler ReqRespHandlerf) ReqRespHandlerf { func Set0boxDetails() { logging.Logger.Info("Setting 0box details") + ClientId0box = viper.GetString("0box.client_id") PublicKey0box = viper.GetString("0box.public_key") logging.Logger.Info("0box public key", zap.Any("public_key", PublicKey0box)) } diff --git a/code/go/0chain.net/core/transaction/entity.go b/code/go/0chain.net/core/transaction/entity.go index 0bc02005b..89f5b433e 100644 --- a/code/go/0chain.net/core/transaction/entity.go +++ b/code/go/0chain.net/core/transaction/entity.go @@ -45,6 +45,7 @@ type StorageNode struct { StakePoolSettings StakePoolSettings `json:"stake_pool_settings"` IsEnterprise bool `json:"is_enterprise"` StorageVersion int `json:"storage_version"` + ManagingWallet string `json:"managing_wallet"` } type BlobberAllocation struct { From 52dcf226103fdc6447e5acb0955b0a49e51d9258 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 00:09:32 +0530 Subject: [PATCH 2/7] Debug --- code/go/0chain.net/blobbercore/handler/protocol.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index 4035a56af..412bbd7de 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -121,6 +121,10 @@ func sendSmartContractBlobberAdd() (*coreTxn.Transaction, error) { return nil, err } + logging.Logger.Info("Jayash Storage Node", zap.Any("sn", sn)) + + panic("implement me") + _, _, _, txn, err := coreTxn.SmartContractTxn(transaction.STORAGE_CONTRACT_ADDRESS, coreTxn.SmartContractTxnData{ Name: transaction.ADD_BLOBBER_SC_NAME, InputArgs: sn, From 118d9891f8215930feded2da41b0cdc2c20853db Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 00:20:48 +0530 Subject: [PATCH 3/7] Debug --- .../blobbercore/handler/protocol.go | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index 412bbd7de..5b0bc655b 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -10,7 +10,6 @@ import ( "github.com/0chain/blobber/code/go/0chain.net/blobbercore/allocation" "github.com/0chain/blobber/code/go/0chain.net/blobbercore/config" - "github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore" "github.com/0chain/blobber/code/go/0chain.net/blobbercore/filestore" "github.com/0chain/blobber/code/go/0chain.net/core/common" "github.com/0chain/blobber/code/go/0chain.net/core/logging" @@ -77,22 +76,19 @@ func getStorageNode() (*transaction.StorageNode, error) { // RegisterBlobber register blobber if it is not registered yet func RegisterBlobber(ctx context.Context) error { - err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error { - _, e := config.ReloadFromChain(ctx, datastore.GetStore().GetDB()) - return e - }) + //err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error { + // _, e := config.ReloadFromChain(ctx, datastore.GetStore().GetDB()) + // return e + //}) - if err != nil { // blobber is not registered yet - txn, err := sendSmartContractBlobberAdd() - if err != nil { - logging.Logger.Error("Error in add blobber", zap.Any("err", err)) - return err - } - - logging.Logger.Info("Verified blobber register transaction", zap.String("txn_hash", txn.Hash), zap.Any("txn_output", txn.TransactionOutput)) - return nil + txn, err := sendSmartContractBlobberAdd() + if err != nil { + logging.Logger.Error("Error in add blobber", zap.Any("err", err)) + return err } + logging.Logger.Info("Verified blobber register transaction", zap.String("txn_hash", txn.Hash), zap.Any("txn_output", txn.TransactionOutput)) + txnHash, err := SendHealthCheck(common.ProviderTypeBlobber) if err != nil { logging.Logger.Error("Failed to send healthcheck transaction", zap.String("txn_hash", txnHash)) From 4633e013bf0af0c535101096cac6a829f500e7f5 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 00:33:30 +0530 Subject: [PATCH 4/7] Fix --- code/go/0chain.net/blobber/http.go | 1 - code/go/0chain.net/blobber/main.go | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/go/0chain.net/blobber/http.go b/code/go/0chain.net/blobber/http.go index 1c31489b3..c5df60e1d 100644 --- a/code/go/0chain.net/blobber/http.go +++ b/code/go/0chain.net/blobber/http.go @@ -115,7 +115,6 @@ func initHandlers(r *mux.Router, devMode bool) { handler.SetupHandlers(r) handler.SetupSwagger() common.SetAdminCredentials(devMode) - common.Set0boxDetails() } func initProfHandlers(mux *http.ServeMux) { diff --git a/code/go/0chain.net/blobber/main.go b/code/go/0chain.net/blobber/main.go index 3f7d34438..d30e075ad 100644 --- a/code/go/0chain.net/blobber/main.go +++ b/code/go/0chain.net/blobber/main.go @@ -25,6 +25,8 @@ func main() { panic(err) } + common.Set0boxDetails() + if err := setupNode(); err != nil { logging.Logger.Error("Error setting up blobber node " + err.Error()) panic(err) From 5b5267450c65d4a1aaa82eb133c798fd3abef2c4 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 00:40:31 +0530 Subject: [PATCH 5/7] Fix --- code/go/0chain.net/blobbercore/handler/protocol.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index 5b0bc655b..b3fa1f772 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -3,6 +3,7 @@ package handler import ( "context" "errors" + "github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore" "sync" "github.com/0chain/gosdk/core/client" @@ -76,10 +77,10 @@ func getStorageNode() (*transaction.StorageNode, error) { // RegisterBlobber register blobber if it is not registered yet func RegisterBlobber(ctx context.Context) error { - //err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error { - // _, e := config.ReloadFromChain(ctx, datastore.GetStore().GetDB()) - // return e - //}) + err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error { + _, e := config.ReloadFromChain(ctx, datastore.GetStore().GetDB()) + return e + }) txn, err := sendSmartContractBlobberAdd() if err != nil { @@ -117,10 +118,6 @@ func sendSmartContractBlobberAdd() (*coreTxn.Transaction, error) { return nil, err } - logging.Logger.Info("Jayash Storage Node", zap.Any("sn", sn)) - - panic("implement me") - _, _, _, txn, err := coreTxn.SmartContractTxn(transaction.STORAGE_CONTRACT_ADDRESS, coreTxn.SmartContractTxnData{ Name: transaction.ADD_BLOBBER_SC_NAME, InputArgs: sn, From 052df04bfa132568577e24e01f26e66e8ee1a5d6 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 18:52:35 +0530 Subject: [PATCH 6/7] Fix --- code/go/0chain.net/blobbercore/handler/protocol.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index b3fa1f772..69c5490f2 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -4,6 +4,7 @@ import ( "context" "errors" "github.com/0chain/blobber/code/go/0chain.net/blobbercore/datastore" + "strings" "sync" "github.com/0chain/gosdk/core/client" @@ -83,7 +84,7 @@ func RegisterBlobber(ctx context.Context) error { }) txn, err := sendSmartContractBlobberAdd() - if err != nil { + if err != nil && !strings.Contains(err.Error(), "blobber already exists") { logging.Logger.Error("Error in add blobber", zap.Any("err", err)) return err } From 769924d3a336af4a22237580f7b24a8a24dc7239 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Sat, 8 Feb 2025 19:01:46 +0530 Subject: [PATCH 7/7] Fix --- code/go/0chain.net/blobbercore/handler/protocol.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/go/0chain.net/blobbercore/handler/protocol.go b/code/go/0chain.net/blobbercore/handler/protocol.go index 69c5490f2..acf86d873 100644 --- a/code/go/0chain.net/blobbercore/handler/protocol.go +++ b/code/go/0chain.net/blobbercore/handler/protocol.go @@ -83,14 +83,12 @@ func RegisterBlobber(ctx context.Context) error { return e }) - txn, err := sendSmartContractBlobberAdd() + _, err = sendSmartContractBlobberAdd() if err != nil && !strings.Contains(err.Error(), "blobber already exists") { logging.Logger.Error("Error in add blobber", zap.Any("err", err)) return err } - logging.Logger.Info("Verified blobber register transaction", zap.String("txn_hash", txn.Hash), zap.Any("txn_output", txn.TransactionOutput)) - txnHash, err := SendHealthCheck(common.ProviderTypeBlobber) if err != nil { logging.Logger.Error("Failed to send healthcheck transaction", zap.String("txn_hash", txnHash))