poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Logging order

This commit is contained in:
obscuren 2014-06-23 16:11:55 +02:00
parent 614624754d
commit 16e8fc7427
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ethchain/state_object.go
View File

@ -91,7 +91,6 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) { func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
addr := ethutil.BigToBytes(num, 256) addr := ethutil.BigToBytes(num, 256)
// FIXME This should be handled in the Trie it self
if val.BigInt().Cmp(ethutil.Big0) == 0 { if val.BigInt().Cmp(ethutil.Big0) == 0 {
c.state.trie.Delete(string(addr)) c.state.trie.Delete(string(addr))

13
ethchain/vm.go
View File

@ -93,7 +93,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
if r := recover(); r != nil { if r := recover(); r != nil {
ret = closure.Return(nil) ret = closure.Return(nil)
err = fmt.Errorf("%v", r) err = fmt.Errorf("%v", r)
fmt.Println("vm err", err) fmt.Println(err)
} }
}() }()
@ -106,11 +106,11 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
require := func(m int) { require := func(m int) {
if stack.Len() < m { if stack.Len() < m {
isRequireError = true isRequireError = true
panic(fmt.Sprintf("stack = %d, req = %d", stack.Len(), m)) panic(fmt.Sprintf("stack err = %d, req = %d", stack.Len(), m))
} }
} }
// Instruction pointer // Program counter
pc := big.NewInt(0) pc := big.NewInt(0)
// Current step count // Current step count
step := 0 step := 0
@ -593,16 +593,18 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
// Generate a new address // Generate a new address
addr := ethutil.CreateAddress(closure.caller.Address(), closure.caller.N()) addr := ethutil.CreateAddress(closure.caller.Address(), closure.caller.N())
vm.Printf(" (*) %x", addr).Endl()
// Create a new contract // Create a new contract
contract := vm.state.NewStateObject(addr) contract := vm.state.NewStateObject(addr)
contract.Amount = value contract.Amount = value
// Set the init script // Set the init script
contract.initScript = mem.Get(offset.Int64(), size.Int64()) contract.initScript = ethutil.BigD(mem.Get(offset.Int64(), size.Int64())).Bytes()
// Transfer all remaining gas to the new // Transfer all remaining gas to the new
// contract so it may run the init script // contract so it may run the init script
gas := new(big.Int).Set(closure.Gas) gas := new(big.Int).Set(closure.Gas)
//closure.UseGas(gas)
// Create the closure // Create the closure
c := NewClosure(closure.caller, c := NewClosure(closure.caller,
@ -613,6 +615,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
closure.Price) closure.Price)
// Call the closure and set the return value as // Call the closure and set the return value as
// main script. // main script.
var err error
c.Script, gas, err = c.Call(vm, nil, hook) c.Script, gas, err = c.Call(vm, nil, hook)
if err != nil { if err != nil {