From 87a9773b63a0f7793dfc15e2867e1f1bb3f0aa57 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Tue, 5 Apr 2022 17:41:11 +0200 Subject: [PATCH 1/4] cmd/geth: allow for big ttd --- cmd/geth/config.go | 2 +- cmd/utils/flags.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 26eeccb8b60b..b04d528e062b 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -160,7 +160,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { cfg.Eth.OverrideArrowGlacier = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideArrowGlacierFlag.Name)) } if ctx.GlobalIsSet(utils.OverrideTerminalTotalDifficulty.Name) { - cfg.Eth.OverrideTerminalTotalDifficulty = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideTerminalTotalDifficulty.Name)) + cfg.Eth.OverrideTerminalTotalDifficulty, _ = new(big.Int).SetString(ctx.GlobalString(utils.OverrideTerminalTotalDifficulty.Name), 0) } backend, eth := utils.RegisterEthService(stack, &cfg.Eth) // Warn users to migrate if they have a legacy freezer format. diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index ae1e77675355..dcc27f76cd5a 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -258,7 +258,7 @@ var ( Name: "override.arrowglacier", Usage: "Manually specify Arrow Glacier fork-block, overriding the bundled setting", } - OverrideTerminalTotalDifficulty = cli.Uint64Flag{ + OverrideTerminalTotalDifficulty = cli.StringFlag{ Name: "override.terminaltotaldifficulty", Usage: "Manually specify TerminalTotalDifficulty, overriding the bundled setting", } From 9f79038e54ce2f2625bdb49d946c6ae540bc7b0d Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 8 Apr 2022 15:22:42 +0200 Subject: [PATCH 2/4] cmd/geth: use BigFlag/GlobalBig for TTD --- cmd/geth/config.go | 2 +- cmd/utils/flags.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index b04d528e062b..d7b8b55d1588 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -160,7 +160,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { cfg.Eth.OverrideArrowGlacier = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideArrowGlacierFlag.Name)) } if ctx.GlobalIsSet(utils.OverrideTerminalTotalDifficulty.Name) { - cfg.Eth.OverrideTerminalTotalDifficulty, _ = new(big.Int).SetString(ctx.GlobalString(utils.OverrideTerminalTotalDifficulty.Name), 0) + cfg.Eth.OverrideTerminalTotalDifficulty = utils.GlobalBig(ctx, utils.OverrideTerminalTotalDifficulty.Name) } backend, eth := utils.RegisterEthService(stack, &cfg.Eth) // Warn users to migrate if they have a legacy freezer format. diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index dcc27f76cd5a..1fb48973244b 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -258,7 +258,7 @@ var ( Name: "override.arrowglacier", Usage: "Manually specify Arrow Glacier fork-block, overriding the bundled setting", } - OverrideTerminalTotalDifficulty = cli.StringFlag{ + OverrideTerminalTotalDifficulty = BigFlag{ Name: "override.terminaltotaldifficulty", Usage: "Manually specify TerminalTotalDifficulty, overriding the bundled setting", } From f57ccb385c9cfffa437ddb797f9d58fdf8e426ce Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Tue, 12 Apr 2022 11:02:59 +0200 Subject: [PATCH 3/4] cmd/utils: initialize f.Value before setting variable --- cmd/utils/customflags.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 0a72e80349d4..13b147a14571 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -154,11 +154,11 @@ func (b *bigValue) String() string { } func (b *bigValue) Set(s string) error { - int, ok := math.ParseBig256(s) - if !ok { + intVal, ok := math.ParseBig256(s) + if !ok || intVal == nil { return errors.New("invalid integer syntax") } - *b = (bigValue)(*int) + *b = (bigValue)(*intVal) return nil } @@ -172,6 +172,7 @@ func (f BigFlag) String() string { func (f BigFlag) Apply(set *flag.FlagSet) { eachName(f.Name, func(name string) { + f.Value = new(big.Int) set.Var((*bigValue)(f.Value), f.Name, f.Usage) }) } From e1710f932e650bc1ef0efbeaa204d0e2f671b068 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 12 Apr 2022 22:46:57 +0200 Subject: [PATCH 4/4] Update customflags.go --- cmd/utils/customflags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go index 13b147a14571..e5be085a5db7 100644 --- a/cmd/utils/customflags.go +++ b/cmd/utils/customflags.go @@ -155,7 +155,7 @@ func (b *bigValue) String() string { func (b *bigValue) Set(s string) error { intVal, ok := math.ParseBig256(s) - if !ok || intVal == nil { + if !ok { return errors.New("invalid integer syntax") } *b = (bigValue)(*intVal)