Generalize expiry based de-duplication, dsmr

chain/processor.go

@@ -53,7 +53,7 @@ func NewExecutionBlock(block *StatelessBlock) (*ExecutionBlock, error) {
 	}, nil
 }
 
-func (b *ExecutionBlock) ContainsTx(id ids.ID) bool {
+func (b *ExecutionBlock) Contains(id ids.ID) bool {
 	return b.txsSet.Contains(id)
 }
 
@@ -69,7 +69,7 @@ func (b *ExecutionBlock) Timestamp() int64 {
 	return b.Tmstmp
 }
 
-func (b *ExecutionBlock) Txs() []*Transaction {
+func (b *ExecutionBlock) Containers() []*Transaction {
 	return b.StatelessBlock.Txs
 }
 

internal/validitywindow/dependencies.go

@@ -15,8 +15,8 @@ type ExecutionBlock[Container emap.Item] interface {
 	Parent() ids.ID
 	Timestamp() int64
 	Height() uint64
-	Txs() []Container
-	ContainsTx(ids.ID) bool
+	Containers() []Container
+	Contains(ids.ID) bool
 }
 
 type ChainIndex[Container emap.Item] interface {

internal/validitywindow/validitywindow.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/set"
@@ -45,7 +46,7 @@ func (v *TimeValidityWindow[Container]) Accept(blk ExecutionBlock[Container]) {
 
 	evicted := v.seen.SetMin(blk.Timestamp())
 	v.log.Debug("txs evicted from seen", zap.Int("len", len(evicted)))
-	v.seen.Add(blk.Txs())
+	v.seen.Add(blk.Containers())
 	v.lastAcceptedBlockHeight = blk.Height()
 }
 
@@ -62,13 +63,22 @@ func (v *TimeValidityWindow[Container]) VerifyExpiryReplayProtection(
 		return err
 	}
 
-	dup, err := v.isRepeat(ctx, parent, oldestAllowed, blk.Txs(), true)
+	dup, err := v.isRepeat(ctx, parent, oldestAllowed, blk.Containers(), true)
 	if err != nil {
 		return err
 	}
 	if dup.Len() > 0 {
 		return fmt.Errorf("%w: duplicate in ancestry", ErrDuplicateContainer)
 	}
+	// make sure we have no repeats within the block itself.
+	blkContainerIDs := set.NewSet[ids.ID](len(blk.Containers()))
+	for _, container := range blk.Containers() {
+		id := container.GetID()
+		if blkContainerIDs.Contains(id) {
+			return fmt.Errorf("%w: duplicate in block", ErrDuplicateContainer)
+		}
+		blkContainerIDs.Add(id)
+	}
 	return nil
 }
 
@@ -85,7 +95,7 @@ func (v *TimeValidityWindow[Container]) isRepeat(
 	ctx context.Context,
 	ancestorBlk ExecutionBlock[Container],
 	oldestAllowed int64,
-	txs []Container,
+	containers []Container,
 	stop bool,
 ) (set.Bits, error) {
 	marker := set.NewBits()
@@ -103,14 +113,14 @@ func (v *TimeValidityWindow[Container]) isRepeat(
 		}
 
 		if ancestorBlk.Height() <= v.lastAcceptedBlockHeight || ancestorBlk.Height() == 0 {
-			return v.seen.Contains(txs, marker, stop), nil
+			return v.seen.Contains(containers, marker, stop), nil
 		}
 
-		for i, tx := range txs {
+		for i, container := range containers {
 			if marker.Contains(i) {
 				continue
 			}
-			if ancestorBlk.ContainsTx(tx.GetID()) {
+			if ancestorBlk.Contains(container.GetID()) {
 				marker.Add(i)
 				if stop {
 					return marker, nil

x/dsmr/block.go

@@ -6,6 +6,7 @@ package dsmr
 import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
+	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 
@@ -105,6 +106,47 @@ func ParseChunk[T Tx](chunkBytes []byte) (Chunk[T], error) {
 	return c, c.init()
 }
 
+// validityWindowBlock bridge the gap between the dsmr's block implementation and the validity window's execution block interface.
+type validityWindowBlock struct {
+	Block
+	certs set.Set[ids.ID]
+}
+
+func (e validityWindowBlock) Timestamp() int64 {
+	return e.Block.Timestamp
+}
+
+func (e validityWindowBlock) Height() uint64 {
+	return e.Block.Height
+}
+
+func (e validityWindowBlock) Contains(id ids.ID) bool {
+	return e.certs.Contains(id)
+}
+
+func (e validityWindowBlock) Parent() ids.ID {
+	return e.Block.ParentID
+}
+
+func (e validityWindowBlock) Containers() []*emapChunkCertificate {
+	chunkCerts := make([]*emapChunkCertificate, len(e.Block.ChunkCerts))
+	for i := range chunkCerts {
+		chunkCerts[i] = &emapChunkCertificate{*e.Block.ChunkCerts[i]}
+	}
+	return chunkCerts
+}
+
+func NewValidityWindowBlock(innerBlock Block) validityWindowBlock {
+	certSet := set.Set[ids.ID]{}
+	for _, c := range innerBlock.ChunkCerts {
+		certSet.Add(c.ChunkID)
+	}
+	return validityWindowBlock{
+		Block: innerBlock,
+		certs: certSet,
+	}
+}
+
 type Block struct {
 	ParentID  ids.ID `serialize:"true"`
 	Height    uint64 `serialize:"true"`

x/dsmr/certificate.go

@@ -46,6 +46,14 @@ type ChunkReference struct {
 	Expiry   int64      `serialize:"true"`
 }
 
+type emapChunkCertificate struct {
+	ChunkCertificate
+}
+
+func (e emapChunkCertificate) GetID() ids.ID { return e.ChunkID }
+
+func (e emapChunkCertificate) GetExpiry() int64 { return e.Expiry }
+
 type ChunkCertificate struct {
 	ChunkReference `serialize:"true"`
 	Signature      *warp.BitSetSignature `serialize:"true"`

x/dsmr/node.go

@@ -14,13 +14,15 @@ import (
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/network/p2p"
 	"github.com/ava-labs/avalanchego/network/p2p/acp118"
+	"github.com/ava-labs/avalanchego/trace"
 	"github.com/ava-labs/avalanchego/utils/crypto/bls"
 	"github.com/ava-labs/avalanchego/utils/logging"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 
 	"github.com/ava-labs/hypersdk/codec"
 	"github.com/ava-labs/hypersdk/consts"
+	"github.com/ava-labs/hypersdk/internal/validitywindow"
 	"github.com/ava-labs/hypersdk/proto/pb/dsmr"
 	"github.com/ava-labs/hypersdk/utils"
 
@@ -54,6 +56,7 @@ type Validator struct {
 
 func New[T Tx](
 	log logging.Logger,
+	tracer trace.Tracer,
 	nodeID ids.NodeID,
 	networkID uint32,
 	chainID ids.ID,
@@ -70,6 +73,8 @@ func New[T Tx](
 	lastAccepted Block,
 	quorumNum uint64,
 	quorumDen uint64,
+	chainIndex validitywindow.ChainIndex[*emapChunkCertificate],
+	validityWindowDuration time.Duration,
 ) (*Node[T], error) {
 	return &Node[T]{
 		ID:                            nodeID,
@@ -88,6 +93,10 @@ func New[T Tx](
 		GetChunkSignatureHandler:      getChunkSignatureHandler,
 		ChunkCertificateGossipHandler: chunkCertificateGossipHandler,
 		storage:                       chunkStorage,
+		log:                           log,
+		tracer:                        tracer,
+		validityWindow:                validitywindow.NewTimeValidityWindow(log, tracer, chainIndex),
+		validityWindowDuration:        validityWindowDuration,
 	}, nil
 }
 
@@ -109,6 +118,10 @@ type Node[T Tx] struct {
 	GetChunkSignatureHandler      p2p.Handler
 	ChunkCertificateGossipHandler p2p.Handler
 	storage                       *ChunkStorage[T]
+	log                           logging.Logger
+	tracer                        trace.Tracer
+	validityWindowDuration        time.Duration
+	validityWindow                *validitywindow.TimeValidityWindow[*emapChunkCertificate]
 }
 
 // BuildChunk builds transactions into a Chunk
@@ -217,19 +230,28 @@ func (n *Node[T]) BuildChunk(
 	return chunk, chunkCert, n.storage.AddLocalChunkWithCert(chunk, &chunkCert)
 }
 
-func (n *Node[T]) BuildBlock(parent Block, timestamp int64) (Block, error) {
+func (n *Node[T]) BuildBlock(ctx context.Context, parent Block, timestamp int64) (Block, error) {
 	if timestamp <= parent.Timestamp {
 		return Block{}, ErrTimestampNotMonotonicallyIncreasing
 	}
 
 	chunkCerts := n.storage.GatherChunkCerts()
+	oldestAllowed := max(0, timestamp-int64(n.validityWindowDuration))
+	chunkCert := make([]*emapChunkCertificate, len(chunkCerts))
+	for i := range chunkCert {
+		chunkCert[i] = &emapChunkCertificate{*chunkCerts[i]}
+	}
+	duplicates, err := n.validityWindow.IsRepeat(ctx, NewValidityWindowBlock(parent), chunkCert, oldestAllowed)
+	if err != nil {
+		return Block{}, err
+	}
+
 	availableChunkCerts := make([]*ChunkCertificate, 0)
-	for _, chunkCert := range chunkCerts {
-		// avoid building blocks with expired chunk certs
-		if chunkCert.Expiry < timestamp {
+	for i, chunkCert := range chunkCerts {
+		// avoid building blocks with duplicate or expired chunk certs
+		if chunkCert.Expiry < timestamp || duplicates.Contains(i) {
 			continue
 		}
-
 		availableChunkCerts = append(availableChunkCerts, chunkCert)
 	}
 	if len(availableChunkCerts) == 0 {
@@ -281,6 +303,13 @@ func (n *Node[T]) Verify(ctx context.Context, parent Block, block Block) error {
 		return fmt.Errorf("%w: %s", ErrEmptyBlock, block.GetID())
 	}
 
+	// Find repeats
+	oldestAllowed := max(0, block.Timestamp-int64(n.validityWindowDuration))
+
+	if err := n.validityWindow.VerifyExpiryReplayProtection(ctx, NewValidityWindowBlock(block), oldestAllowed); err != nil {
+		return fmt.Errorf("%w: block %s oldestAllowed - %d", err, block.GetID(), oldestAllowed)
+	}
+
 	for _, chunkCert := range block.ChunkCerts {
 		if err := chunkCert.Verify(
 			ctx,
@@ -340,6 +369,8 @@ func (n *Node[T]) Accept(ctx context.Context, block Block) error {
 			}
 		}
 	}
+	// update the validity window with the accepted block.
+	n.validityWindow.Accept(NewValidityWindowBlock(block))
 
 	if err := n.storage.SetMin(block.Timestamp, chunkIDs); err != nil {
 		return fmt.Errorf("failed to prune chunks: %w", err)