diff options
| author | obscuren <geffobscura@gmail.com> | 2014-03-03 18:35:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-03-03 18:35:35 +0800 |
| commit | 5b1613d65b0c3471b80990120022b5a745ecab86 (patch) | |
| tree | addbb87cc82cca07e8ac8aa810d810e1de02b2a5 /ethchain/transaction_pool.go | |
| parent | d7c5936ac4ee8ae3156e0bc9813db61b990aa686 (diff) | |
| parent | c1d0ea7366f1bad134c985dbe1f272d376e5ec9b (diff) | |
| download | go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar.gz go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar.bz2 go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar.lz go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar.xz go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.tar.zst go-tangerine-5b1613d65b0c3471b80990120022b5a745ecab86.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ethchain/transaction_pool.go')
| -rw-r--r-- | ethchain/transaction_pool.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ethchain/transaction_pool.go b/ethchain/transaction_pool.go index cd09bf02e..763560570 100644 --- a/ethchain/transaction_pool.go +++ b/ethchain/transaction_pool.go @@ -104,7 +104,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error } }() // Get the sender - sender := block.GetAddr(tx.Sender()) + sender := block.state.GetAccount(tx.Sender()) // Make sure there's enough in the sender's account. Having insufficient // funds won't invalidate this transaction but simple ignores it. @@ -122,7 +122,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error } // Get the receiver - receiver := block.GetAddr(tx.Recipient) + receiver := block.state.GetAccount(tx.Recipient) sender.Nonce += 1 // Send Tx to self @@ -136,10 +136,10 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error // Add the amount to receivers account which should conclude this transaction receiver.Amount.Add(receiver.Amount, tx.Value) - block.UpdateAddr(tx.Recipient, receiver) + block.state.UpdateAccount(tx.Recipient, receiver) } - block.UpdateAddr(tx.Sender(), sender) + block.state.UpdateAccount(tx.Sender(), sender) log.Printf("[TXPL] Processed Tx %x\n", tx.Hash()) |