@pushchain/core 2.1.0 → 2.1.2

package/src/lib/orchestrator/orchestrator.js

@@ -63,7 +63,7 @@ class Orchestrator {
      */
     execute(execute) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             try {
                 // FUNDS_TX short-circuit: Bridge tokens from origin chain to Push Chain
                 // - EVM (Sepolia): UniversalGatewayV0
@@ -138,16 +138,41 @@ class Orchestrator {
                             const bridgeToken = execute.funds.token.mechanism === 'approve'
                                 ? tokenAddr
                                 : '0x0000000000000000000000000000000000000000';
+                            const { nonce } = yield this.getUeaStatusAndNonce();
+                            const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', bridgeAmount);
+                            // Get UEA info
+                            const ueaAddress = this.computeUEAOffchain();
+                            const ueaVersion = yield this.fetchUEAVersion();
+                            const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress, ueaVersion);
+                            const eip712SignatureHex = (0, viem_1.bytesToHex)(eip712Signature);
                             let txHash;
                             try {
+                                // Compute minimal native amount to deposit for gas on Push Chain
+                                const ueaAddressForGas = this.computeUEAOffchain();
+                                const ueaBalanceForGas = yield this.pushClient.getBalance(ueaAddressForGas);
+                                const nativeAmount = yield this.calculateNativeAmountForDeposit(chain, BigInt(0), ueaBalanceForGas);
                                 txHash = yield evmClient.writeContract({
                                     abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                     address: gatewayAddress,
-                                    functionName: 'sendFunds',
-                                    args: [recipient, bridgeToken, bridgeAmount, revertCFG],
+                                    functionName: 'sendTxWithFunds',
+                                    args: [
+                                        tokenAddr,
+                                        bridgeAmount,
+                                        universalPayload,
+                                        revertCFG,
+                                        eip712SignatureHex,
+                                    ],
                                     signer: this.universalSigner,
-                                    value: isNative ? bridgeAmount : BigInt(0),
+                                    value: nativeAmount,
                                 });
+                                // txHash = await evmClient.writeContract({
+                                //   abi: UNIVERSAL_GATEWAY_V0 as unknown as Abi,
+                                //   address: gatewayAddress,
+                                //   functionName: 'sendFunds',
+                                //   args: [recipient, bridgeToken, bridgeAmount, revertCFG],
+                                //   signer: this.universalSigner,
+                                //   value: isNative ? bridgeAmount : BigInt(0),
+                                // });
                             }
                             catch (err) {
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_04);
@@ -169,6 +194,10 @@ class Orchestrator {
                             const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
                             const [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                             const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
+                            // pay-with-token gas abstraction is not supported on Solana
+                            if (((_a = execute.funds) === null || _a === void 0 ? void 0 : _a.payWith) !== undefined) {
+                                throw new Error('Pay-with token is not supported on Solana');
+                            }
                             let txSignature;
                             // SVM-specific RevertSettings: bytes must be a Buffer
                             const revertSvm = {
@@ -329,13 +358,13 @@ class Orchestrator {
                         }
                         const mechanism = execute.funds.token.mechanism;
                         const { deployed, nonce } = yield this.getUeaStatusAndNonce();
-                        const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce);
+                        const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendTxWithFunds');
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01);
                         // Compute required gas funding on Push Chain and current UEA balance
                         const gasEstimate = execute.gasLimit || BigInt(1e7);
                         const gasPrice = yield this.pushClient.getGasPrice();
                         const requiredGasFee = gasEstimate * gasPrice;
-                        const payloadValue = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
+                        const payloadValue = (_b = execute.value) !== null && _b !== void 0 ? _b : BigInt(0);
                         const requiredFunds = requiredGasFee + payloadValue;
                         const ueaAddress = this.computeUEAOffchain();
                         const [ueaBalance] = yield Promise.all([
@@ -368,8 +397,8 @@ class Orchestrator {
                                     functionName: 'config',
                                     args: [configPda.toBase58()],
                                 });
-                                const minField = (_b = cfg.minCapUniversalTxUsd) !== null && _b !== void 0 ? _b : cfg.min_cap_universal_tx_usd;
-                                const maxField = (_c = cfg.maxCapUniversalTxUsd) !== null && _c !== void 0 ? _c : cfg.max_cap_universal_tx_usd;
+                                const minField = (_c = cfg.minCapUniversalTxUsd) !== null && _c !== void 0 ? _c : cfg.min_cap_universal_tx_usd;
+                                const maxField = (_d = cfg.maxCapUniversalTxUsd) !== null && _d !== void 0 ? _d : cfg.max_cap_universal_tx_usd;
                                 const minCapUsd = BigInt(minField.toString());
                                 const maxCapUsd = BigInt(maxField.toString());
                                 if (depositUsd < minCapUsd)
@@ -381,7 +410,7 @@ class Orchestrator {
                                 if (depositUsd > maxCapUsd)
                                     depositUsd = maxCapUsd;
                             }
-                            catch (_d) {
+                            catch (_m) {
                                 // best-effort; fallback to previous bounds if read fails
                             }
                         }
@@ -430,20 +459,73 @@ class Orchestrator {
                                     : (0, viem_1.bytesToHex)(eip712Signature);
                                 const evmClientEvm = evmClient;
                                 const gatewayAddressEvm = gatewayAddress;
-                                txHash = yield evmClientEvm.writeContract({
-                                    abi: abi_1.UNIVERSAL_GATEWAY_V0,
-                                    address: gatewayAddressEvm,
-                                    functionName: 'sendTxWithFunds',
-                                    args: [
-                                        tokenAddr,
-                                        bridgeAmount,
-                                        universalPayload,
-                                        revertCFG,
-                                        eip712SignatureHex,
-                                    ],
-                                    signer: this.universalSigner,
-                                    value: nativeAmount,
-                                });
+                                // New behavior: if user provided a gasTokenAddress, pay gas in that token via Uniswap quote
+                                // Determine pay-with token address, min-out and slippage
+                                const payWith = execute.funds.payWith;
+                                const gasTokenAddress = (_e = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _e === void 0 ? void 0 : _e.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 = (_f = payWith === null || payWith === void 0 ? void 0 : payWith.slippageBps) !== null && _f !== void 0 ? _f : 100;
+                                    amountOutMinETH = BigInt(push_chain_1.PushChain.utils.conversion.slippageToMinAmount(amountOutMinETH.toString(), { slippageBps }));
+                                    const { gasAmount } = yield this.calculateGasAmountFromAmountOutMinETH(gasTokenAddress, amountOutMinETH);
+                                    const deadline = BigInt(0);
+                                    // Ensure caller has enough balance of the gas token to cover fees
+                                    const ownerAddress = this.universalSigner.account
+                                        .address;
+                                    const gasTokenBalance = yield evmClientEvm.getErc20Balance({
+                                        tokenAddress: gasTokenAddress,
+                                        ownerAddress,
+                                    });
+                                    if (gasTokenBalance < gasAmount) {
+                                        const sym = (_h = (_g = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _g === void 0 ? void 0 : _g.symbol) !== null && _h !== void 0 ? _h : 'gas token';
+                                        const decimals = (_k = (_j = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _j === void 0 ? void 0 : _j.decimals) !== null && _k !== void 0 ? _k : 18;
+                                        const needFmt = push_chain_1.PushChain.utils.helpers.formatUnits(gasAmount, decimals);
+                                        const haveFmt = push_chain_1.PushChain.utils.helpers.formatUnits(gasTokenBalance, decimals);
+                                        throw new Error(`Insufficient ${sym} balance to cover gas fees: need ${needFmt}, have ${haveFmt}`);
+                                    }
+                                    // Approve gas token to gateway
+                                    yield this.ensureErc20Allowance(evmClientEvm, gasTokenAddress, gatewayAddressEvm, gasAmount);
+                                    // Approve bridge token already done above; now call new gateway signature (nonpayable)
+                                    txHash = yield evmClientEvm.writeContract({
+                                        abi: abi_1.UNIVERSAL_GATEWAY_V0,
+                                        address: gatewayAddressEvm,
+                                        functionName: 'sendTxWithFunds',
+                                        args: [
+                                            tokenAddr,
+                                            bridgeAmount,
+                                            gasTokenAddress,
+                                            gasAmount,
+                                            amountOutMinETH,
+                                            deadline,
+                                            universalPayload,
+                                            revertCFG,
+                                            eip712SignatureHex,
+                                        ],
+                                        signer: this.universalSigner,
+                                    });
+                                }
+                                else {
+                                    // Existing native-ETH value path
+                                    txHash = yield evmClientEvm.writeContract({
+                                        abi: abi_1.UNIVERSAL_GATEWAY_V0,
+                                        address: gatewayAddressEvm,
+                                        functionName: 'sendTxWithFunds',
+                                        args: [
+                                            tokenAddr,
+                                            bridgeAmount,
+                                            universalPayload,
+                                            revertCFG,
+                                            eip712SignatureHex,
+                                        ],
+                                        signer: this.universalSigner,
+                                        value: nativeAmount,
+                                    });
+                                }
                             }
                             else {
                                 // SVM funds+payload path
@@ -457,6 +539,10 @@ class Orchestrator {
                                 // whitelistPda already computed above
                                 const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
                                 const priceUpdatePk = new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE');
+                                // pay-with-token gas abstraction is not supported on Solana
+                                if (((_l = execute.funds) === null || _l === void 0 ? void 0 : _l.payWith) !== undefined) {
+                                    throw new Error('Pay-with token is not supported on Solana');
+                                }
                                 const isNative = mechanism === 'native' || execute.funds.token.symbol === 'SOL';
                                 const revertSvm2 = {
                                     fundRecipient: userPk,
@@ -1193,6 +1279,118 @@ class Orchestrator {
             }
         });
     }
+    /**
+     * Quotes exact-output on Uniswap V3 for EVM origin chains using QuoterV2.
+     * Returns the minimum required input (amountIn) to receive the target amountOut.
+     */
+    _quoteExactOutput(amountOut_1, _a) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (amountOut, { from, to, }) {
+            var _b, _c, _d;
+            const originChain = this.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 = this.getRpcUrls()[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');
+            }
+            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) {
+                // Find pool address for this fee tier
+                const poolAddress = yield 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;
+                // Skip uninitialized/empty pools to avoid Quoter reverts
+                try {
+                    const liquidity = yield evm.readContract({
+                        abi: poolAbi,
+                        address: poolAddress,
+                        functionName: 'liquidity',
+                        args: [],
+                    });
+                    if (!liquidity || liquidity === BigInt(0))
+                        continue;
+                }
+                catch (_e) {
+                    continue;
+                }
+                // Quote exact output single for this fee tier
+                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 || 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(push_chain_1.PushChain.utils.helpers.formatUnits(amountInBig, {
+                decimals: from.decimals,
+            }));
+            const amountOutHuman = parseFloat(push_chain_1.PushChain.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(),
+            };
+        });
+    }
     ensureErc20Allowance(evmClient, tokenAddress, spender, requiredAmount) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const chain = this.universalSigner.account.chain;
@@ -1303,26 +1501,53 @@ class Orchestrator {
         });
     }
     /**
-     * Builds UniversalPayload for the gateway and computes the native gas deposit.
+     * For sendFunds, we will call internally the sendTxWithFunds.
      */
-    buildGatewayPayloadAndGas(execute, nonce) {
+    buildGatewayPayloadAndGas(execute, nonce, type, fundsValue) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const gasEstimate = execute.gasLimit || BigInt(1e7);
             const payloadValue = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
             const gasAmount = (_b = execute.value) !== null && _b !== void 0 ? _b : BigInt(0);
-            const universalPayload = {
-                to: execute.to,
-                value: payloadValue,
-                data: execute.data || '0x',
-                gasLimit: gasEstimate,
-                maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
-                maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
-                nonce,
-                deadline: execute.deadline || BigInt(9999999999),
-                vType: tx_1.VerificationType.signedVerification,
-            };
-            return { payload: universalPayload, gasAmount };
+            if (type === 'sendTxWithFunds') {
+                if (fundsValue)
+                    throw new Error('fundsValue property must be empty');
+                const universalPayload = {
+                    to: execute.to,
+                    value: payloadValue,
+                    data: execute.data || '0x',
+                    gasLimit: gasEstimate,
+                    maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
+                    maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
+                    nonce,
+                    deadline: execute.deadline || BigInt(9999999999),
+                    vType: tx_1.VerificationType.signedVerification,
+                };
+                return { payload: universalPayload, gasAmount };
+            }
+            else {
+                if (!fundsValue)
+                    throw new Error('fundsValue property must not be empty');
+                // The data will be the abi-encoded transfer function from erc-20 function. The recipient will be `execute.to`, the value
+                // will be the fundsValue property.
+                const data = (0, viem_1.encodeFunctionData)({
+                    abi: abi_1.ERC20_EVM,
+                    functionName: 'transfer',
+                    args: [execute.to, fundsValue],
+                });
+                const universalPayload = {
+                    to: viem_1.zeroAddress, // We can't simply do `0x` because we will get an error when eip712 signing the transaction.
+                    value: payloadValue,
+                    data,
+                    gasLimit: gasEstimate,
+                    maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
+                    maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
+                    nonce,
+                    deadline: execute.deadline || BigInt(9999999999),
+                    vType: tx_1.VerificationType.signedVerification,
+                };
+                return { payload: universalPayload, gasAmount };
+            }
         });
     }
     /********************************** HELPER FUNCTIONS **************************************************/
@@ -1719,6 +1944,102 @@ class Orchestrator {
             return version;
         });
     }
+    // Build EVM gas payment parameters when paying gas with an ERC-20 token
+    calculateGasAmountFromAmountOutMinETH(gasTokenAddress, amountOutMinETH) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const originChain = this.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');
+            }
+            // Resolve WETH: prefer chain config, fallback to registry
+            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 {
+                // Resolve token objects from registries
+                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 this._quoteExactOutput(targetOut, {
+                    from: fromToken,
+                    to: toToken,
+                });
+                const requiredIn = BigInt(exactOutQuote.amountIn);
+                gasAmount = (requiredIn * BigInt(101)) / BigInt(100); // 1% safety margin
+            }
+            return { gasAmount };
+        });
+    }
+    calculateNativeAmountForDeposit(chain, requiredFunds, ueaBalance) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            // Determine USD to deposit via gateway (8 decimals) with caps: min=$1, max=$10
+            const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+            const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
+            const deficit = requiredFunds > ueaBalance ? requiredFunds - ueaBalance : BigInt(0);
+            let depositUsd = deficit > BigInt(0) ? this.pushClient.pushToUSDC(deficit) : oneUsd;
+            if (depositUsd < oneUsd)
+                depositUsd = oneUsd;
+            if (depositUsd > tenUsd)
+                throw new Error('Deposit value exceeds max $10 worth of native token');
+            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02, depositUsd);
+            // 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: this.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 = 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;
+                    // Add 20% safety margin to avoid BelowMinCap due to price drift
+                    const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
+                    if (depositUsd < withMargin)
+                        depositUsd = withMargin;
+                    if (depositUsd > maxCapUsd)
+                        depositUsd = maxCapUsd;
+                }
+                catch (_c) {
+                    // best-effort; fallback to previous bounds if read fails
+                }
+            }
+            // Convert USD(8) -> native units using pricing path
+            const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain); // 8 decimals
+            const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
+            const oneNativeUnit = push_chain_1.PushChain.utils.helpers.parseUnits('1', nativeDecimals);
+            // Ceil division to avoid rounding below min USD on-chain
+            let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
+                nativeTokenUsdPrice;
+            // Add 1 unit safety to avoid BelowMinCap from rounding differences
+            nativeAmount = nativeAmount + BigInt(1);
+            return nativeAmount;
+        });
+    }
 }
 exports.Orchestrator = Orchestrator;
 //# sourceMappingURL=orchestrator.js.map