diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-01 21:44:43 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-01 21:44:43 +0800 |
| commit | 550407b0ec78b7026737d1abe28127da8c0c9063 (patch) | |
| tree | 3241ece71925f73dfb5c05b870ce6e13232e63c0 | |
| parent | d0959063d5f67dccc214f43344d88dce25ca167f (diff) | |
| parent | d294dedfad754fdb6afca22e3bb116e3d07febcd (diff) | |
| download | dexon-550407b0ec78b7026737d1abe28127da8c0c9063.tar.gz dexon-550407b0ec78b7026737d1abe28127da8c0c9063.tar.zst dexon-550407b0ec78b7026737d1abe28127da8c0c9063.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
| -rw-r--r-- | ethchain/block.go | 2 | ||||
| -rw-r--r-- | ethchain/dagger.go | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index fee4a2d59..1be8282fa 100644 --- a/ethchain/block.go +++ b/ethchain/block.go @@ -166,7 +166,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) /* diff --git a/ethchain/dagger.go b/ethchain/dagger.go index 08c4826db..b586657b9 100644 --- a/ethchain/dagger.go +++ b/ethchain/dagger.go @@ -31,6 +31,7 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte { for { select { case <-reactChan: + powlogger.Infoln("Breaking from mining") return nil default: i++ |