merge upstream

4 files changed, 11 insertions, 42 deletions

diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 26ad3e982..480b4055d 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -91,7 +91,6 @@ func (c *StateObject) SetAddr(addr []byte, value interface{}) {
 func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
 	addr := ethutil.BigToBytes(num, 256)
 
-	// FIXME This should be handled in the Trie it self
 	if val.BigInt().Cmp(ethutil.Big0) == 0 {
 		c.state.trie.Delete(string(addr))
 
diff --git a/ethchain/vm.go b/ethchain/vm.go
index 66005e814..4c1821f56 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -109,11 +109,11 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
 	require := func(m int) {
 		if stack.Len() < m {
 			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)
 	// Current step count
 	step := 0
@@ -596,16 +596,18 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
 
 			// Generate a new address
 			addr := ethutil.CreateAddress(closure.caller.Address(), closure.caller.N())
+
+			vm.Printf(" (*) %x", addr).Endl()
+
 			// Create a new contract
 			contract := vm.state.NewStateObject(addr)
 			contract.Amount = value
 
 			// 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
 			// contract so it may run the init script
 			gas := new(big.Int).Set(closure.Gas)
-			//closure.UseGas(gas)
 
 			// Create the closure
 			c := NewClosure(closure.caller,
@@ -616,6 +618,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
 				closure.Price)
 			// Call the closure and set the return value as
 			// main script.
+			var err error
 			c.Script, gas, err = c.Call(vm, nil, hook)
 
 			if err != nil {
diff --git a/ethereum.go b/ethereum.go
index 0dde28e51..1de671712 100644
--- a/ethereum.go
+++ b/ethereum.go
@@ -115,24 +115,6 @@ func New(caps Caps, usePnp bool) (*Ethereum, error) {
 	return ethereum, nil
 }
 
-// Replay block
-func (self *Ethereum) BlockDo(hash []byte) error {
-	block := self.blockChain.GetBlock(hash)
-	if block == nil {
-		return fmt.Errorf("unknown block %x", hash)
-	}
-
-	parent := self.blockChain.GetBlock(block.PrevHash)
-
-	_, err := self.stateManager.ApplyDiff(parent.State(), parent, block)
-	if err != nil {
-		return err
-	}
-
-	return nil
-
-}
-
 func (s *Ethereum) Reactor() *ethutil.ReactorEngine {
 	return s.reactor
 }
diff --git a/ethutil/script.go b/ethutil/script.go
index c8b1da51c..235498df2 100644
--- a/ethutil/script.go
+++ b/ethutil/script.go
@@ -3,6 +3,7 @@ package ethutil
 import (
 	"fmt"
 	"github.com/obscuren/mutan"
+	"github.com/obscuren/mutan/backends"
 	"github.com/obscuren/serpent-go"
 	"strings"
 )
@@ -19,7 +20,9 @@ func Compile(script string) (ret []byte, err error) {
 
 		return byteCode, nil
 	} else {
-		byteCode, errors := mutan.Compile(strings.NewReader(script), false)
+		compiler := mutan.NewCompiler(backend.NewEthereumBackend())
+		byteCode, errors := compiler.Compile(strings.NewReader(script))
+		//byteCode, errors := mutan.Compile(strings.NewReader(script), false)
 		if len(errors) > 0 {
 			var errs string
 			for _, er := range errors {
@@ -33,21 +36,3 @@ func Compile(script string) (ret []byte, err error) {
 		return byteCode, nil
 	}
 }
-
-func CompileScript(script string) ([]byte, []byte, error) {
-	// Preprocess
-	mainInput, initInput := mutan.PreParse(script)
-	// Compile main script
-	mainScript, err := Compile(mainInput)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// Compile init script
-	initScript, err := Compile(initInput)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return mainScript, initScript, nil
-}