npm - @peerbit/trusted-network - Versions diffs - 6.0.130 → 6.0.131 - Mend

@peerbit/trusted-network 6.0.130 → 6.0.131

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist/src/v2-authority-entry.d.ts +34 -2
package/dist/src/v2-authority-entry.d.ts.map +1 -1
package/dist/src/v2-authority-entry.js +184 -85
package/dist/src/v2-authority-entry.js.map +1 -1
package/dist/src/v2-resource-fence-entry.d.ts.map +1 -1
package/dist/src/v2-resource-fence-entry.js +7 -60
package/dist/src/v2-resource-fence-entry.js.map +1 -1
package/package.json +11 -7
package/src/v2-authority-entry.ts +281 -111
package/src/v2-resource-fence-entry.ts +8 -84

package/dist/src/v2-authority-entry.d.ts CHANGED Viewed

@@ -1,9 +1,41 @@
-import { EntryV0 } from "@peerbit/log";
+import { type SignatureWithKey } from "@peerbit/crypto";
+import { EntryV0, type Meta } from "@peerbit/log";
 import { NetworkDescriptorV2 } from "./v2.js";
+export declare const TRUSTED_NETWORK_V2_MAX_CANONICAL_ENTRY_CID_CHARACTERS = 128;
+export type CanonicalPublicEntryV0ScanLimitsV2 = Readonly<{
+    label: string;
+    minimumSignatures: number;
+    maximumSignatures: number;
+    maximumDirectParents?: number;
+    maximumMetadataBytes?: number;
+}>;
+export type CanonicalPublicEntryV0ScanV2 = Readonly<{
+    entry: EntryV0<Uint8Array>;
+    meta: Meta;
+    signatures: SignatureWithKey[];
+    metaBytes: Uint8Array;
+    payloadBytes: Uint8Array;
+    signableBytes: Uint8Array;
+    reservedBytes: Uint8Array;
+    hasHash: boolean;
+    directParentCount: number;
+    signatureCount: number;
+}>;
+/**
+ * Bounds-scans and canonically decodes one already-captured public EntryV0.
+ * Record meaning, signer authority, reserved bytes, hash option, and causal
+ * semantics remain the responsibility of the caller's domain profile.
+ */
+export declare const scanCanonicalPublicEntryV0V2: (entryBytes: Uint8Array, limits: CanonicalPublicEntryV0ScanLimitsV2) => CanonicalPublicEntryV0ScanV2;
+export declare const assertCanonicalSecp256k1SignatureV2: (signature: Uint8Array, label: string) => void;
+export declare const canonicalDirectParentsV2: (parents: readonly string[], label: string) => Array<{
+    cid: string;
+    digest: Uint8Array;
+}>;
 export type AuthenticatedAuthorityEntryV0V2 = {
     descriptor: NetworkDescriptorV2;
     entryBytes: Uint8Array;
-    entry: EntryV0<Uint8Array>;
+    entry: CanonicalPublicEntryV0ScanV2["entry"];
     metaBytes: Uint8Array;
     payloadBytes: Uint8Array;
     reservedBytes: Uint8Array;

package/dist/src/v2-authority-entry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"v2-authority-entry.d.ts","sourceRoot":"","sources":["../../src/v2-authority-entry.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,EAAS,OAAO,EAAe,MAAM,cAAc,CAAC;~~AAE3D~~,OAAO,EACN,mBAAmB,EAInB,MAAM,SAAS,CAAC;AAEjB,MAAM,MAAM,+BAA+B,GAAG;IAC7C,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,KAAK,EAAE,~~OAAO~~,CAAC,~~UAAU~~,CAAC,CAAC;~~IAC3B~~,SAAS,EAAE,UAAU,CAAC;IACtB,YAAY,EAAE,UAAU,CAAC;IACzB,aAAa,EAAE,UAAU,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,CACvC,KAAK,EAAE,+BAA+B,KAClC,IAAI,CAAC;~~AAyLV~~,eAAO,MAAM,8BAA8B,GAC1C,YAAY,UAAU,EACtB,mBAAmB,MAAM,KACvB,UAcF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sCAAsC,GAClD,oBAAoB,UAAU,EAC9B,YAAY,mBAAmB,EAC/B,gBAAgB,yBAAyB,KACvC,OAAO,CAAC,+BAA+B,~~CAoEzC~~,CAAC;AAEF,eAAO,MAAM,8BAA8B,GAC1C,YAAY,UAAU,EACtB,YAAY,mBAAmB,EAC/B,mBAAmB,MAAM,EACzB,gBAAgB,yBAAyB,KACvC,OAAO,CAAC,+BAA+B,CAKxC,CAAC"}
1	+ {"version":3,"file":"v2-authority-entry.d.ts","sourceRoot":"","sources":["../../src/v2-authority-entry.ts"],"names":[],"mappings":"AAOA,OAAO,EAAkB,KAAK,gBAAgB,EAAU,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAS,OAAO,EAAE,KAAK,IAAI,EAAe,MAAM,cAAc,CAAC;AAEtE,OAAO,EACN,mBAAmB,EAInB,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qDAAqD,MAAM,CAAC;AAEzE,MAAM,MAAM,kCAAkC,GAAG,QAAQ,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC,CAAC;AAEH,MAAM,MAAM,4BAA4B,GAAG,QAAQ,CAAC;IACnD,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAC/B,SAAS,EAAE,UAAU,CAAC;IACtB,YAAY,EAAE,UAAU,CAAC;IACzB,aAAa,EAAE,UAAU,CAAC;IAC1B,aAAa,EAAE,UAAU,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;CACvB,CAAC,CAAC;AAsJH;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,GACxC,YAAY,UAAU,EACtB,QAAQ,kCAAkC,KACxC,4BA0GF,CAAC;AASF,eAAO,MAAM,mCAAmC,GAC/C,WAAW,UAAU,EACrB,OAAO,MAAM,KACX,IA2BF,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACpC,SAAS,SAAS,MAAM,EAAE,EAC1B,OAAO,MAAM,KACX,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAA;CAAE,CAoC3C,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC7C,UAAU,EAAE,mBAAmB,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,KAAK,EAAE,4BAA4B,CAAC,OAAO,CAAC,CAAC;IAC7C,SAAS,EAAE,UAAU,CAAC;IACtB,YAAY,EAAE,UAAU,CAAC;IACzB,aAAa,EAAE,UAAU,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,CACvC,KAAK,EAAE,+BAA+B,KAClC,IAAI,CAAC;AAQV,eAAO,MAAM,8BAA8B,GAC1C,YAAY,UAAU,EACtB,mBAAmB,MAAM,KACvB,UAcF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sCAAsC,GAClD,oBAAoB,UAAU,EAC9B,YAAY,mBAAmB,EAC/B,gBAAgB,yBAAyB,KACvC,OAAO,CAAC,+BAA+B,CA0CzC,CAAC;AAEF,eAAO,MAAM,8BAA8B,GAC1C,YAAY,UAAU,EACtB,YAAY,mBAAmB,EAC/B,mBAAmB,MAAM,EACzB,gBAAgB,yBAAyB,KACvC,OAAO,CAAC,+BAA+B,CAKxC,CAAC"}

package/dist/src/v2-authority-entry.js CHANGED Viewed

@@ -1,14 +1,18 @@
 import { deserialize, serialize } from "@dao-xyz/borsh";
+import { cidifyString, codecMap, defaultHasher, stringifyCid, } from "@peerbit/blocks-interface";
 import { DecryptedThing, verify } from "@peerbit/crypto";
 import { Entry, EntryV0, NO_ENCODING } from "@peerbit/log";
 import { equals } from "uint8arrays";
 import { NetworkDescriptorV2, assertNetworkDescriptorV2, copyUint8ArrayWithLengthV2, exactUint8ArrayByteLengthV2, } from "./v2.js";
+export const TRUSTED_NETWORK_V2_MAX_CANONICAL_ENTRY_CID_CHARACTERS = 128;
 class BoundsReaderV2 {
     bytes;
+    label;
     offset = 0;
     view;
-    constructor(bytes) {
+    constructor(bytes, label) {
         this.bytes = bytes;
+        this.label = label;
         this.view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
     }
     get position() {
@@ -17,51 +21,51 @@ class BoundsReaderV2 {
     get remaining() {
         return this.bytes.byteLength - this.offset;
     }
-    readU8(label) {
-        return this.readExact(1, label)[0];
+    readU8(field) {
+        return this.readExact(1, field)[0];
     }
-    readU32(label) {
-        this.requireRemaining(4, label);
+    readU32(field) {
+        this.requireRemaining(4, field);
         const value = this.view.getUint32(this.offset, true);
         this.offset += 4;
         return value;
     }
-    readBytes(label) {
-        return this.readExact(this.readU32(`${label} length`), label);
+    readBytes(field) {
+        return this.readExact(this.readU32(`${field} length`), field);
     }
-    readExact(byteLength, label) {
-        this.requireRemaining(byteLength, label);
+    readExact(byteLength, field) {
+        this.requireRemaining(byteLength, field);
         const start = this.offset;
         this.offset += byteLength;
         return this.bytes.subarray(start, this.offset);
     }
-    expectU8(expected, label) {
-        if (this.readU8(label) !== expected) {
-            throw new Error(`Authority EntryV0 has invalid ${label}`);
+    expectU8(expected, field) {
+        if (this.readU8(field) !== expected) {
+            throw new Error(`${this.label} EntryV0 has invalid ${field}`);
         }
     }
-    expectDone(label) {
+    expectDone(field) {
         if (this.offset !== this.bytes.byteLength) {
-            throw new Error(`Authority EntryV0 has trailing ${label} bytes`);
+            throw new Error(`${this.label} EntryV0 has trailing ${field} bytes`);
         }
     }
-    requireRemaining(byteLength, label) {
+    requireRemaining(byteLength, field) {
         if (!Number.isSafeInteger(byteLength) ||
             byteLength < 0 ||
             byteLength > this.bytes.byteLength - this.offset) {
-            throw new Error(`Authority EntryV0 has truncated ${label}`);
+            throw new Error(`${this.label} EntryV0 has truncated ${field}`);
         }
     }
 }
-const readPublicWrapperV2 = (reader, label) => {
-    if (reader.readU8(`${label} MaybeEncrypted variant`) !== 0 ||
-        reader.readU8(`${label} DecryptedThing variant`) !== 0) {
-        throw new Error(`Authority EntryV0 ${label} must be public`);
+const readPublicWrapperV2 = (reader, label, field) => {
+    if (reader.readU8(`${field} MaybeEncrypted variant`) !== 0 ||
+        reader.readU8(`${field} DecryptedThing variant`) !== 0) {
+        throw new Error(`${label} EntryV0 ${field} must be public`);
     }
-    return reader.readBytes(label);
+    return reader.readBytes(field);
 };
-const scanMetaStructureV2 = (metaBytes) => {
-    const reader = new BoundsReaderV2(metaBytes);
+const scanMetaV2 = (bytes, limits) => {
+    const reader = new BoundsReaderV2(bytes, limits.label);
     reader.expectU8(0, "metadata variant");
     reader.expectU8(0, "clock variant");
     reader.readBytes("clock id");
@@ -69,83 +73,198 @@ const scanMetaStructureV2 = (metaBytes) => {
     reader.readExact(8, "timestamp wall time");
     reader.readExact(4, "timestamp logical time");
     reader.readBytes("gid");
-    const directParentCount = reader.readU32("direct-parent count");
-    // Every Borsh string starts with a four-byte length. Reject an impossible
-    // input-backed count before iterating or invoking the generic decoder.
-    if (directParentCount > Math.floor(reader.remaining / 4)) {
-        throw new Error("Authority EntryV0 has impossible direct-parent count");
+    const parentCount = reader.readU32("direct-parent count");
+    if (parentCount > Math.floor(reader.remaining / 4)) {
+        throw new Error(`${limits.label} EntryV0 has impossible direct-parent count`);
     }
-    for (let i = 0; i < directParentCount; i++) {
+    if (limits.maximumDirectParents !== undefined &&
+        parentCount > limits.maximumDirectParents) {
+        throw new Error(`${limits.label} EntryV0 may contain at most ${limits.maximumDirectParents} direct parents`);
+    }
+    for (let index = 0; index < parentCount; index++) {
         reader.readBytes("direct parent");
     }
     reader.readU8("entry type");
-    const metaDataOption = reader.readU8("metadata data option");
-    if (metaDataOption === 1) {
-        reader.readBytes("metadata data");
+    const metadataOption = reader.readU8("metadata data option");
+    if (metadataOption === 1) {
+        const metadata = reader.readBytes("metadata data");
+        if (limits.maximumMetadataBytes !== undefined &&
+            metadata.byteLength > limits.maximumMetadataBytes) {
+            throw new Error(`${limits.label} EntryV0 metadata may contain at most ${limits.maximumMetadataBytes} bytes`);
+        }
     }
-    else if (metaDataOption !== 0) {
-        throw new Error("Authority EntryV0 has invalid metadata data option");
+    else if (metadataOption !== 0) {
+        throw new Error(`${limits.label} EntryV0 has invalid metadata data option`);
     }
     reader.expectDone("metadata");
-    return directParentCount;
+    return parentCount;
 };
-const scanPayloadStructureV2 = (payloadBytes) => {
-    const reader = new BoundsReaderV2(payloadBytes);
+const scanPayloadV2 = (bytes, label) => {
+    const reader = new BoundsReaderV2(bytes, label);
     reader.expectU8(0, "payload variant");
     const data = reader.readBytes("payload data");
     reader.expectDone("payload");
     return data;
 };
-const scanSignatureStructureV2 = (signatureBytes) => {
-    const reader = new BoundsReaderV2(signatureBytes);
+const scanSignatureV2 = (bytes, label) => {
+    const reader = new BoundsReaderV2(bytes, label);
     reader.expectU8(0, "signature variant");
     reader.readBytes("signature data");
-    const publicKeyVariant = reader.readU8("signature public-key variant");
-    const publicKeyLength = publicKeyVariant === 0 ? 32 : publicKeyVariant === 1 ? 33 : undefined;
-    if (publicKeyLength === undefined) {
-        throw new Error("Authority EntryV0 uses an unsupported signing key");
+    const keyVariant = reader.readU8("signature public-key variant");
+    const keyLength = keyVariant === 0 ? 32 : keyVariant === 1 ? 33 : undefined;
+    if (keyLength === undefined) {
+        throw new Error(`${label} EntryV0 uses an unsupported signing key`);
     }
-    reader.readExact(publicKeyLength, "signature public key");
+    reader.readExact(keyLength, "signature public key");
     reader.readU8("signature prehash");
     reader.expectDone("signature");
 };
-const scanEntryV0StructureV2 = (entryBytes) => {
-    const reader = new BoundsReaderV2(entryBytes);
+/**
+ * Bounds-scans and canonically decodes one already-captured public EntryV0.
+ * Record meaning, signer authority, reserved bytes, hash option, and causal
+ * semantics remain the responsibility of the caller's domain profile.
+ */
+export const scanCanonicalPublicEntryV0V2 = (entryBytes, limits) => {
+    if (!Number.isSafeInteger(limits.minimumSignatures) ||
+        !Number.isSafeInteger(limits.maximumSignatures) ||
+        limits.minimumSignatures < 1 ||
+        limits.maximumSignatures < limits.minimumSignatures) {
+        throw new Error("Invalid internal EntryV0 signature bounds");
+    }
+    const reader = new BoundsReaderV2(entryBytes, limits.label);
     reader.expectU8(0, "entry variant");
-    const metaBytes = readPublicWrapperV2(reader, "metadata");
-    const payloadContainerBytes = readPublicWrapperV2(reader, "payload");
+    const metaBytes = readPublicWrapperV2(reader, limits.label, "metadata");
+    const payloadContainerBytes = readPublicWrapperV2(reader, limits.label, "payload");
     const reservedBytes = reader.readExact(4, "reserved bytes");
     const signablePrefixLength = reader.position;
     if (reader.readU8("signatures option") !== 1) {
-        throw new Error("Authority EntryV0 must contain exactly one signature");
+        throw new Error(`${limits.label} EntryV0 must contain signatures`);
     }
     reader.expectU8(0, "signatures variant");
-    if (reader.readU32("signature count") !== 1) {
-        throw new Error("Authority EntryV0 must contain exactly one signature");
+    const signatureCount = reader.readU32("signature count");
+    if (signatureCount < limits.minimumSignatures ||
+        signatureCount > limits.maximumSignatures ||
+        signatureCount > Math.floor(reader.remaining / 6)) {
+        const expected = limits.minimumSignatures === 1 && limits.maximumSignatures === 1
+            ? "exactly one signature"
+            : limits.minimumSignatures === limits.maximumSignatures
+                ? `exactly ${limits.minimumSignatures}`
+                : `${limits.minimumSignatures}-${limits.maximumSignatures} signatures`;
+        throw new Error(`${limits.label} EntryV0 must contain ${expected}`);
+    }
+    for (let index = 0; index < signatureCount; index++) {
+        scanSignatureV2(readPublicWrapperV2(reader, limits.label, "signature"), limits.label);
     }
-    const signatureBytes = readPublicWrapperV2(reader, "signature");
     const hashOption = reader.readU8("hash option");
     if (hashOption === 1) {
         reader.readBytes("hash");
     }
     else if (hashOption !== 0) {
-        throw new Error("Authority EntryV0 has invalid hash option");
+        throw new Error(`${limits.label} EntryV0 has invalid hash option`);
     }
     reader.expectDone("storage");
-    const directParentCount = scanMetaStructureV2(metaBytes);
-    const payloadBytes = scanPayloadStructureV2(payloadContainerBytes);
-    scanSignatureStructureV2(signatureBytes);
+    const directParentCount = scanMetaV2(metaBytes, limits);
+    const payloadBytes = scanPayloadV2(payloadContainerBytes, limits.label);
     const signableBytes = new Uint8Array(signablePrefixLength + 2);
     signableBytes.set(entryBytes.subarray(0, signablePrefixLength));
+    const entry = deserialize(entryBytes, Entry);
+    if (!(entry instanceof EntryV0)) {
+        throw new Error(`${limits.label} entry must use EntryV0`);
+    }
+    if (!equals(entryBytes, serialize(entry))) {
+        throw new Error(`${limits.label} EntryV0 storage is not canonical`);
+    }
+    if (!(entry._meta instanceof DecryptedThing) ||
+        !(entry._payload instanceof DecryptedThing)) {
+        throw new Error(`${limits.label} EntryV0 metadata and payload must be public`);
+    }
+    if (entry._signatures === undefined ||
+        entry._signatures.signatures.length !== signatureCount ||
+        entry._signatures.signatures.some((signature) => !(signature instanceof DecryptedThing))) {
+        throw new Error(`${limits.label} EntryV0 signatures must be public`);
+    }
+    entry.init({ encoding: NO_ENCODING });
+    const meta = entry.meta;
+    if (!equals(metaBytes, serialize(meta))) {
+        throw new Error(`${limits.label} EntryV0 nested encoding is not canonical`);
+    }
+    if (!equals(payloadBytes, entry.payload.data)) {
+        throw new Error(`${limits.label} EntryV0 payload framing is inconsistent`);
+    }
+    const signatures = entry.signatures;
+    if (signatures.length !== signatureCount) {
+        throw new Error(`${limits.label} EntryV0 signature framing is inconsistent`);
+    }
     return {
+        entry,
+        meta,
+        signatures,
         metaBytes,
         payloadBytes,
         signableBytes,
         reservedBytes,
         hasHash: hashOption === 1,
         directParentCount,
+        signatureCount,
     };
 };
+const SECP256K1_SIGNATURE_TEXT_BYTES = 132;
+const SECP256K1_LOW_S_MAX_HEX = "7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0";
+const isLowerHexByteV2 = (value) => (value >= 0x30 && value <= 0x39) || (value >= 0x61 && value <= 0x66);
+export const assertCanonicalSecp256k1SignatureV2 = (signature, label) => {
+    if (signature.byteLength !== SECP256K1_SIGNATURE_TEXT_BYTES ||
+        signature[0] !== 0x30 ||
+        signature[1] !== 0x78) {
+        throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+    }
+    for (let index = 2; index < signature.byteLength; index++) {
+        if (!isLowerHexByteV2(signature[index])) {
+            throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+        }
+    }
+    if (signature[130] !== 0x31 ||
+        (signature[131] !== 0x62 && signature[131] !== 0x63)) {
+        throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+    }
+    for (let index = 0; index < SECP256K1_LOW_S_MAX_HEX.length; index++) {
+        const actual = signature[66 + index];
+        const maximum = SECP256K1_LOW_S_MAX_HEX.charCodeAt(index);
+        if (actual < maximum)
+            break;
+        if (actual > maximum) {
+            throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+        }
+    }
+};
+export const canonicalDirectParentsV2 = (parents, label) => {
+    const seen = new Set();
+    return parents.map((cid) => {
+        let parsed;
+        try {
+            parsed = cidifyString(cid);
+        }
+        catch {
+            throw new Error(`${label} EntryV0 direct parents must use canonical CIDv1/raw/sha2-256`);
+        }
+        if (!cid ||
+            cid.length > TRUSTED_NETWORK_V2_MAX_CANONICAL_ENTRY_CID_CHARACTERS ||
+            parsed.version !== 1 ||
+            parsed.code !== codecMap.raw.code ||
+            parsed.multihash.code !== defaultHasher.code ||
+            parsed.multihash.digest.byteLength !== 32 ||
+            stringifyCid(parsed) !== cid) {
+            throw new Error(`${label} EntryV0 direct parents must use canonical CIDv1/raw/sha2-256`);
+        }
+        if (seen.has(cid)) {
+            throw new Error(`${label} EntryV0 direct parents must be unique`);
+        }
+        seen.add(cid);
+        return {
+            cid,
+            digest: copyUint8ArrayWithLengthV2(parsed.multihash.digest, parsed.multihash.digest.byteLength),
+        };
+    });
+};
 const validateMaximumEntryBytesV2 = (maximumEntryBytes) => {
     if (!Number.isSafeInteger(maximumEntryBytes) || maximumEntryBytes < 1) {
         throw new Error("Invalid internal authority EntryV0 byte limit");
@@ -174,46 +293,26 @@ export const captureAuthorityEntryV0BytesV2 = (entryBytes, maximumEntryBytes) =>
 export const authenticateCapturedAuthorityEntryV0V2 = async (capturedEntryBytes, descriptor, assertProfile) => {
     assertNetworkDescriptorV2(descriptor);
     const authorityBytes = serialize(descriptor.policyAuthority);
-    const scanned = scanEntryV0StructureV2(capturedEntryBytes);
+    const scanned = scanCanonicalPublicEntryV0V2(capturedEntryBytes, {
+        label: "Authority",
+        minimumSignatures: 1,
+        maximumSignatures: 1,
+    });
     const capturedDescriptor = deserialize(serialize(descriptor), NetworkDescriptorV2);
     assertNetworkDescriptorV2(capturedDescriptor);
     if (!equals(serialize(capturedDescriptor.policyAuthority), authorityBytes)) {
         throw new Error("Network descriptor changed during capture");
     }
-    const entry = deserialize(capturedEntryBytes, Entry);
-    if (!(entry instanceof EntryV0)) {
-        throw new Error("Authority entry must use EntryV0");
-    }
-    if (!equals(capturedEntryBytes, serialize(entry))) {
-        throw new Error("Authority EntryV0 storage is not canonical");
-    }
-    if (!(entry._meta instanceof DecryptedThing)) {
-        throw new Error("Authority EntryV0 metadata must be public");
-    }
-    if (!(entry._payload instanceof DecryptedThing)) {
-        throw new Error("Authority EntryV0 payload must be public");
-    }
-    if (entry._signatures === undefined ||
-        entry._signatures.signatures.length !== 1 ||
-        !(entry._signatures.signatures[0] instanceof DecryptedThing)) {
-        throw new Error("Authority EntryV0 must contain one public signature");
-    }
-    entry.init({ encoding: NO_ENCODING });
-    const payload = entry.payload;
-    const signatures = entry.signatures;
-    if (signatures.length !== 1 ||
-        !equals(serialize(signatures[0].publicKey), authorityBytes)) {
+    const signatures = scanned.signatures;
+    if (!equals(serialize(signatures[0].publicKey), authorityBytes)) {
         throw new Error("Authority EntryV0 signer is not the policy authority");
     }
-    if (!equals(scanned.payloadBytes, payload.data)) {
-        throw new Error("Authority EntryV0 payload framing is inconsistent");
-    }
     const authenticated = {
         descriptor: capturedDescriptor,
         entryBytes: capturedEntryBytes,
-        entry,
+        entry: scanned.entry,
         metaBytes: scanned.metaBytes,
-        payloadBytes: payload.data,
+        payloadBytes: scanned.payloadBytes,
         reservedBytes: scanned.reservedBytes,
         hasHash: scanned.hasHash,
         directParentCount: scanned.directParentCount,

package/dist/src/v2-authority-entry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"v2-authority-entry.js","sourceRoot":"","sources":["../../src/v2-authority-entry.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"v2-authority-entry.js","sourceRoot":"","sources":["../../src/v2-authority-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EACN,YAAY,EACZ,QAAQ,EACR,aAAa,EACb,YAAY,GACZ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAyB,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAa,WAAW,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACN,mBAAmB,EACnB,yBAAyB,EACzB,0BAA0B,EAC1B,2BAA2B,GAC3B,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,MAAM,qDAAqD,GAAG,GAAG,CAAC;AAuBzE,MAAM,cAAc;IAKD;IACA;IALV,MAAM,GAAG,CAAC,CAAC;IACF,IAAI,CAAW;IAEhC,YACkB,KAAiB,EACjB,KAAa;QADb,UAAK,GAAL,KAAK,CAAY;QACjB,UAAK,GAAL,KAAK,CAAQ;QAE9B,IAAI,CAAC,IAAI,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAa;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,KAAa;QACpB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;QACjB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAa;QACtB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,SAAS,CAAC,UAAkB,EAAE,KAAa;QAC1C,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,IAAI,UAAU,CAAC;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,QAAgB,EAAE,KAAa;QACvC,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,wBAAwB,KAAK,EAAE,CAAC,CAAC;QAC/D,CAAC;IACF,CAAC;IAED,UAAU,CAAC,KAAa;QACvB,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,yBAAyB,KAAK,QAAQ,CAAC,CAAC;QACtE,CAAC;IACF,CAAC;IAEO,gBAAgB,CAAC,UAAkB,EAAE,KAAa;QACzD,IACC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC;YACjC,UAAU,GAAG,CAAC;YACd,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,EAC/C,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,0BAA0B,KAAK,EAAE,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;CACD;AAED,MAAM,mBAAmB,GAAG,CAC3B,MAAsB,EACtB,KAAa,EACb,KAAa,EACA,EAAE;IACf,IACC,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,yBAAyB,CAAC,KAAK,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,yBAAyB,CAAC,KAAK,CAAC,EACrD,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,YAAY,KAAK,iBAAiB,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAClB,KAAiB,EACjB,MAA0C,EACjC,EAAE;IACX,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IACpC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7B,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACxC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;IAC3C,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC9C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1D,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CACd,GAAG,MAAM,CAAC,KAAK,6CAA6C,CAC5D,CAAC;IACH,CAAC;IACD,IACC,MAAM,CAAC,oBAAoB,KAAK,SAAS;QACzC,WAAW,GAAG,MAAM,CAAC,oBAAoB,EACxC,CAAC;QACF,MAAM,IAAI,KAAK,CACd,GAAG,MAAM,CAAC,KAAK,gCAAgC,MAAM,CAAC,oBAAoB,iBAAiB,CAC3F,CAAC;IACH,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC;QAClD,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC5B,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAC7D,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACnD,IACC,MAAM,CAAC,oBAAoB,KAAK,SAAS;YACzC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAChD,CAAC;YACF,MAAM,IAAI,KAAK,CACd,GAAG,MAAM,CAAC,KAAK,yCAAyC,MAAM,CAAC,oBAAoB,QAAQ,CAC3F,CAAC;QACH,CAAC;IACF,CAAC;SAAM,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,2CAA2C,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC9B,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAiB,EAAE,KAAa,EAAc,EAAE;IACtE,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAC9C,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,KAAiB,EAAE,KAAa,EAAQ,EAAE;IAClE,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,mBAAmB,CAAC,CAAC;IACxC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACjE,MAAM,SAAS,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,0CAA0C,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;IACpD,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IACnC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC3C,UAAsB,EACtB,MAA0C,EACX,EAAE;IACjC,IACC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAC/C,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAC/C,MAAM,CAAC,iBAAiB,GAAG,CAAC;QAC5B,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,EAClD,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACxE,MAAM,qBAAqB,GAAG,mBAAmB,CAChD,MAAM,EACN,MAAM,CAAC,KAAK,EACZ,SAAS,CACT,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,kCAAkC,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACzC,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzD,IACC,cAAc,GAAG,MAAM,CAAC,iBAAiB;QACzC,cAAc,GAAG,MAAM,CAAC,iBAAiB;QACzC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAC,EAChD,CAAC;QACF,MAAM,QAAQ,GACb,MAAM,CAAC,iBAAiB,KAAK,CAAC,IAAI,MAAM,CAAC,iBAAiB,KAAK,CAAC;YAC/D,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,MAAM,CAAC,iBAAiB,KAAK,MAAM,CAAC,iBAAiB;gBACtD,CAAC,CAAC,WAAW,MAAM,CAAC,iBAAiB,EAAE;gBACvC,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,iBAAiB,aAAa,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,cAAc,EAAE,KAAK,EAAE,EAAE,CAAC;QACrD,eAAe,CACd,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,EACtD,MAAM,CAAC,KAAK,CACZ,CAAC;IACH,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAChD,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;SAAM,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,kCAAkC,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAE7B,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,aAAa,CAAC,qBAAqB,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;IAC/D,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7C,IAAI,CAAC,CAAC,KAAK,YAAY,OAAO,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,yBAAyB,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,mCAAmC,CAAC,CAAC;IACrE,CAAC;IACD,IACC,CAAC,CAAC,KAAK,CAAC,KAAK,YAAY,cAAc,CAAC;QACxC,CAAC,CAAC,KAAK,CAAC,QAAQ,YAAY,cAAc,CAAC,EAC1C,CAAC;QACF,MAAM,IAAI,KAAK,CACd,GAAG,MAAM,CAAC,KAAK,8CAA8C,CAC7D,CAAC;IACH,CAAC;IACD,IACC,KAAK,CAAC,WAAW,KAAK,SAAS;QAC/B,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,cAAc;QACtD,KAAK,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAChC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,YAAY,cAAc,CAAC,CACrD,EACA,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,oCAAoC,CAAC,CAAC;IACtE,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,2CAA2C,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,0CAA0C,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IACpC,IAAI,UAAU,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CACd,GAAG,MAAM,CAAC,KAAK,4CAA4C,CAC3D,CAAC;IACH,CAAC;IACD,OAAO;QACN,KAAK;QACL,IAAI;QACJ,UAAU;QACV,SAAS;QACT,YAAY;QACZ,aAAa;QACb,aAAa;QACb,OAAO,EAAE,UAAU,KAAK,CAAC;QACzB,iBAAiB;QACjB,cAAc;KACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,GAAG,CAAC;AAC3C,MAAM,uBAAuB,GAC5B,kEAAkE,CAAC;AAEpE,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE,CACnD,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,mCAAmC,GAAG,CAClD,SAAqB,EACrB,KAAa,EACN,EAAE;IACT,IACC,SAAS,CAAC,UAAU,KAAK,8BAA8B;QACvD,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI;QACrB,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,EACpB,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,+CAA+C,CAAC,CAAC;IAC1E,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC;QAC3D,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAE,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,+CAA+C,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;IACD,IACC,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI;QACvB,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,EACnD,CAAC;QACF,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,+CAA+C,CAAC,CAAC;IAC1E,CAAC;IACD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,uBAAuB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACrE,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,KAAK,CAAE,CAAC;QACtC,MAAM,OAAO,GAAG,uBAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAG,OAAO;YAAE,MAAM;QAC5B,IAAI,MAAM,GAAG,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,+CAA+C,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACvC,OAA0B,EAC1B,KAAa,EACgC,EAAE;IAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,IAAI,MAAuC,CAAC;QAC5C,IAAI,CAAC;YACJ,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACR,MAAM,IAAI,KAAK,CACd,GAAG,KAAK,+DAA+D,CACvE,CAAC;QACH,CAAC;QACD,IACC,CAAC,GAAG;YACJ,GAAG,CAAC,MAAM,GAAG,qDAAqD;YAClE,MAAM,CAAC,OAAO,KAAK,CAAC;YACpB,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,GAAG,CAAC,IAAI;YACjC,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI;YAC5C,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,KAAK,EAAE;YACzC,YAAY,CAAC,MAAM,CAAC,KAAK,GAAG,EAC3B,CAAC;YACF,MAAM,IAAI,KAAK,CACd,GAAG,KAAK,+DAA+D,CACvE,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,wCAAwC,CAAC,CAAC;QACnE,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,OAAO;YACN,GAAG;YACH,MAAM,EAAE,0BAA0B,CACjC,MAAM,CAAC,SAAS,CAAC,MAAM,EACvB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAClC;SACD,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAiBF,MAAM,2BAA2B,GAAG,CAAC,iBAAyB,EAAQ,EAAE;IACvE,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAClE,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC7C,UAAsB,EACtB,iBAAyB,EACZ,EAAE;IACf,2BAA2B,CAAC,iBAAiB,CAAC,CAAC;IAC/C,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACJ,UAAU,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,iBAAiB,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CACd,oCAAoC,iBAAiB,QAAQ,CAC7D,CAAC;IACH,CAAC;IACD,OAAO,0BAA0B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sCAAsC,GAAG,KAAK,EAC1D,kBAA8B,EAC9B,UAA+B,EAC/B,aAAyC,EACE,EAAE;IAC7C,yBAAyB,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,4BAA4B,CAAC,kBAAkB,EAAE;QAChE,KAAK,EAAE,WAAW;QAClB,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,CAAC;KACpB,CAAC,CAAC;IACH,MAAM,kBAAkB,GAAG,WAAW,CACrC,SAAS,CAAC,UAAU,CAAC,EACrB,mBAAmB,CACnB,CAAC;IACF,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;IAC9C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,cAAc,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IACzE,CAAC;IACD,MAAM,aAAa,GAAoC;QACtD,UAAU,EAAE,kBAAkB;QAC9B,UAAU,EAAE,kBAAkB;QAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,aAAa,EAAE,OAAO,CAAC,aAAa;QACpC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC5C,CAAC;IACF,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC;IAE/B,IAAI,gBAAgB,GAAG,KAAK,CAAC;IAC7B,IAAI,CAAC;QACJ,gBAAgB,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,CAAE,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACxE,CAAC;IAAC,MAAM,CAAC;QACR,8DAA8D;IAC/D,CAAC;IACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,aAAa,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EAClD,UAAsB,EACtB,UAA+B,EAC/B,iBAAyB,EACzB,aAAyC,EACE,EAAE,CAC7C,sCAAsC,CACrC,8BAA8B,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAC7D,UAAU,EACV,aAAa,CACb,CAAC"}

package/dist/src/v2-resource-fence-entry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"v2-resource-fence-entry.d.ts","sourceRoot":"","sources":["../../src/v2-resource-fence-entry.ts"],"names":[],"mappings":"~~AAcA~~,OAAO,EACN,mBAAmB,EACnB,eAAe,EAOf,MAAM,SAAS,CAAC;~~AA4IjB~~,MAAM,MAAM,iCAAiC,GAAG,QAAQ,CAAC;IACxD,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,eAAe,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,aAAa,EAAE,aAAa,CAAC,QAAQ,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC,CAAC;CAC5E,CAAC,CAAC;AAEH,MAAM,MAAM,0CAA0C,GAAG,QAAQ,CAAC;IACjE,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,UAAU,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAiCH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,GAAU,8DAKpD,0CAA0C,KAAG,OAAO,CAAC,iCAAiC,CA6CxF,CAAC"}
1	+ {"version":3,"file":"v2-resource-fence-entry.d.ts","sourceRoot":"","sources":["../../src/v2-resource-fence-entry.ts"],"names":[],"mappings":"AAUA,OAAO,EACN,mBAAmB,EACnB,eAAe,EAOf,MAAM,SAAS,CAAC;AAoEjB,MAAM,MAAM,iCAAiC,GAAG,QAAQ,CAAC;IACxD,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,eAAe,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,aAAa,EAAE,aAAa,CAAC,QAAQ,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC,CAAC,CAAC;CAC5E,CAAC,CAAC;AAEH,MAAM,MAAM,0CAA0C,GAAG,QAAQ,CAAC;IACjE,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,mBAAmB,CAAC;IAChC,kBAAkB,EAAE,UAAU,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC,CAAC;AAiCH;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,GAAU,8DAKpD,0CAA0C,KAAG,OAAO,CAAC,iCAAiC,CA6CxF,CAAC"}

package/dist/src/v2-resource-fence-entry.js CHANGED Viewed

@@ -1,68 +1,12 @@
 import { serialize } from "@dao-xyz/borsh";
-import { calculateRawCid, cidifyString, codecMap, defaultHasher, stringifyCid, } from "@peerbit/blocks-interface";
+import { calculateRawCid } from "@peerbit/blocks-interface";
 import { EntryType } from "@peerbit/log";
 import { equals } from "uint8arrays";
-import { authenticateAuthorityEntryV0V2, } from "./v2-authority-entry.js";
+import { assertCanonicalSecp256k1SignatureV2, authenticateAuthorityEntryV0V2, canonicalDirectParentsV2, } from "./v2-authority-entry.js";
 import { NetworkDescriptorV2, ResourceFenceV2, TRUSTED_NETWORK_V2_MAX_RESOURCE_FENCE_DIRECT_PARENTS, TRUSTED_NETWORK_V2_MAX_RESOURCE_FENCE_ENTRY_BYTES, TRUSTED_NETWORK_V2_RESOURCE_FENCE_BODY_BYTES, copyUint8ArrayWithLengthV2, decodeResourceFenceV2, exactUint8ArrayByteLengthV2, } from "./v2.js";
 const RESOURCE_FENCE_AUTHORITY_LIMITS_V2 = Object.freeze({
     maximumEntryBytes: TRUSTED_NETWORK_V2_MAX_RESOURCE_FENCE_ENTRY_BYTES,
 });
-const SECP256K1_SIGNATURE_TEXT_BYTES = 132;
-const SECP256K1_LOW_S_MAX_HEX = "7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0";
-const isLowerHexByteV2 = (value) => (value >= 0x30 && value <= 0x39) || (value >= 0x61 && value <= 0x66);
-const assertCanonicalSecp256k1SignatureV2 = (signature) => {
-    if (signature.byteLength !== SECP256K1_SIGNATURE_TEXT_BYTES ||
-        signature[0] !== 0x30 ||
-        signature[1] !== 0x78) {
-        throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-    }
-    for (let i = 2; i < signature.byteLength; i++) {
-        if (!isLowerHexByteV2(signature[i])) {
-            throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-        }
-    }
-    if (signature[130] !== 0x31 ||
-        (signature[131] !== 0x62 && signature[131] !== 0x63)) {
-        throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-    }
-    for (let i = 0; i < SECP256K1_LOW_S_MAX_HEX.length; i++) {
-        const actual = signature[66 + i];
-        const maximum = SECP256K1_LOW_S_MAX_HEX.charCodeAt(i);
-        if (actual < maximum)
-            break;
-        if (actual > maximum) {
-            throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-        }
-    }
-};
-const canonicalDirectParentsV2 = (parents) => {
-    const seen = new Set();
-    return parents.map((cid) => {
-        let parsed;
-        try {
-            parsed = cidifyString(cid);
-        }
-        catch {
-            throw new Error("Authority EntryV0 direct parents must use canonical CIDv1/raw/sha2-256");
-        }
-        if (!cid ||
-            parsed.version !== 1 ||
-            parsed.code !== codecMap.raw.code ||
-            parsed.multihash.code !== defaultHasher.code ||
-            parsed.multihash.digest.byteLength !== 32 ||
-            stringifyCid(parsed) !== cid) {
-            throw new Error("Authority EntryV0 direct parents must use canonical CIDv1/raw/sha2-256");
-        }
-        if (seen.has(cid)) {
-            throw new Error("Authority EntryV0 direct parents must be unique");
-        }
-        seen.add(cid);
-        return {
-            cid,
-            digest: copyUint8ArrayWithLengthV2(parsed.multihash.digest, parsed.multihash.digest.byteLength),
-        };
-    });
-};
 const assertResourceFenceEntryV0ProfileV2 = (authenticated) => {
     if (authenticated.hasHash) {
         throw new Error("Authority EntryV0 has invalid resource hash option: embedded hash");
@@ -97,9 +41,12 @@ const assertResourceFenceEntryV0ProfileV2 = (authenticated) => {
     }
     const signature = authenticated.entry.signatures[0];
     if (serialize(signature.publicKey)[0] === 1) {
-        assertCanonicalSecp256k1SignatureV2(signature.signature);
+        assertCanonicalSecp256k1SignatureV2(signature.signature, "Authority");
     }
-    return { meta, directParents: canonicalDirectParentsV2(meta.next) };
+    return {
+        meta,
+        directParents: canonicalDirectParentsV2(meta.next, "Authority"),
+    };
 };
 const captureResourceIdV2 = (resourceId) => {
     let byteLength;

package/dist/src/v2-resource-fence-entry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"v2-resource-fence-entry.js","sourceRoot":"","sources":["../../src/v2-resource-fence-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,~~EACN~~,eAAe,~~EACf~~,~~YAAY,EACZ,QAAQ,EACR,aAAa,EACb,YAAY,GACZ,~~MAAM,2BAA2B,CAAC;~~AACnC~~,OAAO,EAAE,SAAS,EAAa,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAEN,8BAA8B,~~GAC9B~~,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACN,mBAAmB,EACnB,eAAe,EACf,oDAAoD,EACpD,iDAAiD,EACjD,4CAA4C,EAC5C,0BAA0B,EAC1B,qBAAqB,EACrB,2BAA2B,GAC3B,MAAM,SAAS,CAAC;AAEjB,MAAM,kCAAkC,GAAG,MAAM,CAAC,MAAM,CAAC;IACxD,iBAAiB,EAAE,iDAAiD;CACpE,CAAC,CAAC;~~AAEH~~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~~IAC1D~~,CAAC;IACD,OAAO,~~EAAE,~~IAAI,~~EAAE,~~aAAa,EAAE,wBAAwB,CAAC,IAAI,CAAC,IAAI,~~CAAC,~~EAAE,CAAC;~~AACrE~~,CAAC,CAAC;AAmBF,MAAM,mBAAmB,GAAG,CAAC,UAAsB,EAAc,EAAE;IAClE,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACJ,UAAU,GAAG,2BAA2B,CAAC,UAAU,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACR,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACvE,CAAC;IACD,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,0BAA0B,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC9B,aAA8C,EAC9C,IAAqB,EACrB,QAAgB,EAChB,MAAkB,EAClB,GAAW,EACX,QAAgC,EAChC,aAAyD,EACrB,EAAE,CAAC,CAAC;IACxC,UAAU,EAAE,aAAa,CAAC,UAAU;IACpC,QAAQ;IACR,MAAM;IACN,IAAI;IACJ,GAAG;IACH,QAAQ;IACR,aAAa;CACb,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,KAAK,EAAE,EACtD,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,WAAW,GACiC,EAA8C,EAAE;IAC5F,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;IACnE,IAAI,OAAkD,CAAC;IACvD,MAAM,aAAa,GAAG,MAAM,8BAA8B,CACzD,UAAU,EACV,UAAU,EACV,kCAAkC,CAAC,iBAAiB,EACpD,CAAC,SAAS,EAAE,EAAE;QACb,OAAO,GAAG,mCAAmC,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC,CACD,CAAC;IACF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,WAAW,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,IAAI,GAAG,qBAAqB,CACjC,aAAa,CAAC,YAAY,EAC1B,aAAa,CAAC,UAAU,CACxB,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IACjE,OAAO,sBAAsB,CAC5B,aAAa,EACb,IAAI,EACJ,QAAQ,CAAC,GAAG,EACZ,0BAA0B,CACzB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EACnC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAC9C,EACD,OAAO,CAAC,IAAI,CAAC,GAAG,EAChB,OAAO,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;QAC9B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,0BAA0B,CAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,EACjB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAC5B,EACH,OAAO,CAAC,aAAa,CACrB,CAAC;AACH,CAAC,CAAC"}
1	+ {"version":3,"file":"v2-resource-fence-entry.js","sourceRoot":"","sources":["../../src/v2-resource-fence-entry.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@peerbit/trusted-network",
-  "version": "6.0.130",
+  "version": "6.0.131",
   "description": "Access controller that operates on a DB",
   "sideEffects": false,
   "type": "module",
@@ -26,8 +26,12 @@
     "dist",
     "!src/v2-resource-fence-anchor.ts",
     "!src/v2-resource-fence-engine.ts",
+    "!src/v2-resource-operation-entry.ts",
+    "!src/v2-resource-operation-engine.ts",
     "!dist/src/v2-resource-fence-anchor.*",
     "!dist/src/v2-resource-fence-engine.*",
+    "!dist/src/v2-resource-operation-entry.*",
+    "!dist/src/v2-resource-operation-engine.*",
     "!dist/e2e",
     "!dist/test",
     "!**/*.tsbuildinfo"
@@ -60,17 +64,17 @@
     "@libp2p/interface": "^3.2.5",
     "uint8arrays": "^5.1.0",
     "@peerbit/any-store": "2.2.17",
-    "@peerbit/blocks-interface": "2.2.0",
     "@peerbit/any-store-interface": "1.1.4",
+    "@peerbit/blocks-interface": "2.2.1",
+    "@peerbit/document": "15.1.0",
     "@peerbit/crypto": "3.1.6",
-    "@peerbit/document": "15.0.32",
-    "@peerbit/log": "6.2.32",
-    "@peerbit/program": "6.0.59",
-    "@peerbit/shared-log": "16.0.29"
+    "@peerbit/log": "6.2.33",
+    "@peerbit/program": "6.0.60",
+    "@peerbit/shared-log": "16.0.30"
   },
   "devDependencies": {
     "ethers": "^6.17.0",
-    "@peerbit/test-utils": "3.1.40",
+    "@peerbit/test-utils": "3.1.41",
     "@peerbit/time": "3.0.1"
   },
   "repository": {

package/src/v2-authority-entry.ts CHANGED Viewed

@@ -1,6 +1,12 @@
 import { deserialize, serialize } from "@dao-xyz/borsh";
-import { DecryptedThing, verify } from "@peerbit/crypto";
-import { Entry, EntryV0, NO_ENCODING } from "@peerbit/log";
+import {
+	cidifyString,
+	codecMap,
+	defaultHasher,
+	stringifyCid,
+} from "@peerbit/blocks-interface";
+import { DecryptedThing, type SignatureWithKey, verify } from "@peerbit/crypto";
+import { Entry, EntryV0, type Meta, NO_ENCODING } from "@peerbit/log";
 import { equals } from "uint8arrays";
 import {
 	NetworkDescriptorV2,
@@ -9,35 +15,37 @@ import {
 	exactUint8ArrayByteLengthV2,
 } from "./v2.js";
-export type AuthenticatedAuthorityEntryV0V2 = {
-	descriptor: NetworkDescriptorV2;
-	entryBytes: Uint8Array;
-	entry: EntryV0<Uint8Array>;
-	metaBytes: Uint8Array;
-	payloadBytes: Uint8Array;
-	reservedBytes: Uint8Array;
-	hasHash: boolean;
-	directParentCount: number;
-};
+export const TRUSTED_NETWORK_V2_MAX_CANONICAL_ENTRY_CID_CHARACTERS = 128;
-export type AuthorityEntryV0ProfileV2 = (
-	entry: AuthenticatedAuthorityEntryV0V2,
-) => void;
+export type CanonicalPublicEntryV0ScanLimitsV2 = Readonly<{
+	label: string;
+	minimumSignatures: number;
+	maximumSignatures: number;
+	maximumDirectParents?: number;
+	maximumMetadataBytes?: number;
+}>;
-type ScannedEntryV0StructureV2 = {
+export type CanonicalPublicEntryV0ScanV2 = Readonly<{
+	entry: EntryV0<Uint8Array>;
+	meta: Meta;
+	signatures: SignatureWithKey[];
 	metaBytes: Uint8Array;
 	payloadBytes: Uint8Array;
 	signableBytes: Uint8Array;
 	reservedBytes: Uint8Array;
 	hasHash: boolean;
 	directParentCount: number;
-};
+	signatureCount: number;
+}>;
 class BoundsReaderV2 {
 	private offset = 0;
 	private readonly view: DataView;
-	constructor(private readonly bytes: Uint8Array) {
+	constructor(
+		private readonly bytes: Uint8Array,
+		private readonly label: string,
+	) {
 		this.view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 	}
@@ -49,47 +57,47 @@ class BoundsReaderV2 {
 		return this.bytes.byteLength - this.offset;
 	}
-	readU8(label: string): number {
-		return this.readExact(1, label)[0]!;
+	readU8(field: string): number {
+		return this.readExact(1, field)[0]!;
 	}
-	readU32(label: string): number {
-		this.requireRemaining(4, label);
+	readU32(field: string): number {
+		this.requireRemaining(4, field);
 		const value = this.view.getUint32(this.offset, true);
 		this.offset += 4;
 		return value;
 	}
-	readBytes(label: string): Uint8Array {
-		return this.readExact(this.readU32(`${label} length`), label);
+	readBytes(field: string): Uint8Array {
+		return this.readExact(this.readU32(`${field} length`), field);
 	}
-	readExact(byteLength: number, label: string): Uint8Array {
-		this.requireRemaining(byteLength, label);
+	readExact(byteLength: number, field: string): Uint8Array {
+		this.requireRemaining(byteLength, field);
 		const start = this.offset;
 		this.offset += byteLength;
 		return this.bytes.subarray(start, this.offset);
 	}
-	expectU8(expected: number, label: string): void {
-		if (this.readU8(label) !== expected) {
-			throw new Error(`Authority EntryV0 has invalid ${label}`);
+	expectU8(expected: number, field: string): void {
+		if (this.readU8(field) !== expected) {
+			throw new Error(`${this.label} EntryV0 has invalid ${field}`);
 		}
 	}
-	expectDone(label: string): void {
+	expectDone(field: string): void {
 		if (this.offset !== this.bytes.byteLength) {
-			throw new Error(`Authority EntryV0 has trailing ${label} bytes`);
+			throw new Error(`${this.label} EntryV0 has trailing ${field} bytes`);
 		}
 	}
-	private requireRemaining(byteLength: number, label: string): void {
+	private requireRemaining(byteLength: number, field: string): void {
 		if (
 			!Number.isSafeInteger(byteLength) ||
 			byteLength < 0 ||
 			byteLength > this.bytes.byteLength - this.offset
 		) {
-			throw new Error(`Authority EntryV0 has truncated ${label}`);
+			throw new Error(`${this.label} EntryV0 has truncated ${field}`);
 		}
 	}
 }
@@ -97,18 +105,22 @@ class BoundsReaderV2 {
 const readPublicWrapperV2 = (
 	reader: BoundsReaderV2,
 	label: string,
+	field: string,
 ): Uint8Array => {
 	if (
-		reader.readU8(`${label} MaybeEncrypted variant`) !== 0 ||
-		reader.readU8(`${label} DecryptedThing variant`) !== 0
+		reader.readU8(`${field} MaybeEncrypted variant`) !== 0 ||
+		reader.readU8(`${field} DecryptedThing variant`) !== 0
 	) {
-		throw new Error(`Authority EntryV0 ${label} must be public`);
+		throw new Error(`${label} EntryV0 ${field} must be public`);
 	}
-	return reader.readBytes(label);
+	return reader.readBytes(field);
 };
-const scanMetaStructureV2 = (metaBytes: Uint8Array): number => {
-	const reader = new BoundsReaderV2(metaBytes);
+const scanMetaV2 = (
+	bytes: Uint8Array,
+	limits: CanonicalPublicEntryV0ScanLimitsV2,
+): number => {
+	const reader = new BoundsReaderV2(bytes, limits.label);
 	reader.expectU8(0, "metadata variant");
 	reader.expectU8(0, "clock variant");
 	reader.readBytes("clock id");
@@ -116,91 +128,275 @@ const scanMetaStructureV2 = (metaBytes: Uint8Array): number => {
 	reader.readExact(8, "timestamp wall time");
 	reader.readExact(4, "timestamp logical time");
 	reader.readBytes("gid");
-	const directParentCount = reader.readU32("direct-parent count");
-	// Every Borsh string starts with a four-byte length. Reject an impossible
-	// input-backed count before iterating or invoking the generic decoder.
-	if (directParentCount > Math.floor(reader.remaining / 4)) {
-		throw new Error("Authority EntryV0 has impossible direct-parent count");
+	const parentCount = reader.readU32("direct-parent count");
+	if (parentCount > Math.floor(reader.remaining / 4)) {
+		throw new Error(
+			`${limits.label} EntryV0 has impossible direct-parent count`,
+		);
+	}
+	if (
+		limits.maximumDirectParents !== undefined &&
+		parentCount > limits.maximumDirectParents
+	) {
+		throw new Error(
+			`${limits.label} EntryV0 may contain at most ${limits.maximumDirectParents} direct parents`,
+		);
 	}
-	for (let i = 0; i < directParentCount; i++) {
+	for (let index = 0; index < parentCount; index++) {
 		reader.readBytes("direct parent");
 	}
 	reader.readU8("entry type");
-	const metaDataOption = reader.readU8("metadata data option");
-	if (metaDataOption === 1) {
-		reader.readBytes("metadata data");
-	} else if (metaDataOption !== 0) {
-		throw new Error("Authority EntryV0 has invalid metadata data option");
+	const metadataOption = reader.readU8("metadata data option");
+	if (metadataOption === 1) {
+		const metadata = reader.readBytes("metadata data");
+		if (
+			limits.maximumMetadataBytes !== undefined &&
+			metadata.byteLength > limits.maximumMetadataBytes
+		) {
+			throw new Error(
+				`${limits.label} EntryV0 metadata may contain at most ${limits.maximumMetadataBytes} bytes`,
+			);
+		}
+	} else if (metadataOption !== 0) {
+		throw new Error(`${limits.label} EntryV0 has invalid metadata data option`);
 	}
 	reader.expectDone("metadata");
-	return directParentCount;
+	return parentCount;
 };
-const scanPayloadStructureV2 = (payloadBytes: Uint8Array): Uint8Array => {
-	const reader = new BoundsReaderV2(payloadBytes);
+const scanPayloadV2 = (bytes: Uint8Array, label: string): Uint8Array => {
+	const reader = new BoundsReaderV2(bytes, label);
 	reader.expectU8(0, "payload variant");
 	const data = reader.readBytes("payload data");
 	reader.expectDone("payload");
 	return data;
 };
-const scanSignatureStructureV2 = (signatureBytes: Uint8Array): void => {
-	const reader = new BoundsReaderV2(signatureBytes);
+const scanSignatureV2 = (bytes: Uint8Array, label: string): void => {
+	const reader = new BoundsReaderV2(bytes, label);
 	reader.expectU8(0, "signature variant");
 	reader.readBytes("signature data");
-	const publicKeyVariant = reader.readU8("signature public-key variant");
-	const publicKeyLength =
-		publicKeyVariant === 0 ? 32 : publicKeyVariant === 1 ? 33 : undefined;
-	if (publicKeyLength === undefined) {
-		throw new Error("Authority EntryV0 uses an unsupported signing key");
+	const keyVariant = reader.readU8("signature public-key variant");
+	const keyLength = keyVariant === 0 ? 32 : keyVariant === 1 ? 33 : undefined;
+	if (keyLength === undefined) {
+		throw new Error(`${label} EntryV0 uses an unsupported signing key`);
 	}
-	reader.readExact(publicKeyLength, "signature public key");
+	reader.readExact(keyLength, "signature public key");
 	reader.readU8("signature prehash");
 	reader.expectDone("signature");
 };
-const scanEntryV0StructureV2 = (
+/**
+ * Bounds-scans and canonically decodes one already-captured public EntryV0.
+ * Record meaning, signer authority, reserved bytes, hash option, and causal
+ * semantics remain the responsibility of the caller's domain profile.
+ */
+export const scanCanonicalPublicEntryV0V2 = (
 	entryBytes: Uint8Array,
-): ScannedEntryV0StructureV2 => {
-	const reader = new BoundsReaderV2(entryBytes);
+	limits: CanonicalPublicEntryV0ScanLimitsV2,
+): CanonicalPublicEntryV0ScanV2 => {
+	if (
+		!Number.isSafeInteger(limits.minimumSignatures) ||
+		!Number.isSafeInteger(limits.maximumSignatures) ||
+		limits.minimumSignatures < 1 ||
+		limits.maximumSignatures < limits.minimumSignatures
+	) {
+		throw new Error("Invalid internal EntryV0 signature bounds");
+	}
+	const reader = new BoundsReaderV2(entryBytes, limits.label);
 	reader.expectU8(0, "entry variant");
-	const metaBytes = readPublicWrapperV2(reader, "metadata");
-	const payloadContainerBytes = readPublicWrapperV2(reader, "payload");
+	const metaBytes = readPublicWrapperV2(reader, limits.label, "metadata");
+	const payloadContainerBytes = readPublicWrapperV2(
+		reader,
+		limits.label,
+		"payload",
+	);
 	const reservedBytes = reader.readExact(4, "reserved bytes");
 	const signablePrefixLength = reader.position;
 	if (reader.readU8("signatures option") !== 1) {
-		throw new Error("Authority EntryV0 must contain exactly one signature");
+		throw new Error(`${limits.label} EntryV0 must contain signatures`);
 	}
 	reader.expectU8(0, "signatures variant");
-	if (reader.readU32("signature count") !== 1) {
-		throw new Error("Authority EntryV0 must contain exactly one signature");
+	const signatureCount = reader.readU32("signature count");
+	if (
+		signatureCount < limits.minimumSignatures ||
+		signatureCount > limits.maximumSignatures ||
+		signatureCount > Math.floor(reader.remaining / 6)
+	) {
+		const expected =
+			limits.minimumSignatures === 1 && limits.maximumSignatures === 1
+				? "exactly one signature"
+				: limits.minimumSignatures === limits.maximumSignatures
+					? `exactly ${limits.minimumSignatures}`
+					: `${limits.minimumSignatures}-${limits.maximumSignatures} signatures`;
+		throw new Error(`${limits.label} EntryV0 must contain ${expected}`);
+	}
+	for (let index = 0; index < signatureCount; index++) {
+		scanSignatureV2(
+			readPublicWrapperV2(reader, limits.label, "signature"),
+			limits.label,
+		);
 	}
-	const signatureBytes = readPublicWrapperV2(reader, "signature");
 	const hashOption = reader.readU8("hash option");
 	if (hashOption === 1) {
 		reader.readBytes("hash");
 	} else if (hashOption !== 0) {
-		throw new Error("Authority EntryV0 has invalid hash option");
+		throw new Error(`${limits.label} EntryV0 has invalid hash option`);
 	}
 	reader.expectDone("storage");
-	const directParentCount = scanMetaStructureV2(metaBytes);
-	const payloadBytes = scanPayloadStructureV2(payloadContainerBytes);
-	scanSignatureStructureV2(signatureBytes);
+	const directParentCount = scanMetaV2(metaBytes, limits);
+	const payloadBytes = scanPayloadV2(payloadContainerBytes, limits.label);
 	const signableBytes = new Uint8Array(signablePrefixLength + 2);
 	signableBytes.set(entryBytes.subarray(0, signablePrefixLength));
+	const entry = deserialize(entryBytes, Entry);
+	if (!(entry instanceof EntryV0)) {
+		throw new Error(`${limits.label} entry must use EntryV0`);
+	}
+	if (!equals(entryBytes, serialize(entry))) {
+		throw new Error(`${limits.label} EntryV0 storage is not canonical`);
+	}
+	if (
+		!(entry._meta instanceof DecryptedThing) ||
+		!(entry._payload instanceof DecryptedThing)
+	) {
+		throw new Error(
+			`${limits.label} EntryV0 metadata and payload must be public`,
+		);
+	}
+	if (
+		entry._signatures === undefined ||
+		entry._signatures.signatures.length !== signatureCount ||
+		entry._signatures.signatures.some(
+			(signature) => !(signature instanceof DecryptedThing),
+		)
+	) {
+		throw new Error(`${limits.label} EntryV0 signatures must be public`);
+	}
+	entry.init({ encoding: NO_ENCODING });
+	const meta = entry.meta;
+	if (!equals(metaBytes, serialize(meta))) {
+		throw new Error(`${limits.label} EntryV0 nested encoding is not canonical`);
+	}
+	if (!equals(payloadBytes, entry.payload.data)) {
+		throw new Error(`${limits.label} EntryV0 payload framing is inconsistent`);
+	}
+	const signatures = entry.signatures;
+	if (signatures.length !== signatureCount) {
+		throw new Error(
+			`${limits.label} EntryV0 signature framing is inconsistent`,
+		);
+	}
 	return {
+		entry,
+		meta,
+		signatures,
 		metaBytes,
 		payloadBytes,
 		signableBytes,
 		reservedBytes,
 		hasHash: hashOption === 1,
 		directParentCount,
+		signatureCount,
 	};
 };
+const SECP256K1_SIGNATURE_TEXT_BYTES = 132;
+const SECP256K1_LOW_S_MAX_HEX =
+	"7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0";
+const isLowerHexByteV2 = (value: number): boolean =>
+	(value >= 0x30 && value <= 0x39) || (value >= 0x61 && value <= 0x66);
+export const assertCanonicalSecp256k1SignatureV2 = (
+	signature: Uint8Array,
+	label: string,
+): void => {
+	if (
+		signature.byteLength !== SECP256K1_SIGNATURE_TEXT_BYTES ||
+		signature[0] !== 0x30 ||
+		signature[1] !== 0x78
+	) {
+		throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+	}
+	for (let index = 2; index < signature.byteLength; index++) {
+		if (!isLowerHexByteV2(signature[index]!)) {
+			throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+		}
+	}
+	if (
+		signature[130] !== 0x31 ||
+		(signature[131] !== 0x62 && signature[131] !== 0x63)
+	) {
+		throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+	}
+	for (let index = 0; index < SECP256K1_LOW_S_MAX_HEX.length; index++) {
+		const actual = signature[66 + index]!;
+		const maximum = SECP256K1_LOW_S_MAX_HEX.charCodeAt(index);
+		if (actual < maximum) break;
+		if (actual > maximum) {
+			throw new Error(`${label} EntryV0 secp256k1 signature is not canonical`);
+		}
+	}
+};
+export const canonicalDirectParentsV2 = (
+	parents: readonly string[],
+	label: string,
+): Array<{ cid: string; digest: Uint8Array }> => {
+	const seen = new Set<string>();
+	return parents.map((cid) => {
+		let parsed: ReturnType<typeof cidifyString>;
+		try {
+			parsed = cidifyString(cid);
+		} catch {
+			throw new Error(
+				`${label} EntryV0 direct parents must use canonical CIDv1/raw/sha2-256`,
+			);
+		}
+		if (
+			!cid ||
+			cid.length > TRUSTED_NETWORK_V2_MAX_CANONICAL_ENTRY_CID_CHARACTERS ||
+			parsed.version !== 1 ||
+			parsed.code !== codecMap.raw.code ||
+			parsed.multihash.code !== defaultHasher.code ||
+			parsed.multihash.digest.byteLength !== 32 ||
+			stringifyCid(parsed) !== cid
+		) {
+			throw new Error(
+				`${label} EntryV0 direct parents must use canonical CIDv1/raw/sha2-256`,
+			);
+		}
+		if (seen.has(cid)) {
+			throw new Error(`${label} EntryV0 direct parents must be unique`);
+		}
+		seen.add(cid);
+		return {
+			cid,
+			digest: copyUint8ArrayWithLengthV2(
+				parsed.multihash.digest,
+				parsed.multihash.digest.byteLength,
+			),
+		};
+	});
+};
+export type AuthenticatedAuthorityEntryV0V2 = {
+	descriptor: NetworkDescriptorV2;
+	entryBytes: Uint8Array;
+	entry: CanonicalPublicEntryV0ScanV2["entry"];
+	metaBytes: Uint8Array;
+	payloadBytes: Uint8Array;
+	reservedBytes: Uint8Array;
+	hasHash: boolean;
+	directParentCount: number;
+};
+export type AuthorityEntryV0ProfileV2 = (
+	entry: AuthenticatedAuthorityEntryV0V2,
+) => void;
 const validateMaximumEntryBytesV2 = (maximumEntryBytes: number): void => {
 	if (!Number.isSafeInteger(maximumEntryBytes) || maximumEntryBytes < 1) {
 		throw new Error("Invalid internal authority EntryV0 byte limit");
@@ -239,7 +435,11 @@ export const authenticateCapturedAuthorityEntryV0V2 = async (
 ): Promise<AuthenticatedAuthorityEntryV0V2> => {
 	assertNetworkDescriptorV2(descriptor);
 	const authorityBytes = serialize(descriptor.policyAuthority);
-	const scanned = scanEntryV0StructureV2(capturedEntryBytes);
+	const scanned = scanCanonicalPublicEntryV0V2(capturedEntryBytes, {
+		label: "Authority",
+		minimumSignatures: 1,
+		maximumSignatures: 1,
+	});
 	const capturedDescriptor = deserialize(
 		serialize(descriptor),
 		NetworkDescriptorV2,
@@ -248,45 +448,16 @@ export const authenticateCapturedAuthorityEntryV0V2 = async (
 	if (!equals(serialize(capturedDescriptor.policyAuthority), authorityBytes)) {
 		throw new Error("Network descriptor changed during capture");
 	}
-	const entry = deserialize(capturedEntryBytes, Entry);
-	if (!(entry instanceof EntryV0)) {
-		throw new Error("Authority entry must use EntryV0");
-	}
-	if (!equals(capturedEntryBytes, serialize(entry))) {
-		throw new Error("Authority EntryV0 storage is not canonical");
-	}
-	if (!(entry._meta instanceof DecryptedThing)) {
-		throw new Error("Authority EntryV0 metadata must be public");
-	}
-	if (!(entry._payload instanceof DecryptedThing)) {
-		throw new Error("Authority EntryV0 payload must be public");
-	}
-	if (
-		entry._signatures === undefined ||
-		entry._signatures.signatures.length !== 1 ||
-		!(entry._signatures.signatures[0] instanceof DecryptedThing)
-	) {
-		throw new Error("Authority EntryV0 must contain one public signature");
-	}
-	entry.init({ encoding: NO_ENCODING });
-	const payload = entry.payload;
-	const signatures = entry.signatures;
-	if (
-		signatures.length !== 1 ||
-		!equals(serialize(signatures[0]!.publicKey), authorityBytes)
-	) {
+	const signatures = scanned.signatures;
+	if (!equals(serialize(signatures[0]!.publicKey), authorityBytes)) {
 		throw new Error("Authority EntryV0 signer is not the policy authority");
 	}
-	if (!equals(scanned.payloadBytes, payload.data)) {
-		throw new Error("Authority EntryV0 payload framing is inconsistent");
-	}
 	const authenticated: AuthenticatedAuthorityEntryV0V2 = {
 		descriptor: capturedDescriptor,
 		entryBytes: capturedEntryBytes,
-		entry,
+		entry: scanned.entry,
 		metaBytes: scanned.metaBytes,
-		payloadBytes: payload.data,
+		payloadBytes: scanned.payloadBytes,
 		reservedBytes: scanned.reservedBytes,
 		hasHash: scanned.hasHash,
 		directParentCount: scanned.directParentCount,
@@ -302,7 +473,6 @@ export const authenticateCapturedAuthorityEntryV0V2 = async (
 	if (!signatureIsValid) {
 		throw new Error("Authority EntryV0 signature is invalid");
 	}
 	return authenticated;
 };

package/src/v2-resource-fence-entry.ts CHANGED Viewed

@@ -1,16 +1,12 @@
 import { serialize } from "@dao-xyz/borsh";
-import {
-	calculateRawCid,
-	cidifyString,
-	codecMap,
-	defaultHasher,
-	stringifyCid,
-} from "@peerbit/blocks-interface";
+import { calculateRawCid } from "@peerbit/blocks-interface";
 import { EntryType, type Meta } from "@peerbit/log";
 import { equals } from "uint8arrays";
 import {
 	type AuthenticatedAuthorityEntryV0V2,
+	assertCanonicalSecp256k1SignatureV2,
 	authenticateAuthorityEntryV0V2,
+	canonicalDirectParentsV2,
 } from "./v2-authority-entry.js";
 import {
 	NetworkDescriptorV2,
@@ -27,81 +23,6 @@ const RESOURCE_FENCE_AUTHORITY_LIMITS_V2 = Object.freeze({
 	maximumEntryBytes: TRUSTED_NETWORK_V2_MAX_RESOURCE_FENCE_ENTRY_BYTES,
 });
-const SECP256K1_SIGNATURE_TEXT_BYTES = 132;
-const SECP256K1_LOW_S_MAX_HEX =
-	"7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0";
-const isLowerHexByteV2 = (value: number): boolean =>
-	(value >= 0x30 && value <= 0x39) || (value >= 0x61 && value <= 0x66);
-const assertCanonicalSecp256k1SignatureV2 = (signature: Uint8Array): void => {
-	if (
-		signature.byteLength !== SECP256K1_SIGNATURE_TEXT_BYTES ||
-		signature[0] !== 0x30 ||
-		signature[1] !== 0x78
-	) {
-		throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-	}
-	for (let i = 2; i < signature.byteLength; i++) {
-		if (!isLowerHexByteV2(signature[i]!)) {
-			throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-		}
-	}
-	if (
-		signature[130] !== 0x31 ||
-		(signature[131] !== 0x62 && signature[131] !== 0x63)
-	) {
-		throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-	}
-	for (let i = 0; i < SECP256K1_LOW_S_MAX_HEX.length; i++) {
-		const actual = signature[66 + i]!;
-		const maximum = SECP256K1_LOW_S_MAX_HEX.charCodeAt(i);
-		if (actual < maximum) break;
-		if (actual > maximum) {
-			throw new Error("Authority EntryV0 secp256k1 signature is not canonical");
-		}
-	}
-};
-const canonicalDirectParentsV2 = (
-	parents: string[],
-): Array<{ cid: string; digest: Uint8Array }> => {
-	const seen = new Set<string>();
-	return parents.map((cid) => {
-		let parsed: ReturnType<typeof cidifyString>;
-		try {
-			parsed = cidifyString(cid);
-		} catch {
-			throw new Error(
-				"Authority EntryV0 direct parents must use canonical CIDv1/raw/sha2-256",
-			);
-		}
-		if (
-			!cid ||
-			parsed.version !== 1 ||
-			parsed.code !== codecMap.raw.code ||
-			parsed.multihash.code !== defaultHasher.code ||
-			parsed.multihash.digest.byteLength !== 32 ||
-			stringifyCid(parsed) !== cid
-		) {
-			throw new Error(
-				"Authority EntryV0 direct parents must use canonical CIDv1/raw/sha2-256",
-			);
-		}
-		if (seen.has(cid)) {
-			throw new Error("Authority EntryV0 direct parents must be unique");
-		}
-		seen.add(cid);
-		return {
-			cid,
-			digest: copyUint8ArrayWithLengthV2(
-				parsed.multihash.digest,
-				parsed.multihash.digest.byteLength,
-			),
-		};
-	});
-};
 type ResourceFenceEntryV0ProfileV2 = {
 	meta: Meta;
 	directParents: Array<{ cid: string; digest: Uint8Array }>;
@@ -156,9 +77,12 @@ const assertResourceFenceEntryV0ProfileV2 = (
 	}
 	const signature = authenticated.entry.signatures[0]!;
 	if (serialize(signature.publicKey)[0] === 1) {
-		assertCanonicalSecp256k1SignatureV2(signature.signature);
+		assertCanonicalSecp256k1SignatureV2(signature.signature, "Authority");
 	}
-	return { meta, directParents: canonicalDirectParentsV2(meta.next) };
+	return {
+		meta,
+		directParents: canonicalDirectParentsV2(meta.next, "Authority"),
+	};
 };
 export type AuthenticatedResourceFenceEntryV2 = Readonly<{