Merge branch 'master' into miner

2014-03-24 10:24:39 +01:00
parent 274d5cc91c 6a86c517c4
commit 97786d03d5
18 changed files with 796 additions and 521 deletions
--- a/ethchain/block.go
+++ b/ethchain/block.go
@ -142,7 +142,7 @@ func (block *Block) PayFee(addr []byte, fee *big.Int) bool {
 	data := block.state.trie.Get(string(block.Coinbase))

 	// Get the ether (Coinbase) and add the fee (gief fee to miner)
-	ether := NewAccountFromData([]byte(data))
+	ether := NewAccountFromData(block.Coinbase, []byte(data))

 	base = new(big.Int)
 	ether.Amount = base.Add(ether.Amount, fee)