gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into miner

Browse Source
This commit is contained in:
obscuren
2014-04-05 11:25:29 +02:00
parent 782910eaa7 90bb512f42
commit 12643c7c57
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ethchain/state_manager.go
View File

@ -112,13 +112,18 @@ func (sm *StateManager) ApplyTransactions(block *Block, txs []*Transaction) {
// Figure out if the address this transaction was sent to is a
// contract or an actual account. In case of a contract, we process that
// contract instead of moving funds between accounts.
var err error
if contract := sm.procState.GetContract(tx.Recipient); contract != nil {
sm.ProcessContract(contract, tx, block)
} else {
err := sm.Ethereum.TxPool().ProcessTransaction(tx, block)
if err != nil {
ethutil.Config.Log.Infoln("[STATE]", err)
err = sm.Ethereum.TxPool().ProcessTransaction(tx, sm.procState, true)
if err == nil {
sm.ProcessContract(contract, tx, block)
}
} else {
err = sm.Ethereum.TxPool().ProcessTransaction(tx, sm.procState, false)
}
if err != nil {
ethutil.Config.Log.Infoln("[STATE]", err)
}
}
}
@ -323,4 +328,7 @@ func (sm *StateManager) ProcessContract(contract *Contract, tx *Transaction, blo
txData: nil,
})
closure.Call(vm, nil)
// Update the account (refunds)
sm.procState.UpdateAccount(tx.Sender(), caller)
}