parse trie better

mipsevm/full.go

@@ -42,7 +42,7 @@ func getTrieNode(str common.Hash, interpreter *vm.EVMInterpreter, statedb *State
 	ret, err := interpreter.Run(contract, input, false)
 	check(err)
 
-	fmt.Println("getTrieNode", str, ret)
+	//fmt.Println("getTrieNode", str, ret)
 
 	return ret[64:]
 }

mipsevm/full_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
-func TestFull(t *testing.T) {
+func TestFullSlow(t *testing.T) {
 	RunFull()
 }
 

mipsevm/trie.go

@@ -54,18 +54,10 @@ func (kw PreimageKeyValueWriter) Delete(key []byte) error {
 	return nil
 }
 
-// full nodes / BRANCH_NODE have 17 values, each a hash
-// LEAF or EXTENSION nodes have 2 values, a path and value
-func ParseNode(node common.Hash, depth int, callback func(common.Hash) []byte) {
-	if depth > 3 {
-		return
-	}
+func ParseNodeInternal(elems []byte, depth int, callback func(common.Hash) []byte) {
 	sprefix := strings.Repeat("  ", depth)
-	buf := callback(node)
-	elems, _, err := rlp.SplitList(buf)
-	check(err)
 	c, _ := rlp.CountValues(elems)
-	fmt.Println(sprefix, "parsing", node, depth, "elements", c)
+	fmt.Println(sprefix, "parsing", depth, "elements", c)
 	rest := elems
 	for i := 0; i < c; i++ {
 		kind, val, lrest, err := rlp.Split(rest)
@@ -74,12 +66,27 @@ func ParseNode(node common.Hash, depth int, callback func(common.Hash) []byte) {
 		fmt.Println(sprefix, i, kind, val, len(val))
 		if len(val) == 32 {
 			hh := common.BytesToHash(val)
-			fmt.Println(sprefix, "node found with len", len(Preimages[hh]))
+			//fmt.Println(sprefix, "node found with len", len(Preimages[hh]))
 			ParseNode(hh, depth+1, callback)
 		}
+		if kind == rlp.List && len(val) > 0 && len(val) < 32 {
+			ParseNodeInternal(val, depth+1, callback)
+		}
 	}
 }
 
+// full nodes / BRANCH_NODE have 17 values, each a hash
+// LEAF or EXTENSION nodes have 2 values, a path and value
+func ParseNode(node common.Hash, depth int, callback func(common.Hash) []byte) {
+	if depth > 4 {
+		return
+	}
+	buf := callback(node)
+	elems, _, err := rlp.SplitList(buf)
+	check(err)
+	ParseNodeInternal(elems, depth, callback)
+}
+
 func RamToTrie(ram map[uint32](uint32)) common.Hash {
 	mt := trie.NewStackTrie(PreimageKeyValueWriter{})