fix: Add Lens to repository on sync (#143)

Author: AndrewSisley

host-go/node/node.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/sourcenetwork/corekv/badger"
 	"github.com/sourcenetwork/immutable"
+	"github.com/sourcenetwork/lens/host-go/repository"
 	"github.com/sourcenetwork/lens/host-go/runtimes"
 	"github.com/sourcenetwork/lens/host-go/store"
 )
@@ -68,16 +69,18 @@ func New(ctx context.Context, opts ...Option) (*Node, error) {
 		o.IndexstoreNamespace = immutable.Some("i")
 	}
 
+	repo := repository.NewRepository(o.PoolSize.Value(), o.Runtime.Value(), &repositoryTxnSource{src: o.TxnSource.Value()})
+
 	node, err := createNode(
 		ctx,
-		store.New(
+		store.NewWithRepository(
 			o.TxnSource.Value(),
-			o.PoolSize.Value(),
-			o.Runtime.Value(),
+			repo,
 			o.BlockstoreNamespace.Value(),
 			o.BlockstoreChunkSize,
 			o.IndexstoreNamespace.Value(),
 		),
+		repo,
 		o,
 		onClose,
 	)
@@ -105,3 +108,18 @@ func (n *Node) Close() error {
 
 	return nil
 }
+
+// repositoryTxnSource wraps a `TxnSource` so that it satisfies the `repository.TxnSource`
+// interface and can be passed through.
+//
+// Without this, either the `store` package or the `repository` package would require an unnecessarily
+// enlarged Txn interface, hindering consumption.
+type repositoryTxnSource struct {
+	src store.TxnSource
+}
+
+var _ repository.TxnSource = (*repositoryTxnSource)(nil)
+
+func (s *repositoryTxnSource) NewTxn(readonly bool) (repository.Txn, error) {
+	return s.src.NewTxn(readonly)
+}

host-go/node/node_p2p.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/sourcenetwork/lens/host-go/engine/module"
 	"github.com/sourcenetwork/lens/host-go/p2p"
+	"github.com/sourcenetwork/lens/host-go/repository"
 	"github.com/sourcenetwork/lens/host-go/store"
 )
 
@@ -58,7 +59,13 @@ func WithP2Poptions(opts ...sourceP2P.NodeOpt) Option {
 	}
 }
 
-func createNode(ctx context.Context, store store.TxnStore, o Options, onClose []closer) (*Node, error) {
+func createNode(
+	ctx context.Context,
+	store store.TxnStore,
+	repository repository.Repository,
+	o Options,
+	onClose []closer,
+) (*Node, error) {
 	var p2pSys immutable.Option[*p2p.P2P]
 	if !o.DisableP2P {
 		var host p2p.Host
@@ -85,7 +92,7 @@ func createNode(ctx context.Context, store store.TxnStore, o Options, onClose []
 			}
 		}
 
-		p2pSys = immutable.Some(p2p.New(host, o.Rootstore.Value(), o.IndexstoreNamespace.Value()))
+		p2pSys = immutable.Some(p2p.New(host, repository, o.Rootstore.Value(), o.IndexstoreNamespace.Value()))
 	}
 
 	return &Node{

host-go/node/node_p2p_free.go

@@ -13,6 +13,7 @@ import (
 	"github.com/sourcenetwork/immutable"
 
 	"github.com/sourcenetwork/lens/host-go/engine/module"
+	"github.com/sourcenetwork/lens/host-go/repository"
 	"github.com/sourcenetwork/lens/host-go/store"
 )
 
@@ -46,7 +47,13 @@ func WithP2PDisabled(disableP2P bool) Option {
 	}
 }
 
-func createNode(ctx context.Context, store store.TxnStore, o Options, onClose []closer) (*Node, error) {
+func createNode(
+	ctx context.Context,
+	store store.TxnStore,
+	repository repository.Repository,
+	o Options,
+	onClose []closer,
+) (*Node, error) {
 	return &Node{
 		onClose: onClose,
 		Options: o,

host-go/p2p/p2p.go

@@ -10,21 +10,28 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/ipld/go-ipld-prime/linking"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
-	"github.com/ipld/go-ipld-prime/node/bindnode"
 	"github.com/sourcenetwork/corekv"
 	"github.com/sourcenetwork/corekv/blockstore"
 	"github.com/sourcenetwork/corekv/namespace"
+	"github.com/sourcenetwork/lens/host-go/repository"
 	"github.com/sourcenetwork/lens/host-go/store"
 )
 
 type P2P struct {
 	Host       Host
+	repository repository.Repository
 	indexstore corekv.ReaderWriter
 }
 
-func New(host Host, rootstore corekv.ReaderWriter, indexNamespace string) *P2P {
+func New(
+	host Host,
+	repository repository.Repository,
+	rootstore corekv.ReaderWriter,
+	indexNamespace string,
+) *P2P {
 	return &P2P{
 		Host:       host,
+		repository: repository,
 		indexstore: namespace.Wrap(rootstore, []byte(indexNamespace)),
 	}
 }
@@ -42,24 +49,14 @@ func (p *P2P) SyncLens(ctx context.Context, id string) error {
 
 	linkSys := makeLinkSystem(p.Host.IPLDStore())
 
-	configNode, err := linkSys.Load(linking.LinkContext{Ctx: ctx}, cidlink.Link{Cid: cid}, store.ConfigBlockSchemaPrototype)
+	model, err := store.LoadLensModel(ctx, &linkSys, cid)
 	if err != nil {
 		return err
 	}
 
-	configBlock := bindnode.Unwrap(configNode).(*store.ConfigBlock)
-
-	for _, moduleLink := range configBlock.Modules {
-		moduleNode, err := linkSys.Load(linking.LinkContext{Ctx: ctx}, moduleLink, store.ModuleBlockSchemaPrototype)
-		if err != nil {
-			return err
-		}
-		moduleBlock := bindnode.Unwrap(moduleNode).(*store.ModuleBlock)
-
-		_, err = linkSys.Load(linking.LinkContext{Ctx: ctx}, moduleBlock.Lens, store.LensBlockSchemaPrototype)
-		if err != nil {
-			return err
-		}
+	err = p.repository.Add(ctx, id, model)
+	if err != nil {
+		return err
 	}
 
 	// Store the top level index so that it may be fetched efficiently from the Store

host-go/store/block.go

@@ -155,7 +155,7 @@ func (b *ConfigBlock) generateNode() ipld.Node {
 	return bindnode.Wrap(b, ConfigBlockSchema).Representation()
 }
 
-func loadLensModel(ctx context.Context, linkSys *linking.LinkSystem, cid cid.Cid) (model.Lens, error) {
+func LoadLensModel(ctx context.Context, linkSys *linking.LinkSystem, cid cid.Cid) (model.Lens, error) {
 	configNode, err := linkSys.Load(linking.LinkContext{Ctx: ctx}, cidlink.Link{Cid: cid}, ConfigBlockSchemaPrototype)
 	if err != nil {
 		return model.Lens{}, err

host-go/store/store.go

@@ -89,6 +89,25 @@ func New(
 	}
 }
 
+// NewWithRepository creates a new `TxnStore` using the given parameters.
+//
+// The blockstore namespace may safely be shared by other components if desired.
+func NewWithRepository(
+	txnSource TxnSource,
+	repository repository.TxnRepository,
+	blockstoreNamespace string,
+	blockstoreChunksize immutable.Option[int],
+	indexstoreNamespace string,
+) TxnStore {
+	return &implicitTxnStore{
+		txnSource:           txnSource,
+		repository:          repository,
+		blockstoreNamespace: blockstoreNamespace,
+		blockstoreChunksize: blockstoreChunksize,
+		indexstoreNamespace: indexstoreNamespace,
+	}
+}
+
 func add(ctx context.Context, cfg model.Lens, txn *txn) (cid.Cid, error) {
 	configLink, err := writeConfigBlock(ctx, txn.linkSystem, cfg)
 	if err != nil {
@@ -142,7 +161,7 @@ func list(ctx context.Context, txn *txn) (map[cid.Cid]model.Lens, error) {
 			return nil, errors.Join(err, iter.Close())
 		}
 
-		config, err := loadLensModel(ctx, txn.linkSystem, configCID)
+		config, err := LoadLensModel(ctx, txn.linkSystem, configCID)
 		if err != nil {
 			return nil, errors.Join(err, iter.Close())
 		}

host-go/store/txn.go

@@ -40,5 +40,5 @@ type repositoryTxnSource struct {
 var _ repository.TxnSource = (*repositoryTxnSource)(nil)
 
 func (s *repositoryTxnSource) NewTxn(readonly bool) (repository.Txn, error) {
-	return s.NewTxn(readonly)
+	return s.src.NewTxn(readonly)
 }