relay sync1.1

.github/workflows/container-relay-aws.yaml

@@ -0,0 +1,52 @@
+name: container-relay-aws
+on: [push]
+env:
+  REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
+  USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}
+  PASSWORD: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_PASSWORD }}
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: relay
+
+jobs:
+  container-relay-aws:
+    if: github.repository == 'bluesky-social/indigo'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.USERNAME }}
+          password: ${{ env.PASSWORD }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,enable=true,priority=100,prefix=,suffix=,format=long
+
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./cmd/relay/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

atproto/identity/cache_directory.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/golang-lru/v2/expirable"
 )
 
+// CacheDirectory is an implementation of identity.Directory with local cache of Handle and DID
 type CacheDirectory struct {
 	Inner             Directory
 	ErrTTL            time.Duration

atproto/repo/car.go

@@ -9,14 +9,13 @@ import (
 	"github.com/bluesky-social/indigo/atproto/repo/mst"
 	"github.com/bluesky-social/indigo/atproto/syntax"
 
-	"github.com/ipfs/go-datastore"
-	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	"github.com/ipld/go-car"
 )
 
 func LoadFromCAR(ctx context.Context, r io.Reader) (*Commit, *Repo, error) {
 
-	bs := blockstore.NewBlockstore(datastore.NewMapDatastore())
+	//bs := blockstore.NewBlockstore(datastore.NewMapDatastore())
+	bs := NewTinyBlockstore()
 
 	cr, err := car.NewCarReader(r)
 	if err != nil {

atproto/repo/mst/encoding.go

@@ -199,7 +199,7 @@ func (n *Node) writeBlocks(ctx context.Context, bs blockstore.Blockstore, onlyDi
 	return c, nil
 }
 
-func loadNodeFromStore(ctx context.Context, bs blockstore.Blockstore, ref cid.Cid) (*Node, error) {
+func loadNodeFromStore(ctx context.Context, bs MSTBlockSource, ref cid.Cid) (*Node, error) {
 	block, err := bs.Get(ctx, ref)
 	if err != nil {
 		return nil, err

atproto/repo/mst/tree.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 
+	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 )
@@ -143,7 +144,7 @@ func (t *Tree) Copy() Tree {
 	}
 }
 
-func LoadTreeFromStore(ctx context.Context, bs blockstore.Blockstore, root cid.Cid) (*Tree, error) {
+func LoadTreeFromStore(ctx context.Context, bs MSTBlockSource, root cid.Cid) (*Tree, error) {
 	n, err := loadNodeFromStore(ctx, bs, root)
 	if err != nil {
 		return nil, err
@@ -154,6 +155,11 @@ func LoadTreeFromStore(ctx context.Context, bs blockstore.Blockstore, root cid.C
 	}, nil
 }
 
+// subset of Blockstore that we actually need
+type MSTBlockSource interface {
+	Get(ctx context.Context, cid cid.Cid) (blocks.Block, error)
+}
+
 // Walks the tree, encodes any "dirty" nodes as CBOR data, and writes that data as blocks to the provided blockstore. Returns root CID.
 func (t *Tree) WriteDiffBlocks(ctx context.Context, bs blockstore.Blockstore) (*cid.Cid, error) {
 	return t.Root.writeBlocks(ctx, bs, true)