From 5f7e74d5c8c7bef4481d8457183e6d2b4a8a79a6 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 29 Feb 2016 14:15:18 +0100 Subject: [release/1.3.4] cmd/utils: lower the min accepted gas price for relay and GPO to 20 shannon (cherry picked from commit ab92678fb39300d5823857a170be6638b1c2b2c5) --- cmd/utils/flags.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/utils') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3792dc1e0..815e233a8 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -183,7 +183,7 @@ var ( GasPriceFlag = cli.StringFlag{ Name: "gasprice", Usage: "Minimal gas price to accept for mining a transactions", - Value: new(big.Int).Mul(big.NewInt(50), common.Shannon).String(), + Value: new(big.Int).Mul(big.NewInt(20), common.Shannon).String(), } ExtraDataFlag = cli.StringFlag{ Name: "extradata", @@ -356,7 +356,7 @@ var ( GpoMinGasPriceFlag = cli.StringFlag{ Name: "gpomin", Usage: "Minimum suggested gas price", - Value: new(big.Int).Mul(big.NewInt(50), common.Shannon).String(), + Value: new(big.Int).Mul(big.NewInt(20), common.Shannon).String(), } GpoMaxGasPriceFlag = cli.StringFlag{ Name: "gpomax", -- cgit v1.2.3 From 61be63bb9b8527bb3e2357ad35a0f4ef29304da1 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Mon, 29 Feb 2016 10:01:01 +0100 Subject: [release/1.3.4] cmd/utils, params: homestead block (cherry picked from commit e22fd22c97b4f5d4af118dca3fb2cb6292a520a6) Conflicts: cmd/utils/flags.go --- cmd/utils/flags.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmd/utils') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 815e233a8..fd73b4417 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -472,6 +472,8 @@ func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { cfg.DataDir += "/testnet" cfg.NetworkId = 2 cfg.TestNet = true + // overwrite homestead block + params.HomesteadBlock = params.TestNetHomesteadBlock } if ctx.GlobalBool(VMEnableJitFlag.Name) { -- cgit v1.2.3