@pushchain/core 5.1.5-alpha.1 → 5.1.6

package/src/lib/orchestrator/internals/confirmation.js

@@ -18,10 +18,10 @@ const context_2 = require("./context");
 function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmations, timeoutMs) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (confirmations <= 0) {
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, 0, 0);
+            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02, 0, 0);
             return;
         }
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, confirmations);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03, confirmations);
         const start = Date.now();
         const receipt = yield evmClient.publicClient.waitForTransactionReceipt({
             hash: txHash,
@@ -33,7 +33,7 @@ function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmati
             const currentBlock = yield evmClient.publicClient.getBlockNumber();
             if (currentBlock >= targetBlock) {
                 if (lastEmitted < confirmations) {
-                    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, confirmations, confirmations);
+                    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02, confirmations, confirmations);
                 }
                 return;
             }
@@ -41,8 +41,8 @@ function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmati
             const completed = Math.max(1, confirmations - remaining + 1);
             if (completed > lastEmitted) {
                 (0, context_2.fireProgressHook)(ctx, completed >= confirmations
-                    ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02
-                    : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_01, completed, confirmations);
+                    ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02
+                    : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_01, completed, confirmations);
                 lastEmitted = completed;
                 if (completed >= confirmations)
                     return;
@@ -57,10 +57,10 @@ function waitForEvmConfirmationsWithCountdown(ctx, evmClient, txHash, confirmati
 function waitForSvmConfirmationsWithCountdown(ctx, svmClient, txSignature, confirmations, timeoutMs) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (confirmations <= 0) {
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, 0, 0);
+            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02, 0, 0);
             return;
         }
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, confirmations);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03, confirmations);
         const start = Date.now();
         let lastConfirmed = 0;
         // eslint-disable-next-line no-constant-condition
@@ -81,13 +81,13 @@ function waitForSvmConfirmationsWithCountdown(ctx, svmClient, txSignature, confi
                 if (currentConfirms > lastConfirmed) {
                     const clamped = currentConfirms >= confirmations ? confirmations : currentConfirms;
                     (0, context_2.fireProgressHook)(ctx, clamped >= confirmations
-                        ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02
-                        : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_01, Math.max(1, clamped), confirmations);
+                        ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02
+                        : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_01, Math.max(1, clamped), confirmations);
                     lastConfirmed = currentConfirms;
                 }
                 if (hasEnoughConfirmations || isFinalized) {
                     if (lastConfirmed < confirmations) {
-                        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, confirmations, confirmations);
+                        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02, confirmations, confirmations);
                     }
                     return;
                 }
@@ -103,17 +103,62 @@ function waitForLockerFeeConfirmation(ctx, txHashBytes) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const chain = ctx.universalSigner.account.chain;
         const { vm, defaultRPC, fastConfirmations, timeout } = chain_1.CHAIN_INFO[chain];
-        const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
+        // Poll silently — the fee-lock path fires SEND-TX-105-02 as its terminal
+        // confirmation marker; emitting 106-xx here would leak funds-bridge hooks
+        // into a non-funds-bridge path. Uses the same underlying RPC wait as the
+        // funds-bridge confirmation helpers but without the 106-03 / 106-03-02
+        // emissions.
         switch (vm) {
             case enums_1.VM.EVM: {
                 const evmClient = (0, context_1.getOriginEvmClient)(ctx);
-                yield waitForEvmConfirmationsWithCountdown(ctx, evmClient, (0, viem_1.bytesToHex)(txHashBytes), fastConfirmations, timeout);
-                return;
+                const txHash = (0, viem_1.bytesToHex)(txHashBytes);
+                const receipt = yield evmClient.publicClient.waitForTransactionReceipt({
+                    hash: txHash,
+                });
+                if (fastConfirmations <= 1)
+                    return;
+                const targetBlock = receipt.blockNumber + BigInt(fastConfirmations);
+                const start = Date.now();
+                // eslint-disable-next-line no-constant-condition
+                while (true) {
+                    const currentBlock = yield evmClient.publicClient.getBlockNumber();
+                    if (currentBlock >= targetBlock)
+                        return;
+                    if (Date.now() - start > timeout) {
+                        throw new Error(`Timeout: fee-lock tx ${txHash} not confirmed with ${fastConfirmations} confirmations within ${timeout} ms`);
+                    }
+                    yield new Promise((r) => setTimeout(r, 12000));
+                }
             }
             case enums_1.VM.SVM: {
+                const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
                 const svmClient = new svm_client_1.SvmClient({ rpcUrls });
-                yield waitForSvmConfirmationsWithCountdown(ctx, svmClient, bs58_1.bs58.encode(Buffer.from(txHashBytes)), fastConfirmations, timeout);
-                return;
+                const signature = bs58_1.bs58.encode(Buffer.from(txHashBytes));
+                const start = Date.now();
+                // eslint-disable-next-line no-constant-condition
+                while (true) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const connection = svmClient.connections[
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    svmClient.currentConnectionIndex];
+                    const { value } = yield connection.getSignatureStatuses([signature]);
+                    const status = value[0];
+                    if (status) {
+                        if (status.err) {
+                            throw new Error(`SVM fee-lock tx ${signature} failed: ${JSON.stringify(status.err)}`);
+                        }
+                        const isFinalized = status.confirmationStatus === 'finalized' ||
+                            status.confirmations === null;
+                        const hasEnough = status.confirmations != null &&
+                            status.confirmations >= fastConfirmations;
+                        if (isFinalized || hasEnough)
+                            return;
+                    }
+                    if (Date.now() - start > timeout) {
+                        throw new Error(`Timeout: fee-lock tx ${signature} not confirmed with ${fastConfirmations} confirmations within ${timeout} ms`);
+                    }
+                    yield new Promise((r) => setTimeout(r, 500));
+                }
             }
             default:
                 throw new Error(`Unsupported VM for tx confirmation: ${vm}`);

package/src/lib/orchestrator/internals/context.d.ts

@@ -10,6 +10,7 @@ import type { UniversalSigner } from '../../universal/universal.types';
 import type { CHAIN, PUSH_NETWORK } from '../../constants/enums';
 import type { ProgressEvent } from '../../progress-hook/progress-hook.types';
 import type { AccountStatus } from '../orchestrator.types';
+import { TransactionRoute } from '../route-detector';
 import { EvmClient } from '../../vm-client/evm-client';
 export interface OrchestratorContext {
     readonly pushClient: PushClient;
@@ -18,10 +19,26 @@ export interface OrchestratorContext {
     readonly rpcUrls: Partial<Record<CHAIN, string[]>>;
     readonly printTraces: boolean;
     progressHook?: (progress: ProgressEvent) => void;
+    /**
+     * The transaction route currently being executed. Set by
+     * `Orchestrator.execute()` and `Orchestrator.trackTransaction()` before any
+     * submodule fires progress hooks, so route-aware emission code can pick the
+     * correct ID range (101 / 201 / 301). Undefined when no transaction is in
+     * flight (e.g. during account-status reads).
+     */
+    currentRoute?: TransactionRoute;
     ueaVersionCache?: string;
     accountStatusCache: AccountStatus | null;
     /** Cached origin chain EvmClient — avoids creating new clients per call site */
     _originEvmClient?: EvmClient;
+    /**
+     * Set to `true` by inner route handlers after they emit a terminal-ish
+     * error hook (104-04 / 204-04 / 304-04 / 199-02 via execute-standard).
+     * Checked by `Orchestrator.execute()`'s outer catch so it doesn't fire a
+     * second terminal (199-02 / 299-02 / 399-02) on top of the inner one.
+     * Reset to `false` at the start of each `execute()` call.
+     */
+    _routeTerminalEmitted?: boolean;
 }
 /**
  * Returns (and caches) an EvmClient for the signer's origin chain.
@@ -34,5 +51,11 @@ export declare function getOriginEvmClient(ctx: OrchestratorContext): EvmClient;
 export declare function printLog(ctx: OrchestratorContext, msg: string): void;
 /**
  * Fires a progress hook event by ID, forwarding args to the hook factory.
+ *
+ * Suppresses Route 1 IDs when the active route is not R1 — the inner R1
+ * execute pipeline still calls fireProgressHook for events like 101 / 107 /
+ * 199_01, but those describe a Push-perspective view that doesn't match the
+ * R2/R3/R4 lifecycle the consumer is observing. Route handlers emit the
+ * route-specific IDs (201/207/301/307/etc.) explicitly.
  */
 export declare function fireProgressHook(ctx: OrchestratorContext, hookId: string, ...args: any[]): void;

package/src/lib/orchestrator/internals/context.js

@@ -11,9 +11,11 @@ exports.getOriginEvmClient = getOriginEvmClient;
 exports.printLog = printLog;
 exports.fireProgressHook = fireProgressHook;
 const tslib_1 = require("tslib");
+const route_detector_1 = require("../route-detector");
 const chain_1 = require("../../constants/chain");
 const evm_client_1 = require("../../vm-client/evm-client");
 const progress_hook_1 = tslib_1.__importDefault(require("../../progress-hook/progress-hook"));
+const progress_hook_types_1 = require("../../progress-hook/progress-hook.types");
 /**
  * Returns (and caches) an EvmClient for the signer's origin chain.
  * Avoids creating new EvmClient instances in lockFee, confirmation, fetchOriginTx, etc.
@@ -35,10 +37,66 @@ function printLog(ctx, msg) {
         console.log(`[Orchestrator] ${msg}`);
     }
 }
+/**
+ * IDs in the Route 1 range (101–199 + the funds/payload sub-IDs). When the
+ * orchestrator is executing a non-R1 route, these IDs are suppressed at the
+ * fire boundary so emission code in the inner R1 execute pipeline doesn't
+ * leak Route 1 events into a Route 2/3/4 progress stream. The route-specific
+ * IDs (201/207/299, 301/307/399, etc.) are emitted explicitly by the route
+ * handlers and by `wait()` in response-builder.ts.
+ *
+ * Exceptions kept in the stream regardless of route:
+ *   - All UEA migration hooks.
+ *
+ * Separately, the intermediate Push-success markers 199-99-99 (R3) and
+ * 299-99 (R2) are suppressed at `fanOut` in response-builder.ts — they're
+ * internal transition signals, not consumer-facing spec events.
+ */
+const R1_SUPPRESSED_IN_NON_R1 = new Set([
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_101,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_102_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_03,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_03,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_105_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_105_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_03_02,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_06,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_107,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01,
+    progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02,
+]);
+function isR1Route(route) {
+    return route === undefined || route === route_detector_1.TransactionRoute.UOA_TO_PUSH;
+}
 /**
  * Fires a progress hook event by ID, forwarding args to the hook factory.
+ *
+ * Suppresses Route 1 IDs when the active route is not R1 — the inner R1
+ * execute pipeline still calls fireProgressHook for events like 101 / 107 /
+ * 199_01, but those describe a Push-perspective view that doesn't match the
+ * R2/R3/R4 lifecycle the consumer is observing. Route handlers emit the
+ * route-specific IDs (201/207/301/307/etc.) explicitly.
  */
 function fireProgressHook(ctx, hookId, ...args) {
+    if (!isR1Route(ctx.currentRoute) &&
+        R1_SUPPRESSED_IN_NON_R1.has(hookId)) {
+        return;
+    }
     const hookEntry = progress_hook_1.default[hookId];
     const hookPayload = hookEntry(...args);
     printLog(ctx, hookPayload.message);

package/src/lib/orchestrator/internals/execute-funds-only.js

@@ -37,7 +37,7 @@ function executeFundsOnly(ctx, execute, eventBuffer, getResponseCallbacks) {
         if (!helpers_1.SUPPORTED_GATEWAY_CHAINS.includes(chain)) {
             throw new Error(`Funds bridging is not supported on chain ${chain}. Supported chains: ${helpers_1.SUPPORTED_GATEWAY_CHAINS.join(', ')}`);
         }
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain, ctx.universalSigner.account.address);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_101, chain, ctx.universalSigner.account.address);
         const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
         const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
         // Resolve token: default to native token based on VM
@@ -97,10 +97,10 @@ function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
         const ueaBalanceForGas = yield ctx.pushClient.getBalance(ueaAddress);
         const nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, BigInt(0), ueaBalanceForGas);
         (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}`);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02, ueaAddress, deployed);
         (0, context_2.printLog)(ctx, `UEA resolved: ${ueaAddress}, deployed: ${deployed}`);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01, execute.funds.amount, execute.funds.token.decimals, symbol);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_01, execute.funds.amount, execute.funds.token.decimals, symbol);
         // Approve gateway to pull tokens if ERC-20
         if (execute.funds.token.mechanism === 'approve') {
             yield (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClient, tokenAddr, gatewayAddress, execute.funds.amount);
@@ -119,21 +119,35 @@ function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
             txHash = yield (0, gateway_client_1.sendGatewayTxWithFallback)(ctx, evmClient, gatewayAddress, req, ctx.universalSigner, isNative ? nativeAmount + bridgeAmount : nativeAmount);
         }
         catch (err) {
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_04);
+            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04);
             throw err;
         }
         const originTx = yield (0, helpers_2.fetchOriginChainTransactionForProgress)(ctx, chain, txHash, txHash);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
         yield (0, confirmation_1.waitForEvmConfirmationsWithCountdown)(ctx, evmClient, txHash, chain_1.CHAIN_INFO[chain].confirmations, chain_1.CHAIN_INFO[chain].timeout);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05);
         (0, context_2.printLog)(ctx, 'sendFunds — querying Push Chain status: ' + JSON.stringify({
             txHash, evmGatewayMethod: execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds',
         }));
-        const pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds');
-        const response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendFunds', transformFn);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, bridgeAmount, execute.funds.token.decimals, symbol);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+        let response;
+        try {
+            const pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds');
+            // extractPcTxAndTransform fires 199-02 itself on pcTx FAILED; only emit
+            // for non-typed failures (RPC lookup error, timeout).
+            response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendFunds', transformFn);
+        }
+        catch (err) {
+            if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
+                const errMsg = err instanceof Error ? err.message : String(err);
+                (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02, errMsg);
+                throw new push_chain_tx_1.PushChainExecutionError(errMsg, { gatewayTxHash: txHash });
+            }
+            throw err;
+        }
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_06, bridgeAmount, execute.funds.token.decimals, symbol);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_107);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01, [response]);
         return response;
     });
 }
@@ -154,10 +168,10 @@ function executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
             throw new Error('Pay-with token is not supported on Solana');
         }
         const recipientEvm20 = Array.from(Buffer.from(execute.to.slice(2).padStart(40, '0'), 'hex').subarray(0, 20));
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01);
         const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
         const { nonce, deployed } = yield (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02, ueaAddress, deployed);
         let txSignature;
         if (execute.funds.token.mechanism === 'native') {
             const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], programId);
@@ -205,14 +219,26 @@ function executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcU
             throw new Error('Unsupported token mechanism on Solana');
         }
         const originTx = yield (0, helpers_2.fetchOriginChainTransactionForProgress)(ctx, chain, '0x', txSignature);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txSignature, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02, txSignature, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
         yield (0, confirmation_1.waitForSvmConfirmationsWithCountdown)(ctx, svmClient, txSignature, chain_1.CHAIN_INFO[chain].confirmations, chain_1.CHAIN_INFO[chain].timeout);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
-        const pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txSignature, 'sendFunds');
-        const response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txSignature, eventBuffer, 'sendFunds (SVM)', transformFn);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, bridgeAmount, execute.funds.token.decimals, symbol);
-        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05);
+        let response;
+        try {
+            const pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txSignature, 'sendFunds');
+            response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txSignature, eventBuffer, 'sendFunds (SVM)', transformFn);
+        }
+        catch (err) {
+            if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
+                const errMsg = err instanceof Error ? err.message : String(err);
+                (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02, errMsg);
+                throw new push_chain_tx_1.PushChainExecutionError(errMsg, { gatewayTxHash: txSignature });
+            }
+            throw err;
+        }
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_06, bridgeAmount, execute.funds.token.decimals, symbol);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_107);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01, [response]);
         return response;
     });
 }

package/src/lib/orchestrator/internals/execute-funds-payload.js

@@ -24,6 +24,7 @@ const context_1 = require("./context");
 const gas_calculator_1 = require("./gas-calculator");
 const gateway_client_1 = require("./gateway-client");
 const payload_builder_1 = require("./payload-builder");
+const gas_usd_sizer_1 = require("./gas-usd-sizer");
 const uea_manager_1 = require("./uea-manager");
 const confirmation_1 = require("./confirmation");
 const response_builder_1 = require("./response-builder");
@@ -36,7 +37,7 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const transformFn = (tx, buf = []) => (0, response_builder_1.transformToUniversalTxResponse)(ctx, tx, buf, getResponseCallbacks());
         const { chain, evmClient, gatewayAddress } = (0, gateway_client_1.getOriginGatewayContext)(ctx);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain, ctx.universalSigner.account.address);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_101, chain, ctx.universalSigner.account.address);
         // Default token to native ETH if none provided
         if (!execute.funds.token) {
             const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
@@ -64,7 +65,7 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
             deployed = status.deployed;
         }
         const { payload: universalPayload, req } = yield (0, payload_builder_1.buildGatewayPayloadAndGas)(ctx, execute, nonce, 'sendTxWithFunds', execute.funds.amount);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_102_01);
         // Compute required gas funding on Push Chain and current UEA balance
         const gasEstimate = execute.gasLimit || BigInt(1e7);
         const gasPrice = yield ctx.pushClient.getGasPrice();
@@ -73,17 +74,42 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
         const requiredFunds = requiredGasFee + payloadValue;
         const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
         const ueaBalance = yield ctx.pushClient.getBalance(ueaAddress);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
-        // Determine USD to deposit via gateway (8 decimals) with caps: min=$1, max=$1000
-        const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-        const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_01);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_02, ueaAddress, deployed);
+        // SDK 5.2 Case A/B/C sizing on the Push-chain gas portion.
+        // Floor pad comes from the sizer ($1 for Case A); upper bound now lives in
+        // the origin gateway (MAX_CAP_UNIVERSAL_TX_USD) — the SDK no longer caps.
+        const r1Sizing = yield (0, gas_usd_sizer_1.sizeR1PushGas)(ctx, {
+            pushGasFeeWei: requiredGasFee,
+            originChain: chain,
+        });
+        // Convert the sizer's USD result into planned PC native deposit so the
+        // sizer progress hook can surface the user-facing `extraDepositPC` =
+        // totalPCDeposit - gasRequired. The same conversion is reused below for
+        // the final nativeAmount calc (after SVM clamp).
+        const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain);
+        const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
+        const oneNativeUnit = utils_1.Utils.helpers.parseUnits('1', nativeDecimals);
+        const usdToNative = (usd) => {
+            if (nativeTokenUsdPrice === BigInt(0))
+                return BigInt(0);
+            const out = (usd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) / nativeTokenUsdPrice;
+            return out + BigInt(1);
+        };
+        const plannedPCDeposit = usdToNative(r1Sizing.paddedDepositUsd);
+        const extraDepositPC = plannedPCDeposit > requiredGasFee ? plannedPCDeposit - requiredGasFee : BigInt(0);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03, chain, r1Sizing.paddedDepositUsd);
+        const r1SizingHookId = {
+            A: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_01,
+            B: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_02,
+            C: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_03,
+        }[r1Sizing.category];
+        (0, context_1.fireProgressHook)(ctx, r1SizingHookId, chain, requiredGasFee, extraDepositPC, r1Sizing.paddedDepositUsd);
         const deficit = requiredFunds > ueaBalance ? requiredFunds - ueaBalance : BigInt(0);
-        let depositUsd = deficit > BigInt(0) ? ctx.pushClient.pushToUSDC(deficit) : oneUsd;
-        if (depositUsd < oneUsd)
-            depositUsd = oneUsd;
-        if (depositUsd > maxUsd)
-            throw new Error('Deposit value exceeds max $1000 worth of native token');
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02, depositUsd);
+        let depositUsd = deficit > BigInt(0) ? ctx.pushClient.pushToUSDC(deficit) : BigInt(0);
+        // Apply sizer floor: Case A pads to $1, Cases B/C pass-through.
+        if (depositUsd < r1Sizing.paddedDepositUsd)
+            depositUsd = r1Sizing.paddedDepositUsd;
         // If SVM, clamp depositUsd to on-chain Config caps
         if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
             const svmClient = new svm_client_1.SvmClient({
@@ -110,15 +136,12 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
                 // best-effort
             }
         }
-        // Convert USD(8) -> native units
-        const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain);
-        const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
-        const oneNativeUnit = utils_1.Utils.helpers.parseUnits('1', nativeDecimals);
-        let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) / nativeTokenUsdPrice;
-        nativeAmount = nativeAmount + BigInt(1);
+        // Final USD(8) -> native conversion reusing the cached price fetched above.
+        let nativeAmount = usdToNative(depositUsd);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, depositUsd, chain);
         const bridgeAmount = execute.funds.amount;
         const symbol = execute.funds.token.symbol;
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01, bridgeAmount, execute.funds.token.decimals, symbol);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_01, bridgeAmount, execute.funds.token.decimals, symbol);
         if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
             const tokenAddr = execute.funds.token.address;
             if (mechanism === 'approve') {
@@ -134,11 +157,9 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
         try {
             if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                 const tokenAddr = execute.funds.token.address;
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_01);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02);
-                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
+                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_01);
+                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_02);
+                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_03);
                 const evmClientEvm = evmClient;
                 const gatewayAddressEvm = gatewayAddress;
                 const payloadBytes = (0, signing_1.encodeUniversalPayload)(universalPayload);
@@ -180,11 +201,11 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
             }
         }
         catch (err) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_04);
+            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04);
             throw err;
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_03);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
         // Awaiting confirmations
         const signerChain = ctx.universalSigner.account.chain;
         if (chain_1.CHAIN_INFO[signerChain].vm === enums_1.VM.EVM) {
@@ -204,18 +225,30 @@ function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks
                 feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
             }
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
-        let pushChainUniversalTx;
-        if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
-            pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, 'sendTxWithFunds');
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05);
+        let response;
+        try {
+            let pushChainUniversalTx;
+            if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
+                pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, 'sendTxWithFunds');
+            }
+            else {
+                pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txHash, 'sendTxWithFunds');
+            }
+            response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendTxWithFunds', transformFn);
         }
-        else {
-            pushChainUniversalTx = yield (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txHash, 'sendTxWithFunds');
+        catch (err) {
+            if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
+                const errMsg = err instanceof Error ? err.message : String(err);
+                (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02, errMsg);
+                throw new push_chain_tx_1.PushChainExecutionError(errMsg, { gatewayTxHash: txHash });
+            }
+            throw err;
         }
-        const response = yield (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendTxWithFunds', transformFn);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, bridgeAmount, execute.funds.token.decimals, symbol);
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_06, bridgeAmount, execute.funds.token.decimals, symbol);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_107);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_01, [response]);
         return response;
     });
 }