add lastPeriod to ExpiredLeafNode

Author: weiihann

debug.go

@@ -47,6 +47,7 @@ type (
 
 	ExportableExpiredLeafNode struct {
 		Stem       Stem     `json:"stem"`
+		LastPeriod StatePeriod `json:"last_period"`
 		Commitment [32]byte `json:"commitment"`
 	}
 )

encoding.go

@@ -62,7 +62,7 @@ const (
 	leafValueIndexSize     = 1
 	singleSlotLeafSize     = nodeTypeSize + StemSize + 2*banderwagon.UncompressedSize + leafValueIndexSize + leafSlotSize + periodSize
 	eoaLeafSize            = nodeTypeSize + StemSize + 2*banderwagon.UncompressedSize + leafBasicDataSize + periodSize
-	expiredLeafSize        = nodeTypeSize + StemSize + banderwagon.UncompressedSize
+	expiredLeafSize        = nodeTypeSize + StemSize + periodSize + banderwagon.UncompressedSize
 )
 
 func bit(bitlist []byte, nr int) bool {
@@ -198,10 +198,11 @@ func parseSingleSlotNode(serialized []byte, depth byte) (VerkleNode, error) {
 
 func parseExpiredLeafNode(serialized []byte, depth byte) (VerkleNode, error) {
 	l := &ExpiredLeafNode{}
-	l.stem = serialized[leafStemOffset : leafStemOffset+StemSize]
 	l.setDepth(depth)
+	l.stem = serialized[leafStemOffset : leafStemOffset+StemSize]
+	l.lastPeriod = StatePeriodFromBytes(serialized[leafStemOffset+StemSize:leafStemOffset+StemSize+periodSize])
 	l.commitment = new(Point)
-	if err := l.commitment.SetBytesUncompressed(serialized[leafStemOffset+StemSize:], true); err != nil {
+	if err := l.commitment.SetBytesUncompressed(serialized[leafStemOffset+StemSize+periodSize:], true); err != nil {
 		return nil, fmt.Errorf("setting commitment: %w", err)
 	}
 	return l, nil

encoding_test.go

@@ -198,7 +198,7 @@ func TestParseExpiredLeaf(t *testing.T) {
 
 	comm := srs[0]
 	stem := ffx32KeyTest[:StemSize]
-	el := NewExpiredLeafNode(stem, &comm)
+	el := NewExpiredLeafNode(stem, period2, &comm)
 
 	serialized, err := el.Serialize()
 	if err != nil {
@@ -222,4 +222,8 @@ func TestParseExpiredLeaf(t *testing.T) {
 	if !el2.commitment.Equal(&comm) {
 		t.Fatalf("invalid commitment, got %x, expected %x", el2.commitment, comm)
 	}
+
+	if el2.lastPeriod != period2 {
+		t.Fatalf("invalid last period, got %d, expected %d", el2.lastPeriod, period2)
+	}
 }

expired_leaf.go

@@ -28,16 +28,18 @@ package verkle
 import (
 	"fmt"
 	"errors"
+	"encoding/binary"
 )
 
 type ExpiredLeafNode struct {
 	stem       Stem
+	lastPeriod StatePeriod
 	commitment *Point
 	depth      byte // used for proof only, not commitment calculation
 }
 
-func NewExpiredLeafNode(stem Stem, commitment *Point) *ExpiredLeafNode {
-	return &ExpiredLeafNode{stem: stem, commitment: commitment}
+func NewExpiredLeafNode(stem Stem, lastPeriod StatePeriod, commitment *Point) *ExpiredLeafNode {
+	return &ExpiredLeafNode{stem: stem, lastPeriod: lastPeriod, commitment: commitment}
 }
 
 func (n *ExpiredLeafNode) Insert([]byte, []byte, StatePeriod, NodeResolverFn) error {
@@ -95,7 +97,11 @@ func (n *ExpiredLeafNode) Serialize() ([]byte, error) {
 	result := buf[:]
 	result[0] = expiredLeafType
 	copy(result[leafStemOffset:], n.stem[:StemSize])
-	copy(result[leafStemOffset+StemSize:], cBytes[:])
+	
+	lastPeriod := make([]byte, periodSize)
+	binary.BigEndian.PutUint16(lastPeriod, uint16(n.lastPeriod))
+	copy(result[leafStemOffset+StemSize:], lastPeriod)
+	copy(result[leafStemOffset+StemSize+periodSize:], cBytes[:])
 
 	return result, nil
 }

expired_leaf_test.go

@@ -11,7 +11,7 @@ func TestExpiredLeafBasic(t *testing.T) {
 	cfg := GetConfig()
 	srs := cfg.conf.SRS
 	comm := srs[0]
-	leaf := NewExpiredLeafNode(zeroKeyTest[:StemSize], &comm)
+	leaf := NewExpiredLeafNode(zeroKeyTest[:StemSize], period0, &comm)
 
 	err := leaf.Insert(zeroKeyTest, zeroKeyTest, 0, nil)
 	if !errors.Is(err, errExpired) {

expired_tree_test.go

@@ -213,7 +213,7 @@ func TestRootCommitExpired(t *testing.T) {
 	var init Point
 	init.Set(root.Commit())
 
-	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.commitment)
+	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.lastPeriod, leaf.commitment)
 	root.(*InternalNode).children[0] = expiredLeaf
 
 	comm := root.Commit()

proof_ipa.go

@@ -105,16 +105,23 @@ func (vp *VerkleProof) Equal(other *VerkleProof) error {
 	return nil
 }
 
+// TODO(weiihann): add PoeStems for proof of expiry? It should be a list of (stem, lastPeriod)
 type Proof struct {
 	Multipoint *ipa.MultiProof // multipoint argument
 	ExtStatus  []byte          // the extension status of each stem
 	Cs         []*Point        // commitments, sorted by their path in the tree
 	PoaStems   []Stem          // stems proving another stem is absent
+	// PoeInfos    []PoeInfo       // stems proving another stem is expired
 	Keys       [][]byte
 	PreValues  [][]byte
 	PostValues [][]byte
 }
 
+type PoeInfo struct {
+	Stem Stem
+	Period StatePeriod
+}
+
 type SuffixStateDiff struct {
 	Suffix       byte      `json:"suffix"`
 	CurrentValue *[32]byte `json:"currentValue"`

proof_test.go

@@ -857,7 +857,7 @@ func TestProofOfExpiryOneLeaf(t *testing.T) {
 
 	leaf := root.(*InternalNode).children[0].(*LeafNode)
 
-	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.commitment)
+	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.lastPeriod, leaf.commitment)
 	expiredLeaf.setDepth(1)
 	root.(*InternalNode).children[0] = expiredLeaf
 
@@ -904,12 +904,12 @@ func TestProofOfExpiryMultipleLeaves(t *testing.T) {
 	init := root.Commit()
 
 	leaf0 := root.(*InternalNode).children[0].(*LeafNode)
-	expiredLeaf0 := NewExpiredLeafNode(leaf0.stem, leaf0.commitment)
+	expiredLeaf0 := NewExpiredLeafNode(leaf0.stem, leaf0.lastPeriod, leaf0.commitment)
 	expiredLeaf0.setDepth(1)
 	root.(*InternalNode).children[0] = expiredLeaf0
 
 	leaff := root.(*InternalNode).children[255].(*LeafNode)
-	expiredLeaff := NewExpiredLeafNode(leaff.stem, leaff.commitment)
+	expiredLeaff := NewExpiredLeafNode(leaff.stem, leaff.lastPeriod, leaff.commitment)
 	expiredLeaff.setDepth(1)
 	root.(*InternalNode).children[255] = expiredLeaff
 
@@ -1201,7 +1201,7 @@ func TestProofVerificationPreStateExpiredPostStateResurrected(t *testing.T) {
 	rootC := preRoot.Commit()
 
 	leaf := preRoot.(*InternalNode).children[0].(*LeafNode)
-	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.commitment)
+	expiredLeaf := NewExpiredLeafNode(leaf.stem, leaf.lastPeriod, leaf.commitment)
 	expiredLeaf.setDepth(1)
 	preRoot.(*InternalNode).children[0] = expiredLeaf
 

tree.go

@@ -235,6 +235,7 @@ func (n *InternalNode) toExportable() *ExportableInternalNode {
 		case *ExpiredLeafNode:
 			exportable.Children[i] = &ExportableExpiredLeafNode{
 				Stem:       child.stem,
+				LastPeriod: child.lastPeriod,
 				Commitment: child.commitment.Bytes(),
 			}
 		default:
@@ -585,6 +586,7 @@ func (n *InternalNode) CreatePath(path []byte, stemInfo stemInfo, comms []*Point
 			if len(stemInfo.stem) != StemSize {
 				return comms, fmt.Errorf("invalid stem size %d", len(stemInfo.stem))
 			}
+			// TODO(weiihann): add last period
 			newchild := &ExpiredLeafNode{
 				commitment: comms[0],
 				stem:       stemInfo.stem,