Decode big.int in config (#219)

command/server/config.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	godebug "runtime/debug"
@@ -194,7 +195,8 @@ type SealerConfig struct {
 	GasCeil uint64 `hcl:"gas-ceil,optional"`
 
 	// GasPrice is the minimum gas price for mining a transaction
-	GasPrice *big.Int `hcl:"gas-price,optional"`
+	GasPrice    *big.Int
+	GasPriceRaw string `hcl:"gas-price,optional"`
 }
 
 type JsonRPCConfig struct {
@@ -256,10 +258,12 @@ type GpoConfig struct {
 	Percentile uint64 `hcl:"percentile,optional"`
 
 	// MaxPrice is an upper bound gas price
-	MaxPrice *big.Int `hcl:"max-price,optional"`
+	MaxPrice    *big.Int
+	MaxPriceRaw string `hcl:"max-price,optional"`
 
 	// IgnorePrice is a lower bound gas price
-	IgnorePrice *big.Int `hcl:"ignore-price,optional"`
+	IgnorePrice    *big.Int
+	IgnorePriceRaw string `hcl:"ignore-price,optional"`
 }
 
 type TelemetryConfig struct {
@@ -473,6 +477,37 @@ func DefaultConfig() *Config {
 	}
 }
 
+func (c *Config) fillBigInt() error {
+	tds := []struct {
+		path string
+		td   **big.Int
+		str  *string
+	}{
+		{"gpo.maxprice", &c.Gpo.MaxPrice, &c.Gpo.MaxPriceRaw},
+		{"gpo.ignoreprice", &c.Gpo.IgnorePrice, &c.Gpo.IgnorePriceRaw},
+		{"sealer.gasprice", &c.Sealer.GasPrice, &c.Sealer.GasPriceRaw},
+	}
+
+	for _, x := range tds {
+		if *x.str != "" {
+			b := new(big.Int)
+
+			var ok bool
+			if strings.HasPrefix(*x.str, "0x") {
+				b, ok = b.SetString((*x.str)[2:], 16)
+			} else {
+				b, ok = b.SetString(*x.str, 10)
+			}
+			if !ok {
+				return fmt.Errorf("%s can't parse big int %s", x.path, *x.str)
+			}
+			*x.str = ""
+			*x.td = b
+		}
+	}
+	return nil
+}
+
 func (c *Config) fillTimeDurations() error {
 	tds := []struct {
 		path string
@@ -511,10 +546,14 @@ func readConfigFile(path string) (*Config, error) {
 	config := &Config{
 		TxPool: &TxPoolConfig{},
 		Cache:  &CacheConfig{},
+		Sealer: &SealerConfig{},
 	}
 	if err := hclsimple.DecodeFile(path, nil, config); err != nil {
 		return nil, fmt.Errorf("failed to decode config file '%s': %v", path, err)
 	}
+	if err := config.fillBigInt(); err != nil {
+		return nil, err
+	}
 	if err := config.fillTimeDurations(); err != nil {
 		return nil, err
 	}

command/server/config_test.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"math/big"
 	"testing"
 	"time"
 
@@ -81,13 +82,20 @@ func TestConfigLoadFile(t *testing.T) {
 		assert.NoError(t, err)
 		assert.Equal(t, config, &Config{
 			DataDir: "./data",
+			Whitelist: map[string]string{
+				"a": "b",
+			},
 			P2P: &P2PConfig{
 				MaxPeers: 30,
 			},
 			TxPool: &TxPoolConfig{
 				LifeTime: time.Duration(1 * time.Second),
 			},
-			Cache: &CacheConfig{},
+			Gpo: &GpoConfig{
+				MaxPrice: big.NewInt(100),
+			},
+			Sealer: &SealerConfig{},
+			Cache:  &CacheConfig{},
 		})
 	}
 

command/server/testdata/simple.hcl

@@ -1,5 +1,9 @@
 data-dir = "./data"
 
+whitelist = {
+	a = "b"
+}
+
 p2p {
 	max-peers = 30
 }
@@ -7,3 +11,7 @@ p2p {
 txpool {
 	lifetime = "1s"
 }
+
+gpo {
+	max-price = "100"
+}

command/server/testdata/simple.json

@@ -1,9 +1,15 @@
 {
     "data-dir": "./data",
+    "whitelist": {
+        "a": "b"
+    },
     "p2p": {
         "max-peers": 30
     },
     "txpool": {
         "lifetime": "1s"
+    },
+    "gpo": {
+        "max-price": "100"
     }
 }