diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-01 22:03:02 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-01 22:03:02 +0800 |
| commit | 89630d2826300d119f2cdc9f8af6c94926f478a2 (patch) | |
| tree | aa2addd061e2d2a8f3cdc0821260409f31ac3b09 /ethchain/block.go | |
| parent | 12972b4b65a303dc3f9e135b0e2d97f8b7a661e2 (diff) | |
| parent | 550407b0ec78b7026737d1abe28127da8c0c9063 (diff) | |
| download | dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar.gz dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar.bz2 dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar.lz dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar.xz dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.tar.zst dexon-89630d2826300d119f2cdc9f8af6c94926f478a2.zip | |
merge upstream
Diffstat (limited to 'ethchain/block.go')
| -rw-r--r-- | ethchain/block.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index ed5b754f8..a0f9ecd86 100644 --- a/ethchain/block.go +++ b/ethchain/block.go @@ -168,7 +168,7 @@ func (block *Block) CalcGasLimit(parent *Block) *big.Int { result := new(big.Int).Add(previous, curInt) result.Div(result, big.NewInt(1024)) - min := ethutil.BigPow(10, 4) + min := big.NewInt(125000) return ethutil.BigMax(min, result) /* |