@pushchain/core 6.0.20 → 6.0.21

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

@@ -34,245 +34,245 @@ const signing_1 = require("./signing");
 const quote_1 = require("./quote");
 const formatters_1 = require("../../formatters");
 const helpers_1 = require("./helpers");
-function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        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_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] || [];
-            const vm = chain_1.CHAIN_INFO[chain].vm;
-            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');
+async function executeFundsWithPayload(ctx, execute, eventBuffer, getResponseCallbacks) {
+    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_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] || [];
+        const vm = chain_1.CHAIN_INFO[chain].vm;
+        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 mechanism = execute.funds.token.mechanism;
+    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, 'sendTxWithFunds', execute.funds.amount);
+    (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 = await ctx.pushClient.getGasPrice();
+    const requiredGasFee = gasEstimate * gasPrice;
+    const payloadValue = execute.value ?? BigInt(0);
+    const requiredFunds = requiredGasFee + payloadValue;
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    const ueaBalance = await ctx.pushClient.getBalance(ueaAddress);
+    (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 = await (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 = 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 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) : BigInt(0);
+    // Apply sizer floor: Case A pads to $1, Cases B/C pass-through.
+    if (depositUsd < r1Sizing.paddedDepositUsd)
+        depositUsd = r1Sizing.paddedDepositUsd;
+    // Match funds-only and standard fee-lock sizing: fixed PC→USD conversion can
+    // underfund large PC deposits when the live pETH/WPC pool has meaningful
+    // slippage. Quote the native amount required for the target WPC output and
+    // raise the USD deposit before converting back to source-chain native value.
+    if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalance) {
+        const deficit = requiredFunds - ueaBalance;
+        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 > BigInt(0)) {
+            const poolBasedUsd = (poolNativeAmount * nativeTokenUsdPrice) / oneNativeUnit;
+            if (poolBasedUsd > depositUsd) {
+                (0, context_1.printLog)(ctx, `sendFundsWithPayload — pool-based deposit sizing overrides fixed-rate estimate: ` +
+                    `fixedUsd=${depositUsd.toString()}, poolBasedUsd=${poolBasedUsd.toString()}, ` +
+                    `requiredFunds=${requiredFunds.toString()}, ueaBalance=${ueaBalance.toString()}`);
+                depositUsd = poolBasedUsd;
             }
-            execute.funds.token = nativeToken;
         }
-        const mechanism = execute.funds.token.mechanism;
-        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));
+    }
+    // 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({
+            rpcUrls: ctx.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] || chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
+        });
+        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);
+        try {
+            const cfg = await svmClient.readContract({
+                abi: universalGatewayV0_json_1.default, address: universalGatewayV0_json_1.default.address,
+                functionName: 'config', args: [configPda.toBase58()],
+            });
+            const minCapUsd = BigInt((cfg.minCapUniversalTxUsd ?? cfg.min_cap_universal_tx_usd).toString());
+            const maxCapUsd = BigInt((cfg.maxCapUniversalTxUsd ?? cfg.max_cap_universal_tx_usd).toString());
+            if (depositUsd < minCapUsd)
+                depositUsd = minCapUsd;
+            const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
+            if (depositUsd < withMargin)
+                depositUsd = withMargin;
+            if (depositUsd > maxCapUsd)
+                depositUsd = maxCapUsd;
         }
-        else {
-            const status = yield (0, uea_manager_1.getUeaStatusAndNonce)(ctx);
-            nonce = status.nonce;
-            deployed = status.deployed;
+        catch {
+            // best-effort
         }
-        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_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();
-        const requiredGasFee = gasEstimate * gasPrice;
-        const payloadValue = (_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0);
-        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_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) : BigInt(0);
-        // Apply sizer floor: Case A pads to $1, Cases B/C pass-through.
-        if (depositUsd < r1Sizing.paddedDepositUsd)
-            depositUsd = r1Sizing.paddedDepositUsd;
-        // Match funds-only and standard fee-lock sizing: fixed PC→USD conversion can
-        // underfund large PC deposits when the live pETH/WPC pool has meaningful
-        // slippage. Quote the native amount required for the target WPC output and
-        // raise the USD deposit before converting back to source-chain native value.
-        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM && requiredFunds > ueaBalance) {
-            const deficit = requiredFunds - ueaBalance;
-            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 > BigInt(0)) {
-                const poolBasedUsd = (poolNativeAmount * nativeTokenUsdPrice) / oneNativeUnit;
-                if (poolBasedUsd > depositUsd) {
-                    (0, context_1.printLog)(ctx, `sendFundsWithPayload — pool-based deposit sizing overrides fixed-rate estimate: ` +
-                        `fixedUsd=${depositUsd.toString()}, poolBasedUsd=${poolBasedUsd.toString()}, ` +
-                        `requiredFunds=${requiredFunds.toString()}, ueaBalance=${ueaBalance.toString()}`);
-                    depositUsd = poolBasedUsd;
-                }
-            }
+    }
+    // Final USD(8) -> native conversion reusing the cached price fetched above.
+    const 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_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') {
+            const evmClientEvm = evmClient;
+            const gatewayAddressEvm = gatewayAddress;
+            await (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
         }
-        // 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({
-                rpcUrls: ctx.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] || chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
-            });
-            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);
-            try {
-                const cfg = yield svmClient.readContract({
-                    abi: universalGatewayV0_json_1.default, address: universalGatewayV0_json_1.default.address,
-                    functionName: 'config', args: [configPda.toBase58()],
-                });
-                const minCapUsd = BigInt(((_d = cfg.minCapUniversalTxUsd) !== null && _d !== void 0 ? _d : cfg.min_cap_universal_tx_usd).toString());
-                const maxCapUsd = BigInt(((_e = cfg.maxCapUniversalTxUsd) !== null && _e !== void 0 ? _e : cfg.max_cap_universal_tx_usd).toString());
-                if (depositUsd < minCapUsd)
-                    depositUsd = minCapUsd;
-                const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
-                if (depositUsd < withMargin)
-                    depositUsd = withMargin;
-                if (depositUsd > maxCapUsd)
-                    depositUsd = maxCapUsd;
-            }
-            catch (_m) {
-                // best-effort
-            }
+        else if (mechanism === 'permit2') {
+            throw new Error('Permit2 is not supported yet');
         }
-        // Final USD(8) -> native conversion reusing the cached price fetched above.
-        const 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_106_01, bridgeAmount, execute.funds.token.decimals, symbol);
+    }
+    let txHash;
+    try {
         if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
             const tokenAddr = execute.funds.token.address;
-            if (mechanism === 'approve') {
-                const evmClientEvm = evmClient;
-                const gatewayAddressEvm = gatewayAddress;
-                yield (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
-            }
-            else if (mechanism === 'permit2') {
-                throw new Error('Permit2 is not supported yet');
-            }
-        }
-        let txHash;
-        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_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);
-                const payWith = execute.payGasWith;
-                const gasTokenAddress = (_f = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _f === void 0 ? void 0 : _f.address;
-                if (gasTokenAddress) {
-                    if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
-                        throw new Error(`Only ${push_chain_1.PushChain.utils.chains.getChainName(enums_1.CHAIN.ETHEREUM_SEPOLIA)} is supported for paying gas fees with ERC-20 tokens`);
-                    }
-                    let amountOutMinETH = (payWith === null || payWith === void 0 ? void 0 : payWith.minAmountOut) !== undefined ? BigInt(payWith.minAmountOut) : nativeAmount;
-                    const slippageBps = (_g = payWith === null || payWith === void 0 ? void 0 : payWith.slippageBps) !== null && _g !== void 0 ? _g : 100;
-                    amountOutMinETH = BigInt(push_chain_1.PushChain.utils.conversion.slippageToMinAmount(amountOutMinETH.toString(), { slippageBps }));
-                    const quoteExactOutputFn = (amountOut, opts) => (0, quote_1.quoteExactOutput)(ctx, amountOut, opts);
-                    const { gasAmount } = yield (0, gas_calculator_1.calculateGasAmountFromAmountOutMinETH)(ctx, gasTokenAddress, amountOutMinETH, quoteExactOutputFn);
-                    const deadline = BigInt(0);
-                    const ownerAddress = ctx.universalSigner.account.address;
-                    const gasTokenBalance = yield evmClientEvm.getErc20Balance({
-                        tokenAddress: gasTokenAddress, ownerAddress,
-                    });
-                    if (gasTokenBalance < gasAmount) {
-                        const sym = (_j = (_h = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _h === void 0 ? void 0 : _h.symbol) !== null && _j !== void 0 ? _j : 'gas token';
-                        const decimals = (_l = (_k = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _k === void 0 ? void 0 : _k.decimals) !== null && _l !== void 0 ? _l : 18;
-                        throw new Error(`Insufficient ${sym} balance to cover gas fees: need ${utils_1.Utils.helpers.formatUnits(gasAmount, decimals)}, have ${utils_1.Utils.helpers.formatUnits(gasTokenBalance, decimals)}`);
-                    }
-                    yield (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClientEvm, gasTokenAddress, gatewayAddressEvm, gasAmount);
-                    const reqToken = Object.assign(Object.assign({}, req), { gasToken: gasTokenAddress, gasAmount, amountOutMinETH, deadline });
-                    txHash = yield (0, gateway_client_1.sendGatewayTokenTxWithFallback)(ctx, evmClientEvm, gatewayAddressEvm, reqToken, ctx.universalSigner);
+            (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);
+            const payWith = execute.payGasWith;
+            const gasTokenAddress = payWith?.token?.address;
+            if (gasTokenAddress) {
+                if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
+                    throw new Error(`Only ${push_chain_1.PushChain.utils.chains.getChainName(enums_1.CHAIN.ETHEREUM_SEPOLIA)} is supported for paying gas fees with ERC-20 tokens`);
                 }
-                else {
-                    const isNativeToken = mechanism === 'native';
-                    const totalValue = isNativeToken ? nativeAmount + bridgeAmount : nativeAmount;
-                    txHash = yield (0, gateway_client_1.sendGatewayTxWithFallback)(ctx, evmClientEvm, gatewayAddressEvm, req, ctx.universalSigner, totalValue);
+                let amountOutMinETH = payWith?.minAmountOut !== undefined ? BigInt(payWith.minAmountOut) : nativeAmount;
+                const slippageBps = payWith?.slippageBps ?? 100;
+                amountOutMinETH = BigInt(push_chain_1.PushChain.utils.conversion.slippageToMinAmount(amountOutMinETH.toString(), { slippageBps }));
+                const quoteExactOutputFn = (amountOut, opts) => (0, quote_1.quoteExactOutput)(ctx, amountOut, opts);
+                const { gasAmount } = await (0, gas_calculator_1.calculateGasAmountFromAmountOutMinETH)(ctx, gasTokenAddress, amountOutMinETH, quoteExactOutputFn);
+                const deadline = BigInt(0);
+                const ownerAddress = ctx.universalSigner.account.address;
+                const gasTokenBalance = await evmClientEvm.getErc20Balance({
+                    tokenAddress: gasTokenAddress, ownerAddress,
+                });
+                if (gasTokenBalance < gasAmount) {
+                    const sym = payWith?.token?.symbol ?? 'gas token';
+                    const decimals = payWith?.token?.decimals ?? 18;
+                    throw new Error(`Insufficient ${sym} balance to cover gas fees: need ${utils_1.Utils.helpers.formatUnits(gasAmount, decimals)}, have ${utils_1.Utils.helpers.formatUnits(gasTokenBalance, decimals)}`);
                 }
+                await (0, gas_calculator_1.ensureErc20Allowance)(ctx, evmClientEvm, gasTokenAddress, gatewayAddressEvm, gasAmount);
+                const reqToken = {
+                    ...req, gasToken: gasTokenAddress, gasAmount, amountOutMinETH, deadline,
+                };
+                txHash = await (0, gateway_client_1.sendGatewayTokenTxWithFallback)(ctx, evmClientEvm, gatewayAddressEvm, reqToken, ctx.universalSigner);
             }
             else {
-                txHash = yield (0, svm_bridge_1.sendSVMTxWithFunds)(ctx, {
-                    execute, mechanism, universalPayload, bridgeAmount, nativeAmount, req,
-                });
+                const isNativeToken = mechanism === 'native';
+                const totalValue = isNativeToken ? nativeAmount + bridgeAmount : nativeAmount;
+                txHash = await (0, gateway_client_1.sendGatewayTxWithFallback)(ctx, evmClientEvm, gatewayAddressEvm, req, ctx.universalSigner, totalValue);
             }
         }
-        catch (err) {
-            const errMsg = (0, formatters_1.normalizePublicErrorMessage)(err);
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04, errMsg);
-            ctx._routeTerminalEmitted = true;
-            throw new Error(errMsg);
-        }
-        (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) {
-            yield (0, confirmation_1.waitForEvmConfirmationsWithCountdown)(ctx, evmClient, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
-        }
         else {
-            const svmClient = new svm_client_1.SvmClient({
-                rpcUrls: ctx.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] || chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
+            txHash = await (0, svm_bridge_1.sendSVMTxWithFunds)(ctx, {
+                execute, mechanism, universalPayload, bridgeAmount, nativeAmount, req,
             });
-            yield (0, confirmation_1.waitForSvmConfirmationsWithCountdown)(ctx, svmClient, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
         }
-        // Funds Flow: Confirmed on origin
-        let feeLockTxHash = txHash;
-        if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.SVM) {
-            if (feeLockTxHash && !feeLockTxHash.startsWith('0x')) {
-                const decoded = bs58_1.bs58.decode(feeLockTxHash);
-                feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
-            }
+    }
+    catch (err) {
+        const errMsg = (0, formatters_1.normalizePublicErrorMessage)(err);
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_104_04, errMsg);
+        ctx._routeTerminalEmitted = true;
+        throw new Error(errMsg);
+    }
+    (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) {
+        await (0, confirmation_1.waitForEvmConfirmationsWithCountdown)(ctx, evmClient, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
+    }
+    else {
+        const svmClient = new svm_client_1.SvmClient({
+            rpcUrls: ctx.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] || chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
+        });
+        await (0, confirmation_1.waitForSvmConfirmationsWithCountdown)(ctx, svmClient, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
+    }
+    // Funds Flow: Confirmed on origin
+    let feeLockTxHash = txHash;
+    if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.SVM) {
+        if (feeLockTxHash && !feeLockTxHash.startsWith('0x')) {
+            const decoded = bs58_1.bs58.decode(feeLockTxHash);
+            feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
         }
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04, txHash);
-        (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);
+    }
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_04, txHash);
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_106_05);
+    let response;
+    try {
+        let pushChainUniversalTx;
+        const isPc20Import = execute._pc20?.direction === 'import';
+        if (chain_1.CHAIN_INFO[ctx.universalSigner.account.chain].vm === enums_1.VM.EVM) {
+            pushChainUniversalTx = await (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, evmClient, gatewayAddress, txHash, 'sendTxWithFunds', isPc20Import);
         }
-        catch (err) {
-            if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
-                const errMsg = (0, formatters_1.normalizePublicErrorMessage)(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;
+        else {
+            pushChainUniversalTx = await (0, response_builder_1.queryUniversalTxStatusFromGatewayTx)(ctx, undefined, undefined, txHash, 'sendTxWithFunds', isPc20Import);
         }
-        (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;
-    });
+        response = await (0, push_chain_tx_1.extractPcTxAndTransform)(ctx, pushChainUniversalTx, txHash, eventBuffer, 'sendTxWithFunds', transformFn);
+    }
+    catch (err) {
+        if (!(err instanceof push_chain_tx_1.PushChainExecutionError)) {
+            const errMsg = (0, formatters_1.normalizePublicErrorMessage)(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;
+    }
+    (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;
 }
 //# sourceMappingURL=execute-funds-payload.js.map

package/src/lib/orchestrator/internals/execute-standard.d.ts

@@ -1,11 +1,3 @@
-/**
- * Standard payload execution flow (no funds) — extracted from Orchestrator.execute().
- *
- * Handles payload-only execution on Push Chain:
- * - Push-to-Push direct transactions
- * - Fee-locking path for undeployed/underfunded UEA
- * - Signed verification path for deployed UEA with funds
- */
 import { ProgressEvent } from '../../progress-hook/progress-hook.types';
 import type { ExecuteParams, UniversalTxResponse } from '../orchestrator.types';
 import type { OrchestratorContext } from './context';