@forestrie/receipt-verify 2.0.0 → 2.1.0

package/dist/grant-codec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grant-codec.d.ts","sourceRoot":"","sources":["../src/grant-codec.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAuDjD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK,CAO3D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG;IACtD,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;CACzB,CAsBA;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CAa3D"}
+{"version":3,"file":"grant-codec.d.ts","sourceRoot":"","sources":["../src/grant-codec.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAiFjD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK,CAS3D;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,UAAU,GAAG;IACtD,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;CACzB,CAuBA;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CAa3D"}

package/dist/grant-codec.js

@@ -18,6 +18,26 @@ function leftPad(b, length) {
     out.set(b, length - b.length);
     return out;
 }
+/**
+ * Grant wire v0 map keys are 0–6; keys 7 (`signer`) and 8 (`kind`) were
+ * retired before this package existed (FOR-580 owner ruling) and must be
+ * rejected here the same way the encoding and canopy-api codecs already do
+ * on the admission path (`packages/shared/encoding/src/grant-codec.ts`,
+ * `packages/apps/canopy-api/src/grant/codec.ts`) — this codec previously
+ * decoded by key number and silently ignored them.
+ */
+function assertNoObsoleteWireKeys(m) {
+    const keys = m instanceof Map
+        ? [...m.keys()]
+        : Object.keys(m)
+            .map(Number)
+            .filter((n) => Number.isFinite(n));
+    for (const k of keys) {
+        if (k === 7 || k === 8) {
+            throw new Error("Grant wire v0: obsolete CBOR keys 7 (signer) and 8 (kind) must not be present; use grantData in the commitment only.");
+        }
+    }
+}
 function mapToGrant(m) {
     const get = (k) => m instanceof Map ? m.get(k) : m[k];
     const requireBstr = (v, minLen = 0) => {
@@ -52,7 +72,9 @@ export function decodeGrantPayload(bytes) {
     if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
         throw new Error("Grant payload must be a CBOR map");
     }
-    return mapToGrant(raw);
+    const m = raw;
+    assertNoObsoleteWireKeys(m);
+    return mapToGrant(m);
 }
 export function decodeGrantResponse(bytes) {
     const raw = decodeCborDeterministic(bytes);
@@ -60,6 +82,7 @@ export function decodeGrantResponse(bytes) {
         throw new Error("Grant response must be a CBOR map");
     }
     const m = raw;
+    assertNoObsoleteWireKeys(m);
     const get = (k) => m instanceof Map ? m.get(k) : m[k];
     const idtimestampVal = get(CBOR_KEY_IDTIMESTAMP);
     if (!(idtimestampVal instanceof Uint8Array) ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forestrie/receipt-verify",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "license": "MIT",
   "type": "module",
   "description": "Offline SCITT grant receipt verification (ADR-0045)",
@@ -29,8 +29,8 @@
   "dependencies": {
     "@noble/hashes": "^1.7.1",
     "@forestrie/chain-rpc": "0.3.0",
-    "@forestrie/encoding": "0.8.0",
-    "@forestrie/merklelog": "0.4.0"
+    "@forestrie/merklelog": "0.4.0",
+    "@forestrie/encoding": "0.8.0"
   },
   "devDependencies": {
     "esbuild": "^0.24.0",

package/src/grant-codec.ts

@@ -25,6 +25,32 @@ function leftPad(b: Uint8Array, length: number): Uint8Array {
   return out;
 }
 
+/**
+ * Grant wire v0 map keys are 0–6; keys 7 (`signer`) and 8 (`kind`) were
+ * retired before this package existed (FOR-580 owner ruling) and must be
+ * rejected here the same way the encoding and canopy-api codecs already do
+ * on the admission path (`packages/shared/encoding/src/grant-codec.ts`,
+ * `packages/apps/canopy-api/src/grant/codec.ts`) — this codec previously
+ * decoded by key number and silently ignored them.
+ */
+function assertNoObsoleteWireKeys(
+  m: Map<number, unknown> | Record<number, unknown>,
+): void {
+  const keys =
+    m instanceof Map
+      ? [...m.keys()]
+      : Object.keys(m as Record<string, unknown>)
+          .map(Number)
+          .filter((n) => Number.isFinite(n));
+  for (const k of keys) {
+    if (k === 7 || k === 8) {
+      throw new Error(
+        "Grant wire v0: obsolete CBOR keys 7 (signer) and 8 (kind) must not be present; use grantData in the commitment only.",
+      );
+    }
+  }
+}
+
 function mapToGrant(m: Map<number, unknown> | Record<number, unknown>): Grant {
   const get = (k: number): unknown =>
     m instanceof Map ? m.get(k) : (m as Record<number, unknown>)[k];
@@ -63,7 +89,9 @@ export function decodeGrantPayload(bytes: Uint8Array): Grant {
   if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
     throw new Error("Grant payload must be a CBOR map");
   }
-  return mapToGrant(raw as Map<number, unknown> | Record<number, unknown>);
+  const m = raw as Map<number, unknown> | Record<number, unknown>;
+  assertNoObsoleteWireKeys(m);
+  return mapToGrant(m);
 }
 
 export function decodeGrantResponse(bytes: Uint8Array): {
@@ -75,6 +103,7 @@ export function decodeGrantResponse(bytes: Uint8Array): {
     throw new Error("Grant response must be a CBOR map");
   }
   const m = raw as Map<number, unknown> | Record<number, unknown>;
+  assertNoObsoleteWireKeys(m);
   const get = (k: number): unknown =>
     m instanceof Map ? m.get(k) : (m as Record<number, unknown>)[k];
   const idtimestampVal = get(CBOR_KEY_IDTIMESTAMP);