diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/js.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index e7e28b24b..a4b14d7b1 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -119,7 +119,6 @@ func newLightweightJSRE(docRoot string, client rpc.Client, datadir string, inter lr.SetCtrlCAborts(true) lr.SetWordCompleter(makeCompleter(js)) lr.SetTabCompletionStyle(liner.TabPrints) - lr.SetMultiLineMode(true) js.prompter = lr js.atexit = func() { js.withHistory(datadir, func(hist *os.File) { hist.Truncate(0); lr.WriteHistory(hist) }) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 8e89b9fb1..adcc0adca 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -181,7 +181,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", @@ -350,7 +350,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", @@ -672,6 +672,8 @@ func MakeSystemNode(name, version string, extra []byte, ctx *cli.Context) *node. ethConf.Genesis = core.TestNetGenesisBlock() } state.StartingNonce = 1048576 // (2**20) + // overwrite homestead block + params.HomesteadBlock = params.TestNetHomesteadBlock case ctx.GlobalBool(DevModeFlag.Name): // Override the base network stack configs |