add ability to not ensure leaves

bluesky-social · Nov 20, 2023 · 16b01f1 · 16b01f1
1 parent dfe331c
commit 16b01f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/pds/src/api/com/atproto/temp/importRepo.ts b/packages/pds/src/api/com/atproto/temp/importRepo.ts
@@ -99,7 +99,14 @@ const importRepo = async (
   const currRepo = currRoot
     ? await Repo.load(actorStore.repo.storage, CID.parse(currRoot.cid))
     : null
-  const diff = await verifyDiff(currRepo, blocks, roots[0])
+  const diff = await verifyDiff(
+    currRepo,
+    blocks,
+    roots[0],
+    undefined,
+    undefined,
+    { ensureLeaves: false },
+  )
   outBuffer.push(`diffed repo and found ${diff.writes.length} writes\n`)
   diff.commit.rev = rev
   await actorStore.repo.storage.applyCommit(diff.commit, currRepo === null)

diff --git a/packages/repo/src/sync/consumer.ts b/packages/repo/src/sync/consumer.ts
@@ -48,7 +48,9 @@ export const verifyDiff = async (
   updateRoot: CID,
   did?: string,
   signingKey?: string,
+  opts?: { ensureLeaves?: boolean },
 ): Promise<VerifiedDiff> => {
+  const { ensureLeaves = true } = opts ?? {}
   const stagedStorage = new MemoryBlockstore(updateBlocks)
   const updateStorage = repo
     ? new SyncStorage(stagedStorage, repo.storage)
@@ -63,7 +65,7 @@ export const verifyDiff = async (
   const writes = await util.diffToWriteDescripts(diff)
   const newBlocks = diff.newMstBlocks
   const leaves = updateBlocks.getMany(diff.newLeafCids.toList())
-  if (leaves.missing.length > 0) {
+  if (leaves.missing.length > 0 && ensureLeaves) {
     throw new Error(`missing leaf blocks: ${leaves.missing}`)
   }
   newBlocks.addMap(leaves.blocks)