diff options
| author | obscuren <geffobscura@gmail.com> | 2014-04-09 21:50:49 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-04-09 21:50:49 +0800 |
| commit | c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0 (patch) | |
| tree | f6503df1d2d304eb44b25625cc19a123d5971054 | |
| parent | 035f0ffb8ac95faa1742c0575cc9b5409ec54379 (diff) | |
| parent | a83db489dfddb16786b1de3d28aee4a4af9e12d5 (diff) | |
| download | go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar.gz go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar.bz2 go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar.lz go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar.xz go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.tar.zst go-tangerine-c0cad0b534f8e0bdd20f57480883d92ea0ffe9f0.zip | |
Merge branch 'miner' of github.com-obscure:ethereum/eth-go into miner
| -rw-r--r-- | ethchain/block_chain.go | 2 | ||||
| -rw-r--r-- | ethminer/miner.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ethchain/block_chain.go b/ethchain/block_chain.go index f621965ae..2a50ef687 100644 --- a/ethchain/block_chain.go +++ b/ethchain/block_chain.go @@ -169,6 +169,8 @@ func (bc *BlockChain) ResetTillBlockHash(hash []byte) error { bc.LastBlockHash = bc.genesisBlock.Hash() bc.LastBlockNumber = 1 } else { + // TODO: Somehow this doesn't really give the right numbers, double check. + // TODO: Change logs into debug lines returnTo = bc.GetBlock(hash) bc.CurrentBlock = returnTo bc.LastBlockHash = returnTo.Hash() diff --git a/ethminer/miner.go b/ethminer/miner.go index 60af3ab31..d84977342 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -105,6 +105,7 @@ func (miner *Miner) listener() { if found == false { log.Println("[MINER] We did not know about this transaction, adding") miner.txs = append(miner.txs, tx) + miner.block = miner.ethereum.BlockChain().NewBlock(miner.coinbase, miner.txs) miner.block.SetTransactions(miner.txs) } else { log.Println("[MINER] We already had this transaction, ignoring") |