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

11 years ago · 550407b0ec
parent d0959063d5 d294dedfad
commit 550407b0ec
2 changed files with 2 additions and 1 deletions
--- 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)
 	/*
--- 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++