Skip to content

Commit

Permalink
internal/flags: fix --miner.gasprice default listing (ethereum#28932)
Browse files Browse the repository at this point in the history
  • Loading branch information
gzliudan committed Nov 22, 2024
1 parent af8bb30 commit 9197cfa
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions internal/flags/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ type BigFlag struct {
Hidden bool
HasBeenSet bool

Value *big.Int
Value *big.Int
defaultValue *big.Int

Aliases []string
EnvVars []string
Expand All @@ -269,6 +270,10 @@ func (f *BigFlag) IsSet() bool { return f.HasBeenSet }
func (f *BigFlag) String() string { return cli.FlagStringer(f) }

func (f *BigFlag) Apply(set *flag.FlagSet) error {
// Set default value so that environment wont be able to overwrite it
if f.Value != nil {
f.defaultValue = new(big.Int).Set(f.Value)
}
for _, envVar := range f.EnvVars {
envVar = strings.TrimSpace(envVar)
if value, found := syscall.Getenv(envVar); found {
Expand All @@ -283,7 +288,6 @@ func (f *BigFlag) Apply(set *flag.FlagSet) error {
f.Value = new(big.Int)
set.Var((*bigValue)(f.Value), name, f.Usage)
})

return nil
}

Expand All @@ -310,7 +314,7 @@ func (f *BigFlag) GetDefaultText() string {
if f.DefaultText != "" {
return f.DefaultText
}
return f.GetValue()
return f.defaultValue.String()
}

// bigValue turns *big.Int into a flag.Value
Expand Down

0 comments on commit 9197cfa

Please sign in to comment.