diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-03-24 17:24:39 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-03-24 17:24:39 +0800 |
| commit | 97786d03d57e1ca79e34ce5fd9aa172c61c3e665 (patch) | |
| tree | 251a5e54305e5cedf568f2fb73dbff9302df4185 /ethchain/block.go | |
| parent | 274d5cc91c45349ec8d7a1f5a20ef29896b38b2e (diff) | |
| parent | 6a86c517c4f4b372cad0ae1d92e926a482eac5ba (diff) | |
| download | dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar.gz dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar.bz2 dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar.lz dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar.xz dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.tar.zst dexon-97786d03d57e1ca79e34ce5fd9aa172c61c3e665.zip | |
Merge branch 'master' into miner
Diffstat (limited to 'ethchain/block.go')
| -rw-r--r-- | ethchain/block.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ethchain/block.go b/ethchain/block.go index d42aa7d83..732739c1b 100644 --- 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) |