From 8a98b922307afea0feab4b201773883709218e87 Mon Sep 17 00:00:00 2001 From: Jayash Satolia <73050737+Jayashsatolia403@users.noreply.github.com> Date: Sat, 29 Jun 2024 02:46:28 +0530 Subject: [PATCH 1/3] Fix validator url --- cmd/storage.go | 39 +++++++++++++++++++++++++++++++++++---- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 38 insertions(+), 7 deletions(-) diff --git a/cmd/storage.go b/cmd/storage.go index 7da2cf4a..7b40c00b 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -290,10 +290,10 @@ var blobberUpdateCmd = &cobra.Command{ } var resetBlobberStatsCmd = &cobra.Command{ - Use: "reset-blobber-stats", - Short: "Reset blobber stats", - Long: `Reset blobber stats`, - Args: cobra.MinimumNArgs(0), + Use: "reset-blobber-stats", + Short: "Reset blobber stats", + Long: `Reset blobber stats`, + Args: cobra.MinimumNArgs(0), Hidden: true, Run: func(cmd *cobra.Command, args []string) { var ( @@ -359,6 +359,37 @@ var resetBlobberStatsCmd = &cobra.Command{ }, } +var fixValidatorUrl = &cobra.Command{ + Use: "fix-validator-url", + Short: "Fix validator url", + Long: `Fix validator url`, + Args: cobra.MinimumNArgs(0), + Run: func(cmd *cobra.Command, args []string) { + var ( + validatorRequest = &sdk.FixValidatorRequest{} + validatorID string + + err error + + flags = cmd.Flags() + ) + + if !flags.Changed("validator_id") { + log.Fatal("missing required 'validator_id' flag") + } + if validatorID, err = flags.GetString("validator_id"); err != nil { + log.Fatal("error in 'validator_id' flag: ", err) + } + + validatorRequest.ValidatorID = validatorID + + if _, _, err = sdk.ResetValidator(validatorRequest); err != nil { + log.Fatal(err) + } + fmt.Println("validator url fixed successfully") + }, +} + func init() { rootCmd.AddCommand(scConfig) rootCmd.AddCommand(lsBlobers) diff --git a/go.mod b/go.mod index 2c96b7e6..0014adf4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.16.0-RC2 + github.com/0chain/gosdk v1.16.0-RC2.0.20240628211100-969f58802d5a github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 diff --git a/go.sum b/go.sum index eb51e813..1974c1c2 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 h1:z+DtCR8mBsjPnEs github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565/go.mod h1:UyDC8Qyl5z9lGkCnf9RHJPMektnFX8XtCJZHXCCVj8E= 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.16.0-RC2 h1:S8vp6GROrhizUqUYZCG71hP27p/lAFoSy0J5chJCwug= -github.com/0chain/gosdk v1.16.0-RC2/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= +github.com/0chain/gosdk v1.16.0-RC2.0.20240628211100-969f58802d5a h1:wUUWh8wQFnll8+xBnWheA2uawoRnRCNnvmJR2SJSbjM= +github.com/0chain/gosdk v1.16.0-RC2.0.20240628211100-969f58802d5a/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= 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/Luzifer/go-openssl/v3 v3.1.0 h1:QqKqo6kYXGGUsvtUoCpRZm8lHw+jDfhbzr36gVj+/gw= From ce05ffc2378c888d22c094fb7d16cad78708db67 Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 2 Jan 2025 17:30:43 +0530 Subject: [PATCH 2/3] Fix --- go.mod | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e8aa1088..21b19cde 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.20241206200527-e3e37f887e16 + github.com/0chain/gosdk v1.18.14-0.20250102115841-29fc60ff8d0e github.com/icza/bitio v1.1.0 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/cobra v1.6.0 diff --git a/go.sum b/go.sum index bea4d1f4..42f28121 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.20241206200527-e3e37f887e16 h1:UguPfAV0B/d/J1JWlxbkUlBKP3QlVmuATO8OaaHg/Qk= -github.com/0chain/gosdk v1.18.12-0.20241206200527-e3e37f887e16/go.mod h1:8unFy9Dx2YyPKMYPDGR3MFhUEymbAfQcRDm9bobVLGw= +github.com/0chain/gosdk v1.18.14-0.20250102115841-29fc60ff8d0e h1:iLFt+DJYsR6pgXoFIHXSWOc2nm6ayfOpeiZwHZczf6w= +github.com/0chain/gosdk v1.18.14-0.20250102115841-29fc60ff8d0e/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/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= From c504969c73010c2ff971601770e2c69b978f197d Mon Sep 17 00:00:00 2001 From: Jayash Satolia Date: Thu, 2 Jan 2025 19:31:10 +0530 Subject: [PATCH 3/3] Fix --- cmd/storage.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/storage.go b/cmd/storage.go index 8601cf59..70958a26 100644 --- a/cmd/storage.go +++ b/cmd/storage.go @@ -488,6 +488,7 @@ func init() { rootCmd.AddCommand(resetBlobberStatsCmd) rootCmd.AddCommand(resetVersionCmd) rootCmd.AddCommand(insertKilledProviderId) + rootCmd.AddCommand(fixValidatorUrl) scConfig.Flags().Bool("json", false, "(default false) pass this option to print response as json data") lsBlobers.Flags().Bool("json", false, "(default false) pass this option to print response as json data") @@ -532,4 +533,7 @@ func init() { insertKilledProviderId.Flags().String("id", "", "blobber_id is required") insertKilledProviderId.MarkFlagRequired("id") + + fixValidatorUrl.Flags().String("validator_id", "", "validator_id is required") + fixValidatorUrl.MarkFlagRequired("validator_id") }