aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ethchain/state_transition.go8
-rw-r--r--ethchain/vm.go42
-rw-r--r--ethutil/trie_test.go44
-rw-r--r--ethutil/value.go2
4 files changed, 52 insertions, 44 deletions
diff --git a/ethchain/state_transition.go b/ethchain/state_transition.go
index c70dc54b4..8a6565e56 100644
--- a/ethchain/state_transition.go
+++ b/ethchain/state_transition.go
@@ -89,7 +89,7 @@ func (self *StateTransition) BuyGas() error {
sender := self.Sender()
if sender.Amount.Cmp(self.tx.GasValue()) < 0 {
- return fmt.Errorf("Insufficient funds to pre-pay gas. Req %v, has %v", self.tx.GasValue(), self.tx.Value)
+ return fmt.Errorf("Insufficient funds to pre-pay gas. Req %v, has %v", self.tx.GasValue(), sender.Amount)
}
coinbase := self.Coinbase()
@@ -181,7 +181,8 @@ func (self *StateTransition) TransitionState() (err error) {
// Evaluate the initialization script
// and use the return value as the
// script section for the state object.
- //script, gas, err = sm.Eval(state, contract.Init(), contract, tx, block)
+ ethutil.Config.Log.Println(ethutil.LogLevelSystem, receiver.Init())
+
code, err := self.Eval(receiver.Init(), receiver)
if err != nil {
return fmt.Errorf("Error during init script run %v", err)
@@ -190,7 +191,8 @@ func (self *StateTransition) TransitionState() (err error) {
receiver.script = code
} else {
if len(receiver.Script()) > 0 {
- fmt.Println(receiver.Script())
+ ethutil.Config.Log.Println(ethutil.LogLevelSystem, receiver.Script())
+
_, err := self.Eval(receiver.Script(), receiver)
if err != nil {
return fmt.Errorf("Error during code execution %v", err)
diff --git a/ethchain/vm.go b/ethchain/vm.go
index b8ba72c7e..5a15ba81b 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -225,29 +225,41 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case ADD:
require(2)
x, y := stack.Popn()
- // (x + y) % 2 ** 256
+ vm.Printf(" %v + %v", y, x)
+
base.Add(y, x)
+
+ vm.Printf(" = %v", base)
// Pop result back on the stack
stack.Push(base)
case SUB:
require(2)
x, y := stack.Popn()
- // (x - y) % 2 ** 256
+ vm.Printf(" %v - %v", y, x)
+
base.Sub(y, x)
+
+ vm.Printf(" = %v", base)
// Pop result back on the stack
stack.Push(base)
case MUL:
require(2)
x, y := stack.Popn()
- // (x * y) % 2 ** 256
+ vm.Printf(" %v * %v", y, x)
+
base.Mul(y, x)
+
+ vm.Printf(" = %v", base)
// Pop result back on the stack
stack.Push(base)
case DIV:
require(2)
x, y := stack.Popn()
- // floor(x / y)
+ vm.Printf(" %v / %v", y, x)
+
base.Div(y, x)
+
+ vm.Printf(" = %v", base)
// Pop result back on the stack
stack.Push(base)
case SDIV:
@@ -270,7 +282,12 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case MOD:
require(2)
x, y := stack.Popn()
+
+ vm.Printf(" %v %% %v", y, x)
+
base.Mod(y, x)
+
+ vm.Printf(" = %v", base)
stack.Push(base)
case SMOD:
require(2)
@@ -292,8 +309,13 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case EXP:
require(2)
x, y := stack.Popn()
+
+ vm.Printf(" %v ** %v", y, x)
+
base.Exp(y, x, Pow256)
+ vm.Printf(" = %v", base)
+
stack.Push(base)
case NEG:
require(1)
@@ -393,12 +415,11 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
require(1)
offset := stack.Pop().Int64()
- var data []byte
+ data := make([]byte, 32)
if len(closure.Args) >= int(offset) {
l := int64(math.Min(float64(offset+32), float64(len(closure.Args))))
- data = closure.Args[offset : offset+l]
- } else {
- data = []byte{0}
+
+ copy(data, closure.Args[offset:l])
}
vm.Printf(" => 0x%x", data)
@@ -499,13 +520,12 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
case SSTORE:
require(2)
val, loc := stack.Popn()
- fmt.Println("storing", string(val.Bytes()), "@", string(loc.Bytes()))
closure.SetStorage(loc, ethutil.NewValue(val))
// Add the change to manifest
vm.state.manifest.AddStorageChange(closure.Object(), loc.Bytes(), val)
- vm.Printf(" => 0x%x", val)
+ vm.Printf(" {0x%x} 0x%x", loc, val)
case JUMP:
require(1)
pc = stack.Pop()
@@ -519,7 +539,7 @@ func (vm *Vm) RunClosure(closure *Closure, hook DebugHook) (ret []byte, err erro
if cond.Cmp(ethutil.BigTrue) >= 0 {
pc = pos
- vm.Printf(" (t) ~> %v", pc).Endl()
+ vm.Printf(" ~> %v (t)", pc).Endl()
continue
} else {
diff --git a/ethutil/trie_test.go b/ethutil/trie_test.go
index 15dbc5567..2937b1525 100644
--- a/ethutil/trie_test.go
+++ b/ethutil/trie_test.go
@@ -1,12 +1,7 @@
package ethutil
import (
- "bytes"
- "encoding/json"
"fmt"
- "io"
- "io/ioutil"
- "net/http"
"reflect"
"testing"
)
@@ -176,34 +171,23 @@ func TestTriePurge(t *testing.T) {
}
}
-type TestItem struct {
- Name string
- Inputs [][]string
- Expectations string
-}
-
func TestTrieIt(t *testing.T) {
- //_, trie := New()
- resp, err := http.Get("https://raw.githubusercontent.com/ethereum/tests/master/trietest.json")
- if err != nil {
- t.Fail()
- }
+ _, trie := New()
- defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- t.Fail()
+ data := [][]string{
+ {"do", "verb"},
+ {"ether", "wookiedoo"},
+ {"horse", "stallion"},
+ {"shaman", "horse"},
+ {"doge", "coin"},
+ {"ether", ""},
+ {"dog", "puppy"},
+ {"shaman", ""},
}
- dec := json.NewDecoder(bytes.NewReader(body))
- for {
- var test TestItem
- if err := dec.Decode(&test); err == io.EOF {
- break
- } else if err != nil {
- t.Error("Fail something", err)
- break
- }
- fmt.Println(test)
+ for _, item := range data {
+ trie.Update(item[0], item[1])
}
+
+ fmt.Printf("root %x", trie.Root)
}
diff --git a/ethutil/value.go b/ethutil/value.go
index c86c24a7a..ddd864d8a 100644
--- a/ethutil/value.go
+++ b/ethutil/value.go
@@ -114,6 +114,8 @@ func (val *Value) Str() string {
func (val *Value) Bytes() []byte {
if a, ok := val.Val.([]byte); ok {
return a
+ } else if s, ok := val.Val.(byte); ok {
+ return []byte{s}
}
return []byte{}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 03:19:53 +0800