@parity/product-sdk-terminal 0.9.1 → 0.10.0

package/dist/index.js

@@ -1,4 +1,5 @@
-export { requestResourceAllocation, sendResourceAllocation } from './chunk-OKJQEB6P.js';
+import { cacheFilePath, withFileLock, loadJsonCache, saveJsonCache } from './chunk-EORPX5XL.js';
+export { requestResourceAllocation, sendResourceAllocation } from './chunk-EORPX5XL.js';
 import { createNodeStorageAdapter, sanitizeKey } from './chunk-GHOFKVUG.js';
 export { createNodeStorageAdapter } from './chunk-GHOFKVUG.js';
 import { SS_PREVIEW_STAGE_ENDPOINTS, createPappAdapter, AllowanceError } from '@novasamatech/host-papp';
@@ -10,7 +11,7 @@ import { unifyMetadata, decAnyMetadata } from '@polkadot-api/substrate-bindings'
 import { deriveProductAccountPublicKey } from '@parity/product-sdk-keys';
 import { AllowanceExpiredError } from '@parity/product-sdk-signer/errors';
 export { AllowanceExpiredError, SignerError } from '@parity/product-sdk-signer/errors';
-import { fromHex, toHex } from '@polkadot-api/utils';
+import { toHex, fromHex } from '@polkadot-api/utils';
 import { gcm } from '@noble/ciphers/aes.js';
 import { blake2b } from '@noble/hashes/blake2.js';
 import { readFile } from 'fs/promises';
@@ -112,6 +113,70 @@ async function teardown(sessions, lazyClient) {
     restore();
   }
 }
+var log2 = createLogger("terminal");
+var CACHE_KIND = "ProductSubtrees";
+var CACHE_VERSION = 1;
+var SUBTREE_KEY_BYTES = 32;
+var memo = /* @__PURE__ */ new Map();
+function entryKey(session, productId) {
+  return `${session.id}::${productId}`;
+}
+async function requestSubtree(session, productId) {
+  const result = await session.getProductSubtree(productId);
+  if (result.isErr()) {
+    throw new Error(`Could not fetch the product subtree key: ${result.error.message}`);
+  }
+  const key = new Uint8Array(result.value);
+  if (key.length !== SUBTREE_KEY_BYTES) {
+    throw new Error(
+      `Product subtree key must be ${SUBTREE_KEY_BYTES} bytes, got ${key.length}`
+    );
+  }
+  return key;
+}
+function getProductSubtreePublicKey(session, productId, options = {}) {
+  const path = cacheFilePath(options.appId ?? productId, CACHE_KIND, options.storageDir);
+  const key = `${path}::${entryKey(session, productId)}`;
+  const inFlight = memo.get(key);
+  if (inFlight) return inFlight;
+  const pending = resolveSubtree(session, productId, path, entryKey(session, productId));
+  memo.set(key, pending);
+  pending.catch(() => memo.delete(key));
+  return pending;
+}
+async function resolveSubtree(session, productId, path, entry) {
+  return withFileLock(path, async () => {
+    const cache = await loadJsonCache(
+      path,
+      CACHE_VERSION,
+      "product-subtree cache"
+    );
+    const stored = readEntry(cache, entry, path);
+    if (stored) return stored;
+    const fetched = await requestSubtree(session, productId);
+    const entries = typeof cache?.entries === "object" && cache.entries !== null ? cache.entries : {};
+    await saveJsonCache(path, {
+      version: CACHE_VERSION,
+      entries: { ...entries, [entry]: toHex(fetched) }
+    });
+    return fetched;
+  });
+}
+function readEntry(cache, entry, path) {
+  const stored = cache?.entries?.[entry];
+  if (typeof stored !== "string") return null;
+  let bytes;
+  try {
+    bytes = fromHex(stored);
+  } catch {
+    bytes = new Uint8Array();
+  }
+  if (bytes.length === SUBTREE_KEY_BYTES) return bytes;
+  log2.warn("product-subtree cache entry is malformed; refetching", { path });
+  return null;
+}
+
+// src/signer.ts
 function isNoAllowanceError(error) {
   for (let current = error, depth = 0; current != null && depth < 8; depth++) {
     if (current instanceof NoAllowanceError) return true;
@@ -221,16 +286,13 @@ function sessionRootPublicKey(session) {
   }
   return publicKey;
 }
-function deriveProductPublicKey(session, ref) {
-  return deriveProductAccountPublicKey(
-    sessionRootPublicKey(session),
-    ref.productId,
-    ref.derivationIndex
-  );
+async function deriveProductPublicKey(session, ref, options) {
+  const subtree = await getProductSubtreePublicKey(session, ref.productId, options);
+  return deriveProductAccountPublicKey(subtree, { tag: "Index", value: ref.derivationIndex });
 }
-function buildSessionSigner(session, ref) {
+async function buildSessionSigner(session, ref, options) {
   const productAccountId = toProductAccountId(ref);
-  const publicKey = ref.publicKey ?? deriveProductPublicKey(session, ref);
+  const publicKey = ref.publicKey ?? await deriveProductPublicKey(session, ref, options);
   return {
     publicKey,
     // Transaction signing → host-papp `createTransaction`: the wallet builds
@@ -243,11 +305,15 @@ function buildSessionSigner(session, ref) {
     signBytes: makeRawBytesSignCallback(session, productAccountId)
   };
 }
-function createSessionSigner(session, adapter, publicKey) {
-  return buildSessionSigner(session, { productId: adapter.appId, derivationIndex: 0, publicKey });
+function createSessionSigner(session, adapter, publicKey, options) {
+  return buildSessionSigner(
+    session,
+    { productId: adapter.appId, derivationIndex: 0, publicKey },
+    { appId: adapter.appId, ...options }
+  );
 }
-function createSessionSignerForAccount(session, ref) {
-  return buildSessionSigner(session, ref);
+function createSessionSignerForAccount(session, ref, options) {
+  return buildSessionSigner(session, ref, options);
 }
 var AllowanceResourceKindCodec = Enum({
   bulletin: _void,
@@ -367,6 +433,6 @@ async function renderQrCode(data, options) {
   return result;
 }
 
-export { INCOMPLETE_SESSION_MESSAGE, StatementStoreNetworks, createSessionSigner, createSessionSignerForAccount, createTerminalAdapter, deriveProductPublicKey, getBulletinSigner, getStatementStoreProver, hasBulletinAllowance, hasStatementStoreAllowance, isBenignTeardownError, renderQrCode, sessionRootPublicKey, waitForSessions };
+export { INCOMPLETE_SESSION_MESSAGE, StatementStoreNetworks, createSessionSigner, createSessionSignerForAccount, createTerminalAdapter, deriveProductPublicKey, getBulletinSigner, getProductSubtreePublicKey, getStatementStoreProver, hasBulletinAllowance, hasStatementStoreAllowance, isBenignTeardownError, renderQrCode, sessionRootPublicKey, waitForSessions };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map