@parity/product-sdk-terminal 0.0.0-dev.454.0 → 0.0.0-dev.457.0

package/dist/index.js

@@ -1,5 +1,5 @@
-import { cacheFilePath, withFileLock, loadJsonCache, saveJsonCache } from './chunk-EORPX5XL.js';
-export { requestResourceAllocation, sendResourceAllocation } from './chunk-EORPX5XL.js';
+import { cacheFilePath, withFileLock, loadJsonCache, saveJsonCache } from './chunk-L75TTEEA.js';
+export { requestResourceAllocation, sendResourceAllocation } from './chunk-L75TTEEA.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';
@@ -7,10 +7,10 @@ export { AllowanceError, SS_STABLE_STAGE_ENDPOINTS } from '@novasamatech/host-pa
 import { createLazyClient, createPapiStatementStoreAdapter, NoAllowanceError } from '@novasamatech/statement-store';
 import { createLogger } from '@parity/product-sdk-logger';
 import { getWsProvider } from '@polkadot-api/ws-provider';
-import { resolveTxExtVersion } from '@parity/product-sdk-host/tx-ext-version';
 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 { createHostTxCreator } from '@parity/product-sdk-host/tx-creator';
 import { toHex, fromHex } from '@polkadot-api/utils';
 import { gcm } from '@noble/ciphers/aes.js';
 import { blake2b } from '@noble/hashes/blake2.js';
@@ -198,30 +198,20 @@ function toAllowanceExpiredError(error) {
 function toProductAccountId(ref) {
   return [ref.productId, { tag: "Index", value: ref.derivationIndex }];
 }
-function buildCreateTransactionRequest(productAccountId, callData, signedExtensions, txExtVersion) {
-  const checkGenesis = signedExtensions.CheckGenesis;
-  if (!checkGenesis) {
-    throw new Error(
-      "Cannot build transaction: chain did not provide the CheckGenesis signed extension"
-    );
-  }
+function buildCreateTransactionRequest(productAccountId, request) {
   return {
     payload: {
       tag: "v1",
       value: {
         signer: productAccountId,
-        // CheckGenesis carries the genesis hash as its additionalSigned (implicit) data.
-        // `toHex` is typed `string`; the codec wants the 0x literal type.
-        genesisHash: toHex(checkGenesis.additionalSigned),
-        callData,
-        extensions: Object.values(signedExtensions).map(
-          ({ identifier, value, additionalSigned }) => ({
-            id: identifier,
-            extra: value,
-            additionalSigned
-          })
-        ),
-        txExtVersion
+        genesisHash: request.genesisHash,
+        callData: fromHex(request.callData),
+        extensions: request.extensions.map(({ id, extra, additionalSigned }) => ({
+          id,
+          extra: fromHex(extra),
+          additionalSigned: fromHex(additionalSigned)
+        })),
+        txExtVersion: request.txExtVersion
       }
     }
   };
@@ -235,17 +225,6 @@ async function requestSignedTransaction(session, request) {
   }
   return result.value;
 }
-function makeTxSignTx(session, productAccountId, txExtVersion) {
-  return async (callData, signedExtensions, metadata) => requestSignedTransaction(
-    session,
-    buildCreateTransactionRequest(
-      productAccountId,
-      callData,
-      signedExtensions,
-      txExtVersion ?? resolveTxExtVersion(metadata, signedExtensions)
-    )
-  );
-}
 function makeRawBytesSignCallback(session, productAccountId) {
   return async (data) => {
     const result = await session.signRaw({
@@ -276,17 +255,17 @@ async function deriveProductPublicKey(session, ref, options) {
 async function buildSessionSigner(session, ref, options) {
   const productAccountId = toProductAccountId(ref);
   const publicKey = ref.publicKey ?? await deriveProductPublicKey(session, ref, options);
-  return {
+  return createHostTxCreator(
     publicKey,
-    // Transaction signing → host-papp `createTransaction`: the wallet builds
-    // and signs the extrinsic, so it can show a decoded tx (no `<Bytes>`
-    // envelope) and unknown signed extensions (e.g. `AsPgas`) survive.
-    signTx: makeTxSignTx(session, productAccountId, options?.txExtVersion),
-    // Arbitrary-byte signing keeps the `Bytes` tag so the wallet applies the
-    // `<Bytes>...</Bytes>` anti-phishing envelope exactly once on its side
-    // (correct for non-extrinsic user data).
-    signBytes: makeRawBytesSignCallback(session, productAccountId)
-  };
+    async (request) => toHex(
+      await requestSignedTransaction(
+        session,
+        buildCreateTransactionRequest(productAccountId, request)
+      )
+    ),
+    makeRawBytesSignCallback(session, productAccountId),
+    options?.txExtVersion ?? 0
+  );
 }
 function createSessionSigner(session, adapter, publicKey, options) {
   return buildSessionSigner(
@@ -348,6 +327,8 @@ function resolveSessionId(adapter, sessionId) {
 async function getBulletinSigner(adapter, productId, sessionId) {
   const resolvedSessionId = resolveSessionId(adapter, sessionId);
   return adapter.allowance.getBulletinSigner(resolvedSessionId, productId).match(
+    // host-papp 0.12 builds this with `getTxCreator`, so it carries
+    // `publicKey` and `signBytes`, but its declared type is plain `TxCreator`.
     (signer) => signer,
     (err) => {
       throw err;