@pushchain/core 2.1.11 → 3.0.0

package/src/lib/orchestrator/orchestrator.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const viem_1 = require("viem");
 const push_chain_1 = require("../push-chain/push-chain");
 const enums_1 = require("../constants/enums");
+const payload_builders_1 = require("./payload-builders");
 const evm_client_1 = require("../vm-client/evm-client");
 const chain_1 = require("../constants/chain");
 const abi_1 = require("../constants/abi");
@@ -70,13 +71,21 @@ class Orchestrator {
                 // - SVM (Solana Devnet): pushsolanagateway
                 if (execute.funds) {
                     if (!execute.data || execute.data === '0x') {
-                        // Disallow user-provided `value` for funds-only bridging. The SDK derives
-                        // origin-chain msg.value automatically from the funds input:
-                        //  - Native path: msg.value = bridgeAmount
-                        //  - ERC-20 path: msg.value = 0
-                        if (execute.value !== undefined && execute.value !== BigInt(0)) {
-                            throw new Error('Do not set `value` when using funds bridging; the SDK sets origin msg.value from `funds.amount` automatically');
-                        }
+                        // @@@@@@@@@@@@@@@
+                        // @@@@@@@@@@@@@@@
+                        // @@@@@@@@@@@@@@@
+                        // @@@@@@@@@@@@@@@
+                        // @@@@@@@@@@@@@@@
+                        // @@@@@@@@@@@@@@@
+                        // // Disallow user-provided `value` for funds-only bridging. The SDK derives
+                        // // origin-chain msg.value automatically from the funds input:
+                        // //  - Native path: msg.value = bridgeAmount
+                        // //  - ERC-20 path: msg.value = 0
+                        // if (execute.value !== undefined && execute.value !== BigInt(0)) {
+                        //   throw new Error(
+                        //     'Do not set `value` when using funds bridging; the SDK sets origin msg.value from `funds.amount` automatically'
+                        //   );
+                        // }
                         const chain = this.universalSigner.account.chain;
                         const { vm } = chain_1.CHAIN_INFO[chain];
                         if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA ||
@@ -138,16 +147,53 @@ 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 {
-                                txHash = yield evmClient.writeContract({
-                                    abi: abi_1.UNIVERSAL_GATEWAY_V0,
-                                    address: gatewayAddress,
-                                    functionName: 'sendFunds',
-                                    args: [recipient, bridgeToken, bridgeAmount, revertCFG],
-                                    signer: this.universalSigner,
-                                    value: isNative ? bridgeAmount : BigInt(0),
-                                });
+                                // 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);
+                                console.log([
+                                    tokenAddr,
+                                    bridgeAmount,
+                                    universalPayload,
+                                    revertCFG,
+                                    '0x',
+                                ]);
+                                const ueaAddress = this.computeUEAOffchain();
+                                if (execute.to.toLowerCase() === ueaAddress.toLowerCase()) {
+                                    txHash = yield evmClient.writeContract({
+                                        abi: abi_1.UNIVERSAL_GATEWAY_V0,
+                                        address: gatewayAddress,
+                                        functionName: 'sendFunds',
+                                        args: [recipient, bridgeToken, bridgeAmount, revertCFG],
+                                        signer: this.universalSigner,
+                                        value: isNative ? bridgeAmount : BigInt(0),
+                                    });
+                                }
+                                else {
+                                    txHash = yield evmClient.writeContract({
+                                        abi: abi_1.UNIVERSAL_GATEWAY_V0,
+                                        address: gatewayAddress,
+                                        functionName: 'sendTxWithFunds_new',
+                                        args: [
+                                            tokenAddr,
+                                            bridgeAmount,
+                                            universalPayload,
+                                            revertCFG,
+                                            '0x',
+                                        ],
+                                        signer: this.universalSigner,
+                                        value: nativeAmount,
+                                    });
+                                }
                             }
                             catch (err) {
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_04);
@@ -156,10 +202,12 @@ class Orchestrator {
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
                             yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 4, 210000);
-                            // After origin confirmations, query Push Chain for UniversalTx status
-                            yield this.queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, 'sendFunds');
-                            const tx = yield evmClient.getTransaction(txHash);
-                            return yield this.transformToUniversalTxResponse(tx);
+                            const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds');
+                            const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                            const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                            const response = yield this.transformToUniversalTxResponse(tx);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+                            return response;
                         }
                         else {
                             // SVM path (Solana Devnet)
@@ -185,29 +233,55 @@ class Orchestrator {
                                 // Native SOL funds-only
                                 // Compute a local whitelist PDA to avoid TS scope issues
                                 const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
-                                txSignature = yield svmClient.writeContract({
-                                    abi: abi_1.SVM_GATEWAY_IDL,
-                                    address: programId.toBase58(),
-                                    functionName: 'sendFunds', // -> unified sendFunds(recipient, bridge_token, bridge_amount, revert_cfg)
-                                    args: [
-                                        recipientEvm20,
-                                        web3_js_1.PublicKey.default,
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                //////// @@@@@@@
+                                // DO THE SAME AS FOR BELOW, BUT NOW FOR NATIVE.
+                                // for sendTxWithFunds multicall
+                                const ueaAddress = this.computeUEAOffchain();
+                                if (execute.to === ueaAddress) {
+                                    txSignature = yield svmClient.writeContract({
+                                        abi: abi_1.SVM_GATEWAY_IDL,
+                                        address: programId.toBase58(),
+                                        functionName: 'sendFunds', // -> unified sendFunds(recipient, bridge_token, bridge_amount, revert_cfg)
+                                        args: [
+                                            recipientEvm20,
+                                            web3_js_1.PublicKey.default,
+                                            bridgeAmount,
+                                            revertSvm,
+                                        ],
+                                        signer: this.universalSigner,
+                                        accounts: {
+                                            config: configPda,
+                                            vault: vaultPda,
+                                            user: userPk,
+                                            tokenWhitelist: whitelistPdaLocal,
+                                            userTokenAccount: userPk,
+                                            gatewayTokenAccount: vaultPda,
+                                            bridgeToken: web3_js_1.PublicKey.default,
+                                            tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                                            systemProgram: web3_js_1.SystemProgram.programId,
+                                        },
+                                    });
+                                }
+                                else {
+                                    const { nonce } = yield this.getUeaStatusAndNonce();
+                                    const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', execute.funds.amount);
+                                    const ueaBalanceForGas = yield this.pushClient.getBalance(ueaAddress);
+                                    txSignature = yield this._sendSVMTxWithFunds({
+                                        execute,
+                                        mechanism: execute.funds.token.mechanism,
+                                        universalPayload,
                                         bridgeAmount,
-                                        revertSvm,
-                                    ],
-                                    signer: this.universalSigner,
-                                    accounts: {
-                                        config: configPda,
-                                        vault: vaultPda,
-                                        user: userPk,
-                                        tokenWhitelist: whitelistPdaLocal,
-                                        userTokenAccount: userPk,
-                                        gatewayTokenAccount: vaultPda,
-                                        bridgeToken: web3_js_1.PublicKey.default,
-                                        tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-                                        systemProgram: web3_js_1.SystemProgram.programId,
-                                    },
-                                });
+                                        nativeAmount: yield this.calculateNativeAmountForDeposit(chain, BigInt(0), ueaBalanceForGas),
+                                    });
+                                }
                             }
                             else if (execute.funds.token.mechanism === 'approve') {
                                 // SPL token funds-only (requires pre-existing ATAs)
@@ -225,24 +299,40 @@ class Orchestrator {
                                     TOKEN_PROGRAM_ID.toBuffer(),
                                     mintPk.toBuffer(),
                                 ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-                                txSignature = yield svmClient.writeContract({
-                                    abi: abi_1.SVM_GATEWAY_IDL,
-                                    address: programId.toBase58(),
-                                    functionName: 'sendFunds',
-                                    args: [recipientEvm20, mintPk, bridgeAmount, revertSvm],
-                                    signer: this.universalSigner,
-                                    accounts: {
-                                        config: configPda,
-                                        vault: vaultPda,
-                                        tokenWhitelist: whitelistPda,
-                                        userTokenAccount: userAta,
-                                        gatewayTokenAccount: vaultAta,
-                                        user: userPk,
-                                        bridgeToken: mintPk,
-                                        tokenProgram: TOKEN_PROGRAM_ID,
-                                        systemProgram: web3_js_1.SystemProgram.programId,
-                                    },
-                                });
+                                const ueaAddress = this.computeUEAOffchain();
+                                if (execute.to === ueaAddress) {
+                                    // vitalik
+                                    txSignature = yield svmClient.writeContract({
+                                        abi: abi_1.SVM_GATEWAY_IDL,
+                                        address: programId.toBase58(),
+                                        functionName: 'sendFunds',
+                                        args: [recipientEvm20, mintPk, bridgeAmount, revertSvm],
+                                        signer: this.universalSigner,
+                                        accounts: {
+                                            config: configPda,
+                                            vault: vaultPda,
+                                            tokenWhitelist: whitelistPda,
+                                            userTokenAccount: userAta,
+                                            gatewayTokenAccount: vaultAta,
+                                            user: userPk,
+                                            bridgeToken: mintPk,
+                                            tokenProgram: TOKEN_PROGRAM_ID,
+                                            systemProgram: web3_js_1.SystemProgram.programId,
+                                        },
+                                    });
+                                }
+                                else {
+                                    const { nonce } = yield this.getUeaStatusAndNonce();
+                                    const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', execute.funds.amount);
+                                    const ueaBalanceForGas = yield this.pushClient.getBalance(ueaAddress);
+                                    txSignature = yield this._sendSVMTxWithFunds({
+                                        execute,
+                                        mechanism: execute.funds.token.mechanism,
+                                        universalPayload,
+                                        bridgeAmount,
+                                        nativeAmount: yield this.calculateNativeAmountForDeposit(chain, BigInt(0), ueaBalanceForGas),
+                                    });
+                                }
                             }
                             else {
                                 throw new Error('Unsupported token mechanism on Solana');
@@ -255,61 +345,13 @@ class Orchestrator {
                                 timeoutMs: 300000,
                             });
                             // After origin confirmations, query Push Chain for UniversalTx status (SVM)
-                            yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txSignature, 'sendFunds');
+                            const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txSignature, 'sendFunds');
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
-                            // Build a minimal UniversalTxResponse for SVM origin
-                            const chainId = chain_1.CHAIN_INFO[chain].chainId;
-                            const origin = `${chain_1.VM_NAMESPACE[vm]}:${chainId}:${this.universalSigner.account.address}`;
-                            const universalTxResponse = {
-                                hash: txSignature,
-                                origin,
-                                blockNumber: BigInt(0),
-                                blockHash: '',
-                                transactionIndex: 0,
-                                chainId,
-                                from: this.universalSigner.account.address,
-                                to: '0x0000000000000000000000000000000000000000',
-                                nonce: 0,
-                                data: '0x',
-                                value: BigInt(0),
-                                gasLimit: BigInt(0),
-                                gasPrice: undefined,
-                                maxFeePerGas: undefined,
-                                maxPriorityFeePerGas: undefined,
-                                accessList: [],
-                                wait: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    return ({
-                                        hash: txSignature,
-                                        blockNumber: BigInt(0),
-                                        blockHash: '',
-                                        transactionIndex: 0,
-                                        from: this.universalSigner.account.address,
-                                        to: '0x0000000000000000000000000000000000000000',
-                                        contractAddress: null,
-                                        gasPrice: BigInt(0),
-                                        gasUsed: BigInt(0),
-                                        cumulativeGasUsed: BigInt(0),
-                                        logs: [],
-                                        logsBloom: '0x',
-                                        status: 1,
-                                        raw: {
-                                            from: this.universalSigner.account.address,
-                                            to: '0x0000000000000000000000000000000000000000',
-                                        },
-                                    });
-                                }),
-                                type: '99',
-                                typeVerbose: 'universal',
-                                signature: { r: '0x0', s: '0x0', v: 0 },
-                                raw: {
-                                    from: this.universalSigner.account.address,
-                                    to: '0x0000000000000000000000000000000000000000',
-                                    nonce: 0,
-                                    data: '0x',
-                                    value: BigInt(0),
-                                },
-                            };
-                            return universalTxResponse;
+                            const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                            const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                            const response = yield this.transformToUniversalTxResponse(tx);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+                            return response;
                         }
                     }
                     else {
@@ -333,7 +375,7 @@ 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', execute.funds.amount);
                         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);
@@ -426,14 +468,24 @@ class Orchestrator {
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_01);
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02);
-                                const ueaVersion = yield this.fetchUEAVersion();
-                                const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress, ueaVersion);
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
-                                const eip712SignatureHex = typeof eip712Signature === 'string'
-                                    ? eip712Signature
-                                    : (0, viem_1.bytesToHex)(eip712Signature);
                                 const evmClientEvm = evmClient;
                                 const gatewayAddressEvm = gatewayAddress;
+                                // @@@@@@@@@@@@
+                                // txHash = await evmClientEvm.writeContract({
+                                //   abi: UNIVERSAL_GATEWAY_V0 as unknown as Abi,
+                                //   address: gatewayAddressEvm,
+                                //   functionName: 'sendTxWithFunds',
+                                //   args: [
+                                //     tokenAddr,
+                                //     bridgeAmount,
+                                //     universalPayload,
+                                //     revertCFG,
+                                //     '0x',
+                                //   ],
+                                //   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.payGasWith;
@@ -469,7 +521,7 @@ class Orchestrator {
                                     txHash = yield evmClientEvm.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddressEvm,
-                                        functionName: 'sendTxWithFunds',
+                                        functionName: 'sendTxWithFunds_new',
                                         args: [
                                             tokenAddr,
                                             bridgeAmount,
@@ -479,7 +531,7 @@ class Orchestrator {
                                             deadline,
                                             universalPayload,
                                             revertCFG,
-                                            eip712SignatureHex,
+                                            '0x',
                                         ],
                                         signer: this.universalSigner,
                                     });
@@ -489,13 +541,13 @@ class Orchestrator {
                                     txHash = yield evmClientEvm.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddressEvm,
-                                        functionName: 'sendTxWithFunds',
+                                        functionName: 'sendTxWithFunds_new',
                                         args: [
                                             tokenAddr,
                                             bridgeAmount,
                                             universalPayload,
                                             revertCFG,
-                                            eip712SignatureHex,
+                                            '0x',
                                         ],
                                         signer: this.universalSigner,
                                         value: nativeAmount,
@@ -503,103 +555,13 @@ class Orchestrator {
                                 }
                             }
                             else {
-                                // SVM funds+payload path
-                                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,
+                                txHash = yield this._sendSVMTxWithFunds({
+                                    execute,
+                                    mechanism,
+                                    universalPayload,
+                                    bridgeAmount,
+                                    nativeAmount,
                                 });
-                                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);
-                                const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
-                                // 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 (execute.payGasWith !== 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,
-                                    revertMsg: Buffer.from([]),
-                                };
-                                // Compute signature for universal payload on SVM
-                                const ueaAddressSvm = this.computeUEAOffchain();
-                                const ueaVersion = yield this.fetchUEAVersion();
-                                const svmSignature = yield this.signUniversalPayload(universalPayload, ueaAddressSvm, ueaVersion);
-                                if (isNative) {
-                                    // Native SOL as bridge + gas
-                                    const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
-                                    txHash = yield svmClient.writeContract({
-                                        abi: abi_1.SVM_GATEWAY_IDL,
-                                        address: programId.toBase58(),
-                                        functionName: 'sendTxWithFunds',
-                                        args: [
-                                            web3_js_1.PublicKey.default, // bridge_token = default for native SOL
-                                            bridgeAmount,
-                                            universalPayload,
-                                            revertSvm2,
-                                            nativeAmount,
-                                            Buffer.from(svmSignature),
-                                        ],
-                                        signer: this.universalSigner,
-                                        accounts: {
-                                            config: configPda,
-                                            vault: vaultPda,
-                                            tokenWhitelist: whitelistPdaLocal,
-                                            userTokenAccount: userPk, // for native SOL, can be any valid account
-                                            gatewayTokenAccount: vaultPda, // for native SOL, can be any valid account
-                                            user: userPk,
-                                            priceUpdate: priceUpdatePk,
-                                            bridgeToken: web3_js_1.PublicKey.default,
-                                            tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-                                            systemProgram: web3_js_1.SystemProgram.programId,
-                                        },
-                                    });
-                                }
-                                else {
-                                    // SPL token as bridge + native SOL lamports as gas_amount
-                                    const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
-                                    const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
-                                    const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
-                                    const userAta = web3_js_1.PublicKey.findProgramAddressSync([
-                                        userPk.toBuffer(),
-                                        TOKEN_PROGRAM_ID.toBuffer(),
-                                        mintPk.toBuffer(),
-                                    ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-                                    const vaultAta = web3_js_1.PublicKey.findProgramAddressSync([
-                                        vaultPda.toBuffer(),
-                                        TOKEN_PROGRAM_ID.toBuffer(),
-                                        mintPk.toBuffer(),
-                                    ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-                                    const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
-                                    txHash = yield svmClient.writeContract({
-                                        abi: abi_1.SVM_GATEWAY_IDL,
-                                        address: programId.toBase58(),
-                                        functionName: 'sendTxWithFunds',
-                                        args: [
-                                            mintPk,
-                                            bridgeAmount,
-                                            universalPayload,
-                                            revertSvm2,
-                                            nativeAmount,
-                                            Buffer.from(svmSignature),
-                                        ],
-                                        signer: this.universalSigner,
-                                        accounts: {
-                                            config: configPda,
-                                            vault: vaultPda,
-                                            tokenWhitelist: whitelistPdaLocal,
-                                            userTokenAccount: userAta,
-                                            gatewayTokenAccount: vaultAta,
-                                            user: userPk,
-                                            priceUpdate: priceUpdatePk,
-                                            bridgeToken: mintPk,
-                                            tokenProgram: TOKEN_PROGRAM_ID,
-                                            systemProgram: web3_js_1.SystemProgram.programId,
-                                        },
-                                    });
-                                }
                             }
                         }
                         catch (err) {
@@ -638,23 +600,22 @@ class Orchestrator {
                         const txs = yield this.sendUniversalTx(deployed, feeLockTxHash);
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
                         // After sending Cosmos tx to Push Chain, query UniversalTx status
+                        let pushChainUniversalTx;
                         if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                             const evmClientEvm = evmClient;
                             const gatewayAddressEvm = gatewayAddress;
-                            yield this.queryUniversalTxStatusFromGatewayTx(evmClientEvm, gatewayAddressEvm, txHash, 'sendTxWithFunds');
+                            pushChainUniversalTx =
+                                yield this.queryUniversalTxStatusFromGatewayTx(evmClientEvm, gatewayAddressEvm, txHash, 'sendTxWithFunds');
                         }
                         else {
-                            yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txHash, 'sendTxWithFunds');
-                        }
-                        if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
-                            const evmClientEvm = evmClient;
-                            const evmTx = yield evmClientEvm.getTransaction(txHash);
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_07, bridgeAmount, execute.funds.token.decimals, symbol);
-                            return yield this.transformToUniversalTxResponse(evmTx);
-                        }
-                        else {
-                            return txs[txs.length - 1];
+                            pushChainUniversalTx =
+                                yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txHash, 'sendTxWithFunds');
                         }
+                        const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                        const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                        const response = yield this.transformToUniversalTxResponse(tx);
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+                        return response;
                     }
                 }
                 // Set default value for value if undefined
@@ -705,59 +666,39 @@ class Orchestrator {
                 }
                 // Fee locking is required if UEA is not deployed OR insufficient funds
                 const feeLockingRequired = (!isUEADeployed || funds < requiredFunds) && !feeLockTxHash;
+                // const feeLockingRequired = true;
                 // Support multicall payload encoding when execute.data is an array
                 let payloadData;
+                let payloadTo;
                 if (Array.isArray(execute.data)) {
-                    // Gate multicall to supported testnets
-                    const allowedChains = [
-                        enums_1.CHAIN.ETHEREUM_SEPOLIA,
-                        enums_1.CHAIN.ARBITRUM_SEPOLIA,
-                        enums_1.CHAIN.BASE_SEPOLIA,
-                        enums_1.CHAIN.SOLANA_DEVNET,
-                        enums_1.CHAIN.BNB_TESTNET,
-                    ];
-                    if (!allowedChains.includes(this.universalSigner.account.chain)) {
-                        throw new Error('Multicall is only enabled for Ethereum Sepolia, Arbitrum Sepolia, Base Sepolia, and Solana Devnet');
-                    }
-                    // For multicall, `to` must be the executor account (UEA) of the sender
-                    // i.e., PushChain.universal.account
-                    const expectedUea = this.computeUEAOffchain();
-                    const toAddr = (0, viem_1.getAddress)(execute.to);
-                    if (toAddr !== (0, viem_1.getAddress)(expectedUea)) {
-                        throw new Error('Multicall requires `to` to be the executor account (UEA) of the sender.');
-                    }
-                    // Normalize and validate calls
-                    const normalizedCalls = execute.data.map((c) => ({
-                        to: (0, viem_1.getAddress)(c.to),
-                        value: c.value,
-                        data: c.data,
-                    }));
-                    // bytes4(keccak256("UEA_MULTICALL")) selector, e.g., 0x4e2d2ff6-like prefix
-                    const selector = (0, viem_1.keccak256)((0, viem_1.toBytes)('UEA_MULTICALL')).slice(0, 10);
-                    // abi.encode(Call[]), where Call = { address to; uint256 value; bytes data; }
-                    const encodedCalls = (0, viem_1.encodeAbiParameters)([
-                        {
-                            type: 'tuple[]',
-                            components: [
-                                { name: 'to', type: 'address' },
-                                { name: 'value', type: 'uint256' },
-                                { name: 'data', type: 'bytes' },
-                            ],
-                        },
-                    ], [normalizedCalls]);
-                    // Concatenate prefix selector with encodedCalls without 0x
-                    payloadData = (selector + encodedCalls.slice(2));
+                    // payloadData = this._buildMulticallPayloadData(execute.to, execute.data);
+                    // Normal multicall. We replace the `to` to zeroAddress. Then console.warn to let user know that it should be
+                    // passed as zeroAddress in the future.
+                    // execute.to = zeroAddress;
+                    payloadTo = viem_1.zeroAddress;
+                    console.warn(`Multicalls should have execute.to as ${viem_1.zeroAddress}`);
+                    payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
                 }
                 else {
-                    payloadData = (execute.data || '0x');
+                    // payloadData = (execute.data || '0x') as `0x${string}`;
+                    if (execute.to.toLowerCase() !== UEA.toLowerCase()) {
+                        payloadTo = viem_1.zeroAddress;
+                        payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
+                    }
+                    else {
+                        // For value only we don't check below. Only if there is payload to be executed
+                        if (execute.data && execute.to.toLowerCase() === UEA.toLowerCase()) {
+                            throw new Error(`You can't execute data on the UEA address`);
+                        }
+                        payloadTo = execute.to;
+                        payloadData = execute.data || '0x';
+                    }
                 }
-                // Determine payload `to` value. For multicall, `to` must be UEA, pass-through as-is.
-                const payloadTo = execute.to;
                 const universalPayload = JSON.parse(JSON.stringify({
                     to: payloadTo,
                     value: execute.value,
                     data: payloadData,
-                    gasLimit: execute.gasLimit || BigInt(1e7),
+                    gasLimit: execute.gasLimit || BigInt(5e7),
                     maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
                     maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
                     nonce,
@@ -793,30 +734,43 @@ class Orchestrator {
                 }
                 else {
                     /**
-                     * Fee Locking
+                     * Fee Locking - For all chains, EVM and Solana
                      */
                     const fundDifference = requiredFunds - funds;
                     const fixedPushAmount = push_chain_1.PushChain.utils.helpers.parseUnits('0.001', 18); // Minimum lock 0.001 Push tokens
                     const lockAmount = funds < requiredFunds ? fundDifference : fixedPushAmount;
                     const lockAmountInUSD = this.pushClient.pushToUSDC(lockAmount);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_01, lockAmount);
-                    const feeLockTxHashBytes = yield this.lockFee(lockAmountInUSD, executionHash);
+                    const feeLockTxHashBytes = yield this.lockFee(lockAmountInUSD, universalPayload);
                     feeLockTxHash = (0, viem_1.bytesToHex)(feeLockTxHashBytes);
                     verificationData = (0, viem_1.bytesToHex)(feeLockTxHashBytes);
-                    /**
-                     * Waiting for Confirmations
-                     */
                     const { vm } = chain_1.CHAIN_INFO[chain];
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_02, vm === enums_1.VM.SVM
                         ? anchor_1.utils.bytes.bs58.encode(feeLockTxHashBytes)
                         : feeLockTxHash, chain_1.CHAIN_INFO[chain].confirmations);
+                    // Waiting for blocks confirmations
                     yield this.waitForLockerFeeConfirmation(feeLockTxHashBytes);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_03);
+                    // Query nodes via gRPC for Push Chain transaction
+                    const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
+                    const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(new evm_client_1.EvmClient({ rpcUrls: this.rpcUrls[chain] || defaultRPC }), lockerContract, feeLockTxHash, 'sendTxWithGas');
+                    /**
+                     * Return response directly (skip sendUniversalTx for sendTxWithGas flow)
+                     * Note: queryTx may be undefined since validators don't recognize new UniversalTx event yet
+                     */
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06);
+                    // Transform to UniversalTxResponse (follow sendFunds pattern)
+                    const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                    const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                    const response = yield this.transformToUniversalTxResponse(tx);
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
+                    return response;
                 }
                 /**
-                 * Broadcasting Tx to PC
+                 * Non-fee-locking path: Broadcasting Tx to PC via sendUniversalTx
                  */
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06);
+                // We don't need to query via gRPC the PC transaction since it's getting returned it here already.
                 const transactions = yield this.sendUniversalTx(isUEADeployed, feeLockTxHash, universalPayload, verificationData);
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, transactions);
                 return transactions[transactions.length - 1];
@@ -844,11 +798,11 @@ class Orchestrator {
      *
      * @param amount - Fee amount in USDC (8 Decimals)
      * @param executionHash - Optional execution payload hash (default: zeroHash)
-     * @returns Transaction hash of the locking transaction
+     * @returns Transaction hash bytes
      */
-    lockFee(amount_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (amount, // USD with 8 decimals
-        executionHash = viem_1.zeroHash) {
+    lockFee(amount, // USD with 8 decimals
+    universalPayload) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const chain = this.universalSigner.account.chain;
             const { lockerContract, vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
             if (!lockerContract) {
@@ -863,35 +817,88 @@ class Orchestrator {
                         Promise.resolve(new evm_client_1.EvmClient({ rpcUrls })),
                     ]);
                     const nativeDecimals = 18; // ETH, MATIC, etc.
-                    const nativeAmount = (amount * BigInt(Math.pow(10, nativeDecimals))) / nativeTokenUsdPrice;
+                    // Ensure deposit respects gateway USD caps (min $1, max $10) and avoid rounding below min
+                    const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+                    const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
+                    let depositUsd = amount < oneUsd ? oneUsd : amount;
+                    if (depositUsd > tenUsd)
+                        depositUsd = tenUsd;
+                    // Ceil division to avoid falling below on-chain min due to rounding, then add 1 wei safety
+                    let nativeAmount = (depositUsd * BigInt(Math.pow(10, nativeDecimals)) +
+                        (nativeTokenUsdPrice - BigInt(1))) /
+                        nativeTokenUsdPrice;
+                    nativeAmount = nativeAmount + BigInt(1);
+                    // Deposit-only funding via UniversalGatewayV0 (no payload execution)
+                    const revertCFG = {
+                        fundRecipient: this.universalSigner.account.address,
+                        revertMsg: '0x',
+                    };
+                    // Sign the universal payload
+                    const ueaAddress = this.computeUEAOffchain();
+                    const ueaVersion = yield this.fetchUEAVersion();
+                    const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress, ueaVersion);
+                    const eip712SignatureHex = typeof eip712Signature === 'string'
+                        ? eip712Signature
+                        : (0, viem_1.bytesToHex)(eip712Signature);
                     const txHash = yield evmClient.writeContract({
-                        abi: abi_1.FEE_LOCKER_EVM,
+                        abi: abi_1.UNIVERSAL_GATEWAY_V0,
                         address: lockerContract,
-                        functionName: 'addFunds',
-                        args: [executionHash],
+                        functionName: 'sendTxWithGas',
+                        args: [universalPayload, revertCFG, '0x'],
                         signer: this.universalSigner,
                         value: nativeAmount,
                     });
                     return (0, viem_1.hexToBytes)(txHash);
                 }
                 case enums_1.VM.SVM: {
-                    // Run price fetching, client creation, and PDA computation in parallel
-                    const [nativeTokenUsdPrice, svmClient, [lockerPda]] = yield Promise.all([
+                    // Run price fetching and client creation in parallel
+                    const [nativeTokenUsdPrice, svmClient] = yield Promise.all([
                         new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain), // 8 decimals
                         Promise.resolve(new svm_client_1.SvmClient({ rpcUrls })),
-                        Promise.resolve(anchor.web3.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('locker')], new web3_js_1.PublicKey(lockerContract))),
                     ]);
+                    // Ensure deposit respects gateway USD caps (min $1, max $10) and avoid rounding below min
                     const nativeDecimals = 9; // SOL lamports
-                    const nativeAmount = (amount * BigInt(Math.pow(10, nativeDecimals))) / nativeTokenUsdPrice;
+                    const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+                    const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
+                    let depositUsd = amount < oneUsd ? oneUsd : amount;
+                    if (depositUsd > tenUsd)
+                        depositUsd = tenUsd;
+                    // Ceil division to avoid falling below on-chain min due to rounding, then add 1 lamport safety
+                    let nativeAmount = (depositUsd * BigInt(Math.pow(10, nativeDecimals)) +
+                        (nativeTokenUsdPrice - BigInt(1))) /
+                        nativeTokenUsdPrice;
+                    nativeAmount = nativeAmount + BigInt(1);
+                    // Program & PDAs
+                    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);
+                    const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
+                    const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
+                    const revertSvm = {
+                        fundRecipient: userPk,
+                        revertMsg: Buffer.from([]),
+                    };
+                    // const ueaAddressSvm = this.computeUEAOffchain();
+                    // const ueaVersion = await this.fetchUEAVersion();
+                    // const svmSignature = await this.signUniversalPayload(
+                    //   universalPayload,
+                    //   ueaAddressSvm,
+                    //   ueaVersion
+                    // );
                     const txHash = yield svmClient.writeContract({
-                        abi: abi_1.FEE_LOCKER_SVM,
-                        address: lockerContract,
-                        functionName: 'addFunds',
-                        args: [nativeAmount, (0, viem_1.toBytes)(executionHash)],
+                        abi: abi_1.SVM_GATEWAY_IDL,
+                        address: programId.toBase58(),
+                        functionName: 'sendTxWithGas',
+                        args: [
+                            universalPayload,
+                            revertSvm,
+                            new anchor.BN(nativeAmount.toString()),
+                            '0x',
+                        ],
                         signer: this.universalSigner,
                         accounts: {
-                            locker: lockerPda,
-                            user: new web3_js_1.PublicKey(this.universalSigner.account.address),
+                            config: configPda,
+                            vault: vaultPda,
+                            user: userPk,
                             priceUpdate: new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE'),
                             systemProgram: web3_js_1.SystemProgram.programId,
                         },
@@ -1140,6 +1147,148 @@ class Orchestrator {
             return { address: computedAddress, deployed: byteCode !== undefined };
         });
     }
+    _buildMulticallPayloadData(to, data) {
+        const allowedChains = [
+            enums_1.CHAIN.ETHEREUM_SEPOLIA,
+            enums_1.CHAIN.ARBITRUM_SEPOLIA,
+            enums_1.CHAIN.BASE_SEPOLIA,
+            enums_1.CHAIN.SOLANA_DEVNET,
+            enums_1.CHAIN.BNB_TESTNET,
+        ];
+        if (!allowedChains.includes(this.universalSigner.account.chain)) {
+            throw new Error('Multicall is only enabled for Ethereum Sepolia, Arbitrum Sepolia, Base Sepolia, Binance Smart Chain and Solana Devnet');
+        }
+        // For multicall, `to` must be the executor account (UEA) of the sender
+        // i.e., PushChain.universal.account
+        const expectedUea = this.computeUEAOffchain();
+        const toAddr = (0, viem_1.getAddress)(to);
+        // if (toAddr !== getAddress(expectedUea)) {
+        //   throw new Error(
+        //     'Multicall requires `to` to be the executor account (UEA) of the sender.'
+        //   );
+        // }
+        // Normalize and validate calls
+        const normalizedCalls = data.map((c) => ({
+            to: (0, viem_1.getAddress)(c.to),
+            value: c.value,
+            data: c.data,
+        }));
+        // bytes4(keccak256("UEA_MULTICALL")) selector, e.g., 0x4e2d2ff6-like prefix
+        const selector = (0, viem_1.keccak256)((0, viem_1.toBytes)('UEA_MULTICALL')).slice(0, 10);
+        // abi.encode(Call[]), where Call = { address to; uint256 value; bytes data; }
+        const encodedCalls = (0, viem_1.encodeAbiParameters)([
+            {
+                type: 'tuple[]',
+                components: [
+                    { name: 'to', type: 'address' },
+                    { name: 'value', type: 'uint256' },
+                    { name: 'data', type: 'bytes' },
+                ],
+            },
+        ], [normalizedCalls]);
+        // Concatenate prefix selector with encodedCalls without 0x
+        return (selector + encodedCalls.slice(2));
+    }
+    _sendSVMTxWithFunds(_a) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* ({ execute, mechanism, universalPayload, bridgeAmount, nativeAmount, }) {
+            var _b, _c, _d, _e;
+            // SVM funds+payload path
+            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);
+            const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
+            // 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 (execute.payGasWith !== undefined) {
+                throw new Error('Pay-with token is not supported on Solana');
+            }
+            if (!((_c = (_b = execute.funds) === null || _b === void 0 ? void 0 : _b.token) === null || _c === void 0 ? void 0 : _c.address)) {
+                throw new Error('Token address is required for bridge path');
+            }
+            const isNative = mechanism === 'native' || execute.funds.token.symbol === 'SOL';
+            const revertSvm2 = {
+                fundRecipient: userPk,
+                revertMsg: Buffer.from([]),
+            };
+            // Compute signature for universal payload on SVM
+            const ueaAddressSvm = this.computeUEAOffchain();
+            const ueaVersion = yield this.fetchUEAVersion();
+            const svmSignature = yield this.signUniversalPayload(universalPayload, ueaAddressSvm, ueaVersion);
+            if (isNative) {
+                // Native SOL as bridge + gas
+                const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
+                return yield svmClient.writeContract({
+                    abi: abi_1.SVM_GATEWAY_IDL,
+                    address: programId.toBase58(),
+                    functionName: 'sendTxWithFunds',
+                    args: [
+                        web3_js_1.PublicKey.default, // bridge_token = default for native SOL
+                        bridgeAmount,
+                        universalPayload,
+                        revertSvm2,
+                        nativeAmount,
+                        Buffer.from(svmSignature),
+                    ],
+                    signer: this.universalSigner,
+                    accounts: {
+                        config: configPda,
+                        vault: vaultPda,
+                        tokenWhitelist: whitelistPdaLocal,
+                        userTokenAccount: userPk, // for native SOL, can be any valid account
+                        gatewayTokenAccount: vaultPda, // for native SOL, can be any valid account
+                        user: userPk,
+                        priceUpdate: priceUpdatePk,
+                        bridgeToken: web3_js_1.PublicKey.default,
+                        tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                    },
+                });
+            }
+            else {
+                // SPL token as bridge + native SOL lamports as gas_amount
+                if (!((_e = (_d = execute.funds) === null || _d === void 0 ? void 0 : _d.token) === null || _e === void 0 ? void 0 : _e.address)) {
+                    throw new Error('Token address is required for SPL bridge path');
+                }
+                const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
+                const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+                const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+                const userAta = web3_js_1.PublicKey.findProgramAddressSync([userPk.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+                const vaultAta = web3_js_1.PublicKey.findProgramAddressSync([vaultPda.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), mintPk.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+                const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
+                return yield svmClient.writeContract({
+                    abi: abi_1.SVM_GATEWAY_IDL,
+                    address: programId.toBase58(),
+                    functionName: 'sendTxWithFunds',
+                    args: [
+                        mintPk,
+                        bridgeAmount,
+                        universalPayload,
+                        revertSvm2,
+                        nativeAmount,
+                        Buffer.from(svmSignature),
+                    ],
+                    signer: this.universalSigner,
+                    accounts: {
+                        config: configPda,
+                        vault: vaultPda,
+                        tokenWhitelist: whitelistPdaLocal,
+                        userTokenAccount: userAta,
+                        gatewayTokenAccount: vaultAta,
+                        user: userPk,
+                        priceUpdate: priceUpdatePk,
+                        bridgeToken: mintPk,
+                        tokenProgram: TOKEN_PROGRAM_ID,
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                    },
+                });
+            }
+        });
+    }
     computeUEAOffchain() {
         const { chain, address } = this.universalSigner.account;
         const { vm, chainId } = chain_1.CHAIN_INFO[chain];
@@ -1230,20 +1379,12 @@ class Orchestrator {
             switch (vm) {
                 case enums_1.VM.EVM: {
                     const evmClient = new evm_client_1.EvmClient({ rpcUrls });
-                    yield evmClient.waitForConfirmations({
-                        txHash: (0, viem_1.bytesToHex)(txHashBytes),
-                        confirmations,
-                        timeoutMs: timeout,
-                    });
+                    yield this.waitForEvmConfirmationsWithCountdown(evmClient, (0, viem_1.bytesToHex)(txHashBytes), confirmations, timeout);
                     return;
                 }
                 case enums_1.VM.SVM: {
                     const svmClient = new svm_client_1.SvmClient({ rpcUrls });
-                    yield svmClient.waitForConfirmations({
-                        txSignature: anchor_1.utils.bytes.bs58.encode(txHashBytes),
-                        confirmations,
-                        timeoutMs: timeout,
-                    });
+                    yield this.waitForSvmConfirmationsWithCountdown(svmClient, anchor_1.utils.bytes.bs58.encode(txHashBytes), confirmations, timeout);
                     return;
                 }
                 default:
@@ -1473,26 +1614,68 @@ 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;
+            var _a, _b, _c, _d, _e;
             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 };
+            const gasAmount = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
+            if (type === 'sendTxWithFunds') {
+                if (!((_b = execute.funds) === null || _b === void 0 ? void 0 : _b.token))
+                    throw new Error(`Invalid ${(_c = execute.funds) === null || _c === void 0 ? void 0 : _c.token}`);
+                const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
+                    execute,
+                    ueaAddress: this.computeUEAOffchain(),
+                });
+                // THIS ABOVE WILL CHANGE WHEN FUNDS ARE PASSED
+                const universalPayload = {
+                    to: viem_1.zeroAddress,
+                    value: (_d = execute.value) !== null && _d !== void 0 ? _d : BigInt(0),
+                    // data: execute.data || '0x',
+                    data: this._buildMulticallPayloadData(execute.to, multicallData),
+                    gasLimit: gasEstimate,
+                    maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
+                    maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
+                    nonce,
+                    deadline: execute.deadline || BigInt(9999999999),
+                    vType: tx_1.VerificationType.universalTxVerification,
+                };
+                return { payload: universalPayload, gasAmount };
+            }
+            else {
+                if (!fundsValue)
+                    throw new Error('fundsValue property must not be empty');
+                const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
+                    execute,
+                    ueaAddress: this.computeUEAOffchain(),
+                });
+                // // 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 = encodeFunctionData({
+                //   abi: ERC20_EVM,
+                //   functionName: 'transfer',
+                //   args: [execute.to, fundsValue],
+                // });
+                // const pushChainTo = PushChain.utils.tokens.toSyntheticAddress(
+                //   execute.funds!.token as MoveableToken
+                // );
+                const universalPayload = {
+                    to: viem_1.zeroAddress, // We can't simply do `0x` because we will get an error when eip712 signing the transaction.
+                    value: (_e = execute.value) !== null && _e !== void 0 ? _e : BigInt(0),
+                    data: this._buildMulticallPayloadData(execute.to, multicallData),
+                    // data: this._buildMulticallPayloadData(execute.to, [
+                    //   { to: pushChainTo, value: execute.value ?? BigInt(0), data },
+                    // ]),
+                    gasLimit: gasEstimate,
+                    maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
+                    maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
+                    nonce,
+                    deadline: execute.deadline || BigInt(9999999999),
+                    vType: tx_1.VerificationType.universalTxVerification,
+                };
+                return { payload: universalPayload, gasAmount };
+            }
         });
     }
     /********************************** HELPER FUNCTIONS **************************************************/
@@ -1738,15 +1921,16 @@ class Orchestrator {
                 continue;
             const discriminatorHex = (0, viem_1.bytesToHex)(decoded.slice(0, 8)).slice(2);
             // Skip add_funds discriminator; return the first other Program data event
-            if (discriminatorHex === '7f1f6cffbb134644')
-                continue;
-            return i;
+            // if (discriminatorHex === '7f1f6cffbb134644') continue;
+            if (discriminatorHex === '6c9ad829b5ea1d7c')
+                return i;
+            // return i;
         }
         // Fallback to first log
         return 0;
     }
     // Query Push Chain for UniversalTx status given an origin gateway tx (EVM or SVM)
-    queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, fromBranch) {
+    queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, evmGatewayMethod) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             try {
@@ -1757,11 +1941,22 @@ class Orchestrator {
                 if (vm === enums_1.VM.EVM) {
                     if (!evmClient || !gatewayAddress)
                         throw new Error('Missing EVM context');
-                    const receipt = yield evmClient.publicClient.getTransactionReceipt({
-                        hash: txHash,
-                    });
+                    let receipt;
+                    try {
+                        receipt = yield evmClient.publicClient.getTransactionReceipt({
+                            hash: txHash,
+                        });
+                    }
+                    catch (_c) {
+                        // Receipt might not be indexed yet on this RPC; wait briefly for it
+                        receipt = yield evmClient.publicClient.waitForTransactionReceipt({
+                            hash: txHash,
+                            confirmations: 0,
+                            timeout: chain_1.CHAIN_INFO[chain].timeout,
+                        });
+                    }
                     const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() === gatewayAddress.toLowerCase());
-                    const logIndexToUse = fromBranch === 'sendTxWithFunds' ? 1 : 0;
+                    const logIndexToUse = evmGatewayMethod === 'sendTxWithFunds' ? 1 : 0;
                     const firstLog = (gatewayLogs[logIndexToUse] ||
                         ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[logIndexToUse]));
                     const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
@@ -1800,10 +1995,13 @@ class Orchestrator {
                 const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
                 // Fetch UniversalTx via gRPC with a brief retry window
                 let universalTxObj;
-                for (let attempt = 0; attempt < 10; attempt++) {
+                for (let attempt = 0; attempt < 15; attempt++) {
                     try {
                         const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
                         universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
+                        console.log('@@@@@');
+                        console.log(universalTxObj);
+                        console.log('@@@@@');
                         if (universalTxObj)
                             break;
                     }
@@ -1829,7 +2027,7 @@ class Orchestrator {
                 // );
                 return universalTxObj;
             }
-            catch (_c) {
+            catch (_d) {
                 // Best-effort; do not fail flow if PC query is unavailable
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
                 return undefined;
@@ -1847,15 +2045,31 @@ class Orchestrator {
                 hash: txHash,
             });
             const targetBlock = receipt.blockNumber + BigInt(confirmations);
+            // Track last emitted confirmation to avoid duplicates
+            let lastEmitted = 0;
             // Poll blocks and emit remaining confirmations
             // eslint-disable-next-line no-constant-condition
             while (true) {
                 const currentBlock = yield evmClient.publicClient.getBlockNumber();
-                if (currentBlock >= targetBlock)
+                // If already confirmed, emit progress for final confirmation
+                if (currentBlock >= targetBlock) {
+                    // Only emit if we haven't already shown this confirmation
+                    if (lastEmitted < confirmations) {
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, confirmations, confirmations);
+                    }
                     return;
+                }
                 const remaining = Number(targetBlock - currentBlock);
                 const completed = Math.max(1, confirmations - remaining + 1);
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, completed, confirmations);
+                // Only emit if this is a new confirmation count
+                if (completed > lastEmitted) {
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, completed, confirmations);
+                    lastEmitted = completed;
+                    // If we've reached required confirmations, we're done
+                    if (completed >= confirmations) {
+                        return;
+                    }
+                }
                 if (Date.now() - start > timeoutMs) {
                     throw new Error(`Timeout: transaction ${txHash} not confirmed with ${confirmations} confirmations within ${timeoutMs} ms`);
                 }
@@ -1863,6 +2077,44 @@ class Orchestrator {
             }
         });
     }
+    // Emit countdown updates while waiting for SVM confirmations
+    waitForSvmConfirmationsWithCountdown(svmClient, txSignature, confirmations, timeoutMs) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            // initial emit
+            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, confirmations);
+            const start = Date.now();
+            // Poll for confirmations and emit progress
+            let lastConfirmed = 0;
+            // eslint-disable-next-line no-constant-condition
+            while (true) {
+                const connection = svmClient.connections[svmClient.currentConnectionIndex];
+                const { value } = yield connection.getSignatureStatuses([txSignature]);
+                const status = value[0];
+                if (status) {
+                    const currentConfirms = (_a = status.confirmations) !== null && _a !== void 0 ? _a : 0;
+                    const hasEnoughConfirmations = currentConfirms >= confirmations;
+                    const isSuccessfullyFinalized = status.err === null && status.confirmationStatus !== null;
+                    // Emit progress if we have more confirmations than before OR if finalized
+                    if (currentConfirms > lastConfirmed ||
+                        (isSuccessfullyFinalized && lastConfirmed === 0)) {
+                        const confirmCount = isSuccessfullyFinalized && currentConfirms === 0
+                            ? confirmations
+                            : currentConfirms;
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, Math.max(1, confirmCount), confirmations);
+                        lastConfirmed = currentConfirms;
+                    }
+                    if (hasEnoughConfirmations || isSuccessfullyFinalized) {
+                        return;
+                    }
+                }
+                if (Date.now() - start > timeoutMs) {
+                    throw new Error(`Timeout: transaction ${txSignature} not confirmed with ${confirmations} confirmations within ${timeoutMs} ms`);
+                }
+                yield new Promise((r) => setTimeout(r, 500));
+            }
+        });
+    }
     // Fetch and cache UEA version from the contract on Push Chain
     fetchUEAVersion() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1928,6 +2180,63 @@ class Orchestrator {
             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