Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint 1.19 #410

Merged
merged 12 commits into from
Feb 7, 2025
44 changes: 44 additions & 0 deletions cmd/mn-delete.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package cmd

import (
"fmt"
"github.com/0chain/gosdk/zcncore"
"github.com/spf13/cobra"
"log"
)

var minerDelete = &cobra.Command{
Use: "mn-delete",
Short: "delete miner",
Long: "delete miner",
Args: cobra.MinimumNArgs(0),
Run: func(cmd *cobra.Command, args []string) {
var (
flags = cmd.Flags()
id string
err error
)

if !flags.Changed("id") {
log.Fatal("missing id flag")
}

if id, err = flags.GetString("id"); err != nil {
log.Fatal(err)
}

hash, _, _, _, err := zcncore.DeleteMiner(id)
if err != nil {
log.Fatal("Delete miner failed : ", err.Error())
}

fmt.Println("delete miner success with transaction hash : ", hash)
},
}

func init() {
rootCmd.AddCommand(minerDelete)
minerDelete.PersistentFlags().String("id", "", "miner ID to delete")
_ = minerDelete.MarkFlagRequired("id")

}
44 changes: 44 additions & 0 deletions cmd/sh-delete.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package cmd

import (
"fmt"
"github.com/0chain/gosdk/zcncore"
"github.com/spf13/cobra"
"log"
)

var sharderDelete = &cobra.Command{
Use: "sh-delete",
Short: "delete sharder",
Long: "delete sharder",
Args: cobra.MinimumNArgs(0),
Run: func(cmd *cobra.Command, args []string) {
var (
flags = cmd.Flags()
id string
err error
)

if !flags.Changed("id") {
log.Fatal("missing id flag")
}

if id, err = flags.GetString("id"); err != nil {
log.Fatal(err)
}

hash, _, _, _, err := zcncore.DeleteSharder(id)
if err != nil {
log.Fatal("Delete sharder failed : ", err.Error())
}

fmt.Println("delete sharder success with transaction hash : ", hash)
},
}

func init() {
rootCmd.AddCommand(sharderDelete)
sharderDelete.PersistentFlags().String("id", "", "sharder ID to delete")
_ = sharderDelete.MarkFlagRequired("id")

}
67 changes: 67 additions & 0 deletions cmd/vc-add.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package cmd

import (
"fmt"
"github.com/0chain/gosdk/zboxcore/sdk"
"github.com/0chain/gosdk/zcncore"
"github.com/spf13/cobra"
"log"
)

var providerRegister = &cobra.Command{
Use: "vc-add",
Short: "add node to view change",
Long: "add node to view change, add a miner or sharder to the register list so that they can join the MB. Only chainowner can do this.",
// Args: cobra.MinimumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
var (
flags = cmd.Flags()
id string
err error
)

if !flags.Changed("id") {
log.Fatal("missing id flag")
}

if id, err = flags.GetString("id"); err != nil {
log.Fatal(err)
}

if !flags.Changed("provider-type") {
log.Fatal("missing provider-type flag")
}

nodeType, err := flags.GetString("provider-type")
if err != nil {
log.Fatal(err)
}

var pt sdk.ProviderType
switch nodeType {
case "miner":
pt = sdk.ProviderMiner
case "sharder":
pt = sdk.ProviderSharder
default:
log.Fatalf("unknown provider type: %v", nodeType)
}

hash, _, _, _, err := zcncore.VcRegisterNode(id, pt)
if err != nil {
log.Fatal("Vc register node : ", err)
}

fmt.Println("vc add success with transaction hash : ", hash)
},
}

func init() {
rootCmd.AddCommand(providerRegister)
providerRegister.PersistentFlags().String("id", "", "provider ID to add to view change")
_ = providerRegister.MarkFlagRequired("id")

providerRegister.PersistentFlags().String("provider-type", "", "provider type")
_ = providerRegister.MarkFlagRequired("provider-type")

}
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ go 1.22.0
toolchain go1.22.5

require (
github.com/0chain/gosdk v1.18.12-0.20241205003726-a738be4e1f20
github.com/0chain/gosdk v1.19.0-RC2.0.20250117164514-4933fa5602a5
github.com/ethereum/go-ethereum v1.13.2
github.com/icza/bitio v1.1.0
github.com/olekukonko/tablewriter v0.0.5
@@ -111,4 +111,4 @@ require (
)

// temporary, for development
// replace github.com/0chain/gosdk => ../gosdk
//replace github.com/0chain/gosdk => ../gosdk
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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.12-0.20241204141302-7029d233e3e0 h1:U4/UR2XB1roUMEjBf26glTDKwJB5o1h33mZDKOE+YfU=
github.com/0chain/gosdk v1.18.12-0.20241204141302-7029d233e3e0/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.19.0-RC2.0.20250117164514-4933fa5602a5 h1:A8Ig1uLfMIaGtP4/m2X7/KZC9+thbsOJNBaMY/ZsycY=
github.com/0chain/gosdk v1.19.0-RC2.0.20250117164514-4933fa5602a5/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.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=