diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2017-02-02 22:25:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 22:25:42 +0800 |
| commit | 8b57c494908637a5c0e74f8f7a13b3218e026757 (patch) | |
| tree | d5c7842eea6959c3b91dba00e8452a79d735a2a3 /cmd | |
| parent | 296450451b090393b2dd11d057c5b72cb4d92356 (diff) | |
| download | go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar.gz go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar.bz2 go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar.lz go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar.xz go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.tar.zst go-tangerine-8b57c494908637a5c0e74f8f7a13b3218e026757.zip | |
params: core, core/vm, miner: 64bit gas instructions (#3514)
Reworked the EVM gas instructions to use 64bit integers rather than
arbitrary size big ints. All gas operations, be it additions,
multiplications or divisions, are checked and guarded against 64 bit
integer overflows.
In additon, most of the protocol paramaters in the params package have
been converted to uint64 and are now constants rather than variables.
* common/math: added overflow check ops
* core: vmenv, env renamed to evm
* eth, internal/ethapi, les: unmetered eth_call and cancel methods
* core/vm: implemented big.Int pool for evm instructions
* core/vm: unexported intPool methods & verification methods
* core/vm: added memoryGasCost overflow check and test
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 ff9d34b3c..d7e4cc7b5 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -202,7 +202,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 |