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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

min/max stake clean up for bl-update and validator-update commands #605

Open
wants to merge 3 commits into
base: sprint-1.14
Choose a base branch
from
Open

min/max stake clean up for bl-update and validator-update commands #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56158ca
min/max stake clean up for bl-update and validator-update commands
Ash-KODES Mar 21, 2024
82f8c05
Removing spaces
Ash-KODES Mar 21, 2024
7f0cb2f
Merge branch 'sprint-1.14' into configCleanup
Ash-KODES Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 0 additions & 29 deletions cmd/storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ var blobberInfoCmd = &cobra.Command{
fmt.Println(" max_offer_duration:", blob.Terms.MaxOfferDuration)
fmt.Println("settings:")
fmt.Println(" delegate_wallet:", blob.StakePoolSettings.DelegateWallet)
fmt.Println(" min_stake: ", blob.StakePoolSettings.MinStake)
fmt.Println(" max_stake: ", blob.StakePoolSettings.MaxStake)
fmt.Println(" num_delegates: ", blob.StakePoolSettings.NumDelegates)
fmt.Println(" service_charge: ", blob.StakePoolSettings.ServiceCharge*100, "%")
},
Expand Down Expand Up @@ -222,31 +220,6 @@ var blobberUpdateCmd = &cobra.Command{

stakePoolSettings := &blockchain.UpdateStakePoolSettings{}
var stakePoolSettingChanged bool
if flags.Changed("min_stake") {
var minStake float64
if minStake, err = flags.GetFloat64("min_stake"); err != nil {
log.Fatal(err)
}
stake, err := common.ToBalance(minStake)
if err != nil {
log.Fatal(err)
}
stakePoolSettings.MinStake = &stake
stakePoolSettingChanged = true
}

if flags.Changed("max_stake") {
var maxStake float64
if maxStake, err = flags.GetFloat64("max_stake"); err != nil {
log.Fatal(err)
}
stake, err := common.ToBalance(maxStake)
if err != nil {
log.Fatal(err)
}
stakePoolSettings.MaxStake = &stake
stakePoolSettingChanged = true
}

if flags.Changed("num_delegates") {
var nd int
Expand Down Expand Up @@ -396,8 +369,6 @@ func init() {
buf.Float64("read_price", 0.0, "update read_price, optional")
buf.Float64("write_price", 0.0, "update write_price, optional")
buf.Duration("max_offer_duration", 0*time.Second, "update max_offer_duration, optional")
buf.Float64("min_stake", 0.0, "update min_stake, optional")
buf.Float64("max_stake", 0.0, "update max_stake, optional")
buf.Int("num_delegates", 0, "update num_delegates, optional")
buf.Float64("service_charge", 0.0, "update service_charge, optional")
buf.Bool("not_available", true, "(default false) set blobber's availability for new allocations")
Expand Down
29 changes: 1 addition & 28 deletions cmd/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ func printValidators(nodes []*sdk.Validator) {
fmt.Println("is shut down: ", validator.IsShutdown)
fmt.Println("settings:")
fmt.Println(" delegate_wallet:", validator.DelegateWallet)
fmt.Println(" min_stake: ", validator.MinStake)
fmt.Println(" max_stake: ", validator.MaxStake)
fmt.Println(" total_stake: ", validator.StakeTotal)
fmt.Println(" num_delegates: ", validator.NumDelegates)
fmt.Println(" service_charge: ", validator.ServiceCharge*100, "%")
Expand Down Expand Up @@ -126,30 +124,7 @@ var validatorUpdateCmd = &cobra.Command{

updateValidator := new(sdk.UpdateValidator)
updateValidator.ID = common.Key(validatorID)
if flags.Changed("min_stake") {
var minStake float64
if minStake, err = flags.GetFloat64("min_stake"); err != nil {
log.Fatal(err)
}
stake, err := common.ToBalance(minStake)
if err != nil {
log.Fatal(err)
}
updateValidator.MinStake = &stake
}

if flags.Changed("max_stake") {
var maxStake float64
if maxStake, err = flags.GetFloat64("max_stake"); err != nil {
log.Fatal(err)
}
stake, err := common.ToBalance(maxStake)
if err != nil {
log.Fatal(err)
}
updateValidator.MaxStake = &stake
}


if flags.Changed("num_delegates") {
var nd int
if nd, err = flags.GetInt("num_delegates"); err != nil {
Expand Down Expand Up @@ -186,8 +161,6 @@ func init() {

buf := validatorUpdateCmd.Flags()
buf.String("validator_id", "", "validator ID, required")
buf.Float64("min_stake", 0.0, "update min_stake, optional")
buf.Float64("max_stake", 0.0, "update max_stake, optional")
buf.Int("num_delegates", 0, "update num_delegates, optional")
buf.Float64("service_charge", 0.0, "update service_charge, optional")
validatorUpdateCmd.MarkFlagRequired("validator_id")
Expand Down