add prevData to commit event

bluesky-social · Feb 5, 2025 · 991f1cb · 991f1cb
1 parent 56abefb
commit 991f1cb
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 0 deletions.
diff --git a/lexicons/com/atproto/sync/subscribeRepos.json b/lexicons/com/atproto/sync/subscribeRepos.json
@@ -105,6 +105,10 @@
             "description": "List of new blobs (by CID) referenced by records in this commit."
           }
         },
+        "prevData": {
+          "type": "cid-link",
+          "description": "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose."
+        },
         "time": {
           "type": "string",
           "format": "datetime",

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -3827,6 +3827,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts b/packages/api/src/client/types/com/atproto/sync/subscribeRepos.ts
@@ -29,6 +29,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
   [k: string]: unknown

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -3827,6 +3827,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/bsky/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -56,6 +56,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
   [k: string]: unknown

diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
@@ -3827,6 +3827,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/ozone/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -56,6 +56,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
   [k: string]: unknown

diff --git a/packages/pds/src/actor-store/repo/transactor.ts b/packages/pds/src/actor-store/repo/transactor.ts
@@ -65,6 +65,7 @@ export class RepoTransactor extends RepoReader {
       ...commit,
       ops: commitOpsFromCreates(writes),
       blobs: blobCidsFromWrites(writes),
+      prevData: null,
     }
   }
 
@@ -140,6 +141,7 @@ export class RepoTransactor extends RepoReader {
     }
 
     const repo = await Repo.load(this.storage, currRoot.cid)
+    const prevData = repo.commit.data
     const writeOps = writes.map(writeToOp)
     const commit = await repo.formatCommit(writeOps, this.signingKey)
 
@@ -165,6 +167,7 @@ export class RepoTransactor extends RepoReader {
       ...commit,
       ops: commitOps,
       blobs: blobCidsFromWrites(writes),
+      prevData,
     }
   }
 

diff --git a/packages/pds/src/api/com/atproto/server/activateAccount.ts b/packages/pds/src/api/com/atproto/server/activateAccount.ts
@@ -45,6 +45,7 @@ export default function (server: Server, ctx: AppContext) {
           removedCids: new CidSet(),
           ops: [],
           blobs: new CidSet(),
+          prevData: null,
         }
       })
 

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -3827,6 +3827,11 @@ export const schemaDict = {
                 'List of new blobs (by CID) referenced by records in this commit.',
             },
           },
+          prevData: {
+            type: 'cid-link',
+            description:
+              "EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose.",
+          },
           time: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts b/packages/pds/src/lexicon/types/com/atproto/sync/subscribeRepos.ts
@@ -56,6 +56,8 @@ export interface Commit {
   blocks: Uint8Array
   ops: RepoOp[]
   blobs: CID[]
+  /** EXPERIMENTAL. The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. */
+  prevData?: CID
   /** Timestamp of when this message was originally broadcast. */
   time: string
   [k: string]: unknown

diff --git a/packages/pds/src/repo/types.ts b/packages/pds/src/repo/types.ts
@@ -52,6 +52,7 @@ export type CommitOp = {
 export type CommitDataWithOps = CommitData & {
   ops: CommitOp[]
   blobs: CidSet
+  prevData: CID | null
 }
 
 export type PreparedWrite = PreparedCreate | PreparedUpdate | PreparedDelete

diff --git a/packages/pds/src/scripts/rebuild-repo.ts b/packages/pds/src/scripts/rebuild-repo.ts
@@ -73,6 +73,7 @@ export const rebuildRepo = async (ctx: AppContext, args: string[]) => {
       removedCids: toDelete,
       ops: [],
       blobs: new CidSet(),
+      prevData: null,
     }
   })
   await ctx.accountManager.updateRepoRoot(did, commit.cid, rev)

diff --git a/packages/pds/src/sequencer/events.ts b/packages/pds/src/sequencer/events.ts
@@ -34,6 +34,7 @@ export const formatSeqCommit = async (
       blocks: await blocksToCarFile(commitData.cid, justRoot),
       ops: [],
       blobs: [],
+      prevData: commitData.prevData ?? undefined,
     }
   } else {
     evt = {
@@ -47,6 +48,7 @@ export const formatSeqCommit = async (
       blocks: await blocksToCarFile(commitData.cid, blocksToSend),
       ops: commitData.ops,
       blobs: commitData.blobs.toList(),
+      prevData: commitData.prevData ?? undefined,
     }
   }
 
@@ -149,6 +151,7 @@ export const commitEvt = z.object({
   blocks: schema.bytes,
   ops: z.array(commitEvtOp),
   blobs: z.array(schema.cid),
+  prevData: schema.cid.optional(),
 })
 export type CommitEvt = z.infer<typeof commitEvt>