From b66a99e32dd51ddd66a81141a9a37f93144935bd Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Wed, 9 Apr 2014 08:55:39 -0400
Subject: Added todo
---
ethchain/block_chain.go | 2 ++
1 file changed, 2 insertions(+)
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()
--
cgit v1.2.3
From a83db489dfddb16786b1de3d28aee4a4af9e12d5 Mon Sep 17 00:00:00 2001
From: Maran <maran.hidskes@gmail.com>
Date: Wed, 9 Apr 2014 09:48:17 -0400
Subject: Fix transaction on new blocks
---
ethminer/miner.go | 1 +
1 file changed, 1 insertion(+)
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")
--
cgit v1.2.3