@atcute/lexicon-resolver 0.1.2 → 0.1.4

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,qBAAa,+BAAgC,SAAQ,KAAK;IAChD,IAAI,SAAqC;CAClD;AAED,qBAAa,sBAAuB,SAAQ,+BAA+B;IAGvD,IAAI,EAAE,IAAI;IAFpB,IAAI,SAA4B;gBAEtB,IAAI,EAAE,IAAI;CAG7B;AAED,qBAAa,8BAA+B,SAAQ,+BAA+B;IAI1E,IAAI,EAAE,IAAI;IAHT,IAAI,SAAoC;gBAGzC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,6BAA8B,SAAQ,+BAA+B;IAIzE,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,MAAM;IAJV,IAAI,SAAmC;gBAGxC,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM;CAInB;AAED,qBAAa,uBAAwB,SAAQ,+BAA+B;IAGxD,IAAI,EAAE,IAAI;IAFpB,IAAI,SAA6B;gBAEvB,IAAI,EAAE,IAAI;CAG7B;AAID,qBAAa,sBAAuB,SAAQ,KAAK;IACvC,IAAI,SAA4B;CACzC;AAGD,qBAAa,4BAA6B,SAAQ,sBAAsB;IAI/D,IAAI,EAAE,IAAI;IAHT,IAAI,SAAkC;gBAGvC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,yBAA0B,SAAQ,sBAAsB;IAI5D,IAAI,EAAE,IAAI;IAHT,IAAI,SAA+B;gBAGpC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,wBAAyB,SAAQ,sBAAsB;IAI3D,IAAI,EAAE,IAAI;IAHT,IAAI,SAA8B;gBAGnC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAGpD,qBAAa,+BAAgC,SAAQ,KAAK;IAChD,IAAI,SAAqC;CAClD;AAED,qBAAa,sBAAuB,SAAQ,+BAA+B;IAGvD,IAAI,EAAE,IAAI;IAFpB,IAAI,SAA4B;gBAEtB,IAAI,EAAE,IAAI;CAG7B;AAED,qBAAa,8BAA+B,SAAQ,+BAA+B;IAI1E,IAAI,EAAE,IAAI;IAHT,IAAI,SAAoC;gBAGzC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,6BAA8B,SAAQ,+BAA+B;IAIzE,IAAI,EAAE,IAAI;IACV,GAAG,EAAE,MAAM;IAJV,IAAI,SAAmC;gBAGxC,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM;CAInB;AAED,qBAAa,uBAAwB,SAAQ,+BAA+B;IAGxD,IAAI,EAAE,IAAI;IAFpB,IAAI,SAA6B;gBAEvB,IAAI,EAAE,IAAI;CAG7B;AAID,qBAAa,sBAAuB,SAAQ,KAAK;IACvC,IAAI,SAA4B;CACzC;AAED,qBAAa,4BAA6B,SAAQ,sBAAsB;IAI/D,IAAI,EAAE,IAAI;IAHT,IAAI,SAAkC;gBAGvC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,yBAA0B,SAAQ,sBAAsB;IAI5D,IAAI,EAAE,IAAI;IAHT,IAAI,SAA+B;gBAGpC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB;AAED,qBAAa,wBAAyB,SAAQ,sBAAsB;IAI3D,IAAI,EAAE,IAAI;IAHT,IAAI,SAA8B;gBAGnC,IAAI,EAAE,IAAI,EACjB,OAAO,CAAC,EAAE,YAAY;CAIvB"}

package/dist/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAEA,8CAA8C;AAC9C,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IAChD,IAAI,GAAG,iCAAiC,CAAC;CAClD;AAED,MAAM,OAAO,sBAAuB,SAAQ,+BAA+B;IAGvD;IAFV,IAAI,GAAG,wBAAwB,CAAC;IAEzC,YAAmB,IAAU;QAC5B,KAAK,CAAC,qCAAqC,IAAI,EAAE,CAAC,CAAC;QADjC,SAAI,GAAJ,IAAI,CAAM;IAE7B,CAAC;CACD;AAED,MAAM,OAAO,8BAA+B,SAAQ,+BAA+B;IAI1E;IAHC,IAAI,GAAG,gCAAgC,CAAC;IAEjD,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,6CAA6C,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAH7D,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,6BAA8B,SAAQ,+BAA+B;IAIzE;IACA;IAJC,IAAI,GAAG,+BAA+B,CAAC;IAEhD,YACQ,IAAU,EACV,GAAW;QAElB,KAAK,CAAC,gDAAgD,IAAI,SAAS,GAAG,EAAE,CAAC,CAAC;QAHnE,SAAI,GAAJ,IAAI,CAAM;QACV,QAAG,GAAH,GAAG,CAAQ;IAGnB,CAAC;CACD;AAED,MAAM,OAAO,uBAAwB,SAAQ,+BAA+B;IAGxD;IAFV,IAAI,GAAG,yBAAyB,CAAC;IAE1C,YAAmB,IAAU;QAC5B,KAAK,CAAC,wDAAwD,IAAI,EAAE,CAAC,CAAC;QADpD,SAAI,GAAJ,IAAI,CAAM;IAE7B,CAAC;CACD;AACD,aAAa;AAEb,oCAAoC;AACpC,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IACvC,IAAI,GAAG,wBAAwB,CAAC;CACzC;AAGD,MAAM,OAAO,4BAA6B,SAAQ,sBAAsB;IAI/D;IAHC,IAAI,GAAG,8BAA8B,CAAC;IAE/C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,mCAAmC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHnD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,yBAA0B,SAAQ,sBAAsB;IAI5D;IAHC,IAAI,GAAG,2BAA2B,CAAC;IAE5C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,gCAAgC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHhD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,wBAAyB,SAAQ,sBAAsB;IAI3D;IAHC,IAAI,GAAG,0BAA0B,CAAC;IAE3C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,sCAAsC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHtD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AACD,aAAa"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../lib/errors.ts"],"names":[],"mappings":"AAEA,8CAA8C;AAC9C,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IAChD,IAAI,GAAG,iCAAiC,CAAC;CAClD;AAED,MAAM,OAAO,sBAAuB,SAAQ,+BAA+B;IAGvD;IAFV,IAAI,GAAG,wBAAwB,CAAC;IAEzC,YAAmB,IAAU;QAC5B,KAAK,CAAC,qCAAqC,IAAI,EAAE,CAAC,CAAC;QADjC,SAAI,GAAJ,IAAI,CAAM;IAE7B,CAAC;CACD;AAED,MAAM,OAAO,8BAA+B,SAAQ,+BAA+B;IAI1E;IAHC,IAAI,GAAG,gCAAgC,CAAC;IAEjD,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,6CAA6C,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAH7D,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,6BAA8B,SAAQ,+BAA+B;IAIzE;IACA;IAJC,IAAI,GAAG,+BAA+B,CAAC;IAEhD,YACQ,IAAU,EACV,GAAW;QAElB,KAAK,CAAC,gDAAgD,IAAI,SAAS,GAAG,EAAE,CAAC,CAAC;QAHnE,SAAI,GAAJ,IAAI,CAAM;QACV,QAAG,GAAH,GAAG,CAAQ;IAGnB,CAAC;CACD;AAED,MAAM,OAAO,uBAAwB,SAAQ,+BAA+B;IAGxD;IAFV,IAAI,GAAG,yBAAyB,CAAC;IAE1C,YAAmB,IAAU;QAC5B,KAAK,CAAC,wDAAwD,IAAI,EAAE,CAAC,CAAC;QADpD,SAAI,GAAJ,IAAI,CAAM;IAE7B,CAAC;CACD;AACD,aAAa;AAEb,oCAAoC;AACpC,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IACvC,IAAI,GAAG,wBAAwB,CAAC;CACzC;AAED,MAAM,OAAO,4BAA6B,SAAQ,sBAAsB;IAI/D;IAHC,IAAI,GAAG,8BAA8B,CAAC;IAE/C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,mCAAmC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHnD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,yBAA0B,SAAQ,sBAAsB;IAI5D;IAHC,IAAI,GAAG,2BAA2B,CAAC;IAE5C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,gCAAgC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHhD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AAED,MAAM,OAAO,wBAAyB,SAAQ,sBAAsB;IAI3D;IAHC,IAAI,GAAG,0BAA0B,CAAC;IAE3C,YACQ,IAAU,EACjB,OAAsB;QAEtB,KAAK,CAAC,sCAAsC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAHtD,SAAI,GAAJ,IAAI,CAAM;IAIlB,CAAC;CACD;AACD,aAAa"}

package/dist/schemas/xrpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../../lib/schemas/xrpc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAMhE,OAAO,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAG/E,MAAM,WAAW,4BAA4B;IAC5C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACrB;AAED,qBAAa,qBAAqB;;IACjC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;gBAGtC,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAiB,EAAE,EAAE,4BAA4B;IAKrF,OAAO,CACZ,SAAS,EAAE,UAAU,EACrB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,cAAc,CAAC;CA6E1B"}
+{"version":3,"file":"xrpc.d.ts","sourceRoot":"","sources":["../../lib/schemas/xrpc.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAOhE,OAAO,KAAK,EAAE,cAAc,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAE/E,MAAM,WAAW,4BAA4B;IAC5C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;CACrB;AAED,qBAAa,qBAAqB;;IACjC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;gBAGtC,EAAE,mBAAmB,EAAE,KAAK,EAAE,SAAiB,EAAE,EAAE,4BAA4B;IAKrF,OAAO,CACZ,SAAS,EAAE,UAAU,EACrB,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,2BAA2B,GACnC,OAAO,CAAC,cAAc,CAAC;CAiG1B"}

package/dist/schemas/xrpc.js

@@ -1,9 +1,10 @@
-import { getPdsEndpoint } from '@atcute/identity';
+import { getPublicKeyFromDidController, P256PublicKey, Secp256k1PublicKey, } from '@atcute/crypto';
+import { getAtprotoVerificationMaterial, getPdsEndpoint } from '@atcute/identity';
 import { lexiconDoc } from '@atcute/lexicon-doc';
+import { verifyRecord } from '@atcute/repo';
 import { FailedResponseError } from '@atcute/util-fetch';
 import { LEXICON_SCHEMA_COLLECTION } from '../constants.js';
 import * as err from '../errors.js';
-import { verifyRecord } from './verify.js';
 export class LexiconSchemaResolver {
     didDocumentResolver;
     #fetch;
@@ -46,11 +47,28 @@ export class LexiconSchemaResolver {
         // Step 3: Verify record and extract data
         let verifiedRecord;
         try {
+            // Extract public key from DID document for signature verification
+            const controller = getAtprotoVerificationMaterial(didDocument);
+            if (!controller) {
+                throw new Error(`did document does not contain verification material`);
+            }
+            const found = getPublicKeyFromDidController(controller);
+            let publicKey;
+            switch (found.type) {
+                case 'p256': {
+                    publicKey = await P256PublicKey.importRaw(found.publicKeyBytes);
+                    break;
+                }
+                case 'secp256k1': {
+                    publicKey = await Secp256k1PublicKey.importRaw(found.publicKeyBytes);
+                    break;
+                }
+            }
             verifiedRecord = await verifyRecord({
                 did: authority,
                 collection: LEXICON_SCHEMA_COLLECTION,
                 rkey: nsid,
-                didDocument,
+                publicKey,
                 carBytes,
             });
         }
@@ -73,7 +91,7 @@ export class LexiconSchemaResolver {
             throw new err.InvalidLexiconSchemaError(nsid, { cause });
         }
         return {
-            uri: verifiedRecord.uri,
+            uri: `at://${authority}/${LEXICON_SCHEMA_COLLECTION}/${nsid}`,
             cid: verifiedRecord.cid,
             rawSchema: verifiedRecord.record,
             schema: schema,

package/dist/schemas/xrpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../../lib/schemas/xrpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xrpc.js","sourceRoot":"","sources":["../../lib/schemas/xrpc.ts"],"names":[],"mappings":"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"}

package/lib/constants.ts

@@ -1 +1 @@
-export const LEXICON_SCHEMA_COLLECTION = 'com.atproto.lexicon.schema';
+export const LEXICON_SCHEMA_COLLECTION = 'com.atproto.lexicon.schema';

package/lib/errors.ts

@@ -49,7 +49,6 @@ export class LexiconResolutionError extends Error {
 	override name = 'LexiconResolutionError';
 }
 
-
 export class FailedLexiconResolutionError extends LexiconResolutionError {
 	override name = 'FailedLexiconResolutionError';
 

package/lib/index.ts

@@ -2,4 +2,4 @@ export * from './authority/doh-json.js';
 export * from './errors.js';
 export * from './schemas/xrpc.js';
 export * from './types.js';
-export * from './utils.js';
+export * from './utils.js';

package/lib/schemas/xrpc.ts

@@ -1,14 +1,20 @@
-import { getPdsEndpoint } from '@atcute/identity';
+import {
+	getPublicKeyFromDidController,
+	P256PublicKey,
+	Secp256k1PublicKey,
+	type PublicKey,
+} from '@atcute/crypto';
+import { getAtprotoVerificationMaterial, getPdsEndpoint } from '@atcute/identity';
 import type { DidDocumentResolver } from '@atcute/identity-resolver';
 import { lexiconDoc, type LexiconDoc } from '@atcute/lexicon-doc';
 import type { AtprotoDid, Nsid } from '@atcute/lexicons/syntax';
+import { verifyRecord, type VerifiedRecord } from '@atcute/repo';
 
 import { FailedResponseError } from '@atcute/util-fetch';
 
 import { LEXICON_SCHEMA_COLLECTION } from '../constants.js';
 import * as err from '../errors.js';
 import type { ResolvedSchema, ResolveLexiconRecordOptions } from '../types.js';
-import { verifyRecord, type VerifiedRecord } from './verify.js';
 
 export interface LexiconSchemaResolverOptions {
 	didDocumentResolver: DidDocumentResolver;
@@ -69,11 +75,31 @@ export class LexiconSchemaResolver {
 		// Step 3: Verify record and extract data
 		let verifiedRecord: VerifiedRecord;
 		try {
+			// Extract public key from DID document for signature verification
+			const controller = getAtprotoVerificationMaterial(didDocument);
+			if (!controller) {
+				throw new Error(`did document does not contain verification material`);
+			}
+
+			const found = getPublicKeyFromDidController(controller);
+
+			let publicKey: PublicKey;
+			switch (found.type) {
+				case 'p256': {
+					publicKey = await P256PublicKey.importRaw(found.publicKeyBytes);
+					break;
+				}
+				case 'secp256k1': {
+					publicKey = await Secp256k1PublicKey.importRaw(found.publicKeyBytes);
+					break;
+				}
+			}
+
 			verifiedRecord = await verifyRecord({
 				did: authority,
 				collection: LEXICON_SCHEMA_COLLECTION,
 				rkey: nsid,
-				didDocument,
+				publicKey,
 				carBytes,
 			});
 		} catch (cause) {
@@ -99,7 +125,7 @@ export class LexiconSchemaResolver {
 		}
 
 		return {
-			uri: verifiedRecord.uri,
+			uri: `at://${authority}/${LEXICON_SCHEMA_COLLECTION}/${nsid}`,
 			cid: verifiedRecord.cid,
 			rawSchema: verifiedRecord.record,
 			schema: schema,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@atcute/lexicon-resolver",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "atproto lexicon authority resolution",
   "keywords": [
     "atproto",
@@ -29,18 +29,15 @@
   },
   "dependencies": {
     "@badrap/valita": "^0.4.6",
-    "@atcute/cbor": "^2.2.6",
-    "@atcute/car": "^3.1.2",
-    "@atcute/cid": "^2.2.4",
-    "@atcute/lexicon-doc": "^1.1.2",
-    "@atcute/crypto": "^2.2.5",
-    "@atcute/lexicons": "^1.2.2",
-    "@atcute/uint8array": "^1.0.5",
-    "@atcute/util-fetch": "^1.0.3"
+    "@atcute/lexicon-doc": "^2.0.0",
+    "@atcute/crypto": "^2.2.6",
+    "@atcute/lexicons": "^1.2.4",
+    "@atcute/util-fetch": "^1.0.3",
+    "@atcute/repo": "^0.1.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.21",
-    "@atcute/identity": "^1.1.1",
+    "@types/bun": "^1.3.1",
+    "@atcute/identity": "^1.1.2",
     "@atcute/identity-resolver": "^1.1.4"
   },
   "scripts": {

package/dist/schemas/verify.d.ts

@@ -1,19 +0,0 @@
-import { type DidDocument } from '@atcute/identity';
-import { type AtprotoDid } from '@atcute/lexicons/syntax';
-export interface VerifiedRecord {
-    /** AT-URI of the record */
-    uri: string;
-    /** CID of the record */
-    cid: string;
-    /** Record data */
-    record: unknown;
-}
-export interface VerifyRecordOptions {
-    did: AtprotoDid;
-    collection: string;
-    rkey: string;
-    didDocument: DidDocument;
-    carBytes: Uint8Array;
-}
-export declare const verifyRecord: ({ did, collection, rkey, didDocument, carBytes, }: VerifyRecordOptions) => Promise<VerifiedRecord>;
-//# sourceMappingURL=verify.d.ts.map

package/dist/schemas/verify.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../lib/schemas/verify.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,WAAW,EAAkC,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAG1D,MAAM,WAAW,cAAc;IAC9B,2BAA2B;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,wBAAwB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,kBAAkB;IAClB,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,mBAAmB;IACnC,GAAG,EAAE,UAAU,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,UAAU,CAAC;CACrB;AAED,eAAO,MAAM,YAAY,GAAU,mDAMhC,mBAAmB,KAAG,OAAO,CAAC,cAAc,CA0E9C,CAAC"}

package/dist/schemas/verify.js

@@ -1,169 +0,0 @@
-import * as CAR from '@atcute/car';
-import { CarReader } from '@atcute/car/v4';
-import * as CBOR from '@atcute/cbor';
-import * as CID from '@atcute/cid';
-import { getPublicKeyFromDidController, verifySig } from '@atcute/crypto';
-import { getAtprotoVerificationMaterial } from '@atcute/identity';
-import {} from '@atcute/lexicons/syntax';
-import { toSha256 } from '@atcute/uint8array';
-export const verifyRecord = async ({ did, collection, rkey, didDocument, carBytes, }) => {
-    // grab public key from did document
-    let publicKey;
-    {
-        const controller = getAtprotoVerificationMaterial(didDocument);
-        if (!controller) {
-            throw new Error(`did document does not contain verification material`);
-        }
-        publicKey = getPublicKeyFromDidController(controller);
-    }
-    // read the car
-    let blockmap;
-    let commit;
-    {
-        const reader = CarReader.fromUint8Array(carBytes);
-        if (reader.header.data.roots.length !== 1) {
-            throw new Error(`car must have exactly one root`);
-        }
-        blockmap = new Map();
-        for (const entry of reader) {
-            const cidString = CID.toString(entry.cid);
-            // Verify that `bytes` matches its associated CID
-            const expectedCid = CID.toString(await CID.create(entry.cid.codec, entry.bytes));
-            if (cidString !== expectedCid) {
-                throw new Error(`cid does not match bytes`);
-            }
-            blockmap.set(cidString, entry);
-        }
-        if (blockmap.size === 0) {
-            throw new Error(`car must have at least one block`);
-        }
-        commit = CAR.readBlock(blockmap, reader.header.data.roots[0], CAR.isCommit);
-    }
-    // verify did in commit matches the did
-    if (commit.did !== did) {
-        throw new Error(`did in commit does not match expected did`);
-    }
-    // verify signature contained in commit is valid
-    {
-        const { sig, ...unsigned } = commit;
-        const data = CBOR.encode(unsigned);
-        const valid = await verifySig(publicKey, CBOR.fromBytes(sig), data);
-        if (!valid) {
-            throw new Error(`signature verification failed`);
-        }
-    }
-    // find and verify the record in the commit
-    const targetKey = `${collection}/${rkey}`;
-    const { found } = await dfs(blockmap, commit.data.$link, targetKey);
-    if (!found) {
-        throw new Error(`could not find record in car`);
-    }
-    return {
-        uri: `at://${did}/${collection}/${rkey}`,
-        cid: found.cid,
-        record: found.record,
-    };
-};
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-const dfs = async (blockmap, from, targetKey, visited = new Set()) => {
-    // If there's no starting point, return empty state
-    if (from == null) {
-        return { found: false };
-    }
-    // Check for cycles
-    {
-        if (visited.has(from)) {
-            throw new Error(`cycle detected; cid=${from}`);
-        }
-        visited.add(from);
-    }
-    // Get the block data
-    let node;
-    {
-        const entry = blockmap.get(from);
-        if (!entry) {
-            return { found: false };
-        }
-        const decoded = CBOR.decode(entry.bytes);
-        if (!CAR.isMstNode(decoded)) {
-            throw new Error(`invalid mst node; cid=${from}`);
-        }
-        node = decoded;
-    }
-    // Recursively process the left child
-    const left = await dfs(blockmap, node.l?.$link, targetKey, visited);
-    let key = '';
-    let found = left.found;
-    let depth;
-    let firstKey;
-    let lastKey;
-    // Process all entries in this node
-    for (const entry of node.e) {
-        // Construct the key by truncating and appending
-        key = key.substring(0, entry.p) + decoder.decode(CBOR.fromBytes(entry.k));
-        // Check if this is our target key
-        if (key === targetKey) {
-            const recordBlock = blockmap.get(entry.v.$link);
-            if (recordBlock) {
-                const record = CBOR.decode(recordBlock.bytes);
-                found = { cid: entry.v.$link, record };
-            }
-        }
-        // Calculate depth based on leading zeros in the hash
-        const keyDigest = await toSha256(encoder.encode(key));
-        let zeroCount = 0;
-        outerLoop: for (const byte of keyDigest) {
-            for (let bit = 7; bit >= 0; bit--) {
-                if (((byte >> bit) & 1) !== 0) {
-                    break outerLoop;
-                }
-                zeroCount++;
-            }
-        }
-        const thisDepth = Math.floor(zeroCount / 2);
-        // Ensure consistent depth
-        if (depth === undefined) {
-            depth = thisDepth;
-        }
-        else if (depth !== thisDepth) {
-            throw new Error(`node has entries with different depths; cid=${from}`);
-        }
-        // Track first and last keys
-        if (lastKey === undefined) {
-            firstKey = key;
-            lastKey = key;
-        }
-        // Check key ordering
-        if (lastKey > key) {
-            throw new Error(`entries are out of order; cid=${from}`);
-        }
-        // Process right child
-        const right = await dfs(blockmap, entry.t?.$link, targetKey, visited);
-        // Check ordering with right subtree
-        if (right.min && right.min < lastKey) {
-            throw new Error(`entries are out of order; cid=${from}`);
-        }
-        found = found || right.found;
-        // Check depth ordering
-        if (left.depth !== undefined && left.depth >= thisDepth) {
-            throw new Error(`depths are out of order; cid=${from}`);
-        }
-        if (right.depth !== undefined && right.depth >= thisDepth) {
-            throw new Error(`depths are out of order; cid=${from}`);
-        }
-        // Update last key based on right subtree
-        lastKey = right.max ?? key;
-    }
-    // Check ordering with left subtree
-    if (left.max && firstKey && left.max > firstKey) {
-        throw new Error(`entries are out of order; cid=${from}`);
-    }
-    return {
-        found,
-        min: firstKey,
-        max: lastKey,
-        depth,
-    };
-};
-//# sourceMappingURL=verify.js.map

package/dist/schemas/verify.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"verify.js","sourceRoot":"","sources":["../../lib/schemas/verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAuB,6BAA6B,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC/F,OAAO,EAAoB,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAmB,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAmB9C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EAClC,GAAG,EACH,UAAU,EACV,IAAI,EACJ,WAAW,EACX,QAAQ,GACa,EAA2B,EAAE;IAClD,oCAAoC;IACpC,IAAI,SAAyB,CAAC;IAC9B,CAAC;QACA,MAAM,UAAU,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACxE,CAAC;QAED,SAAS,GAAG,6BAA6B,CAAC,UAAU,CAAC,CAAC;IACvD,CAAC;IAED,eAAe;IACf,IAAI,QAAsB,CAAC;IAC3B,IAAI,MAAkB,CAAC;IACvB,CAAC;QACA,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACnD,CAAC;QAED,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE1C,iDAAiD;YACjD,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAiB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7F,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC7C,CAAC;YAED,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAED,uCAAuC;IACvC,IAAI,MAAM,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;IAED,gDAAgD;IAChD,CAAC;QACA,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC;QAEpC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,SAAS,CAC5B,SAAS,EACT,IAAI,CAAC,SAAS,CAAC,GAAG,CAA4B,EAC9C,IAA+B,CAC/B,CAAC;QAEF,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAED,2CAA2C;IAC3C,MAAM,SAAS,GAAG,GAAG,UAAU,IAAI,IAAI,EAAE,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACpE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACjD,CAAC;IAED,OAAO;QACN,GAAG,EAAE,QAAQ,GAAG,IAAI,UAAU,IAAI,IAAI,EAAE;QACxC,GAAG,EAAE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC;AACH,CAAC,CAAC;AASF,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAClC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;AAElC,MAAM,GAAG,GAAG,KAAK,EAChB,QAAsB,EACtB,IAAwB,EACxB,SAAiB,EACjB,UAAU,IAAI,GAAG,EAAU,EACN,EAAE;IACvB,mDAAmD;IACnD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAED,mBAAmB;IACnB,CAAC;QACA,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,qBAAqB;IACrB,IAAI,IAAiB,CAAC;IACtB,CAAC;QACA,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACzB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,GAAG,OAAO,CAAC;IAChB,CAAC;IAED,qCAAqC;IACrC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAEpE,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;IACvB,IAAI,KAAyB,CAAC;IAC9B,IAAI,QAA4B,CAAC;IACjC,IAAI,OAA2B,CAAC;IAEhC,mCAAmC;IACnC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC;QAC5B,gDAAgD;QAChD,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1E,kCAAkC;QAClC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAChD,IAAI,WAAW,EAAE,CAAC;gBACjB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC9C,KAAK,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YACxC,CAAC;QACF,CAAC;QAED,qDAAqD;QACrD,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACtD,IAAI,SAAS,GAAG,CAAC,CAAC;QAElB,SAAS,EAAE,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YACzC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;gBACnC,IAAI,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC/B,MAAM,SAAS,CAAC;gBACjB,CAAC;gBACD,SAAS,EAAE,CAAC;YACb,CAAC;QACF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QAE5C,0BAA0B;QAC1B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,KAAK,GAAG,SAAS,CAAC;QACnB,CAAC;aAAM,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,+CAA+C,IAAI,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,4BAA4B;QAC5B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,QAAQ,GAAG,GAAG,CAAC;YACf,OAAO,GAAG,GAAG,CAAC;QACf,CAAC;QAED,qBAAqB;QACrB,IAAI,OAAO,GAAG,GAAG,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,sBAAsB;QACtB,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtE,oCAAoC;QACpC,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;QAED,KAAK,GAAG,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC;QAE7B,uBAAuB;QACvB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,IAAI,SAAS,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,yCAAyC;QACzC,OAAO,GAAG,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC;IAC5B,CAAC;IAED,mCAAmC;IACnC,IAAI,IAAI,CAAC,GAAG,IAAI,QAAQ,IAAI,IAAI,CAAC,GAAG,GAAG,QAAQ,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO;QACN,KAAK;QACL,GAAG,EAAE,QAAQ;QACb,GAAG,EAAE,OAAO;QACZ,KAAK;KACL,CAAC;AACH,CAAC,CAAC"}

package/lib/schemas/verify.ts

@@ -1,245 +0,0 @@
-import * as CAR from '@atcute/car';
-import { CarReader } from '@atcute/car/v4';
-import * as CBOR from '@atcute/cbor';
-import * as CID from '@atcute/cid';
-import { type FoundPublicKey, getPublicKeyFromDidController, verifySig } from '@atcute/crypto';
-import { type DidDocument, getAtprotoVerificationMaterial } from '@atcute/identity';
-import { type AtprotoDid } from '@atcute/lexicons/syntax';
-import { toSha256 } from '@atcute/uint8array';
-
-export interface VerifiedRecord {
-	/** AT-URI of the record */
-	uri: string;
-	/** CID of the record */
-	cid: string;
-	/** Record data */
-	record: unknown;
-}
-
-export interface VerifyRecordOptions {
-	did: AtprotoDid;
-	collection: string;
-	rkey: string;
-	didDocument: DidDocument;
-	carBytes: Uint8Array;
-}
-
-export const verifyRecord = async ({
-	did,
-	collection,
-	rkey,
-	didDocument,
-	carBytes,
-}: VerifyRecordOptions): Promise<VerifiedRecord> => {
-	// grab public key from did document
-	let publicKey: FoundPublicKey;
-	{
-		const controller = getAtprotoVerificationMaterial(didDocument);
-		if (!controller) {
-			throw new Error(`did document does not contain verification material`);
-		}
-
-		publicKey = getPublicKeyFromDidController(controller);
-	}
-
-	// read the car
-	let blockmap: CAR.BlockMap;
-	let commit: CAR.Commit;
-	{
-		const reader = CarReader.fromUint8Array(carBytes);
-		if (reader.header.data.roots.length !== 1) {
-			throw new Error(`car must have exactly one root`);
-		}
-
-		blockmap = new Map();
-		for (const entry of reader) {
-			const cidString = CID.toString(entry.cid);
-
-			// Verify that `bytes` matches its associated CID
-			const expectedCid = CID.toString(await CID.create(entry.cid.codec as 85 | 113, entry.bytes));
-			if (cidString !== expectedCid) {
-				throw new Error(`cid does not match bytes`);
-			}
-
-			blockmap.set(cidString, entry);
-		}
-
-		if (blockmap.size === 0) {
-			throw new Error(`car must have at least one block`);
-		}
-
-		commit = CAR.readBlock(blockmap, reader.header.data.roots[0], CAR.isCommit);
-	}
-
-	// verify did in commit matches the did
-	if (commit.did !== did) {
-		throw new Error(`did in commit does not match expected did`);
-	}
-
-	// verify signature contained in commit is valid
-	{
-		const { sig, ...unsigned } = commit;
-
-		const data = CBOR.encode(unsigned);
-		const valid = await verifySig(
-			publicKey,
-			CBOR.fromBytes(sig) as Uint8Array<ArrayBuffer>,
-			data as Uint8Array<ArrayBuffer>,
-		);
-
-		if (!valid) {
-			throw new Error(`signature verification failed`);
-		}
-	}
-
-	// find and verify the record in the commit
-	const targetKey = `${collection}/${rkey}`;
-	const { found } = await dfs(blockmap, commit.data.$link, targetKey);
-	if (!found) {
-		throw new Error(`could not find record in car`);
-	}
-
-	return {
-		uri: `at://${did}/${collection}/${rkey}`,
-		cid: found.cid,
-		record: found.record,
-	};
-};
-
-interface DfsResult {
-	found: false | { cid: string; record: unknown };
-	min?: string;
-	max?: string;
-	depth?: number;
-}
-
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-
-const dfs = async (
-	blockmap: CAR.BlockMap,
-	from: string | undefined,
-	targetKey: string,
-	visited = new Set<string>(),
-): Promise<DfsResult> => {
-	// If there's no starting point, return empty state
-	if (from == null) {
-		return { found: false };
-	}
-
-	// Check for cycles
-	{
-		if (visited.has(from)) {
-			throw new Error(`cycle detected; cid=${from}`);
-		}
-
-		visited.add(from);
-	}
-
-	// Get the block data
-	let node: CAR.MstNode;
-	{
-		const entry = blockmap.get(from);
-		if (!entry) {
-			return { found: false };
-		}
-
-		const decoded = CBOR.decode(entry.bytes);
-		if (!CAR.isMstNode(decoded)) {
-			throw new Error(`invalid mst node; cid=${from}`);
-		}
-
-		node = decoded;
-	}
-
-	// Recursively process the left child
-	const left = await dfs(blockmap, node.l?.$link, targetKey, visited);
-
-	let key = '';
-	let found = left.found;
-	let depth: number | undefined;
-	let firstKey: string | undefined;
-	let lastKey: string | undefined;
-
-	// Process all entries in this node
-	for (const entry of node.e) {
-		// Construct the key by truncating and appending
-		key = key.substring(0, entry.p) + decoder.decode(CBOR.fromBytes(entry.k));
-
-		// Check if this is our target key
-		if (key === targetKey) {
-			const recordBlock = blockmap.get(entry.v.$link);
-			if (recordBlock) {
-				const record = CBOR.decode(recordBlock.bytes);
-				found = { cid: entry.v.$link, record };
-			}
-		}
-
-		// Calculate depth based on leading zeros in the hash
-		const keyDigest = await toSha256(encoder.encode(key));
-		let zeroCount = 0;
-
-		outerLoop: for (const byte of keyDigest) {
-			for (let bit = 7; bit >= 0; bit--) {
-				if (((byte >> bit) & 1) !== 0) {
-					break outerLoop;
-				}
-				zeroCount++;
-			}
-		}
-
-		const thisDepth = Math.floor(zeroCount / 2);
-
-		// Ensure consistent depth
-		if (depth === undefined) {
-			depth = thisDepth;
-		} else if (depth !== thisDepth) {
-			throw new Error(`node has entries with different depths; cid=${from}`);
-		}
-
-		// Track first and last keys
-		if (lastKey === undefined) {
-			firstKey = key;
-			lastKey = key;
-		}
-
-		// Check key ordering
-		if (lastKey > key) {
-			throw new Error(`entries are out of order; cid=${from}`);
-		}
-
-		// Process right child
-		const right = await dfs(blockmap, entry.t?.$link, targetKey, visited);
-
-		// Check ordering with right subtree
-		if (right.min && right.min < lastKey) {
-			throw new Error(`entries are out of order; cid=${from}`);
-		}
-
-		found = found || right.found;
-
-		// Check depth ordering
-		if (left.depth !== undefined && left.depth >= thisDepth) {
-			throw new Error(`depths are out of order; cid=${from}`);
-		}
-
-		if (right.depth !== undefined && right.depth >= thisDepth) {
-			throw new Error(`depths are out of order; cid=${from}`);
-		}
-
-		// Update last key based on right subtree
-		lastKey = right.max ?? key;
-	}
-
-	// Check ordering with left subtree
-	if (left.max && firstKey && left.max > firstKey) {
-		throw new Error(`entries are out of order; cid=${from}`);
-	}
-
-	return {
-		found,
-		min: firstKey,
-		max: lastKey,
-		depth,
-	};
-};