diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-15 00:59:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 00:59:00 +0800 |
| commit | a973d1d5233bbd36cbaed0b7235311d4cd529580 (patch) | |
| tree | 61ed1bd31a9c2a2e6a052a122a737deaee70c6cb /cmd | |
| parent | 15a609d5d6613e37e819975ceba01cb5ba735242 (diff) | |
| parent | c12f4df910e2da1cc5dd28c5c4bbe2d8721e1057 (diff) | |
| download | dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.gz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.bz2 dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.lz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.xz dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.tar.zst dexon-a973d1d5233bbd36cbaed0b7235311d4cd529580.zip | |
Merge pull request #3674 from obscuren/gaz64
params: core, core/vm, miner: 64bit gas instructions
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/evm/main.go | 4 | ||||
| -rw-r--r-- | cmd/geth/main.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 9f67e6628..8af0cebbb 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -156,7 +156,7 @@ func run(ctx *cli.Context) error { ret, _, err = runtime.Create(input, &runtime.Config{ Origin: sender.Address(), State: statedb, - GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)), + GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)).Uint64(), GasPrice: common.Big(ctx.GlobalString(PriceFlag.Name)), Value: common.Big(ctx.GlobalString(ValueFlag.Name)), EVMConfig: vm.Config{ @@ -172,7 +172,7 @@ func run(ctx *cli.Context) error { ret, err = runtime.Call(receiver.Address(), common.Hex2Bytes(ctx.GlobalString(InputFlag.Name)), &runtime.Config{ Origin: sender.Address(), State: statedb, - GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)), + GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)).Uint64(), GasPrice: common.Big(ctx.GlobalString(PriceFlag.Name)), Value: common.Big(ctx.GlobalString(ValueFlag.Name)), EVMConfig: vm.Config{ diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 1680a32e0..c19770bfa 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -205,7 +205,7 @@ func makeFullNode(ctx *cli.Context) *node.Node { if err != nil { glog.V(logger.Warn).Infoln("error setting canonical miner information:", err) } - if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() { + if uint64(len(extra)) > params.MaximumExtraDataSize { glog.V(logger.Warn).Infoln("error setting canonical miner information: extra exceeds", params.MaximumExtraDataSize) glog.V(logger.Debug).Infof("extra: %x\n", extra) extra = nil |