Skip to content

Commit 550407b

Browse files
committed
Merge branch 'develop' of github.zerozr99.workers.dev-obscure:ethereum/eth-go into develop
2 parents d095906 + d294ded commit 550407b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

ethchain/block.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (block *Block) CalcGasLimit(parent *Block) *big.Int {
166166
result := new(big.Int).Add(previous, curInt)
167167
result.Div(result, big.NewInt(1024))
168168

169-
min := ethutil.BigPow(10, 4)
169+
min := big.NewInt(125000)
170170

171171
return ethutil.BigMax(min, result)
172172
/*

ethchain/dagger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte {
3131
for {
3232
select {
3333
case <-reactChan:
34+
powlogger.Infoln("Breaking from mining")
3435
return nil
3536
default:
3637
i++

0 commit comments

Comments
 (0)