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

VM Recovery

This commit is contained in:
obscuren 2014-01-03 13:40:25 +01:00
parent 78d18b134f
commit 055407c835
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block_manager.go
View File

@ -11,7 +11,7 @@
package main package main
import ( import (
_"fmt" "fmt"
) )
type BlockManager struct { type BlockManager struct {
@ -33,7 +33,13 @@ func (bm *BlockManager) ProcessBlock(block *Block) error {
// Process each transaction/contract // Process each transaction/contract
for _, tx := range block.transactions { for _, tx := range block.transactions {
go bm.ProcessTransaction(tx, block, lockChan) // If there's no recipient, it's a contract
if tx.recipient == "" {
go bm.ProcessContract(tx, block, lockChan)
} else {
// "finish" tx which isn't a contract
lockChan <- true
}
} }
// Wait for all Tx to finish processing // Wait for all Tx to finish processing
@ -44,8 +50,18 @@ func (bm *BlockManager) ProcessBlock(block *Block) error {
return nil return nil
} }
func (bm *BlockManager) ProcessTransaction(tx *Transaction, block *Block, lockChan chan bool) { func (bm *BlockManager) ProcessContract(tx *Transaction, block *Block, lockChan chan bool) {
bm.vm.RunTransaction(tx, block, func(opType OpType) bool { // Recovering function in case the VM had any errors
defer func() {
if r := recover(); r != nil {
fmt.Println("Recovered from VM execution with err =", r)
// Let the channel know where done even though it failed (so the execution may resume normally)
lockChan <- true
}
}()
// Process contract
bm.vm.ProcContract(tx, block, func(opType OpType) bool {
// TODO calculate fees // TODO calculate fees
return true // Continue return true // Continue