mirror
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum
2
0
Fork 1
Code Issues Releases Wiki Activity

Reverted changes

Browse Source
pull/150/head
obscuren 11 years ago
parent 527a3bbc2a
commit 035f0ffb8a
2 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      ethchain/state_manager.go
  2. 10
      ethchain/transaction_pool.go

4
ethchain/state_manager.go
Unescape View File

@ -114,12 +114,12 @@ func (sm *StateManager) ApplyTransactions(block *Block, txs []*Transaction) {
// contract instead of moving funds between accounts. // contract instead of moving funds between accounts.
var err error var err error
if contract := sm.procState.GetContract(tx.Recipient); contract != nil { if contract := sm.procState.GetContract(tx.Recipient); contract != nil {
err = sm.Ethereum.TxPool().ProcessTransaction(tx, sm.procState, true) err = sm.Ethereum.TxPool().ProcessTransaction(tx, block, true)
if err == nil { if err == nil {
sm.ProcessContract(contract, tx, block) sm.ProcessContract(contract, tx, block)
} }
} else { } else {
err = sm.Ethereum.TxPool().ProcessTransaction(tx, sm.procState, false) err = sm.Ethereum.TxPool().ProcessTransaction(tx, block, false)
} }
if err != nil { if err != nil {

10
ethchain/transaction_pool.go
Unescape View File

@ -90,7 +90,7 @@ func (pool *TxPool) addTransaction(tx *Transaction) {
// Process transaction validates the Tx and processes funds from the // Process transaction validates the Tx and processes funds from the
// sender to the recipient. // sender to the recipient.
func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract bool) (err error) { func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block, toContract bool) (err error) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
log.Println(r) log.Println(r)
@ -98,7 +98,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
} }
}() }()
// Get the sender // Get the sender
sender := state.GetAccount(tx.Sender()) sender := block.state.GetAccount(tx.Sender())
// Make sure there's enough in the sender's account. Having insufficient // Make sure there's enough in the sender's account. Having insufficient
// funds won't invalidate this transaction but simple ignores it. // funds won't invalidate this transaction but simple ignores it.
@ -112,7 +112,7 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
} }
// Get the receiver // Get the receiver
receiver := state.GetAccount(tx.Recipient) receiver := block.state.GetAccount(tx.Recipient)
sender.Nonce += 1 sender.Nonce += 1
// Send Tx to self // Send Tx to self
@ -128,10 +128,10 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, toContract
// Add the amount to receivers account which should conclude this transaction // Add the amount to receivers account which should conclude this transaction
receiver.Amount.Add(receiver.Amount, tx.Value) receiver.Amount.Add(receiver.Amount, tx.Value)
state.UpdateAccount(tx.Recipient, receiver) block.state.UpdateAccount(tx.Recipient, receiver)
} }
state.UpdateAccount(tx.Sender(), sender) block.state.UpdateAccount(tx.Sender(), sender)
log.Printf("[TXPL] Processed Tx %x\n", tx.Hash()) log.Printf("[TXPL] Processed Tx %x\n", tx.Hash())

Write Preview
Loading…
Cancel
Save