cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Handle contract messages

Browse Source
This commit is contained in:
obscuren 2014-04-01 10:41:30 +02:00
parent 7277c42047
commit 7d0348e4ba
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethchain/state_manager.go
View File

@ -114,16 +114,21 @@ func (sm *StateManager) ApplyTransactions(block *Block, txs []*Transaction) {
// Figure out if the address this transaction was sent to is a // 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 or an actual account. In case of a contract, we process that
// contract instead of moving funds between accounts. // contract instead of moving funds between accounts.
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)
if err == nil {
sm.ProcessContract(contract, tx, block) sm.ProcessContract(contract, tx, block)
}
} else { } else {
err := sm.Ethereum.TxPool().ProcessTransaction(tx, block) err = sm.Ethereum.TxPool().ProcessTransaction(tx, sm.procState, false)
}
if err != nil { if err != nil {
ethutil.Config.Log.Infoln("[STATE]", err) ethutil.Config.Log.Infoln("[STATE]", err)
} }
} }
} }
}
} }
// The prepare function, prepares the state manager for the next // The prepare function, prepares the state manager for the next
@ -318,4 +323,7 @@ func (sm *StateManager) ProcessContract(contract *Contract, tx *Transaction, blo
txData: nil, txData: nil,
}) })
closure.Call(vm, nil) closure.Call(vm, nil)
// Update the account (refunds)
sm.procState.UpdateAccount(tx.Sender(), caller)
} }

12
ethchain/transaction_pool.go
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, block *Block) (err error) { func (pool *TxPool) ProcessTransaction(tx *Transaction, state *State, 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, block *Block) (err error
} }
}() }()
// Get the sender // Get the sender
sender := block.state.GetAccount(tx.Sender()) sender := 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.
@ -116,13 +116,15 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error
} }
// Get the receiver // Get the receiver
receiver := block.state.GetAccount(tx.Recipient) receiver := state.GetAccount(tx.Recipient)
sender.Nonce += 1 sender.Nonce += 1
// Send Tx to self // Send Tx to self
if bytes.Compare(tx.Recipient, tx.Sender()) == 0 { if bytes.Compare(tx.Recipient, tx.Sender()) == 0 {
// Subtract the fee // Subtract the fee
sender.Amount.Sub(sender.Amount, new(big.Int).Mul(TxFee, TxFeeRat)) sender.Amount.Sub(sender.Amount, new(big.Int).Mul(TxFee, TxFeeRat))
} else if toContract {
sender.Amount.Sub(sender.Amount, new(big.Int).Mul(TxFee, TxFeeRat))
} else { } else {
// Subtract the amount from the senders account // Subtract the amount from the senders account
sender.Amount.Sub(sender.Amount, totAmount) sender.Amount.Sub(sender.Amount, totAmount)
@ -130,10 +132,10 @@ func (pool *TxPool) ProcessTransaction(tx *Transaction, block *Block) (err error
// 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)
block.state.UpdateAccount(tx.Recipient, receiver) state.UpdateAccount(tx.Recipient, receiver)
} }
block.state.UpdateAccount(tx.Sender(), sender) state.UpdateAccount(tx.Sender(), sender)
log.Printf("[TXPL] Processed Tx %x\n", tx.Hash()) log.Printf("[TXPL] Processed Tx %x\n", tx.Hash())