mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-04 01:54:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
obscuren 2014-04-09 15:50:49 +02:00
commit c0cad0b534
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethchain/block_chain.go
View File

@ -169,6 +169,8 @@ func (bc *BlockChain) ResetTillBlockHash(hash []byte) error {
bc.LastBlockHash = bc.genesisBlock.Hash() bc.LastBlockHash = bc.genesisBlock.Hash()
bc.LastBlockNumber = 1 bc.LastBlockNumber = 1
} else { } else {
// TODO: Somehow this doesn't really give the right numbers, double check.
// TODO: Change logs into debug lines
returnTo = bc.GetBlock(hash) returnTo = bc.GetBlock(hash)
bc.CurrentBlock = returnTo bc.CurrentBlock = returnTo
bc.LastBlockHash = returnTo.Hash() bc.LastBlockHash = returnTo.Hash()

1
ethminer/miner.go
View File

@ -105,6 +105,7 @@ func (miner *Miner) listener() {
if found == false { if found == false {
log.Println("[MINER] We did not know about this transaction, adding") log.Println("[MINER] We did not know about this transaction, adding")
miner.txs = append(miner.txs, tx) miner.txs = append(miner.txs, tx)
miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs)
miner.block.SetTransactions(miner.txs) miner.block.SetTransactions(miner.txs)
} else { } else {
log.Println("[MINER] We already had this transaction, ignoring") log.Println("[MINER] We already had this transaction, ignoring")