Merge pull request #614 from etclabscore/fix-config-toml

Fix config toml, go generate

.github/workflows/go-generate-check.yml

@@ -1,5 +1,7 @@
 name: Developer helper
-on: pull_request
+on:
+  pull_request:
+  workflow_dispatch:
 env:
   # GENERATE_EXCEPTIONS are exceptions made to the 'go generate' command.
   # These patterns are matched (negatively) against 'go list' output.

cmd/geth/config.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"math/big"
 	"os"
 	"reflect"
 	"unicode"
@@ -171,7 +170,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	stack, cfg := makeConfigNode(ctx)
 	if ctx.IsSet(utils.ECBP1100Flag.Name) {
 		if n := ctx.Uint64(utils.ECBP1100Flag.Name); n != math.MaxUint64 {
-			cfg.Eth.ECBP1100 = new(big.Int).SetUint64(n)
+			cfg.Eth.OverrideECBP1100 = &n
 		}
 	}
 	if ctx.IsSet(utils.ECBP1100NoDisableFlag.Name) {
@@ -181,7 +180,7 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 	}
 	if ctx.IsSet(utils.OverrideECBP1100DeactivateFlag.Name) {
 		if n := ctx.Uint64(utils.OverrideECBP1100DeactivateFlag.Name); n != math.MaxUint64 {
-			cfg.Eth.OverrideECBP1100Deactivate = new(big.Int).SetUint64(n)
+			cfg.Eth.OverrideECBP1100Deactivate = &n
 		}
 	}
 	if ctx.IsSet(utils.OverrideShanghai.Name) {

eth/backend.go

@@ -230,15 +230,13 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 	}
 	eth.bloomIndexer.Start(eth.blockchain)
 	// Handle artificial finality config override cases.
-	if n := config.ECBP1100; n != nil {
-		v := n.Uint64()
-		if err := eth.blockchain.Config().SetECBP1100Transition(&v); err != nil {
+	if n := config.OverrideECBP1100; n != nil {
+		if err := eth.blockchain.Config().SetECBP1100Transition(n); err != nil {
 			return nil, err
 		}
 	}
 	if n := config.OverrideECBP1100Deactivate; n != nil {
-		v := n.Uint64()
-		if err := eth.blockchain.Config().SetECBP1100DeactivateTransition(&v); err != nil {
+		if err := eth.blockchain.Config().SetECBP1100DeactivateTransition(n); err != nil {
 			return nil, err
 		}
 	}

eth/ethconfig/config.go

@@ -18,7 +18,6 @@
 package ethconfig
 
 import (
-	"math/big"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -217,9 +216,9 @@ type Config struct {
 	CheckpointOracle *ctypes.CheckpointOracleConfig `toml:",omitempty"`
 
 	// Manual configuration field for ECBP1100 activation number. Used for modifying genesis config via CLI flag.
-	ECBP1100 *big.Int
+	OverrideECBP1100 *uint64 `toml:",omitempty"`
 	// Manual configuration field for ECBP1100's disablement block number. Used for modifying genesis config via CLI flag.
-	OverrideECBP1100Deactivate *big.Int
+	OverrideECBP1100Deactivate *uint64 `toml:",omitempty"`
 
 	// ECBP1100NoDisable overrides
 	// When this value is *true, ECBP100 will not (ever) be disabled; when *false, it will never be enabled.