@pushchain/core 6.0.19 → 6.0.21

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

@@ -30,281 +30,319 @@ const confirmation_1 = require("./confirmation");
 const response_builder_1 = require("./response-builder");
 const push_chain_tx_1 = require("./push-chain-tx");
 const svm_helpers_1 = require("./svm-helpers");
+const svm_1 = require("./pc20/svm");
 const helpers_2 = require("./helpers");
 const response_builder_2 = require("./response-builder");
 const formatters_1 = require("../../formatters");
-function executeFundsOnly(ctx, execute, eventBuffer, getResponseCallbacks) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const transformFn = (tx, buf = []) => (0, response_builder_2.transformToUniversalTxResponse)(ctx, tx, buf, getResponseCallbacks());
-        const chain = ctx.universalSigner.account.chain;
-        const { vm } = chain_1.CHAIN_INFO[chain];
-        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(', ')}`);
+async function executeFundsOnly(ctx, execute, eventBuffer, getResponseCallbacks) {
+    const transformFn = (tx, buf = []) => (0, response_builder_2.transformToUniversalTxResponse)(ctx, tx, buf, getResponseCallbacks());
+    const chain = ctx.universalSigner.account.chain;
+    const { vm } = chain_1.CHAIN_INFO[chain];
+    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_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
+    if (!execute.funds.token) {
+        const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
+        const preferredSymbol = vm === enums_1.VM.EVM ? 'ETH' : vm === enums_1.VM.SVM ? 'SOL' : undefined;
+        const nativeToken = preferredSymbol
+            ? available.find((t) => t.symbol === preferredSymbol)
+            : undefined;
+        if (!nativeToken) {
+            throw new Error('Native token not configured for this chain');
         }
-        (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
-        if (!execute.funds.token) {
-            const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
-            const preferredSymbol = vm === enums_1.VM.EVM ? 'ETH' : vm === enums_1.VM.SVM ? 'SOL' : undefined;
-            const nativeToken = preferredSymbol
-                ? available.find((t) => t.symbol === preferredSymbol)
-                : undefined;
-            if (!nativeToken) {
-                throw new Error('Native token not configured for this chain');
-            }
-            execute.funds.token = nativeToken;
-        }
-        const amount = execute.funds.amount;
-        const symbol = execute.funds.token.symbol;
-        const bridgeAmount = amount;
-        if (vm === enums_1.VM.EVM) {
-            return executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol);
-        }
-        else {
-            return executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, bridgeAmount, symbol);
-        }
-    });
+        execute.funds.token = nativeToken;
+    }
+    const amount = execute.funds.amount;
+    const symbol = execute.funds.token.symbol;
+    const bridgeAmount = amount;
+    if (vm === enums_1.VM.EVM) {
+        return executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol);
+    }
+    else {
+        return executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, bridgeAmount, symbol);
+    }
 }
 // ============================================================================
 // EVM funds-only path
 // ============================================================================
-function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const evmClient = (0, context_1.getOriginEvmClient)(ctx);
-        const gatewayAddress = lockerContract;
-        const tokenAddr = execute.funds.token.address;
-        const isNative = execute.funds.token.mechanism === 'native';
-        // Skip getCode if accountStatusCache already confirmed deployment
-        let nonce;
-        let deployed;
-        const deployedHint = (_b = (_a = ctx.accountStatusCache) === null || _a === void 0 ? void 0 : _a.uea) === null || _b === void 0 ? void 0 : _b.deployed;
-        if (deployedHint) {
-            deployed = true;
-            nonce = yield (0, uea_manager_1.getUEANonce)(ctx, (0, uea_manager_1.computeUEAOffchain)(ctx));
+async function executeFundsOnlyEvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, lockerContract, bridgeAmount, symbol) {
+    const evmClient = (0, context_1.getOriginEvmClient)(ctx);
+    const gatewayAddress = lockerContract;
+    const tokenAddr = execute.funds.token.address;
+    const isNative = execute.funds.token.mechanism === 'native';
+    // Skip getCode if accountStatusCache already confirmed deployment
+    let nonce;
+    let deployed;
+    const deployedHint = ctx.accountStatusCache?.uea?.deployed;
+    if (deployedHint) {
+        deployed = true;
+        nonce = await (0, uea_manager_1.getUEANonce)(ctx, (0, uea_manager_1.computeUEAOffchain)(ctx));
+    }
+    else {
+        const status = await (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
+        nonce = status.nonce;
+        deployed = status.deployed;
+    }
+    const { payload: universalPayload, req } = await (0, payload_builder_1.buildGatewayPayloadAndGas)(ctx, execute, nonce, 'sendFunds', bridgeAmount);
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    (0, context_2.printLog)(ctx, 'sendFunds — buildGatewayPayloadAndGas result: ' + JSON.stringify({
+        recipient: execute.to, ueaAddress,
+        isSelfBridge: execute.to.toLowerCase() === ueaAddress.toLowerCase(),
+        bridgeAmount: bridgeAmount.toString(), isNative, tokenAddr,
+        nonce: nonce.toString(), deployed,
+    }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
+    const ueaBalanceForGas = await ctx.pushClient.getBalance(ueaAddress);
+    const gasEstimate = execute.gasLimit || BigInt(1e7);
+    const gasPrice = await ctx.pushClient.getGasPrice();
+    const requiredGasFee = gasEstimate * gasPrice;
+    const requiredFunds = requiredGasFee + (execute.value ?? BigInt(0));
+    let nativeAmount = await (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, requiredFunds, ueaBalanceForGas, 
+    // Defer the 103-03-04 ("Prepaid Deposit Estimated") hook — we emit the full
+    // 103-03 sizing sequence below, after 103-01/103-02 (UEA resolution), to
+    // match the funds-payload path ordering.
+    { emitDepositEstimated: false });
+    // For EVM fee-locking, fixed-rate PC→USD sizing can underfund when the
+    // live WPC/native pool prices PC above the SDK's fallback price. Size the
+    // native deposit against the same Push Chain pool used by the gateway.
+    if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalanceForGas) {
+        const deficit = requiredFunds - ueaBalanceForGas;
+        const targetWpc = (deficit * BigInt(12)) / BigInt(10);
+        const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(chain, ctx.pushNetwork);
+        const poolNativeAmount = await (0, gas_calculator_1.estimateNativeForDesiredDeposit)(ctx, targetWpc, originPrc20);
+        if (poolNativeAmount > nativeAmount) {
+            (0, context_2.printLog)(ctx, `sendFunds — pool-based deposit sizing overrides fixed-rate estimate: fixedNative=${nativeAmount.toString()}, ` +
+                `poolNative=${poolNativeAmount.toString()}, requiredFunds=${requiredFunds.toString()}, ` +
+                `ueaBalance=${ueaBalanceForGas.toString()}`);
+            nativeAmount = poolNativeAmount;
         }
-        else {
-            const status = yield (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
-            nonce = status.nonce;
-            deployed = status.deployed;
-        }
-        const { payload: universalPayload, req } = yield (0, payload_builder_1.buildGatewayPayloadAndGas)(ctx, execute, nonce, 'sendFunds', bridgeAmount);
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        (0, context_2.printLog)(ctx, 'sendFunds — buildGatewayPayloadAndGas result: ' + JSON.stringify({
-            recipient: execute.to, ueaAddress,
-            isSelfBridge: execute.to.toLowerCase() === ueaAddress.toLowerCase(),
-            bridgeAmount: bridgeAmount.toString(), isNative, tokenAddr,
-            nonce: nonce.toString(), deployed,
+    }
+    (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}, ` +
+        `requiredFunds: ${requiredFunds.toString()}`);
+    (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}`);
+    // SDK 5.2 R1 deposit-sizing progress (parent + Case A/B/C + terminal),
+    // emitted here — after UEA resolution — to match the funds-payload path's
+    // ordering. The terminal 103-03-04 hook was suppressed inside
+    // calculateNativeAmountForDeposit above so it lands in this position instead
+    // of before 103-01/103-02. Purely cosmetic: a pool/price read failure here
+    // must never block the bridge, so we fall back to the terminal hook alone.
+    try {
+        const r1Sizing = await (0, gas_usd_sizer_1.sizeR1PushGas)(ctx, {
+            pushGasFeeWei: requiredGasFee,
+            originChain: chain,
+        });
+        const nativeTokenUsdPrice = await 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 plannedPCDeposit = nativeTokenUsdPrice === BigInt(0)
+            ? BigInt(0)
+            : (r1Sizing.paddedDepositUsd * oneNativeUnit +
+                (nativeTokenUsdPrice - BigInt(1))) /
+                nativeTokenUsdPrice +
+                BigInt(1);
+        const extraDepositPC = plannedPCDeposit > requiredGasFee
+            ? plannedPCDeposit - requiredGasFee
+            : BigInt(0);
+        (0, context_2.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_2.fireProgressHook)(ctx, r1SizingHookId, chain, requiredGasFee, extraDepositPC, r1Sizing.paddedDepositUsd);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, r1Sizing.paddedDepositUsd, chain);
+    }
+    catch {
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, BigInt(0), chain);
+    }
+    (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.
+    //
+    // A PC20 wrapper is deliberately NOT approved. The gateway's configured
+    // PC20Factory burns it directly via `burnFrom(sourceAsset, caller, amount)`,
+    // so an allowance here would be granted and never used — a pointless
+    // approval tx and a standing allowance on the user's wrapper balance.
+    if (execute.funds.token.mechanism === 'approve') {
+        await (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClient, tokenAddr, gatewayAddress, execute.funds.amount);
+    }
+    else if (execute.funds.token.mechanism === 'permit2') {
+        throw new Error('Permit2 is not supported yet');
+    }
+    let txHash;
+    try {
+        (0, context_2.printLog)(ctx, (execute.to.toLowerCase() === ueaAddress.toLowerCase() ? 'FUNDS ONLY SELF' : 'FUNDS ONLY OTHER') +
+            ' — gateway call payload: ' + JSON.stringify({
+            gatewayAddress, functionName: 'sendUniversalTx', req,
+            value: (isNative ? nativeAmount + bridgeAmount : nativeAmount).toString(),
+            isNative, bridgeAmount: bridgeAmount.toString(), nativeAmount: nativeAmount.toString(),
         }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
-        const ueaBalanceForGas = yield ctx.pushClient.getBalance(ueaAddress);
-        const gasEstimate = execute.gasLimit || BigInt(1e7);
-        const gasPrice = yield ctx.pushClient.getGasPrice();
-        const requiredGasFee = gasEstimate * gasPrice;
-        const requiredFunds = requiredGasFee + ((_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0));
-        let nativeAmount = yield (0, gas_calculator_1.calculateNativeAmountForDeposit)(ctx, chain, requiredFunds, ueaBalanceForGas, 
-        // Defer the 103-03-04 ("Prepaid Deposit Estimated") hook — we emit the full
-        // 103-03 sizing sequence below, after 103-01/103-02 (UEA resolution), to
-        // match the funds-payload path ordering.
-        { emitDepositEstimated: false });
-        // For EVM fee-locking, fixed-rate PC→USD sizing can underfund when the
-        // live WPC/native pool prices PC above the SDK's fallback price. Size the
-        // native deposit against the same Push Chain pool used by the gateway.
-        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalanceForGas) {
-            const deficit = requiredFunds - ueaBalanceForGas;
-            const targetWpc = (deficit * BigInt(12)) / BigInt(10);
-            const originPrc20 = (0, helpers_1.getNativePRC20ForChain)(chain, ctx.pushNetwork);
-            const poolNativeAmount = yield (0, gas_calculator_1.estimateNativeForDesiredDeposit)(ctx, targetWpc, originPrc20);
-            if (poolNativeAmount > nativeAmount) {
-                (0, context_2.printLog)(ctx, `sendFunds — pool-based deposit sizing overrides fixed-rate estimate: fixedNative=${nativeAmount.toString()}, ` +
-                    `poolNative=${poolNativeAmount.toString()}, requiredFunds=${requiredFunds.toString()}, ` +
-                    `ueaBalance=${ueaBalanceForGas.toString()}`);
-                nativeAmount = poolNativeAmount;
-            }
-        }
-        (0, context_2.printLog)(ctx, `sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}, ` +
-            `requiredFunds: ${requiredFunds.toString()}`);
-        (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}`);
-        // SDK 5.2 R1 deposit-sizing progress (parent + Case A/B/C + terminal),
-        // emitted here — after UEA resolution — to match the funds-payload path's
-        // ordering. The terminal 103-03-04 hook was suppressed inside
-        // calculateNativeAmountForDeposit above so it lands in this position instead
-        // of before 103-01/103-02. Purely cosmetic: a pool/price read failure here
-        // must never block the bridge, so we fall back to the terminal hook alone.
-        try {
-            const r1Sizing = yield (0, gas_usd_sizer_1.sizeR1PushGas)(ctx, {
-                pushGasFeeWei: requiredGasFee,
-                originChain: chain,
-            });
-            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 plannedPCDeposit = nativeTokenUsdPrice === BigInt(0)
-                ? BigInt(0)
-                : (r1Sizing.paddedDepositUsd * oneNativeUnit +
-                    (nativeTokenUsdPrice - BigInt(1))) /
-                    nativeTokenUsdPrice +
-                    BigInt(1);
-            const extraDepositPC = plannedPCDeposit > requiredGasFee
-                ? plannedPCDeposit - requiredGasFee
-                : BigInt(0);
-            (0, context_2.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_2.fireProgressHook)(ctx, r1SizingHookId, chain, requiredGasFee, extraDepositPC, r1Sizing.paddedDepositUsd);
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, r1Sizing.paddedDepositUsd, chain);
-        }
-        catch (_d) {
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, BigInt(0), chain);
-        }
-        (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);
-        }
-        else if (execute.funds.token.mechanism === 'permit2') {
-            throw new Error('Permit2 is not supported yet');
-        }
-        let txHash;
-        try {
-            (0, context_2.printLog)(ctx, (execute.to.toLowerCase() === ueaAddress.toLowerCase() ? 'FUNDS ONLY SELF' : 'FUNDS ONLY OTHER') +
-                ' — gateway call payload: ' + JSON.stringify({
-                gatewayAddress, functionName: 'sendUniversalTx', req,
-                value: (isNative ? nativeAmount + bridgeAmount : nativeAmount).toString(),
-                isNative, bridgeAmount: bridgeAmount.toString(), nativeAmount: nativeAmount.toString(),
-            }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
-            txHash = yield (0, gateway_client_1.sendGatewayTxWithFallback)(ctx, evmClient, gatewayAddress, req, ctx.universalSigner, isNative ? nativeAmount + bridgeAmount : nativeAmount);
-        }
-        catch (err) {
+        txHash = await (0, gateway_client_1.sendGatewayTxWithFallback)(ctx, evmClient, gatewayAddress, req, ctx.universalSigner, isNative ? nativeAmount + bridgeAmount : nativeAmount);
+    }
+    catch (err) {
+        const errMsg = (0, formatters_1.normalizePublicErrorMessage)(err);
+        (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04, errMsg);
+        ctx._routeTerminalEmitted = true;
+        throw new Error(errMsg);
+    }
+    const originTx = await (0, helpers_2.fetchOriginChainTransactionForProgress)(ctx, chain, txHash, txHash);
+    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
+    await (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_106_04, txHash);
+    (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',
+    }));
+    let response;
+    try {
+        const pushChainUniversalTx = await (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds', execute._pc20?.direction === 'import');
+        // extractPcTxAndTransform fires 199-02 itself on pcTx FAILED; only emit
+        // for non-typed failures (RPC lookup error, timeout).
+        response = await (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendFunds', transformFn);
+    }
+    catch (err) {
+        if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
             const errMsg = (0, formatters_1.normalizePublicErrorMessage)(err);
-            (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04, errMsg);
-            ctx._routeTerminalEmitted = true;
-            throw new Error(errMsg);
-        }
-        const originTx = yield (0, helpers_2.fetchOriginChainTransactionForProgress)(ctx, chain, txHash, txHash);
-        (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_106_04, txHash);
-        (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',
-        }));
-        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 = (0, formatters_1.normalizePublicErrorMessage)(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_199_02, errMsg);
+            throw new push_chain_tx_1.PushChainExecutionError(errMsg, { gatewayTxHash: txHash });
         }
-        (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;
-    });
+        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;
 }
 // ============================================================================
 // SVM funds-only path
 // ============================================================================
-function executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, bridgeAmount, symbol) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const svmClient = new svm_client_1.SvmClient({ rpcUrls });
-        const programId = new web3_js_1.PublicKey(universalGatewayV0_json_1.default.address);
-        const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
-        const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
-        const { feeVaultPda, protocolFeeLamports } = yield (0, svm_helpers_1.getSvmProtocolFee)(svmClient, programId);
-        const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
-        const userPk = new web3_js_1.PublicKey(ctx.universalSigner.account.address);
-        const priceUpdatePk = new web3_js_1.PublicKey(chain_1.SVM_PYTH_PRICE_FEED);
-        if (execute.payGasWith !== undefined) {
-            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_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_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);
-            const reqNative = (0, svm_helpers_1.buildSvmUniversalTxRequest)({
-                recipient: recipientEvm20, token: web3_js_1.PublicKey.default, amount: bridgeAmount,
-                payload: '0x', revertRecipient: userPk, signatureData: '0x',
-            });
-            txSignature = yield svmClient.writeContract({
-                abi: universalGatewayV0_json_1.default, address: programId.toBase58(), functionName: 'sendUniversalTx',
-                args: [reqNative, bridgeAmount + protocolFeeLamports], signer: ctx.universalSigner,
-                accounts: {
-                    config: configPda, vault: vaultPda, feeVault: feeVaultPda,
-                    userTokenAccount: vaultPda, gatewayTokenAccount: vaultPda, user: userPk,
-                    priceUpdate: priceUpdatePk, rateLimitConfig: rateLimitConfigPda,
-                    tokenRateLimit: tokenRateLimitPda,
-                    tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-                    systemProgram: web3_js_1.SystemProgram.programId,
-                },
-            });
-        }
-        else if (execute.funds.token.mechanism === 'approve') {
-            const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
-            const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
-            const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
-            const userAta = web3_js_1.PublicKey.findProgramAddressSync([userPk.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-            const vaultAta = web3_js_1.PublicKey.findProgramAddressSync([vaultPda.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-            const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), mintPk.toBuffer()], programId);
-            const reqSpl = (0, svm_helpers_1.buildSvmUniversalTxRequest)({
-                recipient: recipientEvm20, token: mintPk, amount: bridgeAmount,
-                payload: '0x', revertRecipient: userPk, signatureData: '0x',
-            });
-            txSignature = yield svmClient.writeContract({
-                abi: universalGatewayV0_json_1.default, address: programId.toBase58(), functionName: 'sendUniversalTx',
-                args: [reqSpl, protocolFeeLamports], signer: ctx.universalSigner,
-                accounts: {
-                    config: configPda, vault: vaultPda, feeVault: feeVaultPda,
-                    userTokenAccount: userAta, gatewayTokenAccount: vaultAta, user: userPk,
-                    tokenProgram: TOKEN_PROGRAM_ID, priceUpdate: priceUpdatePk,
-                    rateLimitConfig: rateLimitConfigPda, tokenRateLimit: tokenRateLimitPda,
-                    systemProgram: web3_js_1.SystemProgram.programId,
-                },
-            });
-        }
-        else {
-            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_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_106_04, txSignature);
-        (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 = (0, formatters_1.normalizePublicErrorMessage)(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;
+async function executeFundsOnlySvm(ctx, execute, eventBuffer, transformFn, chain, rpcUrls, bridgeAmount, symbol) {
+    const svmClient = new svm_client_1.SvmClient({ rpcUrls });
+    const programId = new web3_js_1.PublicKey(universalGatewayV0_json_1.default.address);
+    const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
+    const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
+    const { feeVaultPda, protocolFeeLamports } = await (0, svm_helpers_1.getSvmProtocolFee)(svmClient, programId);
+    const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
+    const userPk = new web3_js_1.PublicKey(ctx.universalSigner.account.address);
+    const priceUpdatePk = new web3_js_1.PublicKey(chain_1.SVM_PYTH_PRICE_FEED);
+    if (execute.payGasWith !== undefined) {
+        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_103_01);
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    const { nonce, deployed } = await (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
+    (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);
+        const reqNative = (0, svm_helpers_1.buildSvmUniversalTxRequest)({
+            recipient: recipientEvm20, token: web3_js_1.PublicKey.default, amount: bridgeAmount,
+            payload: '0x', revertRecipient: userPk, signatureData: '0x',
+        });
+        txSignature = await svmClient.writeContract({
+            abi: universalGatewayV0_json_1.default, address: programId.toBase58(), functionName: 'sendUniversalTx',
+            args: [reqNative, bridgeAmount + protocolFeeLamports], signer: ctx.universalSigner,
+            accounts: {
+                config: configPda, vault: vaultPda, feeVault: feeVaultPda,
+                userTokenAccount: vaultPda, gatewayTokenAccount: vaultPda, user: userPk,
+                priceUpdate: priceUpdatePk, rateLimitConfig: rateLimitConfigPda,
+                tokenRateLimit: tokenRateLimitPda,
+                tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                systemProgram: web3_js_1.SystemProgram.programId,
+            },
+        });
+    }
+    else if (execute.funds.token.mechanism === 'approve') {
+        const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
+        const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+        const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+        const userAta = web3_js_1.PublicKey.findProgramAddressSync([userPk.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+        const vaultAta = web3_js_1.PublicKey.findProgramAddressSync([vaultPda.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+        const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), mintPk.toBuffer()], programId);
+        const reqSpl = (0, svm_helpers_1.buildSvmUniversalTxRequest)({
+            recipient: recipientEvm20, token: mintPk, amount: bridgeAmount,
+            payload: '0x', revertRecipient: userPk, signatureData: '0x',
+        });
+        txSignature = await svmClient.writeContract({
+            abi: universalGatewayV0_json_1.default, address: programId.toBase58(), functionName: 'sendUniversalTx',
+            args: [reqSpl, protocolFeeLamports], signer: ctx.universalSigner,
+            accounts: {
+                config: configPda, vault: vaultPda, feeVault: feeVaultPda,
+                userTokenAccount: userAta, gatewayTokenAccount: vaultAta, user: userPk,
+                tokenProgram: TOKEN_PROGRAM_ID, priceUpdate: priceUpdatePk,
+                rateLimitConfig: rateLimitConfigPda, tokenRateLimit: tokenRateLimitPda,
+                systemProgram: web3_js_1.SystemProgram.programId,
+            },
+        });
+    }
+    else if (execute.funds.token.mechanism === 'pc20-burn') {
+        // NOTE: currently unreachable from sendTransaction — the orchestrator
+        // routes SVM PC20 imports through the funds+payload path (svm-bridge),
+        // because a pure burn's empty payload gets the PC20 selector prepended by
+        // the gateway and classified FUNDS_AND_PAYLOAD, which the chain's inbound
+        // decode bricks on with no revert (the selector-only "0x" guard bug).
+        // Kept correct as the pure-burn shape for when that chain fix ships.
+        //
+        // PC20 wrapper burn — route_pc20_universal_tx (deposit.rs). Differs from
+        // the SPL escrow route in four program-enforced ways: the recipient must
+        // be the nonzero Push recipient (the chain unlocks directly to it), the
+        // gateway token account must be ABSENT (burn, not escrow),
+        // remaining_accounts must be exactly [pc20_state ro, pc20_mint w], and
+        // token_rate_limit is null — a pure burn consumes no per-token rate limit,
+        // and this call sends exactly the inbound fee, so there is no post-fee
+        // native excess to route as a (rate-limited) FUNDS leg. The gateway
+        // prepends the PC20 selector itself — the SDK must not.
+        const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
+        const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+        const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+        const userAta = web3_js_1.PublicKey.findProgramAddressSync([userPk.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+        const { remainingAccounts } = (0, svm_1.buildPC20BurnAccounts)({ programId, mint: mintPk });
+        const reqBurn = (0, svm_helpers_1.buildSvmUniversalTxRequest)({
+            recipient: recipientEvm20, token: mintPk, amount: bridgeAmount,
+            payload: '0x', revertRecipient: userPk, signatureData: '0x',
+        });
+        txSignature = await svmClient.writeContract({
+            abi: universalGatewayV0_json_1.default, address: programId.toBase58(), functionName: 'sendUniversalTx',
+            args: [reqBurn, protocolFeeLamports], signer: ctx.universalSigner,
+            accounts: {
+                config: configPda, vault: vaultPda, feeVault: feeVaultPda,
+                userTokenAccount: userAta, gatewayTokenAccount: null, user: userPk,
+                tokenProgram: TOKEN_PROGRAM_ID, priceUpdate: priceUpdatePk,
+                rateLimitConfig: rateLimitConfigPda, tokenRateLimit: null,
+                systemProgram: web3_js_1.SystemProgram.programId,
+            },
+            remainingAccounts,
+        });
+    }
+    else {
+        throw new Error('Unsupported token mechanism on Solana');
+    }
+    const originTx = await (0, helpers_2.fetchOriginChainTransactionForProgress)(ctx, chain, '0x', txSignature);
+    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_02, txSignature, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
+    await (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_106_04, txSignature);
+    (0, context_2.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05);
+    let response;
+    try {
+        const pushChainUniversalTx = await (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txSignature, 'sendFunds', execute._pc20?.direction === 'import');
+        response = await (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 = (0, formatters_1.normalizePublicErrorMessage)(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 });
         }
-        (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;
-    });
+        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;
 }
 //# sourceMappingURL=execute-funds-only.js.map

package/src/lib/orchestrator/internals/execute-funds-payload.d.ts

@@ -5,7 +5,7 @@
  * for both EVM and SVM origin chains.
  */
 import { ProgressEvent } from '../../progress-hook/progress-hook.types';
-import type { ExecuteParams, UniversalTxResponse } from '../orchestrator.types';
+import type { LegacyExecuteParams, UniversalTxResponse } from '../orchestrator.types';
 import type { OrchestratorContext } from './context';
 import { type ResponseBuilderCallbacks } from './response-builder';
-export declare function executeFundsWithPayload(ctx: OrchestratorContext, execute: ExecuteParams, eventBuffer: ProgressEvent[], getResponseCallbacks: () => ResponseBuilderCallbacks): Promise<UniversalTxResponse>;
+export declare function executeFundsWithPayload(ctx: OrchestratorContext, execute: LegacyExecuteParams, eventBuffer: ProgressEvent[], getResponseCallbacks: () => ResponseBuilderCallbacks): Promise<UniversalTxResponse>;