@sig-net/midnight 0.19.0 → 0.20.0-rc.1

package/dist/signature-requests-state-reader.d.ts

@@ -1,25 +1,9 @@
+import { type RawContractState } from "./raw-contract-state.ts";
 import { type RequestIdHex, type SignBidirectionalEvent, type SignBidirectionalEventIndex } from "./signet-requests.ts";
-import { type RawContractState } from "./signature-state-reading.ts";
-/**
- * Aligned-value entry count of an event record EXCLUDING the capacity-scaled
- * vectors: sender (1) + requestNonce (1) + keyVersion (1) + path (1) +
- * algo (1) + dest (1) + params (1) + txParamType (1, enums are one atom
- * whatever their byte width) + the EvmType2TxParams fixed fields
- * (chainId..value = 7, accessListEntryCount = 1) + the calldata Maybe's
- * is_some (1), selector (1) and noWords (1) + caip2Id (1) + the two schema
- * fields (1 each). A stored event cell therefore holds
- *   `REQUEST_FIXED_VALUE_ATOMS + maxCalldataWords
- *      + maxAccessListEntries·(2 + maxStorageKeysPerEntry)`
- * entries (each calldata word is one Bytes<32> atom, and each access-list
- * entry is address + storageKeyCount + its keys).
- */
-export declare const REQUEST_FIXED_VALUE_ATOMS = 22;
 /**
  * The decoded signet ledger fields of a requesting contract: its request
  * index and its contract-local request counter (Compact `Counter`), the
- * source of each request's `requestNonce`. Nothing off-chain depends on the
- * counter: it is decoded here only because both fields travel together in
- * tests and diagnostics.
+ * source of each request's `requestNonce`.
  */
 export interface SignetRequestsLedger {
     /** The request counter (`Counter`). */
@@ -29,47 +13,37 @@ export interface SignetRequestsLedger {
 }
 /**
  * MPC-style read: parse the signet ledger fields out of raw contract state
- * by field position alone, with no compiled contract and no generated
- * `ledger()`, only the caller-supplied field positions and the canonical descriptors
- * from signet-requests.ts. A contract chooses its own layout, so the caller
- * must know where the fields sit (the caller contract in this repo uses
- * index 0 / counter 1, and a notification names the index position of the
- * contract it points at).
+ * by caller-supplied field positions. A contract chooses its own layout, so
+ * the caller must know where the fields sit.
+ *
+ * Records are decoded, not verified against the ids they are filed under:
+ * {@link lookupSignetRequestAt} is the verified lookup.
  *
  * @param raw - Raw contract state, e.g. `queryContractState(address).data`
  *   from the indexer or `ctx.currentQueryContext.state` from the simulator.
  * @param requestsIndexPath - Resolved ledger-tree path of the request index.
  * @param noncePath - Resolved ledger-tree path of the request counter.
  * @returns The decoded {@link SignetRequestsLedger}.
- * @throws Error if a field is missing, has the wrong state-value shape, or a
- *   record matches no capacity split.
+ * @throws {Error} If a field is missing, has the wrong state-value shape, or a
+ *   record is not a decodable evmType2 request record.
  */
 export declare function readSignetRequestsLedgerFromState(raw: RawContractState, requestsIndexPath: readonly number[], noncePath: readonly number[]): SignetRequestsLedger;
 /**
  * Look up ONE request by id in a contract's request index at an arbitrary
- * ledger field, the single-record sibling of
- * {@link readSignetRequestsLedgerFromState}: the discovery primitive of the
- * event-based feed and what a point verification uses. A notification
- * declares the stored request's id and names both the requester contract
- * AND which field holds its index.
- *
- * `undefined` means the id is NOT a member of the index at `requestsPath`
- * (the pointer is forged, stale, points at the wrong field, or the request is
- * not yet indexed) and the caller MUST drop it.
- * Every non-membership case (field out of range, field is not a Map, id absent,
- * a cell that fails to decode) returns `undefined` rather than throwing, so a
- * malformed or adversarial notification can never crash the reader.
- *
- * Only the matched record is decoded, and it is decoded
- * by the same {@link decodeSignBidirectionalEvent} the full reader uses, so
- * the result is `toEqual` to `readSignetRequestsLedgerFromState(raw,
- * fieldIndex, …).requestsIndex.get(requestId)`.
+ * ledger field: the single-record sibling of
+ * {@link readSignetRequestsLedgerFromState} and the discovery primitive of
+ * the event-based feed. The recompute-and-drop gate: the decode never sees
+ * the id, so the final recompute is the only thing binding a record's
+ * contents to the key it was filed under, and a mismatch (a spoofed or
+ * wrongly filed record) is dropped. Every non-membership case returns
+ * `undefined` rather than throwing, and the caller MUST drop such a pointer.
  *
  * @param raw - Raw contract state, e.g. `queryContractState(address).data`.
  * @param requestsPath - Resolved ledger-tree path of the request index in
  *   `raw`, as the notification carries it.
  * @param requestId - The request id to look up.
- * @returns The stored request record, or `undefined` when it is not a member.
+ * @returns The stored, id-verified request record, or `undefined` when it is
+ *   not a member.
  */
 export declare function lookupSignetRequestAt(raw: RawContractState, requestsPath: readonly number[], requestId: RequestIdHex): SignBidirectionalEvent | undefined;
 //# sourceMappingURL=signature-requests-state-reader.d.ts.map

package/dist/signature-requests-state-reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signature-requests-state-reader.d.ts","sourceRoot":"","sources":["../src/signature-requests-state-reader.ts"],"names":[],"mappings":"AAmBA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,sBAAsB,EAC3B,KAAK,2BAA2B,EACjC,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAEtC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AA6F5C;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,aAAa,EAAE,2BAA2B,CAAC;CAC5C;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,gBAAgB,EACrB,iBAAiB,EAAE,SAAS,MAAM,EAAE,EACpC,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,oBAAoB,CAqBtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,gBAAgB,EACrB,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,SAAS,EAAE,YAAY,GACtB,sBAAsB,GAAG,SAAS,CA2BpC"}
+{"version":3,"file":"signature-requests-state-reader.d.ts","sourceRoot":"","sources":["../src/signature-requests-state-reader.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,yBAAyB,CAAC;AAGvF,OAAO,EAEL,KAAK,YAAY,EAGjB,KAAK,sBAAsB,EAC3B,KAAK,2BAA2B,EAEjC,MAAM,sBAAsB,CAAC;AAwC9B;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,aAAa,EAAE,2BAA2B,CAAC;CAC5C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iCAAiC,CAC/C,GAAG,EAAE,gBAAgB,EACrB,iBAAiB,EAAE,SAAS,MAAM,EAAE,EACpC,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,oBAAoB,CAoBtB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,gBAAgB,EACrB,YAAY,EAAE,SAAS,MAAM,EAAE,EAC/B,SAAS,EAAE,YAAY,GACtB,sBAAsB,GAAG,SAAS,CA+BpC"}

package/dist/signature-requests-state-reader.js

@@ -1,125 +1,67 @@
-// MPC-style raw state reader for the signature-REQUESTS side: decode the signet
-// request ledger fields out of a contract's raw state WITHOUT the compiled
-// contract. This is how the MPC monitor consumes signet contracts: it has only
-// a contract address, queries raw state from the indexer
-// (queryContractState(address).data), and decodes by ledger-tree PATH.
-// A contract is free to place its request index at any field: the caller
-// supplies the resolved path, which the discovery path learns from the
-// notification's requestsPath (sourced from the caller's contract-info.json).
-// The compiled contract's generated ledger() follows exactly this path internally.
-// The record descriptors themselves are the parameterised twins in
-// signet-requests.ts. The generic tree walk and shared base descriptors live
-// in signature-state-reading.ts.
-import { calculateRequestId, signBidirectionalEventDescriptor, } from "./signet-evtype2tx-requests.js";
-import { requestIdHex, } from "./signet-requests.js";
-import { requestIdType, signetFieldNodeByPath, u64, } from "./signature-state-reading.js";
+// MPC-style raw state reader for the signature-REQUESTS side: read the
+// signet request ledger fields out of a contract's raw state by resolved
+// ledger-tree path, as the MPC monitor and the event feed consume signet
+// contracts. The generic tree walk lives in raw-contract-state.ts and the
+// per-decomposition record decoding in signet-evtype2tx-record-decoding.ts.
+//
+// The read algorithm is the TS twin of the MPC's Rust reader
+// (chain-signatures/chain-midnight/src/reader.rs) and must stay in lockstep
+// with it: each record is decoded once, and id verification is a separate
+// recompute-and-drop gate ({@link lookupSignetRequestAt}).
+import { decodeExactly, UINT_64 } from "./compact-descriptors.js";
+import { signetFieldNodeByPath } from "./raw-contract-state.js";
+import { decodeEvmType2SignBidirectionalEvent } from "./signet-evtype2tx-record-decoding.js";
+import { calculateRequestId } from "./signet-request-id.js";
+import { requestIdBytes, requestIdHex, requestIdType, TxParamType, } from "./signet-requests.js";
+// Atom position of `txParamType` in a stored record: the chain-agnostic head
+// of SignBidirectionalEvent (sender through txParamType) occupies the first
+// 8 atoms whatever the decomposition, so the tag sits at the same index in
+// every record.
+const TX_PARAM_TYPE_ATOM = 7;
 /**
- * Aligned-value entry count of an event record EXCLUDING the capacity-scaled
- * vectors: sender (1) + requestNonce (1) + keyVersion (1) + path (1) +
- * algo (1) + dest (1) + params (1) + txParamType (1, enums are one atom
- * whatever their byte width) + the EvmType2TxParams fixed fields
- * (chainId..value = 7, accessListEntryCount = 1) + the calldata Maybe's
- * is_some (1), selector (1) and noWords (1) + caip2Id (1) + the two schema
- * fields (1 each). A stored event cell therefore holds
- *   `REQUEST_FIXED_VALUE_ATOMS + maxCalldataWords
- *      + maxAccessListEntries·(2 + maxStorageKeysPerEntry)`
- * entries (each calldata word is one Bytes<32> atom, and each access-list
- * entry is address + storageKeyCount + its keys).
- */
-export const REQUEST_FIXED_VALUE_ATOMS = 22;
-/**
- * Recover a record's capacity instantiation (maxCalldataWords,
- * maxAccessListEntries, maxStorageKeysPerEntry) from its aligned-value atom
- * count and decode it. One atom count does not determine the capacities
- * uniquely, so candidates are enumerated, access-list-free first (today's
- * producers, the caller contract <1, 0, 0> and the erc20-vault example
- * <2, 0, 0>, are all access-list-free), and validated by the decode itself:
- * the descriptors' Bytes length checks and the enum range check reject wrong
- * splits, and a decode that leaves atoms unconsumed is rejected here.
+ * Decode a stored request record: read the `txParamType` tag and hand the
+ * cell to that decomposition's decoder, so a foreign param type fails by
+ * name rather than as capacity arithmetic. Does NOT verify the record
+ * against the id it is filed under.
  *
- * The schema byte widths (`#LenOutputDeserialization`,
- * `#LenRespondSerialization`) are read from the LAST TWO atoms' actual byte
- * lengths. That works because the state layer stores atoms with trailing
- * zeros trimmed and schemas are exact-length by protocol convention (JSON
- * schema strings sized to fit, never NUL-padded, never ending in a zero
- * byte), so stored length == declared length. A contract that padded its
- * schema capacity with trailing zeros would decode to the trimmed width and
- * fail the request-id recompute, which is the authoritative check anyway.
- *
- * @param atoms - The record cell's aligned value (a fresh copy per attempt).
- * @param expectedRequestId - The id the record is stored under, used to pick
- *   between splits when more than one decodes cleanly.
+ * @param cell - The record cell as stored (value atoms plus alignment).
  * @returns The decoded record.
- * @throws Error if no capacity split decodes the value cleanly.
+ * @throws {Error} If the cell is not a decodable request record of a known
+ *   decomposition.
  */
-function decodeSignBidirectionalEvent(atoms, expectedRequestId) {
-    const variable = atoms.length - REQUEST_FIXED_VALUE_ATOMS;
-    if (variable < 0) {
-        throw new Error(`request record has ${atoms.length} value entries: fewer than the ` +
-            `${REQUEST_FIXED_VALUE_ATOMS} its fixed fields need`);
+function decodeSignBidirectionalEvent(cell) {
+    const what = "request record";
+    const atom = cell.value[TX_PARAM_TYPE_ATOM];
+    if (atom === undefined) {
+        throw new Error(`${what} ends before txParamType`);
     }
-    const lenOutputDeserialization = atoms[atoms.length - 2].length;
-    const lenRespondSerialization = atoms[atoms.length - 1].length;
-    const attempt = (maxWords, maxEntries, maxKeys) => {
-        const cursor = [...atoms];
-        try {
-            const record = signBidirectionalEventDescriptor(maxWords, maxEntries, maxKeys, lenOutputDeserialization, lenRespondSerialization).fromValue(cursor);
-            // A clean decode consumes the record exactly.
-            return cursor.length === 0 ? record : undefined;
-        }
-        catch {
-            return undefined;
-        }
-    };
-    // Several splits can decode cleanly (an access-list entry's 20-byte address atom
-    // re-pads into a 32-byte calldata word just as well), so only the id the record is
-    // filed under separates them. This disambiguates but does not authenticate (the MPC
-    // recomputes against the sender-bound id before signing).
-    //
-    // First match wins, so the common access-list-free case stays at one decode.
-    // `fallback` preserves the pre-recompute behaviour when no split matches the id.
-    let fallback;
-    const take = (record) => {
-        if (record === undefined)
-            return false;
-        fallback ??= record;
-        return requestIdHex(calculateRequestId(record)) === expectedRequestId;
-    };
-    // No access list: variable atoms are calldata words alone (one atom each).
-    const accessListFree = attempt(variable, 0, 0);
-    if (take(accessListFree))
-        return accessListFree;
-    // With an access list: E entries of (2 + K) atoms, the rest words.
-    for (let entries = 1; entries * 2 <= variable; entries++) {
-        for (let keys = 0; entries * (2 + keys) <= variable; keys++) {
-            const words = variable - entries * (2 + keys);
-            const record = attempt(words, entries, keys);
-            if (take(record))
-                return record;
-        }
+    if (atom.length > 1) {
+        throw new Error(`${what} txParamType atom holds ${String(atom.length)} bytes, expected at most 1`);
     }
-    if (fallback === undefined) {
-        throw new Error(`request record with ${atoms.length} value entries matches no ` +
-            `(calldata words, access-list entries, storage keys) capacity split`);
+    // The state layer trims trailing zeros, so evmType2 (0) arrives empty.
+    const paramType = atom[0] ?? 0;
+    switch (paramType) {
+        case TxParamType.evmType2:
+            return decodeEvmType2SignBidirectionalEvent(cell, what);
+        default:
+            throw new Error(`unsupported txParamType ${String(paramType)}`);
     }
-    return fallback;
 }
 /**
  * MPC-style read: parse the signet ledger fields out of raw contract state
- * by field position alone, with no compiled contract and no generated
- * `ledger()`, only the caller-supplied field positions and the canonical descriptors
- * from signet-requests.ts. A contract chooses its own layout, so the caller
- * must know where the fields sit (the caller contract in this repo uses
- * index 0 / counter 1, and a notification names the index position of the
- * contract it points at).
+ * by caller-supplied field positions. A contract chooses its own layout, so
+ * the caller must know where the fields sit.
+ *
+ * Records are decoded, not verified against the ids they are filed under:
+ * {@link lookupSignetRequestAt} is the verified lookup.
  *
  * @param raw - Raw contract state, e.g. `queryContractState(address).data`
  *   from the indexer or `ctx.currentQueryContext.state` from the simulator.
  * @param requestsIndexPath - Resolved ledger-tree path of the request index.
  * @param noncePath - Resolved ledger-tree path of the request counter.
  * @returns The decoded {@link SignetRequestsLedger}.
- * @throws Error if a field is missing, has the wrong state-value shape, or a
- *   record matches no capacity split.
+ * @throws {Error} If a field is missing, has the wrong state-value shape, or a
+ *   record is not a decodable evmType2 request record.
  */
 export function readSignetRequestsLedgerFromState(raw, requestsIndexPath, noncePath) {
     const map = signetFieldNodeByPath(raw, requestsIndexPath).asMap();
@@ -128,45 +70,35 @@ export function readSignetRequestsLedgerFromState(raw, requestsIndexPath, nonceP
     }
     const requestsIndex = new Map();
     for (const key of map.keys()) {
-        // fromValue consumes its input, so hand each descriptor a copy.
-        const requestId = requestIdHex(requestIdType.fromValue([...key.value]));
+        const requestId = requestIdHex(decodeExactly(requestIdType, key.value, "request index key"));
         const cell = map.get(key)?.asCell();
         if (cell === undefined)
             continue;
-        requestsIndex.set(requestId, decodeSignBidirectionalEvent(cell.value, requestId));
+        requestsIndex.set(requestId, decodeSignBidirectionalEvent(cell));
     }
-    const nonceCell = signetFieldNodeByPath(raw, noncePath).asCell();
-    if (nonceCell === undefined) {
+    const nonceField = signetFieldNodeByPath(raw, noncePath);
+    if (nonceField.type() !== "cell") {
         throw new Error(`Ledger field at path ${JSON.stringify(noncePath)} is not a Cell`);
     }
-    const nonce = u64.fromValue([...nonceCell.value]);
+    const nonce = decodeExactly(UINT_64, nonceField.asCell().value, "request counter");
     return { nonce, requestsIndex };
 }
 /**
  * Look up ONE request by id in a contract's request index at an arbitrary
- * ledger field, the single-record sibling of
- * {@link readSignetRequestsLedgerFromState}: the discovery primitive of the
- * event-based feed and what a point verification uses. A notification
- * declares the stored request's id and names both the requester contract
- * AND which field holds its index.
- *
- * `undefined` means the id is NOT a member of the index at `requestsPath`
- * (the pointer is forged, stale, points at the wrong field, or the request is
- * not yet indexed) and the caller MUST drop it.
- * Every non-membership case (field out of range, field is not a Map, id absent,
- * a cell that fails to decode) returns `undefined` rather than throwing, so a
- * malformed or adversarial notification can never crash the reader.
- *
- * Only the matched record is decoded, and it is decoded
- * by the same {@link decodeSignBidirectionalEvent} the full reader uses, so
- * the result is `toEqual` to `readSignetRequestsLedgerFromState(raw,
- * fieldIndex, …).requestsIndex.get(requestId)`.
+ * ledger field: the single-record sibling of
+ * {@link readSignetRequestsLedgerFromState} and the discovery primitive of
+ * the event-based feed. The recompute-and-drop gate: the decode never sees
+ * the id, so the final recompute is the only thing binding a record's
+ * contents to the key it was filed under, and a mismatch (a spoofed or
+ * wrongly filed record) is dropped. Every non-membership case returns
+ * `undefined` rather than throwing, and the caller MUST drop such a pointer.
  *
  * @param raw - Raw contract state, e.g. `queryContractState(address).data`.
  * @param requestsPath - Resolved ledger-tree path of the request index in
  *   `raw`, as the notification carries it.
  * @param requestId - The request id to look up.
- * @returns The stored request record, or `undefined` when it is not a member.
+ * @returns The stored, id-verified request record, or `undefined` when it is
+ *   not a member.
  */
 export function lookupSignetRequestAt(raw, requestsPath, requestId) {
     let node;
@@ -180,22 +112,26 @@ export function lookupSignetRequestAt(raw, requestsPath, requestId) {
     if (map === undefined) {
         return undefined; // the named field is not a request index
     }
-    for (const key of map.keys()) {
-        // fromValue consumes its input, so hand each descriptor a copy.
-        if (requestIdHex(requestIdType.fromValue([...key.value])) !== requestId) {
-            continue;
-        }
-        const cell = map.get(key)?.asCell();
-        if (cell === undefined) {
-            return undefined;
-        }
-        try {
-            return decodeSignBidirectionalEvent(cell.value, requestId);
-        }
-        catch {
-            return undefined; // a cell that is not a decodable request record
-        }
+    // The ledger's own keyed lookup on the ledger's own key type: toValue
+    // produces the canonical (zero-trimmed) key form the map stores.
+    const entry = map.get({
+        value: requestIdType.toValue(requestIdBytes(requestId)),
+        alignment: requestIdType.alignment(),
+    });
+    const cell = entry?.asCell();
+    if (cell === undefined) {
+        return undefined; // id absent, or its entry is not a cell
+    }
+    let record;
+    try {
+        record = decodeSignBidirectionalEvent(cell);
+    }
+    catch {
+        return undefined; // a cell that is not a decodable request record
+    }
+    if (requestIdHex(calculateRequestId(record)) !== requestId) {
+        return undefined; // spoofed or wrongly filed record
     }
-    return undefined; // id absent from the index
+    return record;
 }
 //# sourceMappingURL=signature-requests-state-reader.js.map

package/dist/signature-requests-state-reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature-requests-state-reader.js","sourceRoot":"","sources":["../src/signature-requests-state-reader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signature-requests-state-reader.js","sourceRoot":"","sources":["../src/signature-requests-state-reader.ts"],"names":[],"mappings":"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"}

package/dist/signature-response-verification.d.ts

@@ -1,22 +1,23 @@
-import type { SignBidirectionalEvent } from "./signet-requests.ts";
 import type { SignatureRespondedEvent } from "./signet-contract-events.ts";
+import { type SignBidirectionalEvent } from "./signet-requests.ts";
 /**
- * Recover the EVM address that produced a response signature, over the
- * signing hash of the transaction the request describes.
+ * Recover the address that produced a response signature, over the signing
+ * digest of the transaction the request describes: the response-side
+ * dispatch on the request's `txParamType`.
  *
  * @param request - The on-ledger request record the response answers.
  * @param response - The posted signature record answering it.
  * @returns The checksummed recovered signer address.
- * @throws Error if the response is not a decodable signature or the request
- *   record is malformed (see
+ * @throws {Error} If the request's `txParamType` names a decomposition this
+ *   library does not sign-verify, the response is not a decodable signature,
+ *   or the request record is malformed (see
  *   {@link signBidirectionalEventToUnsignedEvmTransaction}).
  */
 export declare function recoverSignatureResponseSigner(request: SignBidirectionalEvent, response: SignatureRespondedEvent): string;
 /**
  * Verify a posted response against its request: does the signature recover
- * to `expectedSigner`? Never throws: a response that is malformed or signed
- * by anyone else is simply not valid, which is the expected state of affairs
- * on an unauthenticated log.
+ * to `expectedSigner`? Never throws: a malformed or wrongly-signed response
+ * is simply not valid.
  *
  * @param request - The on-ledger request record the response answers.
  * @param response - The posted signature record answering it.

package/dist/signature-response-verification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signature-response-verification.d.ts","sourceRoot":"","sources":["../src/signature-response-verification.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,uBAAuB,GAChC,MAAM,CAKR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,uBAAuB,EACjC,cAAc,EAAE,MAAM,GACrB,OAAO,CAST"}
+{"version":3,"file":"signature-response-verification.d.ts","sourceRoot":"","sources":["../src/signature-response-verification.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,OAAO,EAAE,KAAK,sBAAsB,EAAe,MAAM,sBAAsB,CAAC;AAEhF;;;;;;;;;;;;GAYG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,uBAAuB,GAChC,MAAM,CAUR;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,uBAAuB,EACjC,cAAc,EAAE,MAAM,GACrB,OAAO,CAMT"}

package/dist/signature-response-verification.js

@@ -1,32 +1,36 @@
 // Client-side verification of MPC signature responses. The signet contract
 // emits signature responses UNAUTHENTICATED (see the module header in
-// Signet.compact), so a poller must verify every posted response
-// before trusting it: rebuild the unsigned EVM transaction from the on-ledger
-// request record, assembled exactly as the MPC assembles it (sig-net/mpc
-// response server, managed/erc20-vault/signet/calldata-builder.ts), and
-// check that the posted signature record recovers to the requester's derived
-// EVM address over that transaction's signing hash.
+// Signet.compact), so a poller must verify every posted response before
+// trusting it.
 import { getAddress, recoverAddress } from "ethers";
-import { signBidirectionalEventToUnsignedEvmTransaction, signatureRespondedEventToSignature, } from "./signet-evtype2tx-requests.js";
+import { signatureRespondedEventToSignature } from "./ecdsa-attestation.js";
+import { signBidirectionalEventToUnsignedEvmTransaction } from "./signet-evtype2tx-requests.js";
+import { TxParamType } from "./signet-requests.js";
 /**
- * Recover the EVM address that produced a response signature, over the
- * signing hash of the transaction the request describes.
+ * Recover the address that produced a response signature, over the signing
+ * digest of the transaction the request describes: the response-side
+ * dispatch on the request's `txParamType`.
  *
  * @param request - The on-ledger request record the response answers.
  * @param response - The posted signature record answering it.
  * @returns The checksummed recovered signer address.
- * @throws Error if the response is not a decodable signature or the request
- *   record is malformed (see
+ * @throws {Error} If the request's `txParamType` names a decomposition this
+ *   library does not sign-verify, the response is not a decodable signature,
+ *   or the request record is malformed (see
  *   {@link signBidirectionalEventToUnsignedEvmTransaction}).
  */
 export function recoverSignatureResponseSigner(request, response) {
-    return recoverAddress(signBidirectionalEventToUnsignedEvmTransaction(request).unsignedHash, signatureRespondedEventToSignature(response));
+    switch (request.txParamType) {
+        case TxParamType.evmType2:
+            return recoverAddress(signBidirectionalEventToUnsignedEvmTransaction(request).unsignedHash, signatureRespondedEventToSignature(response));
+        default:
+            throw new Error(`unsupported txParamType ${String(request.txParamType)}`);
+    }
 }
 /**
  * Verify a posted response against its request: does the signature recover
- * to `expectedSigner`? Never throws: a response that is malformed or signed
- * by anyone else is simply not valid, which is the expected state of affairs
- * on an unauthenticated log.
+ * to `expectedSigner`? Never throws: a malformed or wrongly-signed response
+ * is simply not valid.
  *
  * @param request - The on-ledger request record the response answers.
  * @param response - The posted signature record answering it.
@@ -35,8 +39,7 @@ export function recoverSignatureResponseSigner(request, response) {
  */
 export function verifySignatureRespondedEvent(request, response, expectedSigner) {
     try {
-        return (recoverSignatureResponseSigner(request, response) ===
-            getAddress(expectedSigner));
+        return recoverSignatureResponseSigner(request, response) === getAddress(expectedSigner);
     }
     catch {
         return false;

package/dist/signature-response-verification.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature-response-verification.js","sourceRoot":"","sources":["../src/signature-response-verification.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,sEAAsE;AACtE,iEAAiE;AACjE,8EAA8E;AAC9E,yEAAyE;AACzE,wEAAwE;AACxE,6EAA6E;AAC7E,oDAAoD;AAEpD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EACL,8CAA8C,EAC9C,kCAAkC,GACnC,MAAM,gCAAgC,CAAC;AAIxC;;;;;;;;;;GAUG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA+B,EAC/B,QAAiC;IAEjC,OAAO,cAAc,CACnB,8CAA8C,CAAC,OAAO,CAAC,CAAC,YAAY,EACpE,kCAAkC,CAAC,QAAQ,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,6BAA6B,CAC3C,OAA+B,EAC/B,QAAiC,EACjC,cAAsB;IAEtB,IAAI,CAAC;QACH,OAAO,CACL,8BAA8B,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjD,UAAU,CAAC,cAAc,CAAC,CAC3B,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
+{"version":3,"file":"signature-response-verification.js","sourceRoot":"","sources":["../src/signature-response-verification.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,sEAAsE;AACtE,wEAAwE;AACxE,eAAe;AAEf,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAEpD,OAAO,EAAE,kCAAkC,EAAE,MAAM,wBAAwB,CAAC;AAE5E,OAAO,EAAE,8CAA8C,EAAE,MAAM,gCAAgC,CAAC;AAChG,OAAO,EAA+B,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEhF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA+B,EAC/B,QAAiC;IAEjC,QAAQ,OAAO,CAAC,WAAW,EAAE,CAAC;QAC5B,KAAK,WAAW,CAAC,QAAQ;YACvB,OAAO,cAAc,CACnB,8CAA8C,CAAC,OAAO,CAAC,CAAC,YAAY,EACpE,kCAAkC,CAAC,QAAQ,CAAC,CAC7C,CAAC;QACJ;YACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,6BAA6B,CAC3C,OAA+B,EAC/B,QAAiC,EACjC,cAAsB;IAEtB,IAAI,CAAC;QACH,OAAO,8BAA8B,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,UAAU,CAAC,cAAc,CAAC,CAAC;IAC1F,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}