Account migration

lexicons/com/atproto/repo/importRepo.json

@@ -0,0 +1,23 @@
+{
+  "lexicon": 1,
+  "id": "com.atproto.repo.importRepo",
+  "defs": {
+    "main": {
+      "type": "procedure",
+      "description": "Import a full repo, overwriting existing",
+      "input": {
+        "encoding": "application/vnd.ipld.car"
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["head"],
+          "properties": {
+            "head": {"type": "string", "format": "cid"}
+          }
+        }
+      }
+    }
+  }
+}

lexicons/com/atproto/server/createAccount.json

@@ -13,6 +13,7 @@
           "properties": {
             "email": {"type": "string"},
             "handle": {"type": "string", "format": "handle"},
+            "did": {"type": "string", "format": "did"},
             "inviteCode": {"type": "string"},
             "password": {"type": "string"},
             "recoveryKey": {"type": "string"}

lexicons/com/atproto/server/describeServer.json

@@ -9,10 +9,16 @@
         "encoding": "application/json",
         "schema": {
           "type": "object",
-          "required": ["availableUserDomains"],
+          "required": ["availableUserDomains", "repoSigningKey"],
           "properties": {
             "inviteCodeRequired": {"type": "boolean"},
             "availableUserDomains": {"type": "array", "items": {"type": "string"}},
+            "repoSigningKey": {"type": "string"},
+            "plcRotationKeys": {
+              "type": "array",
+              "items": {"type": "string"},
+              "maxLength": 4
+            },
             "links": {"type": "ref", "ref": "#links"}
           }
         }

packages/api/src/client/index.ts

@@ -27,6 +27,7 @@ import * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createReco
 import * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
 import * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
 import * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
+import * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
 import * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
 import * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
 import * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
@@ -105,6 +106,7 @@ export * as ComAtprotoRepoCreateRecord from './types/com/atproto/repo/createReco
 export * as ComAtprotoRepoDeleteRecord from './types/com/atproto/repo/deleteRecord'
 export * as ComAtprotoRepoDescribeRepo from './types/com/atproto/repo/describeRepo'
 export * as ComAtprotoRepoGetRecord from './types/com/atproto/repo/getRecord'
+export * as ComAtprotoRepoImportRepo from './types/com/atproto/repo/importRepo'
 export * as ComAtprotoRepoListRecords from './types/com/atproto/repo/listRecords'
 export * as ComAtprotoRepoPutRecord from './types/com/atproto/repo/putRecord'
 export * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef'
@@ -462,6 +464,17 @@ export class RepoNS {
       })
   }
 
+  importRepo(
+    data?: ComAtprotoRepoImportRepo.InputSchema,
+    opts?: ComAtprotoRepoImportRepo.CallOptions,
+  ): Promise<ComAtprotoRepoImportRepo.Response> {
+    return this._service.xrpc
+      .call('com.atproto.repo.importRepo', opts?.qp, data, opts)
+      .catch((e) => {
+        throw ComAtprotoRepoImportRepo.toKnownErr(e)
+      })
+  }
+
   listRecords(
     params?: ComAtprotoRepoListRecords.QueryParams,
     opts?: ComAtprotoRepoListRecords.CallOptions,

packages/api/src/client/lexicons.ts

@@ -1400,6 +1400,32 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoRepoImportRepo: {
+    lexicon: 1,
+    id: 'com.atproto.repo.importRepo',
+    defs: {
+      main: {
+        type: 'procedure',
+        description: 'Import a full repo, overwriting existing',
+        input: {
+          encoding: 'application/vnd.ipld.car',
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['head'],
+            properties: {
+              head: {
+                type: 'string',
+                format: 'cid',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ComAtprotoRepoListRecords: {
     lexicon: 1,
     id: 'com.atproto.repo.listRecords',
@@ -1630,6 +1656,10 @@ export const schemaDict = {
                 type: 'string',
                 format: 'handle',
               },
+              did: {
+                type: 'string',
+                format: 'did',
+              },
               inviteCode: {
                 type: 'string',
               },
@@ -1836,7 +1866,7 @@ export const schemaDict = {
           encoding: 'application/json',
           schema: {
             type: 'object',
-            required: ['availableUserDomains'],
+            required: ['availableUserDomains', 'repoSigningKey'],
             properties: {
               inviteCodeRequired: {
                 type: 'boolean',
@@ -1847,6 +1877,16 @@ export const schemaDict = {
                   type: 'string',
                 },
               },
+              repoSigningKey: {
+                type: 'string',
+              },
+              plcRotationKeys: {
+                type: 'array',
+                items: {
+                  type: 'string',
+                },
+                maxLength: 4,
+              },
               links: {
                 type: 'ref',
                 ref: 'lex:com.atproto.server.describeServer#links',
@@ -4195,6 +4235,7 @@ export const ids = {
   ComAtprotoRepoDeleteRecord: 'com.atproto.repo.deleteRecord',
   ComAtprotoRepoDescribeRepo: 'com.atproto.repo.describeRepo',
   ComAtprotoRepoGetRecord: 'com.atproto.repo.getRecord',
+  ComAtprotoRepoImportRepo: 'com.atproto.repo.importRepo',
   ComAtprotoRepoListRecords: 'com.atproto.repo.listRecords',
   ComAtprotoRepoPutRecord: 'com.atproto.repo.putRecord',
   ComAtprotoRepoStrongRef: 'com.atproto.repo.strongRef',

packages/api/src/client/types/com/atproto/repo/importRepo.ts

@@ -0,0 +1,35 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+
+export interface QueryParams {}
+
+export type InputSchema = string | Uint8Array
+
+export interface OutputSchema {
+  head: string
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+  qp?: QueryParams
+  encoding: 'application/vnd.ipld.car'
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

packages/api/src/client/types/com/atproto/server/createAccount.ts

@@ -12,6 +12,7 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   handle: string
+  did?: string
   inviteCode?: string
   password: string
   recoveryKey?: string

packages/api/src/client/types/com/atproto/server/describeServer.ts

@@ -14,6 +14,8 @@ export type InputSchema = undefined
 export interface OutputSchema {
   inviteCodeRequired?: boolean
   availableUserDomains: string[]
+  repoSigningKey: string
+  plcRotationKeys?: string[]
   links?: Links
   [k: string]: unknown
 }

packages/dev-env/package.json

@@ -20,7 +20,7 @@
     "@atproto/did-resolver": "*",
     "@atproto/pds": "*",
     "@atproto/uri": "*",
-    "@did-plc/lib": "^0.0.1",
+    "@did-plc/lib": "0.0.3",
     "@did-plc/server": "^0.0.1",
     "better-sqlite3": "^7.6.2",
     "chalk": "^5.0.1",

packages/did-resolver/package.json

@@ -26,7 +26,7 @@
     "did-resolver": "^4.0.0"
   },
   "devDependencies": {
-    "@did-plc/lib": "^0.0.1",
+    "@did-plc/lib": "0.0.3",
     "@did-plc/server": "^0.0.1",
     "cors": "^2.8.5",
     "express": "^4.18.2",

packages/did-resolver/src/resolver.ts

@@ -33,7 +33,6 @@ export class DidResolver {
     did: string,
     options: DIDResolutionOptions = {},
   ): Promise<DIDResolutionResult> {
-    log.info({ did }, 'resolving did')
     const res = await this.resolver.resolve(did, options)
     log.info({ did, res }, 'resolved did')
     return res

packages/pds/package.json

@@ -35,7 +35,7 @@
     "@atproto/repo": "*",
     "@atproto/uri": "*",
     "@atproto/xrpc-server": "*",
-    "@did-plc/lib": "^0.0.1",
+    "@did-plc/lib": "0.0.3",
     "better-sqlite3": "^7.6.2",
     "bytes": "^3.1.2",
     "cors": "^2.8.5",

packages/pds/src/api/com/atproto/repo/importRepo.ts

@@ -0,0 +1,61 @@
+import { Server } from '../../../../lexicon'
+import AppContext from '../../../../context'
+import { readCarWithRoot, MemoryBlockstore, Repo } from '@atproto/repo'
+import * as ui8 from 'uint8arrays'
+import SqlRepoStorage from '../../../../sql-repo-storage'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { prepareCreate, PreparedCreate } from '../../../../repo'
+
+export default function (server: Server, ctx: AppContext) {
+  server.com.atproto.repo.importRepo({
+    auth: ctx.accessVerifierCheckTakedown,
+    handler: async ({ auth, input }) => {
+      const requester = auth.credentials.did
+      let carBytes = new Uint8Array([])
+      for await (const chunk of input.body) {
+        carBytes = ui8.concat([carBytes, new Uint8Array(chunk)])
+      }
+      const car = await readCarWithRoot(carBytes)
+      const storage = new MemoryBlockstore(car.blocks)
+      const repo = await Repo.load(storage, car.root)
+      const contents = await repo.getContents()
+
+      const creates: PreparedCreate[] = []
+      for (const collection of Object.keys(contents)) {
+        for (const rkey of Object.keys(contents[collection])) {
+          creates.push(
+            await prepareCreate({
+              did: requester,
+              collection,
+              rkey,
+              record: contents[collection][rkey],
+            }),
+          )
+        }
+      }
+
+      const head = await ctx.db.transaction(async (dbTxn) => {
+        const repoSrvc = ctx.services.repo(dbTxn)
+        const storage = new SqlRepoStorage(ctx.db, requester)
+        const prevHead = await storage.getHead()
+        if (prevHead !== null) {
+          throw new InvalidRequestError(
+            `Repo already exists for user: ${requester}`,
+          )
+        }
+        return await repoSrvc.createRepo(
+          requester,
+          creates,
+          new Date().toISOString(),
+        )
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {
+          head: head.toString(),
+        },
+      }
+    },
+  })
+}

packages/pds/src/api/com/atproto/repo/index.ts

@@ -5,6 +5,7 @@ import createRecord from './createRecord'
 import deleteRecord from './deleteRecord'
 import describeRepo from './describeRepo'
 import getRecord from './getRecord'
+import importRepo from './importRepo'
 import listRecords from './listRecords'
 import putRecord from './putRecord'
 import uploadBlob from './uploadBlob'
@@ -15,6 +16,7 @@ export default function (server: Server, ctx: AppContext) {
   deleteRecord(server, ctx)
   describeRepo(server, ctx)
   getRecord(server, ctx)
+  importRepo(server, ctx)
   listRecords(server, ctx)
   putRecord(server, ctx)
   uploadBlob(server, ctx)