@pushchain/core 6.0.19 → 6.0.21

package/src/lib/orchestrator/internals/gas-calculator.js

@@ -13,7 +13,6 @@ exports.calculateNativeAmountForDeposit = calculateNativeAmountForDeposit;
 exports.calculateGasAmountFromAmountOutMinETH = calculateGasAmountFromAmountOutMinETH;
 exports.estimateDepositFromLockedNative = estimateDepositFromLockedNative;
 exports.estimateNativeForDesiredDeposit = estimateNativeForDesiredDeposit;
-const tslib_1 = require("tslib");
 const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
 const abi_1 = require("../../constants/abi");
@@ -99,142 +98,137 @@ const ZERO_ADDR = '0x0000000000000000000000000000000000000000';
 // ============================================================================
 // ERC-20 Allowance
 // ============================================================================
-function ensureErc20Allowance(ctx, evmClient, tokenAddress, spender, requiredAmount) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const chain = ctx.universalSigner.account.chain;
-        const owner = ctx.universalSigner.account.address;
-        const currentAllowance = yield evmClient.readContract({
-            abi: abi_1.ERC20_EVM,
-            address: tokenAddress,
-            functionName: 'allowance',
-            args: [owner, spender],
-        });
-        if (currentAllowance >= requiredAmount)
-            return;
-        if (currentAllowance > BigInt(0)) {
-            (0, context_1.printLog)(ctx, `Resetting existing allowance from ${currentAllowance.toString()} to 0 for spender ${spender}`);
-            const resetTxHash = yield evmClient.writeContract({
-                abi: abi_1.ERC20_EVM,
-                address: tokenAddress,
-                functionName: 'approve',
-                args: [spender, BigInt(0)],
-                signer: ctx.universalSigner,
-            });
-            yield evmClient.waitForConfirmations({
-                txHash: resetTxHash,
-                confirmations: 1,
-                timeoutMs: chain_1.CHAIN_INFO[chain].timeout,
-            });
-        }
-        const setTxHash = yield evmClient.writeContract({
+async function ensureErc20Allowance(ctx, evmClient, tokenAddress, spender, requiredAmount) {
+    const chain = ctx.universalSigner.account.chain;
+    const owner = ctx.universalSigner.account.address;
+    const currentAllowance = await evmClient.readContract({
+        abi: abi_1.ERC20_EVM,
+        address: tokenAddress,
+        functionName: 'allowance',
+        args: [owner, spender],
+    });
+    if (currentAllowance >= requiredAmount)
+        return;
+    if (currentAllowance > BigInt(0)) {
+        (0, context_1.printLog)(ctx, `Resetting existing allowance from ${currentAllowance.toString()} to 0 for spender ${spender}`);
+        const resetTxHash = await evmClient.writeContract({
             abi: abi_1.ERC20_EVM,
             address: tokenAddress,
             functionName: 'approve',
-            args: [spender, requiredAmount],
+            args: [spender, BigInt(0)],
             signer: ctx.universalSigner,
         });
-        yield evmClient.waitForConfirmations({
-            txHash: setTxHash,
+        await evmClient.waitForConfirmations({
+            txHash: resetTxHash,
             confirmations: 1,
             timeoutMs: chain_1.CHAIN_INFO[chain].timeout,
         });
-        try {
-            const updated = yield evmClient.readContract({
-                abi: abi_1.ERC20_EVM,
-                address: tokenAddress,
-                functionName: 'allowance',
-                args: [owner, spender],
-            });
-            if (updated < requiredAmount) {
-                (0, context_1.printLog)(ctx, 'Warning: allowance not updated yet; proceeding');
-            }
-        }
-        catch (_a) {
-            // ignore
-        }
+    }
+    const setTxHash = await evmClient.writeContract({
+        abi: abi_1.ERC20_EVM,
+        address: tokenAddress,
+        functionName: 'approve',
+        args: [spender, requiredAmount],
+        signer: ctx.universalSigner,
     });
+    await evmClient.waitForConfirmations({
+        txHash: setTxHash,
+        confirmations: 1,
+        timeoutMs: chain_1.CHAIN_INFO[chain].timeout,
+    });
+    try {
+        const updated = await evmClient.readContract({
+            abi: abi_1.ERC20_EVM,
+            address: tokenAddress,
+            functionName: 'allowance',
+            args: [owner, spender],
+        });
+        if (updated < requiredAmount) {
+            (0, context_1.printLog)(ctx, 'Warning: allowance not updated yet; proceeding');
+        }
+    }
+    catch {
+        // ignore
+    }
 }
 // ============================================================================
 // Outbound Gas Fee Query
 // ============================================================================
-function queryOutboundGasFee(ctx, prc20Token, gasLimit, destinationChain) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
-        const rpcUrl = ((_b = (_a = chain_1.CHAIN_INFO[pushChain]) === null || _a === void 0 ? void 0 : _a.defaultRPC) === null || _b === void 0 ? void 0 : _b[0]) || 'unknown';
-        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 1] inputs: gateway=${gatewayPcAddress}, prc20Token=${prc20Token}, gasLimit=${gasLimit}, rpcUrl=${rpcUrl}`);
-        let universalCoreAddress;
-        try {
-            universalCoreAddress = yield ctx.pushClient.readContract({
-                address: gatewayPcAddress,
-                abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'universalCore',
-                args: [],
-            });
-            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 2] universalCore resolved to: ${universalCoreAddress}`);
-        }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 2] FAILED to read universalCore: ${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
-        const callData = (0, viem_1.encodeFunctionData)({
+async function queryOutboundGasFee(ctx, prc20Token, gasLimit, destinationChain) {
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
+    const rpcUrl = chain_1.CHAIN_INFO[pushChain]?.defaultRPC?.[0] || 'unknown';
+    (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 1] inputs: gateway=${gatewayPcAddress}, prc20Token=${prc20Token}, gasLimit=${gasLimit}, rpcUrl=${rpcUrl}`);
+    let universalCoreAddress;
+    try {
+        universalCoreAddress = await ctx.pushClient.readContract({
+            address: gatewayPcAddress,
+            abi: abi_1.UNIVERSAL_GATEWAY_PC,
+            functionName: 'universalCore',
+            args: [],
+        });
+        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 2] universalCore resolved to: ${universalCoreAddress}`);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 2] FAILED to read universalCore: ${err instanceof Error ? err.message : String(err)}`);
+        throw err;
+    }
+    const callData = (0, viem_1.encodeFunctionData)({
+        abi: abi_1.UNIVERSAL_CORE_EVM,
+        functionName: 'getOutboundTxGasAndFees',
+        args: [prc20Token, gasLimit],
+    });
+    (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] calling getOutboundTxGasAndFees on ${universalCoreAddress}`);
+    (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] eth_call: {"method":"eth_call","params":[{"to":"${universalCoreAddress}","data":"${callData}"},"latest"]}`);
+    let gasToken;
+    let gasFee;
+    let protocolFee;
+    let gasPrice = BigInt(0);
+    let gasLimitUsed = gasLimit;
+    try {
+        const result = await ctx.pushClient.readContract({
+            address: universalCoreAddress,
             abi: abi_1.UNIVERSAL_CORE_EVM,
             functionName: 'getOutboundTxGasAndFees',
             args: [prc20Token, gasLimit],
         });
-        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] calling getOutboundTxGasAndFees on ${universalCoreAddress}`);
-        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] eth_call: {"method":"eth_call","params":[{"to":"${universalCoreAddress}","data":"${callData}"},"latest"]}`);
-        let gasToken;
-        let gasFee;
-        let protocolFee;
-        let gasPrice = BigInt(0);
-        let gasLimitUsed = gasLimit;
+        gasToken = result[0];
+        gasFee = result[1];
+        protocolFee = result[2];
+        gasPrice = result[3];
+        gasLimitUsed = result[5] ?? gasLimit;
+        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 4] success: gasToken=${gasToken}, gasFee=${gasFee}, protocolFee=${protocolFee}, gasPrice=${gasPrice}, gasLimitUsed=${gasLimitUsed}`);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] FAILED: ${err instanceof Error ? err.message : String(err)}`);
+        throw err;
+    }
+    let nativeValueForGas;
+    let sizing;
+    if (destinationChain !== undefined) {
         try {
-            const result = yield ctx.pushClient.readContract({
-                address: universalCoreAddress,
-                abi: abi_1.UNIVERSAL_CORE_EVM,
-                functionName: 'getOutboundTxGasAndFees',
-                args: [prc20Token, gasLimit],
+            sizing = await (0, gas_usd_sizer_1.sizeOutboundGas)(ctx, {
+                gasFee,
+                originChain: ctx.universalSigner.account.chain,
+                destinationChain,
             });
-            gasToken = result[0];
-            gasFee = result[1];
-            protocolFee = result[2];
-            gasPrice = result[3];
-            gasLimitUsed = (_c = result[5]) !== null && _c !== void 0 ? _c : gasLimit;
-            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 4] success: gasToken=${gasToken}, gasFee=${gasFee}, protocolFee=${protocolFee}, gasPrice=${gasPrice}, gasLimitUsed=${gasLimitUsed}`);
+            // All categories — A, B, and C — return the sizer's calibrated gas leg.
+            // R3 consumers additionally bump `nativeValueForGas` by `overflowNativePc`
+            // when category === 'C' (see route-handlers.executeCeaToPush).
+            nativeValueForGas = sizing.gasLegNativePc + protocolFee;
+            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] sizer: category=${sizing.category}, gasUsd=${sizing.gasUsd}, ` +
+                `gasLegNativePc=${sizing.gasLegNativePc}, overflowNativePc=${sizing.overflowNativePc}, nativeValueForGas=${nativeValueForGas}`);
         }
         catch (err) {
-            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 3] FAILED: ${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
-        let nativeValueForGas;
-        let sizing;
-        if (destinationChain !== undefined) {
-            try {
-                sizing = yield (0, gas_usd_sizer_1.sizeOutboundGas)(ctx, {
-                    gasFee,
-                    originChain: ctx.universalSigner.account.chain,
-                    destinationChain,
-                });
-                // All categories — A, B, and C — return the sizer's calibrated gas leg.
-                // R3 consumers additionally bump `nativeValueForGas` by `overflowNativePc`
-                // when category === 'C' (see route-handlers.executeCeaToPush).
-                nativeValueForGas = sizing.gasLegNativePc + protocolFee;
-                (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] sizer: category=${sizing.category}, gasUsd=${sizing.gasUsd}, ` +
-                    `gasLegNativePc=${sizing.gasLegNativePc}, overflowNativePc=${sizing.overflowNativePc}, nativeValueForGas=${nativeValueForGas}`);
-            }
-            catch (err) {
-                (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] sizer failed (${err instanceof Error ? err.message : String(err)}); falling back to 1M buffer`);
-                nativeValueForGas = protocolFee + gasFee * GAS_FEE_BUFFER_MULTIPLIER;
-            }
-        }
-        else {
+            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] sizer failed (${err instanceof Error ? err.message : String(err)}); falling back to 1M buffer`);
             nativeValueForGas = protocolFee + gasFee * GAS_FEE_BUFFER_MULTIPLIER;
-            (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] no destinationChain provided; legacy 1M buffer: nativeValueForGas=${nativeValueForGas}`);
         }
-        return { gasToken, gasFee, protocolFee, nativeValueForGas, gasPrice, gasLimitUsed, universalCoreAddress, sizing };
-    });
+    }
+    else {
+        nativeValueForGas = protocolFee + gasFee * GAS_FEE_BUFFER_MULTIPLIER;
+        (0, context_1.printLog)(ctx, `queryOutboundGasFee — [step 5] no destinationChain provided; legacy 1M buffer: nativeValueForGas=${nativeValueForGas}`);
+    }
+    return { gasToken, gasFee, protocolFee, nativeValueForGas, gasPrice, gasLimitUsed, universalCoreAddress, sizing };
 }
 // ============================================================================
 // Uniswap V3 Pool Price Estimation
@@ -245,124 +239,121 @@ function queryOutboundGasFee(ctx, prc20Token, gasLimit, destinationChain) {
  * Returns the estimated amount with a 2x safety buffer (excess is refunded by the contract).
  * Falls back to a percentage of accountBalance if any on-chain query fails.
  */
-function estimateNativeValueForSwap(ctx, universalCoreAddress, gasToken, gasFee, accountBalance) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        // 2.2x safety buffer applied to the pool quote; excess is refunded by
-        // swapAndBurnGas. Composed of a 2x pool-slippage cushion plus 10%
-        // headroom that used to live in the R2 route-handler callers (×110/100
-        // after this function returned). Folded into one place here so the cap
-        // branch below correctly bounds the FINAL inflated value — the previous
-        // arrangement (outer ×1.10 on top of an inner cap that returned
-        // `balance - GAS_RESERVE`) caused a deterministic preflight failure
-        // whenever the cap fired: required = 1.10 × (balance − 3 PC) + 3 PC ≈
-        // balance × 1.10 − 0.3 PC > balance for any non-trivial balance. See
-        // preflight.ts:215.
-        const SWAP_BUFFER_NUM = BigInt(22);
-        const SWAP_BUFFER_DEN = BigInt(10);
-        const BALANCE_FALLBACK_DIVISOR = BigInt(10); // 10% of balance as fallback
-        const GAS_RESERVE = BigInt(3e18); // 3 UPC reserve for tx overhead
-        try {
-            // Read WPC, factory, and defaultFeeTier in parallel
-            const [wpcAddress, factoryAddress, feeTier] = yield Promise.all([
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'WPC',
-                    args: [],
-                }),
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'uniswapV3Factory',
-                    args: [],
-                }),
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'defaultFeeTier',
-                    args: [gasToken],
-                }),
-            ]);
-            if (!feeTier) {
-                (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — no fee tier for gasToken, using balance fallback`);
-                return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
-            }
-            const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
-            const quoterAddress = (_b = (_a = chain_1.CHAIN_INFO[pushChain]) === null || _a === void 0 ? void 0 : _a.dex) === null || _b === void 0 ? void 0 : _b.uniV3QuoterV2;
-            if (quoterAddress && !quoterAddress.startsWith('0xTBD')) {
-                try {
-                    const quote = yield ctx.pushClient.readContract({
-                        address: quoterAddress,
-                        abi: UNISWAP_V3_QUOTER_EXACT_OUTPUT_ABI,
-                        functionName: 'quoteExactOutputSingle',
-                        args: [
-                            {
-                                tokenIn: wpcAddress,
-                                tokenOut: gasToken,
-                                amount: gasFee,
-                                fee: feeTier,
-                                sqrtPriceLimitX96: BigInt(0),
-                            },
-                        ],
-                    });
-                    const exactWpcNeeded = quote[0];
-                    const result = (exactWpcNeeded * SWAP_BUFFER_NUM) / SWAP_BUFFER_DEN;
-                    (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — exactOutput quoter=${quoterAddress}, ` +
-                        `wpcNeeded=${exactWpcNeeded}, withBuffer(2.2x)=${result}`);
-                    return capSwapEstimate(result, accountBalance, GAS_RESERVE, exactWpcNeeded);
-                }
-                catch (quoteErr) {
-                    (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — exactOutput quote failed: ${quoteErr instanceof Error ? quoteErr.message : String(quoteErr)}, falling back to slot0 price`);
-                }
-            }
-            // Get pool address from factory
-            const poolAddress = yield ctx.pushClient.readContract({
-                address: factoryAddress,
-                abi: UNISWAP_V3_FACTORY_ABI,
-                functionName: 'getPool',
-                args: [wpcAddress, gasToken, feeTier],
-            });
-            if (poolAddress === ZERO_ADDR) {
-                (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool not found, using balance fallback`);
-                return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
-            }
-            // Read slot0 for current price
-            const slot0 = yield ctx.pushClient.readContract({
-                address: poolAddress,
-                abi: UNISWAP_V3_POOL_SLOT0_ABI,
-                functionName: 'slot0',
+async function estimateNativeValueForSwap(ctx, universalCoreAddress, gasToken, gasFee, accountBalance) {
+    // 2.2x safety buffer applied to the pool quote; excess is refunded by
+    // swapAndBurnGas. Composed of a 2x pool-slippage cushion plus 10%
+    // headroom that used to live in the R2 route-handler callers (×110/100
+    // after this function returned). Folded into one place here so the cap
+    // branch below correctly bounds the FINAL inflated value — the previous
+    // arrangement (outer ×1.10 on top of an inner cap that returned
+    // `balance - GAS_RESERVE`) caused a deterministic preflight failure
+    // whenever the cap fired: required = 1.10 × (balance − 3 PC) + 3 PC ≈
+    // balance × 1.10 − 0.3 PC > balance for any non-trivial balance. See
+    // preflight.ts:215.
+    const SWAP_BUFFER_NUM = BigInt(22);
+    const SWAP_BUFFER_DEN = BigInt(10);
+    const BALANCE_FALLBACK_DIVISOR = BigInt(10); // 10% of balance as fallback
+    const GAS_RESERVE = BigInt(3e18); // 3 UPC reserve for tx overhead
+    try {
+        // Read WPC, factory, and defaultFeeTier in parallel
+        const [wpcAddress, factoryAddress, feeTier] = await Promise.all([
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'WPC',
                 args: [],
-            });
-            const sqrtPriceX96 = slot0[0];
-            if (!sqrtPriceX96 || sqrtPriceX96 === BigInt(0)) {
-                (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool not initialized, using balance fallback`);
-                return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
-            }
-            // price (token1/token0 in raw units) = (sqrtPriceX96)² / 2¹⁹²
-            const Q192 = BigInt(1) << BigInt(192);
-            const priceNum = sqrtPriceX96 * sqrtPriceX96; // sqrtPrice² in Q192
-            // Uniswap V3 sorts tokens: token0 < token1 by address
-            const isGasTokenToken0 = gasToken.toLowerCase() < wpcAddress.toLowerCase();
-            let wpcNeeded;
-            if (isGasTokenToken0) {
-                // price = WPC_per_gasToken → wpcNeeded = gasFee * price
-                wpcNeeded = (gasFee * priceNum) / Q192;
+            }),
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'uniswapV3Factory',
+                args: [],
+            }),
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'defaultFeeTier',
+                args: [gasToken],
+            }),
+        ]);
+        if (!feeTier) {
+            (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — no fee tier for gasToken, using balance fallback`);
+            return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
+        }
+        const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
+        const quoterAddress = chain_1.CHAIN_INFO[pushChain]?.dex?.uniV3QuoterV2;
+        if (quoterAddress && !quoterAddress.startsWith('0xTBD')) {
+            try {
+                const quote = await ctx.pushClient.readContract({
+                    address: quoterAddress,
+                    abi: UNISWAP_V3_QUOTER_EXACT_OUTPUT_ABI,
+                    functionName: 'quoteExactOutputSingle',
+                    args: [
+                        {
+                            tokenIn: wpcAddress,
+                            tokenOut: gasToken,
+                            amount: gasFee,
+                            fee: feeTier,
+                            sqrtPriceLimitX96: BigInt(0),
+                        },
+                    ],
+                });
+                const exactWpcNeeded = quote[0];
+                const result = (exactWpcNeeded * SWAP_BUFFER_NUM) / SWAP_BUFFER_DEN;
+                (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — exactOutput quoter=${quoterAddress}, ` +
+                    `wpcNeeded=${exactWpcNeeded}, withBuffer(2.2x)=${result}`);
+                return capSwapEstimate(result, accountBalance, GAS_RESERVE, exactWpcNeeded);
             }
-            else {
-                // price = gasToken_per_WPC → wpcNeeded = gasFee / price
-                wpcNeeded = (gasFee * Q192) / priceNum;
+            catch (quoteErr) {
+                (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — exactOutput quote failed: ${quoteErr instanceof Error ? quoteErr.message : String(quoteErr)}, falling back to slot0 price`);
             }
-            const result = (wpcNeeded * SWAP_BUFFER_NUM) / SWAP_BUFFER_DEN;
-            (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool=${poolAddress}, sqrtPriceX96=${sqrtPriceX96}, ` +
-                `wpcNeeded=${wpcNeeded}, withBuffer(2.2x)=${result}`);
-            return capSwapEstimate(result, accountBalance, GAS_RESERVE, wpcNeeded);
         }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — failed: ${err instanceof Error ? err.message : String(err)}, using balance fallback`);
+        // Get pool address from factory
+        const poolAddress = await ctx.pushClient.readContract({
+            address: factoryAddress,
+            abi: UNISWAP_V3_FACTORY_ABI,
+            functionName: 'getPool',
+            args: [wpcAddress, gasToken, feeTier],
+        });
+        if (poolAddress === ZERO_ADDR) {
+            (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool not found, using balance fallback`);
             return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
         }
-    });
+        // Read slot0 for current price
+        const slot0 = await ctx.pushClient.readContract({
+            address: poolAddress,
+            abi: UNISWAP_V3_POOL_SLOT0_ABI,
+            functionName: 'slot0',
+            args: [],
+        });
+        const sqrtPriceX96 = slot0[0];
+        if (!sqrtPriceX96 || sqrtPriceX96 === BigInt(0)) {
+            (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool not initialized, using balance fallback`);
+            return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
+        }
+        // price (token1/token0 in raw units) = (sqrtPriceX96)² / 2¹⁹²
+        const Q192 = BigInt(1) << BigInt(192);
+        const priceNum = sqrtPriceX96 * sqrtPriceX96; // sqrtPrice² in Q192
+        // Uniswap V3 sorts tokens: token0 < token1 by address
+        const isGasTokenToken0 = gasToken.toLowerCase() < wpcAddress.toLowerCase();
+        let wpcNeeded;
+        if (isGasTokenToken0) {
+            // price = WPC_per_gasToken → wpcNeeded = gasFee * price
+            wpcNeeded = (gasFee * priceNum) / Q192;
+        }
+        else {
+            // price = gasToken_per_WPC → wpcNeeded = gasFee / price
+            wpcNeeded = (gasFee * Q192) / priceNum;
+        }
+        const result = (wpcNeeded * SWAP_BUFFER_NUM) / SWAP_BUFFER_DEN;
+        (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — pool=${poolAddress}, sqrtPriceX96=${sqrtPriceX96}, ` +
+            `wpcNeeded=${wpcNeeded}, withBuffer(2.2x)=${result}`);
+        return capSwapEstimate(result, accountBalance, GAS_RESERVE, wpcNeeded);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `estimateNativeValueForSwap — failed: ${err instanceof Error ? err.message : String(err)}, using balance fallback`);
+        return balanceFallback(accountBalance, BALANCE_FALLBACK_DIVISOR, GAS_RESERVE);
+    }
 }
 /**
  * Bound the buffered swap estimate by the UEA's affordable PC.
@@ -400,169 +391,161 @@ function balanceFallback(balance, divisor, reserve) {
 // ============================================================================
 // Rescue Gas Fee Query
 // ============================================================================
-function queryRescueGasFee(ctx, prc20Token, destinationChain) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        (0, context_1.printLog)(ctx, `queryRescueGasFee — inputs: gateway=${gatewayPcAddress}, prc20Token=${prc20Token}`);
-        let universalCoreAddress;
-        try {
-            universalCoreAddress = yield ctx.pushClient.readContract({
-                address: gatewayPcAddress,
-                abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'universalCore',
-                args: [],
-            });
-            (0, context_1.printLog)(ctx, `queryRescueGasFee — universalCore resolved to: ${universalCoreAddress}`);
-        }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `queryRescueGasFee — FAILED to read universalCore: ${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
-        let gasToken;
-        let gasFee;
-        let rescueGasLimit;
-        let gasPrice;
+async function queryRescueGasFee(ctx, prc20Token, destinationChain) {
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    (0, context_1.printLog)(ctx, `queryRescueGasFee — inputs: gateway=${gatewayPcAddress}, prc20Token=${prc20Token}`);
+    let universalCoreAddress;
+    try {
+        universalCoreAddress = await ctx.pushClient.readContract({
+            address: gatewayPcAddress,
+            abi: abi_1.UNIVERSAL_GATEWAY_PC,
+            functionName: 'universalCore',
+            args: [],
+        });
+        (0, context_1.printLog)(ctx, `queryRescueGasFee — universalCore resolved to: ${universalCoreAddress}`);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `queryRescueGasFee — FAILED to read universalCore: ${err instanceof Error ? err.message : String(err)}`);
+        throw err;
+    }
+    let gasToken;
+    let gasFee;
+    let rescueGasLimit;
+    let gasPrice;
+    try {
+        const result = await ctx.pushClient.readContract({
+            address: universalCoreAddress,
+            abi: abi_1.UNIVERSAL_CORE_EVM,
+            functionName: 'getRescueFundsGasLimit',
+            args: [prc20Token],
+        });
+        gasToken = result[0];
+        gasFee = result[1];
+        rescueGasLimit = result[2];
+        gasPrice = result[3];
+        (0, context_1.printLog)(ctx, `queryRescueGasFee — success: gasToken=${gasToken}, gasFee=${gasFee}, rescueGasLimit=${rescueGasLimit}, gasPrice=${gasPrice}`);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `queryRescueGasFee — FAILED: ${err instanceof Error ? err.message : String(err)}`);
+        throw err;
+    }
+    let nativeValueForGas;
+    let sizing;
+    if (destinationChain !== undefined) {
         try {
-            const result = yield ctx.pushClient.readContract({
-                address: universalCoreAddress,
-                abi: abi_1.UNIVERSAL_CORE_EVM,
-                functionName: 'getRescueFundsGasLimit',
-                args: [prc20Token],
+            sizing = await (0, gas_usd_sizer_1.sizeOutboundGas)(ctx, {
+                gasFee,
+                originChain: ctx.universalSigner.account.chain,
+                destinationChain,
             });
-            gasToken = result[0];
-            gasFee = result[1];
-            rescueGasLimit = result[2];
-            gasPrice = result[3];
-            (0, context_1.printLog)(ctx, `queryRescueGasFee — success: gasToken=${gasToken}, gasFee=${gasFee}, rescueGasLimit=${rescueGasLimit}, gasPrice=${gasPrice}`);
+            nativeValueForGas = sizing.gasLegNativePc;
+            (0, context_1.printLog)(ctx, `queryRescueGasFee — sizer: category=${sizing.category}, gasUsd=${sizing.gasUsd}, nativeValueForGas=${nativeValueForGas}`);
         }
         catch (err) {
-            (0, context_1.printLog)(ctx, `queryRescueGasFee — FAILED: ${err instanceof Error ? err.message : String(err)}`);
-            throw err;
-        }
-        let nativeValueForGas;
-        let sizing;
-        if (destinationChain !== undefined) {
-            try {
-                sizing = yield (0, gas_usd_sizer_1.sizeOutboundGas)(ctx, {
-                    gasFee,
-                    originChain: ctx.universalSigner.account.chain,
-                    destinationChain,
-                });
-                nativeValueForGas = sizing.gasLegNativePc;
-                (0, context_1.printLog)(ctx, `queryRescueGasFee — sizer: category=${sizing.category}, gasUsd=${sizing.gasUsd}, nativeValueForGas=${nativeValueForGas}`);
-            }
-            catch (err) {
-                (0, context_1.printLog)(ctx, `queryRescueGasFee — sizer failed (${err instanceof Error ? err.message : String(err)}); falling back to 1M buffer`);
-                nativeValueForGas = gasFee * GAS_FEE_BUFFER_MULTIPLIER;
-            }
-        }
-        else {
+            (0, context_1.printLog)(ctx, `queryRescueGasFee — sizer failed (${err instanceof Error ? err.message : String(err)}); falling back to 1M buffer`);
             nativeValueForGas = gasFee * GAS_FEE_BUFFER_MULTIPLIER;
-            (0, context_1.printLog)(ctx, `queryRescueGasFee — no destinationChain provided; legacy 1M buffer: nativeValueForGas=${nativeValueForGas}`);
         }
-        return { gasToken, gasFee, rescueGasLimit, gasPrice, nativeValueForGas, sizing };
-    });
+    }
+    else {
+        nativeValueForGas = gasFee * GAS_FEE_BUFFER_MULTIPLIER;
+        (0, context_1.printLog)(ctx, `queryRescueGasFee — no destinationChain provided; legacy 1M buffer: nativeValueForGas=${nativeValueForGas}`);
+    }
+    return { gasToken, gasFee, rescueGasLimit, gasPrice, nativeValueForGas, sizing };
 }
 // ============================================================================
 // Native Amount Calculation for Deposit
 // ============================================================================
-function calculateNativeAmountForDeposit(ctx, chain, requiredFunds, ueaBalance, 
+async function calculateNativeAmountForDeposit(ctx, chain, requiredFunds, ueaBalance, 
 // When false, suppress the SEND-TX-103-03-04 ("Prepaid Deposit Estimated")
 // progress hook so the caller can emit the full 103-03 sizing sequence
 // (parent + Case A/B/C + terminal) AFTER 103-01/103-02, matching the
 // funds-payload path ordering. The deposit math is unaffected.
 opts) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_102_01);
-        const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-        const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
-        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');
-        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,
+    (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_102_01);
+    const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
+    const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
+    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');
+    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(abi_1.SVM_GATEWAY_IDL.address);
+        const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
+        try {
+            const cfg = await svmClient.readContract({
+                abi: abi_1.SVM_GATEWAY_IDL,
+                address: abi_1.SVM_GATEWAY_IDL.address,
+                functionName: 'config',
+                args: [configPda.toBase58()],
             });
-            const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
-            const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
-            try {
-                const cfg = yield svmClient.readContract({
-                    abi: abi_1.SVM_GATEWAY_IDL,
-                    address: abi_1.SVM_GATEWAY_IDL.address,
-                    functionName: 'config',
-                    args: [configPda.toBase58()],
-                });
-                const minField = (_a = cfg.minCapUniversalTxUsd) !== null && _a !== void 0 ? _a : cfg.min_cap_universal_tx_usd;
-                const maxField = (_b = cfg.maxCapUniversalTxUsd) !== null && _b !== void 0 ? _b : cfg.max_cap_universal_tx_usd;
-                const minCapUsd = BigInt(minField.toString());
-                const maxCapUsd = BigInt(maxField.toString());
-                if (depositUsd < minCapUsd)
-                    depositUsd = minCapUsd;
-                const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
-                if (depositUsd < withMargin)
-                    depositUsd = withMargin;
-                if (depositUsd > maxCapUsd)
-                    depositUsd = maxCapUsd;
-            }
-            catch (_c) {
-                // best-effort
-            }
+            const minField = cfg.minCapUniversalTxUsd ?? cfg.min_cap_universal_tx_usd;
+            const maxField = cfg.maxCapUniversalTxUsd ?? cfg.max_cap_universal_tx_usd;
+            const minCapUsd = BigInt(minField.toString());
+            const maxCapUsd = BigInt(maxField.toString());
+            if (depositUsd < minCapUsd)
+                depositUsd = minCapUsd;
+            const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
+            if (depositUsd < withMargin)
+                depositUsd = withMargin;
+            if (depositUsd > maxCapUsd)
+                depositUsd = maxCapUsd;
         }
-        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);
-        if ((opts === null || opts === void 0 ? void 0 : opts.emitDepositEstimated) !== false) {
-            (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, depositUsd, chain);
+        catch {
+            // best-effort
         }
-        return nativeAmount;
-    });
+    }
+    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);
+    let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
+        nativeTokenUsdPrice;
+    nativeAmount = nativeAmount + BigInt(1);
+    if (opts?.emitDepositEstimated !== false) {
+        (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_103_03_04, nativeAmount, depositUsd, chain);
+    }
+    return nativeAmount;
 }
 // ============================================================================
 // ERC-20 Gas Amount from Exact Output Quote
 // ============================================================================
-function calculateGasAmountFromAmountOutMinETH(ctx, gasTokenAddress, amountOutMinETH, quoteExactOutputFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const originChain = ctx.universalSigner.account.chain;
-        if (originChain !== enums_1.CHAIN.ETHEREUM_SEPOLIA &&
-            originChain !== enums_1.CHAIN.ARBITRUM_SEPOLIA &&
-            originChain !== enums_1.CHAIN.BASE_SEPOLIA) {
-            throw new Error('Gas payment in ERC-20 is supported only on Ethereum Sepolia, Arbitrum Sepolia, and Base Sepolia for now');
-        }
-        const WETH = (_a = chain_1.CHAIN_INFO[originChain].dex) === null || _a === void 0 ? void 0 : _a.weth;
-        if (!WETH)
-            throw new Error('WETH address not configured for this chain');
-        let gasAmount;
-        if (gasTokenAddress.toLowerCase() === WETH.toLowerCase()) {
-            gasAmount = BigInt(amountOutMinETH);
-        }
-        else {
-            const fromList = (_b = tokens_1.PAYABLE_TOKENS[originChain]) !== null && _b !== void 0 ? _b : [];
-            const fromToken = fromList.find((t) => (t.address || '').toLowerCase() === gasTokenAddress.toLowerCase());
-            const toList = ((_c = tokens_1.MOVEABLE_TOKENS[originChain]) !== null && _c !== void 0 ? _c : []);
-            const toToken = toList.find((t) => t.symbol === 'WETH' ||
-                (t.address || '').toLowerCase() === (WETH || '').toLowerCase());
-            if (!fromToken || !toToken) {
-                throw new Error('Token not supported for quoting');
-            }
-            const targetOut = BigInt(amountOutMinETH);
-            const exactOutQuote = yield quoteExactOutputFn(targetOut, {
-                from: fromToken,
-                to: toToken,
-            });
-            const requiredIn = BigInt(exactOutQuote.amountIn);
-            gasAmount = (requiredIn * BigInt(101)) / BigInt(100);
+async function calculateGasAmountFromAmountOutMinETH(ctx, gasTokenAddress, amountOutMinETH, quoteExactOutputFn) {
+    const originChain = ctx.universalSigner.account.chain;
+    if (originChain !== enums_1.CHAIN.ETHEREUM_SEPOLIA &&
+        originChain !== enums_1.CHAIN.ARBITRUM_SEPOLIA &&
+        originChain !== enums_1.CHAIN.BASE_SEPOLIA) {
+        throw new Error('Gas payment in ERC-20 is supported only on Ethereum Sepolia, Arbitrum Sepolia, and Base Sepolia for now');
+    }
+    const WETH = chain_1.CHAIN_INFO[originChain].dex?.weth;
+    if (!WETH)
+        throw new Error('WETH address not configured for this chain');
+    let gasAmount;
+    if (gasTokenAddress.toLowerCase() === WETH.toLowerCase()) {
+        gasAmount = BigInt(amountOutMinETH);
+    }
+    else {
+        const fromList = tokens_1.PAYABLE_TOKENS[originChain] ?? [];
+        const fromToken = fromList.find((t) => (t.address || '').toLowerCase() === gasTokenAddress.toLowerCase());
+        const toList = (tokens_1.MOVEABLE_TOKENS[originChain] ?? []);
+        const toToken = toList.find((t) => t.symbol === 'WETH' ||
+            (t.address || '').toLowerCase() === (WETH || '').toLowerCase());
+        if (!fromToken || !toToken) {
+            throw new Error('Token not supported for quoting');
         }
-        return { gasAmount };
-    });
+        const targetOut = BigInt(amountOutMinETH);
+        const exactOutQuote = await quoteExactOutputFn(targetOut, {
+            from: fromToken,
+            to: toToken,
+        });
+        const requiredIn = BigInt(exactOutQuote.amountIn);
+        gasAmount = (requiredIn * BigInt(101)) / BigInt(100);
+    }
+    return { gasAmount };
 }
 // ============================================================================
 // Estimate UPC deposit from locked ETH via Uniswap V3 quote
@@ -575,87 +558,84 @@ function calculateGasAmountFromAmountOutMinETH(ctx, gasTokenAddress, amountOutMi
  * Queries the same Uniswap V3 QuoterV2 the chain uses in execute_inbound_gas.go.
  * Returns 0 on any failure (caller should fall back to other logic).
  */
-function estimateDepositFromLockedNative(ctx, nativeAmountForLocker, prc20Token) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        try {
-            const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
-            const quoterAddress = (_b = (_a = chain_1.CHAIN_INFO[pushChain]) === null || _a === void 0 ? void 0 : _a.dex) === null || _b === void 0 ? void 0 : _b.uniV3QuoterV2;
-            if (!quoterAddress || quoterAddress.startsWith('0xTBD'))
-                return BigInt(0);
-            // Get UniversalCore → WPC address + fee tier (reuses existing ABI)
-            const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-            const universalCoreAddress = yield ctx.pushClient.readContract({
-                address: gatewayPcAddress,
-                abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'universalCore',
+async function estimateDepositFromLockedNative(ctx, nativeAmountForLocker, prc20Token) {
+    try {
+        const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
+        const quoterAddress = chain_1.CHAIN_INFO[pushChain]?.dex?.uniV3QuoterV2;
+        if (!quoterAddress || quoterAddress.startsWith('0xTBD'))
+            return BigInt(0);
+        // Get UniversalCore → WPC address + fee tier (reuses existing ABI)
+        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+        const universalCoreAddress = await ctx.pushClient.readContract({
+            address: gatewayPcAddress,
+            abi: abi_1.UNIVERSAL_GATEWAY_PC,
+            functionName: 'universalCore',
+            args: [],
+        });
+        const [wpcAddress, feeTier] = await Promise.all([
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'WPC',
                 args: [],
-            });
-            const [wpcAddress, feeTier] = yield Promise.all([
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'WPC',
-                    args: [],
-                }),
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'defaultFeeTier',
-                    args: [prc20Token],
-                }),
-            ]);
-            if (!feeTier || !wpcAddress)
-                return BigInt(0);
-            // QuoterV2.quoteExactInputSingle — same call the chain relay makes
-            const QUOTER_ABI = [
-                {
-                    type: 'function',
-                    name: 'quoteExactInputSingle',
-                    inputs: [
-                        {
-                            type: 'tuple',
-                            components: [
-                                { name: 'tokenIn', type: 'address' },
-                                { name: 'tokenOut', type: 'address' },
-                                { name: 'amountIn', type: 'uint256' },
-                                { name: 'fee', type: 'uint24' },
-                                { name: 'sqrtPriceLimitX96', type: 'uint160' },
-                            ],
-                        },
-                    ],
-                    outputs: [
-                        { name: 'amountOut', type: 'uint256' },
-                        { name: 'sqrtPriceX96After', type: 'uint160' },
-                        { name: 'initializedTicksCrossed', type: 'uint32' },
-                        { name: 'gasEstimate', type: 'uint256' },
-                    ],
-                    stateMutability: 'view',
-                },
-            ];
-            const result = yield ctx.pushClient.readContract({
-                address: quoterAddress,
-                abi: QUOTER_ABI,
-                functionName: 'quoteExactInputSingle',
-                args: [
+            }),
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'defaultFeeTier',
+                args: [prc20Token],
+            }),
+        ]);
+        if (!feeTier || !wpcAddress)
+            return BigInt(0);
+        // QuoterV2.quoteExactInputSingle — same call the chain relay makes
+        const QUOTER_ABI = [
+            {
+                type: 'function',
+                name: 'quoteExactInputSingle',
+                inputs: [
                     {
-                        tokenIn: prc20Token,
-                        tokenOut: wpcAddress,
-                        amountIn: nativeAmountForLocker,
-                        fee: feeTier,
-                        sqrtPriceLimitX96: BigInt(0),
+                        type: 'tuple',
+                        components: [
+                            { name: 'tokenIn', type: 'address' },
+                            { name: 'tokenOut', type: 'address' },
+                            { name: 'amountIn', type: 'uint256' },
+                            { name: 'fee', type: 'uint24' },
+                            { name: 'sqrtPriceLimitX96', type: 'uint160' },
+                        ],
                     },
                 ],
-            });
-            const amountOut = result[0];
-            (0, context_1.printLog)(ctx, `estimateDepositFromLockedNative — quote: ${nativeAmountForLocker.toString()} pETH → ${amountOut.toString()} WPC (fee tier: ${feeTier})`);
-            return amountOut;
-        }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `estimateDepositFromLockedNative — failed: ${err instanceof Error ? err.message : String(err)}`);
-            return BigInt(0);
-        }
-    });
+                outputs: [
+                    { name: 'amountOut', type: 'uint256' },
+                    { name: 'sqrtPriceX96After', type: 'uint160' },
+                    { name: 'initializedTicksCrossed', type: 'uint32' },
+                    { name: 'gasEstimate', type: 'uint256' },
+                ],
+                stateMutability: 'view',
+            },
+        ];
+        const result = await ctx.pushClient.readContract({
+            address: quoterAddress,
+            abi: QUOTER_ABI,
+            functionName: 'quoteExactInputSingle',
+            args: [
+                {
+                    tokenIn: prc20Token,
+                    tokenOut: wpcAddress,
+                    amountIn: nativeAmountForLocker,
+                    fee: feeTier,
+                    sqrtPriceLimitX96: BigInt(0),
+                },
+            ],
+        });
+        const amountOut = result[0];
+        (0, context_1.printLog)(ctx, `estimateDepositFromLockedNative — quote: ${nativeAmountForLocker.toString()} pETH → ${amountOut.toString()} WPC (fee tier: ${feeTier})`);
+        return amountOut;
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `estimateDepositFromLockedNative — failed: ${err instanceof Error ? err.message : String(err)}`);
+        return BigInt(0);
+    }
 }
 /**
  * Inverse of estimateDepositFromLockedNative: given a desired WPC output,
@@ -666,86 +646,83 @@ function estimateDepositFromLockedNative(ctx, nativeAmountForLocker, prc20Token)
  * of the fixed $0.10/PC SDK rate. Returns 0 on any failure (caller should
  * fall back to the fixed-rate sizing).
  */
-function estimateNativeForDesiredDeposit(ctx, desiredWpc, prc20Token) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        try {
-            if (desiredWpc <= BigInt(0))
-                return BigInt(0);
-            const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
-            const quoterAddress = (_b = (_a = chain_1.CHAIN_INFO[pushChain]) === null || _a === void 0 ? void 0 : _a.dex) === null || _b === void 0 ? void 0 : _b.uniV3QuoterV2;
-            if (!quoterAddress || quoterAddress.startsWith('0xTBD'))
-                return BigInt(0);
-            const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-            const universalCoreAddress = yield ctx.pushClient.readContract({
-                address: gatewayPcAddress,
-                abi: abi_1.UNIVERSAL_GATEWAY_PC,
-                functionName: 'universalCore',
+async function estimateNativeForDesiredDeposit(ctx, desiredWpc, prc20Token) {
+    try {
+        if (desiredWpc <= BigInt(0))
+            return BigInt(0);
+        const pushChain = (0, helpers_1.getPushChainForNetwork)(ctx.pushNetwork);
+        const quoterAddress = chain_1.CHAIN_INFO[pushChain]?.dex?.uniV3QuoterV2;
+        if (!quoterAddress || quoterAddress.startsWith('0xTBD'))
+            return BigInt(0);
+        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+        const universalCoreAddress = await ctx.pushClient.readContract({
+            address: gatewayPcAddress,
+            abi: abi_1.UNIVERSAL_GATEWAY_PC,
+            functionName: 'universalCore',
+            args: [],
+        });
+        const [wpcAddress, feeTier] = await Promise.all([
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'WPC',
                 args: [],
-            });
-            const [wpcAddress, feeTier] = yield Promise.all([
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'WPC',
-                    args: [],
-                }),
-                ctx.pushClient.readContract({
-                    address: universalCoreAddress,
-                    abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
-                    functionName: 'defaultFeeTier',
-                    args: [prc20Token],
-                }),
-            ]);
-            if (!feeTier || !wpcAddress)
-                return BigInt(0);
-            const QUOTER_ABI = [
-                {
-                    type: 'function',
-                    name: 'quoteExactOutputSingle',
-                    inputs: [
-                        {
-                            type: 'tuple',
-                            components: [
-                                { name: 'tokenIn', type: 'address' },
-                                { name: 'tokenOut', type: 'address' },
-                                { name: 'amount', type: 'uint256' },
-                                { name: 'fee', type: 'uint24' },
-                                { name: 'sqrtPriceLimitX96', type: 'uint160' },
-                            ],
-                        },
-                    ],
-                    outputs: [
-                        { name: 'amountIn', type: 'uint256' },
-                        { name: 'sqrtPriceX96After', type: 'uint160' },
-                        { name: 'initializedTicksCrossed', type: 'uint32' },
-                        { name: 'gasEstimate', type: 'uint256' },
-                    ],
-                    stateMutability: 'view',
-                },
-            ];
-            const result = yield ctx.pushClient.readContract({
-                address: quoterAddress,
-                abi: QUOTER_ABI,
-                functionName: 'quoteExactOutputSingle',
-                args: [
+            }),
+            ctx.pushClient.readContract({
+                address: universalCoreAddress,
+                abi: UNIVERSAL_CORE_SWAP_HELPERS_ABI,
+                functionName: 'defaultFeeTier',
+                args: [prc20Token],
+            }),
+        ]);
+        if (!feeTier || !wpcAddress)
+            return BigInt(0);
+        const QUOTER_ABI = [
+            {
+                type: 'function',
+                name: 'quoteExactOutputSingle',
+                inputs: [
                     {
-                        tokenIn: prc20Token,
-                        tokenOut: wpcAddress,
-                        amount: desiredWpc,
-                        fee: feeTier,
-                        sqrtPriceLimitX96: BigInt(0),
+                        type: 'tuple',
+                        components: [
+                            { name: 'tokenIn', type: 'address' },
+                            { name: 'tokenOut', type: 'address' },
+                            { name: 'amount', type: 'uint256' },
+                            { name: 'fee', type: 'uint24' },
+                            { name: 'sqrtPriceLimitX96', type: 'uint160' },
+                        ],
                     },
                 ],
-            });
-            const amountIn = result[0];
-            (0, context_1.printLog)(ctx, `estimateNativeForDesiredDeposit — quote: ${desiredWpc.toString()} WPC ← ${amountIn.toString()} pETH (fee tier: ${feeTier})`);
-            return amountIn;
-        }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `estimateNativeForDesiredDeposit — failed: ${err instanceof Error ? err.message : String(err)}`);
-            return BigInt(0);
-        }
-    });
+                outputs: [
+                    { name: 'amountIn', type: 'uint256' },
+                    { name: 'sqrtPriceX96After', type: 'uint160' },
+                    { name: 'initializedTicksCrossed', type: 'uint32' },
+                    { name: 'gasEstimate', type: 'uint256' },
+                ],
+                stateMutability: 'view',
+            },
+        ];
+        const result = await ctx.pushClient.readContract({
+            address: quoterAddress,
+            abi: QUOTER_ABI,
+            functionName: 'quoteExactOutputSingle',
+            args: [
+                {
+                    tokenIn: prc20Token,
+                    tokenOut: wpcAddress,
+                    amount: desiredWpc,
+                    fee: feeTier,
+                    sqrtPriceLimitX96: BigInt(0),
+                },
+            ],
+        });
+        const amountIn = result[0];
+        (0, context_1.printLog)(ctx, `estimateNativeForDesiredDeposit — quote: ${desiredWpc.toString()} WPC ← ${amountIn.toString()} pETH (fee tier: ${feeTier})`);
+        return amountIn;
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `estimateNativeForDesiredDeposit — failed: ${err instanceof Error ? err.message : String(err)}`);
+        return BigInt(0);
+    }
 }
 //# sourceMappingURL=gas-calculator.js.map