提交 550407b0 编写于 作者: O obscuren

Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop

......@@ -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)
/*
......
......@@ -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++
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册