diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-02-13 23:13:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 23:13:40 +0800 |
| commit | 0850f68fd17586370b102aa516739476db4913c2 (patch) | |
| tree | 5d2f140139f3763a7da3c20a88acff96b58ec8ad /cmd | |
| parent | f8f428cc18c5f70814d7b3937128781bac14bffd (diff) | |
| parent | 57f4e9025757254536a738bb4771712038f1e763 (diff) | |
| download | dexon-0850f68fd17586370b102aa516739476db4913c2.tar dexon-0850f68fd17586370b102aa516739476db4913c2.tar.gz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.bz2 dexon-0850f68fd17586370b102aa516739476db4913c2.tar.lz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.xz dexon-0850f68fd17586370b102aa516739476db4913c2.tar.zst dexon-0850f68fd17586370b102aa516739476db4913c2.zip | |
Merge pull request #3668 from obscuren/revert-gas64
Revert "params: core, core/vm, miner: 64bit gas instructions (#3514)"
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 8af0cebbb..9f67e6628 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)).Uint64(), + GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)), 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)).Uint64(), + GasLimit: common.Big(ctx.GlobalString(GasFlag.Name)), 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 c19770bfa..1680a32e0 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 { + if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() { 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 |