WIP: Shwap prototype

share/shwap/data_id.go

@@ -34,6 +34,12 @@ func NewDataID(height uint64, rowIdx uint16, namespace share.Namespace, root *sh
 		},
 		DataNamespace: string(namespace),
 	}
+
+	verifyFn := func(d Data) error {
+		return d.Verify(root)
+	}
+	dataVerifiers.Add(did, verifyFn)
+
 	return did, did.Verify(root)
 }
 

share/shwap/row_id.go

@@ -34,6 +34,12 @@ func NewRowID(height uint64, rowIdx uint16, root *share.Root) (RowID, error) {
 		RowIndex: rowIdx,
 		Height:   height,
 	}
+
+	verifyFn := func(row Row) error {
+		return row.Verify(root)
+	}
+	rowVerifiers.Add(rid, verifyFn)
+
 	return rid, rid.Verify(root)
 }
 
@@ -145,3 +151,7 @@ func (rid RowID) BlockFromFile(ctx context.Context, f file.EdsFile) (blocks.Bloc
 	}
 	return blk, nil
 }
+
+func (rid RowID) Release() {
+	rowVerifiers.Delete(rid)
+}

share/shwap/sample_id.go

@@ -38,6 +38,12 @@ func NewSampleID(height uint64, smplIdx int, root *share.Root) (SampleID, error)
 		},
 		ShareIndex: shrIdx,
 	}
+
+	verifyFn := func(s Sample) error {
+		return s.Verify(root)
+	}
+	sampleVerifiers.Add(sid, verifyFn)
+
 	return sid, sid.Verify(root)
 }
 
@@ -127,3 +133,7 @@ func (sid SampleID) BlockFromFile(ctx context.Context, f file.EdsFile) (blocks.B
 	}
 	return blk, nil
 }
+
+func (sid SampleID) Release() {
+	sampleVerifiers.Delete(sid)
+}

share/shwap/shwap.go

@@ -6,19 +6,11 @@ import (
 	"hash"
 	"sync"
 
-	"github.com/ipfs/boxo/blockservice"
-	"github.com/ipfs/boxo/blockstore"
-	"github.com/ipfs/boxo/exchange"
 	"github.com/ipfs/go-cid"
 	logger "github.com/ipfs/go-log/v2"
 	mh "github.com/multiformats/go-multihash"
 )
 
-// NewBlockService creates a new blockservice.BlockService with allowlist supporting the protocol.
-func NewBlockService(b blockstore.Blockstore, ex exchange.Interface) blockservice.BlockService {
-	return blockservice.New(b, ex, blockservice.WithAllowlist(defaultAllowlist))
-}
-
 var log = logger.Logger("shwap")
 
 const (
@@ -86,8 +78,12 @@ func (v *verifiers[ID, V]) Verify(id ID, val V) error {
 	return f.(func(V) error)(val)
 }
 
-// defaultAllowlist keeps default list of hashes allowed in the network.
-var defaultAllowlist allowlist
+func (v *verifiers[ID, V]) Delete(id ID) {
+	v.mp.Delete(id)
+}
+
+// DefaultAllowlist keeps default list of hashes allowed in the network.
+var DefaultAllowlist allowlist
 
 type allowlist struct{}
 
@@ -102,7 +98,7 @@ func (a allowlist) IsAllowed(code uint64) bool {
 
 func validateCID(cid cid.Cid) error {
 	prefix := cid.Prefix()
-	if !defaultAllowlist.IsAllowed(prefix.MhType) {
+	if !DefaultAllowlist.IsAllowed(prefix.MhType) {
 		return fmt.Errorf("unsupported multihash type %d", prefix.MhType)
 	}