Merge pull request #6 from NilFoundation/cherry-pick-upstream

Cherry-pick upstream commits

hasher.go

@@ -1,13 +1,12 @@
 package ssz
 
 import (
+	"encoding/binary"
 	"fmt"
 	"hash"
 	"math/bits"
 	"sync"
 
-	"encoding/binary"
-
 	"github.com/iden3/go-iden3-crypto/poseidon"
 )
 
@@ -21,9 +20,11 @@ var (
 	ErrIncorrectListSize = fmt.Errorf("incorrect list size")
 )
 
-var zeroHashes [65][32]byte
-var zeroHashLevels map[string]int
-var trueBytes, falseBytes []byte
+var (
+	zeroHashes            [65][32]byte
+	zeroHashLevels        map[string]int
+	trueBytes, falseBytes []byte
+)
 
 func init() {
 	falseBytes = make([]byte, 32)
@@ -42,6 +43,9 @@ func init() {
 }
 
 func poseidonSum(input []byte) []byte {
+	if input == nil {
+		return make([]byte, 32)
+	}
 	res := poseidon.Sum(input)
 	if len(res) == 32 {
 		return res

sszgen/generator/unmarshal.go

@@ -39,22 +39,18 @@ func (v *Value) unmarshal(dst string) string {
 			validate = fmt.Sprintf("if len(%s) > %d { return ssz.ErrBytesLength }\n", dst, v.m)
 		}
 
-		refName := ""
-		if v.ref != "" {
-			refName = v.ref + "." + v.obj
-		}
-
 		// both fixed and dynamic are decoded equally
 		tmpl := `{{.validate}}if cap(::.{{.name}}) == 0 {
-			{{if .refName}} ::.{{.name}} = {{ .refName }}(make([]byte, 0, len({{.dst}}))) {{ else }} ::.{{.name}} = make([]byte, 0, len({{.dst}})) {{ end }}
+			{{if .isRef}} ::.{{.name}} = {{ ref .obj }}(make([]byte, 0, len({{.dst}}))) {{ else }} ::.{{.name}} = make([]byte, 0, len({{.dst}})) {{ end }}
 		}
 		::.{{.name}} = append(::.{{.name}}, {{.dst}}...)`
 		return execTmpl(tmpl, map[string]interface{}{
 			"validate": validate,
 			"name":     v.name,
 			"dst":      dst,
 			"size":     v.m,
-			"refName":  refName,
+			"isRef":    v.ref != "",
+			"obj":      v,
 		})
 
 	case TypeUint:

sszgen/testcases/issue_166.go

@@ -0,0 +1,9 @@
+package testcases
+
+//go:generate go run ../main.go --path issue_166.go --include ./other
+
+import "github.com/NilFoundation/fastssz/sszgen/testcases/other"
+
+type Issue165 struct {
+	A other.Case4Bytes
+}

tests/codetrie_test.go

@@ -12,6 +12,9 @@ import (
 )
 
 func poseidonSum(input []byte) []byte {
+	if input == nil {
+		return make([]byte, 32)
+	}
 	output := make([]byte, 32)
 	res := poseidon.Sum(input)
 	copy(output[32-len(res):], res)

tree.go

@@ -92,7 +92,6 @@ func (n *Node) Show(maxDepth int) {
 }
 
 func (n *Node) show(depth int, maxDepth int) {
-
 	space := ""
 	for i := 0; i < depth; i++ {
 		space += "\t"
@@ -287,6 +286,11 @@ func hashNode(n *Node) []byte {
 		panic("Tree incomplete")
 	}
 
+	if n.value != nil {
+		// This value has already been hashed, don't do the work again.
+		return n.value
+	}
+
 	if n.right.isEmpty {
 		result := hashFn(append(hashNode(n.left), n.right.value...))
 		n.value = result // Set the hash result on each node so that proofs can be generated for any level
@@ -337,6 +341,10 @@ func (n *Node) Prove(index int) (*Proof, error) {
 	}
 
 	proof.Hashes = hashes
+	if cur.value == nil {
+		// This is an intermediate node without a value; add the hash to it so that we're providing a suitable leaf value.
+		cur.value = hashNode(cur)
+	}
 	proof.Leaf = cur.value
 
 	return proof, nil

tree_test.go

@@ -2,7 +2,9 @@ package ssz
 
 import (
 	"bytes"
+	"encoding/binary"
 	"encoding/hex"
+	"math/rand"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -203,3 +205,87 @@ func TestGetRequiredIndices(t *testing.T) {
 		}
 	}
 }
+
+func TestProveRepeated(t *testing.T) {
+	expectedProofHex := []string{
+		"0000000000000000000000000000000000000000000000000000000000000000",
+		"0f63cd0c9fbe679a562469831d8e810c9d33cc2409695b8e6a893e627ea952d1",
+		"2002fe39e9f175512f30e30fa0d4e003e9df611db3fca96197db976f8644c75a",
+		"0efb0ee9dcc58a77f39d41bae90162cd3bf08e13a071178e1025553db53745ad",
+		"27f5f069f3f41c239e75979eb0657fb075dbf942cca053299352f44b9e9965d3",
+		"1fbd18a35a88359c8c07f8376be954c34dd26072ccf177877212c3f9374ddc59",
+		"2e26d40034abf56520b6f5541568a7686ceb239e7758be6e532795b7f73fa5d2",
+		"0b79992a65a374bac4b18ec26f9e37157d4e0f4c127c04ca72c8a53c41cd9224",
+		"1bb420fa5409ee48bb27b0d4465592ab5707eddb0781c13558a4f0c897174603",
+		"0324443b152adfd89fd6e9ab1f961f7d7a7685eda90ab43ac09b2032e749cbc2",
+		"1c00cb3774bc70cc022ef9fde08ae772f60bd3a2687dc38a00aae29b24d69462",
+		"25cf3992c3326fcdefb83c2be615934d83d7442ef45986cfa6c3232e7df3c9c8",
+		"154c56140e60983aaa84422e1dc1157108ba78e67a2873b2be2fd0f4f40dc1ee",
+		"12e3145a126ae9f763558b70a5f8028ee3df4621c0aabc84ef9343386c7eb13e",
+		"2262efd8de5e475e56f5d15032313fd423a3d11b977e7937189f238da081cfd4",
+		"14bc25b6b80519138cbf24ea6a9fb50c6de5866b597e1aab72546efd1693424e",
+		"0221f72ccd94b863552b04add6c4e598e0b8ba417c1cc162aa3ea5c45de413c2",
+		"13f6e36d3fdf2cc8d464d8fb7938ed1f4d0341f0bbac5547e1c00df112844350",
+		"0dd210443855682a4b32995f498f365e4d2ba82936045b1611f80000a30d2580",
+		"30177faa30b66f174c9c248aa8296d216b3a494430693a0d5ad71996c57996ad",
+	}
+
+	chunks := make([][]byte, 1048576)
+	for i := uint32(0); i < 1048576; i++ {
+		x := make([]byte, 4)
+		binary.LittleEndian.PutUint32(x, i)
+		chunks = append(chunks, x)
+	}
+
+	r, err := TreeFromChunks(chunks)
+	if err != nil {
+		t.Errorf("Failed to construct tree: %v\n", err)
+		t.Fail()
+	}
+
+	// Repeatedly prove the same entry, to ensure that there are no mutations
+	// as a result of proving.
+	for i := 0; i < 1024; i++ {
+		p, err := r.Prove(1048576)
+		if err != nil {
+			t.Errorf("Failed to generate proof: %v\n", err)
+			t.Fail()
+		}
+
+		for i, n := range p.Hashes {
+			e, err := hex.DecodeString(expectedProofHex[i])
+			if err != nil {
+				t.Errorf("Failed to decode hex string: %v\n", err)
+				t.Fail()
+			}
+			if !bytes.Equal(e, n) {
+				t.Errorf("Invalid proof item. Expected %s, got %s\n", expectedProofHex[i], hex.EncodeToString(n))
+				t.Fail()
+			}
+		}
+	}
+}
+
+func BenchmarkProve(b *testing.B) {
+	chunks := make([][]byte, 1048576)
+	for i := uint32(0); i < 1048576; i++ {
+		x := make([]byte, 4)
+		binary.LittleEndian.PutUint32(x, i)
+		chunks = append(chunks, x)
+	}
+
+	r, err := TreeFromChunks(chunks)
+	if err != nil {
+		b.Errorf("Failed to construct tree: %v\n", err)
+		b.Fail()
+	}
+
+	for i := 0; i < b.N; i++ {
+		//nolint
+		_, err := r.Prove(rand.Intn(1048575) + 1)
+		if err != nil {
+			b.Errorf("Failed to generate proof: %v\n", err)
+			b.Fail()
+		}
+	}
+}