@pushchain/core 6.0.19 → 6.0.21

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

@@ -4,111 +4,107 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.quoteExactOutput = quoteExactOutput;
-const tslib_1 = require("tslib");
 const viem_1 = require("viem");
 const chain_1 = require("../../constants/chain");
 const enums_1 = require("../../constants/enums");
 const utils_1 = require("../../utils");
 const evm_client_1 = require("../../vm-client/evm-client");
-function quoteExactOutput(ctx_1, amountOut_1, _a) {
-    return tslib_1.__awaiter(this, arguments, void 0, function* (ctx, amountOut, { from, to, }) {
-        var _b, _c, _d;
-        const originChain = ctx.universalSigner.account.chain;
-        if (originChain !== enums_1.CHAIN.ETHEREUM_MAINNET &&
-            originChain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
-            throw new Error('Exact-output quoting is only supported on Ethereum Mainnet and Sepolia for now');
+async function quoteExactOutput(ctx, amountOut, { from, to, }) {
+    const originChain = ctx.universalSigner.account.chain;
+    if (originChain !== enums_1.CHAIN.ETHEREUM_MAINNET &&
+        originChain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
+        throw new Error('Exact-output quoting is only supported on Ethereum Mainnet and Sepolia for now');
+    }
+    if (!from)
+        throw new Error('from token is required');
+    if (!to)
+        throw new Error('to token is required');
+    const rpcUrls = ctx.rpcUrls[originChain] || chain_1.CHAIN_INFO[originChain].defaultRPC;
+    const evm = new evm_client_1.EvmClient({ rpcUrls });
+    const factoryFromConfig = chain_1.CHAIN_INFO[originChain].dex?.uniV3Factory;
+    const quoterFromConfig = chain_1.CHAIN_INFO[originChain].dex?.uniV3QuoterV2;
+    if (!factoryFromConfig || !quoterFromConfig) {
+        throw new Error('Uniswap V3 addresses not configured for this chain');
+    }
+    const UNISWAP_V3_FACTORY = factoryFromConfig;
+    const UNISWAP_V3_QUOTER_V2 = quoterFromConfig;
+    const factoryAbi = (0, viem_1.parseAbi)([
+        'function getPool(address tokenA, address tokenB, uint24 fee) view returns (address)',
+    ]);
+    const quoterAbi = (0, viem_1.parseAbi)([
+        'function quoteExactOutputSingle((address tokenIn, address tokenOut, uint256 amount, uint24 fee, uint160 sqrtPriceLimitX96) params) returns (uint256 amountIn, uint160 sqrtPriceX96After, uint32 initializedTicksCrossed, uint256 gasEstimate)',
+    ]);
+    const poolAbi = (0, viem_1.parseAbi)([
+        'function liquidity() view returns (uint128)',
+    ]);
+    const feeTiers = [100, 500, 3000, 10000];
+    let bestAmountIn = null;
+    let bestFee = null;
+    for (const fee of feeTiers) {
+        const poolAddress = await evm.readContract({
+            abi: factoryAbi,
+            address: UNISWAP_V3_FACTORY,
+            functionName: 'getPool',
+            args: [from.address, to.address, fee],
+        });
+        const isZero = !poolAddress ||
+            poolAddress.toLowerCase() ===
+                '0x0000000000000000000000000000000000000000';
+        if (isZero)
+            continue;
+        try {
+            const liquidity = await evm.readContract({
+                abi: poolAbi,
+                address: poolAddress,
+                functionName: 'liquidity',
+                args: [],
+            });
+            if (!liquidity || liquidity === BigInt(0))
+                continue;
         }
-        if (!from)
-            throw new Error('from token is required');
-        if (!to)
-            throw new Error('to token is required');
-        const rpcUrls = ctx.rpcUrls[originChain] || chain_1.CHAIN_INFO[originChain].defaultRPC;
-        const evm = new evm_client_1.EvmClient({ rpcUrls });
-        const factoryFromConfig = (_b = chain_1.CHAIN_INFO[originChain].dex) === null || _b === void 0 ? void 0 : _b.uniV3Factory;
-        const quoterFromConfig = (_c = chain_1.CHAIN_INFO[originChain].dex) === null || _c === void 0 ? void 0 : _c.uniV3QuoterV2;
-        if (!factoryFromConfig || !quoterFromConfig) {
-            throw new Error('Uniswap V3 addresses not configured for this chain');
+        catch {
+            continue;
         }
-        const UNISWAP_V3_FACTORY = factoryFromConfig;
-        const UNISWAP_V3_QUOTER_V2 = quoterFromConfig;
-        const factoryAbi = (0, viem_1.parseAbi)([
-            'function getPool(address tokenA, address tokenB, uint24 fee) view returns (address)',
-        ]);
-        const quoterAbi = (0, viem_1.parseAbi)([
-            'function quoteExactOutputSingle((address tokenIn, address tokenOut, uint256 amount, uint24 fee, uint160 sqrtPriceLimitX96) params) returns (uint256 amountIn, uint160 sqrtPriceX96After, uint32 initializedTicksCrossed, uint256 gasEstimate)',
-        ]);
-        const poolAbi = (0, viem_1.parseAbi)([
-            'function liquidity() view returns (uint128)',
-        ]);
-        const feeTiers = [100, 500, 3000, 10000];
-        let bestAmountIn = null;
-        let bestFee = null;
-        for (const fee of feeTiers) {
-            const poolAddress = yield evm.readContract({
-                abi: factoryAbi,
-                address: UNISWAP_V3_FACTORY,
-                functionName: 'getPool',
-                args: [from.address, to.address, fee],
+        try {
+            const result = await evm.readContract({
+                abi: quoterAbi,
+                address: UNISWAP_V3_QUOTER_V2,
+                functionName: 'quoteExactOutputSingle',
+                args: [
+                    {
+                        tokenIn: from.address,
+                        tokenOut: to.address,
+                        amount: amountOut,
+                        fee,
+                        sqrtPriceLimitX96: BigInt(0),
+                    },
+                ],
             });
-            const isZero = !poolAddress ||
-                poolAddress.toLowerCase() ===
-                    '0x0000000000000000000000000000000000000000';
-            if (isZero)
-                continue;
-            try {
-                const liquidity = yield evm.readContract({
-                    abi: poolAbi,
-                    address: poolAddress,
-                    functionName: 'liquidity',
-                    args: [],
-                });
-                if (!liquidity || liquidity === BigInt(0))
-                    continue;
-            }
-            catch (_e) {
+            const amountIn = result?.[0] ?? BigInt(0);
+            if (amountIn === BigInt(0))
                 continue;
-            }
-            try {
-                const result = yield evm.readContract({
-                    abi: quoterAbi,
-                    address: UNISWAP_V3_QUOTER_V2,
-                    functionName: 'quoteExactOutputSingle',
-                    args: [
-                        {
-                            tokenIn: from.address,
-                            tokenOut: to.address,
-                            amount: amountOut,
-                            fee,
-                            sqrtPriceLimitX96: BigInt(0),
-                        },
-                    ],
-                });
-                const amountIn = (_d = result === null || result === void 0 ? void 0 : result[0]) !== null && _d !== void 0 ? _d : BigInt(0);
-                if (amountIn === BigInt(0))
-                    continue;
-                if (bestAmountIn === null || amountIn < bestAmountIn) {
-                    bestAmountIn = amountIn;
-                    bestFee = fee;
-                }
-            }
-            catch (_f) {
-                // try next fee
+            if (bestAmountIn === null || amountIn < bestAmountIn) {
+                bestAmountIn = amountIn;
+                bestFee = fee;
             }
         }
-        if (bestAmountIn === null || bestFee === null) {
-            throw new Error('No direct Uniswap V3 pool found for the given token pair on common fee tiers');
+        catch {
+            // try next fee
         }
-        const amountInBig = BigInt(bestAmountIn);
-        const amountInHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountInBig, { decimals: from.decimals }));
-        const amountOutHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountOut, { decimals: to.decimals }));
-        const rate = amountInHuman > 0 ? amountOutHuman / amountInHuman : 0;
-        return {
-            amountIn: bestAmountIn.toString(),
-            amountOut: amountOut.toString(),
-            rate,
-            route: [from.symbol, to.symbol],
-            timestamp: Date.now(),
-        };
-    });
+    }
+    if (bestAmountIn === null || bestFee === null) {
+        throw new Error('No direct Uniswap V3 pool found for the given token pair on common fee tiers');
+    }
+    const amountInBig = BigInt(bestAmountIn);
+    const amountInHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountInBig, { decimals: from.decimals }));
+    const amountOutHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountOut, { decimals: to.decimals }));
+    const rate = amountInHuman > 0 ? amountOutHuman / amountInHuman : 0;
+    return {
+        amountIn: bestAmountIn.toString(),
+        amountOut: amountOut.toString(),
+        rate,
+        route: [from.symbol, to.symbol],
+        timestamp: Date.now(),
+    };
 }
 //# sourceMappingURL=quote.js.map

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

@@ -7,7 +7,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rescueFunds = rescueFunds;
-const tslib_1 = require("tslib");
 const viem_1 = require("viem");
 const universalGatewayPC_evm_1 = require("../../constants/abi/universalGatewayPC.evm");
 const selectors_1 = require("../../constants/selectors");
@@ -29,84 +28,82 @@ const gas_calculator_1 = require("./gas-calculator");
  * @param executeFn - The Orchestrator.execute() method (avoids circular dep)
  * @returns Transaction response
  */
-function rescueFunds(ctx, params, executeFn) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        // Validate universalTxId format (bytes32: 0x + 64 hex chars)
-        if (!params.universalTxId ||
-            params.universalTxId.length !== 66 ||
-            !/^0x[0-9a-fA-F]{64}$/.test(params.universalTxId)) {
-            throw new Error(`Invalid universalTxId: expected 0x-prefixed bytes32 (66 chars), got "${params.universalTxId}"`);
-        }
-        // Validate prc20 is not zero address
-        if (!params.prc20 ||
-            params.prc20 === selectors_1.ZERO_ADDRESS) {
-            throw new Error('prc20 token address cannot be zero address');
-        }
-        const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
-        const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
-        (0, context_1.printLog)(ctx, `rescueFunds — universalTxId=${params.universalTxId}, prc20=${params.prc20}, gateway=${gatewayPcAddress}`);
-        // Pre-fetch UEA status
-        const [ueaCode, ueaBalance] = yield Promise.all([
-            ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
-            ctx.pushClient.getBalance(ueaAddress),
-        ]);
-        const isUEADeployed = ueaCode !== undefined;
-        const ueaNonce = isUEADeployed ? yield (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
-        // Query rescue gas fee
-        let nativeValueForGas = BigInt(0);
-        try {
-            const result = yield (0, gas_calculator_1.queryRescueGasFee)(ctx, params.prc20, ctx.universalSigner.account.chain);
-            nativeValueForGas = result.nativeValueForGas;
-            (0, context_1.printLog)(ctx, `rescueFunds — queried gas fee: gasFee=${result.gasFee.toString()}, gasToken=${result.gasToken}, nativeValueForGas=${nativeValueForGas.toString()}`);
-        }
-        catch (err) {
-            throw new Error(`Failed to query rescue gas fee: ${err}`);
-        }
-        // Adjust nativeValueForGas using the same balance-capping pattern as outbound
-        const EVM_NATIVE_VALUE_TARGET = BigInt(200e18); // 200 UPC
-        const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for tx overhead
-        const currentBalance = ueaBalance;
-        let adjustedValue;
-        if (currentBalance > EVM_NATIVE_VALUE_TARGET + EVM_GAS_RESERVE) {
-            adjustedValue = EVM_NATIVE_VALUE_TARGET;
-        }
-        else if (currentBalance > EVM_GAS_RESERVE) {
-            adjustedValue = currentBalance - EVM_GAS_RESERVE;
-        }
-        else {
-            adjustedValue = nativeValueForGas;
-        }
-        if (adjustedValue !== nativeValueForGas) {
-            (0, context_1.printLog)(ctx, `rescueFunds — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} (UEA balance: ${currentBalance.toString()})`);
-            nativeValueForGas = adjustedValue;
-        }
-        // Build single rescue multicall (no PRC-20 approval needed — no burn)
-        const rescueCallData = (0, viem_1.encodeFunctionData)({
-            abi: universalGatewayPC_evm_1.UNIVERSAL_GATEWAY_PC,
-            functionName: 'rescueFundsOnSourceChain',
-            args: [params.universalTxId, params.prc20],
-        });
-        const pushChainMulticalls = [
-            {
-                to: gatewayPcAddress,
-                value: nativeValueForGas,
-                data: rescueCallData,
-            },
-        ];
-        (0, context_1.printLog)(ctx, `rescueFunds — built rescue multicall, nativeValueForGas=${nativeValueForGas.toString()}`);
-        const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => { var _a; return sum + ((_a = mc.value) !== null && _a !== void 0 ? _a : BigInt(0)); }, BigInt(0));
-        const executeParams = {
-            to: ueaAddress,
-            value: multicallNativeValue,
-            data: pushChainMulticalls,
-            _ueaStatus: {
-                isDeployed: isUEADeployed,
-                nonce: ueaNonce,
-                balance: ueaBalance,
-            },
-            _skipFeeLocking: true,
-        };
-        return executeFn(executeParams);
+async function rescueFunds(ctx, params, executeFn) {
+    // Validate universalTxId format (bytes32: 0x + 64 hex chars)
+    if (!params.universalTxId ||
+        params.universalTxId.length !== 66 ||
+        !/^0x[0-9a-fA-F]{64}$/.test(params.universalTxId)) {
+        throw new Error(`Invalid universalTxId: expected 0x-prefixed bytes32 (66 chars), got "${params.universalTxId}"`);
+    }
+    // Validate prc20 is not zero address
+    if (!params.prc20 ||
+        params.prc20 === selectors_1.ZERO_ADDRESS) {
+        throw new Error('prc20 token address cannot be zero address');
+    }
+    const ueaAddress = (0, uea_manager_1.computeUEAOffchain)(ctx);
+    const gatewayPcAddress = (0, helpers_1.getUniversalGatewayPCAddress)();
+    (0, context_1.printLog)(ctx, `rescueFunds — universalTxId=${params.universalTxId}, prc20=${params.prc20}, gateway=${gatewayPcAddress}`);
+    // Pre-fetch UEA status
+    const [ueaCode, ueaBalance] = await Promise.all([
+        ctx.pushClient.publicClient.getCode({ address: ueaAddress }),
+        ctx.pushClient.getBalance(ueaAddress),
+    ]);
+    const isUEADeployed = ueaCode !== undefined;
+    const ueaNonce = isUEADeployed ? await (0, uea_manager_1.getUEANonce)(ctx, ueaAddress) : BigInt(0);
+    // Query rescue gas fee
+    let nativeValueForGas = BigInt(0);
+    try {
+        const result = await (0, gas_calculator_1.queryRescueGasFee)(ctx, params.prc20, ctx.universalSigner.account.chain);
+        nativeValueForGas = result.nativeValueForGas;
+        (0, context_1.printLog)(ctx, `rescueFunds — queried gas fee: gasFee=${result.gasFee.toString()}, gasToken=${result.gasToken}, nativeValueForGas=${nativeValueForGas.toString()}`);
+    }
+    catch (err) {
+        throw new Error(`Failed to query rescue gas fee: ${err}`);
+    }
+    // Adjust nativeValueForGas using the same balance-capping pattern as outbound
+    const EVM_NATIVE_VALUE_TARGET = BigInt(200e18); // 200 UPC
+    const EVM_GAS_RESERVE = BigInt(3e18); // 3 UPC for tx overhead
+    const currentBalance = ueaBalance;
+    let adjustedValue;
+    if (currentBalance > EVM_NATIVE_VALUE_TARGET + EVM_GAS_RESERVE) {
+        adjustedValue = EVM_NATIVE_VALUE_TARGET;
+    }
+    else if (currentBalance > EVM_GAS_RESERVE) {
+        adjustedValue = currentBalance - EVM_GAS_RESERVE;
+    }
+    else {
+        adjustedValue = nativeValueForGas;
+    }
+    if (adjustedValue !== nativeValueForGas) {
+        (0, context_1.printLog)(ctx, `rescueFunds — adjusting nativeValueForGas from ${nativeValueForGas.toString()} to ${adjustedValue.toString()} (UEA balance: ${currentBalance.toString()})`);
+        nativeValueForGas = adjustedValue;
+    }
+    // Build single rescue multicall (no PRC-20 approval needed — no burn)
+    const rescueCallData = (0, viem_1.encodeFunctionData)({
+        abi: universalGatewayPC_evm_1.UNIVERSAL_GATEWAY_PC,
+        functionName: 'rescueFundsOnSourceChain',
+        args: [params.universalTxId, params.prc20],
     });
+    const pushChainMulticalls = [
+        {
+            to: gatewayPcAddress,
+            value: nativeValueForGas,
+            data: rescueCallData,
+        },
+    ];
+    (0, context_1.printLog)(ctx, `rescueFunds — built rescue multicall, nativeValueForGas=${nativeValueForGas.toString()}`);
+    const multicallNativeValue = pushChainMulticalls.reduce((sum, mc) => sum + (mc.value ?? BigInt(0)), BigInt(0));
+    const executeParams = {
+        to: ueaAddress,
+        value: multicallNativeValue,
+        data: pushChainMulticalls,
+        _ueaStatus: {
+            isDeployed: isUEADeployed,
+            nonce: ueaNonce,
+            balance: ueaBalance,
+        },
+        _skipFeeLocking: true,
+    };
+    return executeFn(executeParams);
 }
 //# sourceMappingURL=rescue.js.map

package/src/lib/orchestrator/internals/response-builder.d.ts

@@ -28,7 +28,34 @@ export interface ResponseBuilderCallbacks {
         maxTimeoutMs: number;
     };
 }
-export declare function queryUniversalTxStatusFromGatewayTx(ctx: OrchestratorContext, evmClient: EvmClient | undefined, gatewayAddress: `0x${string}` | undefined, txHash: string, evmGatewayMethod: 'sendFunds' | 'sendTxWithFunds' | 'sendTxWithGas'): Promise<UniversalTx | undefined>;
+/**
+ * Pick the gateway log whose event is the PC20 burn — the leg that carries the
+ * user's transfer.
+ *
+ * A PC20 return with a prepaid gas deposit makes the gateway emit TWO
+ * `UniversalTx` events from one user tx: the PC20 burn (payload prefixed with
+ * the `PC20` selector) and, second, a plain FUNDS event for the attached
+ * native value. Each becomes its own UTX on Push. The default "last gateway
+ * log" heuristic therefore selects the *fee-credit* leg, so a failure there
+ * (see the known fee-credit bug) is reported as the whole transfer failing —
+ * even though the tokens arrived via the first leg.
+ *
+ * Identification is by payload prefix rather than log order: the selector is
+ * what the gateway itself stamps on the PC20 leg, so it stays correct if the
+ * emission order ever changes. Returns null when no PC20 leg is present, and
+ * the caller keeps its existing behaviour.
+ */
+export declare function findPC20GatewayLogIndex(ctx: OrchestratorContext, gatewayLogs: Array<{
+    topics?: unknown;
+    data?: unknown;
+    logIndex?: unknown;
+}>): number | null;
+export declare function queryUniversalTxStatusFromGatewayTx(ctx: OrchestratorContext, evmClient: EvmClient | undefined, gatewayAddress: `0x${string}` | undefined, txHash: string, evmGatewayMethod: 'sendFunds' | 'sendTxWithFunds' | 'sendTxWithGas', 
+/**
+ * Set for PC20 imports (wrapper burns). Selects the PC20 burn leg rather
+ * than the last gateway log — see {@link findPC20GatewayLogIndex}.
+ */
+preferPC20Log?: boolean): Promise<UniversalTx | undefined>;
 /**
  * Source-hash resolution for trackTransaction.
  *