@pushchain/core 3.0.8 → 4.0.0

package/src/lib/orchestrator/orchestrator.js

@@ -2,24 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Orchestrator = void 0;
 const tslib_1 = require("tslib");
+const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
 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");
-const push_client_1 = require("../push-client/push-client");
-const svm_client_1 = require("../vm-client/svm-client");
-const web3_js_1 = require("@solana/web3.js");
-const anchor = tslib_1.__importStar(require("@coral-xyz/anchor"));
+const uea_evm_1 = require("../constants/abi/uea.evm");
+const chain_1 = require("../constants/chain");
+const enums_1 = require("../constants/enums");
+const tokens_1 = require("../constants/tokens");
 const tx_1 = require("../generated/v1/tx");
 const price_fetch_1 = require("../price-fetch/price-fetch");
-const anchor_1 = require("@coral-xyz/anchor");
-const progress_hook_types_1 = require("../progress-hook/progress-hook.types");
 const progress_hook_1 = tslib_1.__importDefault(require("../progress-hook/progress-hook"));
-const uea_evm_1 = require("../constants/abi/uea.evm");
-const tokens_1 = require("../constants/tokens");
+const progress_hook_types_1 = require("../progress-hook/progress-hook.types");
+const push_chain_1 = require("../push-chain/push-chain");
+const push_client_1 = require("../push-client/push-client");
+const evm_client_1 = require("../vm-client/evm-client");
+const svm_client_1 = require("../vm-client/svm-client");
+const payload_builders_1 = require("./payload-builders");
 class Orchestrator {
     constructor(universalSigner, pushNetwork, rpcUrls = {}, printTraces = false, progressHook) {
         this.universalSigner = universalSigner;
@@ -66,26 +65,8 @@ class Orchestrator {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             try {
-                // FUNDS_TX short-circuit: Bridge tokens from origin chain to Push Chain
-                // - EVM (Sepolia): UniversalGatewayV0
-                // - 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'
-                        //   );
-                        // }
                         const chain = this.universalSigner.account.chain;
                         const { vm } = chain_1.CHAIN_INFO[chain];
                         if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA ||
@@ -96,7 +77,7 @@ class Orchestrator {
                             throw new Error('Funds bridging is only supported on Ethereum Sepolia, Arbitrum Sepolia, Base Sepolia, BNB Testnet, and Solana Devnet for now');
                         }
                         // Progress: Origin chain detected
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain, this.universalSigner.account.address);
                         const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
                         const rpcUrls = this.rpcUrls[chain] || defaultRPC;
                         // Resolve token: default to native token based on VM (ETH for EVM, SOL for SVM)
@@ -114,23 +95,6 @@ class Orchestrator {
                         }
                         const amount = execute.funds.amount;
                         const symbol = execute.funds.token.symbol;
-                        // Funds Flow: Preparing funds transfer
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01, amount, execute.funds.token.decimals, symbol);
-                        if (vm === enums_1.VM.EVM) {
-                            const evmClient = new evm_client_1.EvmClient({ rpcUrls });
-                            const gatewayAddress = lockerContract;
-                            const tokenAddr = execute.funds.token.address;
-                            // Approve gateway to pull tokens if ERC-20 (not native sentinel)
-                            if (execute.funds.token.mechanism === 'approve') {
-                                yield this.ensureErc20Allowance(evmClient, tokenAddr, gatewayAddress, amount);
-                            }
-                            else if (execute.funds.token.mechanism === 'permit2') {
-                                throw new Error('Permit2 is not supported yet');
-                            }
-                            else if (execute.funds.token.mechanism === 'native') {
-                                // Native flow uses msg.value == bridgeAmount and bridgeToken = address(0)
-                            }
-                        }
                         const bridgeAmount = amount;
                         const revertCFG = {
                             fundRecipient: this.universalSigner.account
@@ -141,48 +105,85 @@ class Orchestrator {
                             const evmClient = new evm_client_1.EvmClient({ rpcUrls });
                             const gatewayAddress = lockerContract;
                             const tokenAddr = execute.funds.token.address;
-                            // Call UniversalGatewayV0.sendFunds(recipient, bridgeToken, bridgeAmount, revertCFG)
                             const recipient = execute.to; // funds to recipient on Push Chain
                             const isNative = execute.funds.token.mechanism === 'native';
                             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 { nonce, deployed } = yield this.getUeaStatusAndNonce();
+                            const { payload: universalPayload, req } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', bridgeAmount);
                             const ueaAddress = this.computeUEAOffchain();
-                            const ueaVersion = yield this.fetchUEAVersion();
-                            const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress, ueaVersion);
-                            const eip712SignatureHex = (0, viem_1.bytesToHex)(eip712Signature);
+                            // Compute minimal native amount to deposit for gas on Push Chain
+                            const ueaBalanceForGas = yield this.pushClient.getBalance(ueaAddress);
+                            const nativeAmount = yield this.calculateNativeAmountForDeposit(chain, BigInt(0), ueaBalanceForGas);
+                            // We log the SEND_TX_03_01 here because the progress hook for gas estimation should arrive before the resolving of UEA.
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01, amount, execute.funds.token.decimals, symbol);
+                            if (vm === enums_1.VM.EVM) {
+                                const evmClient = new evm_client_1.EvmClient({ rpcUrls });
+                                const gatewayAddress = lockerContract;
+                                const tokenAddr = execute.funds.token.address;
+                                // Approve gateway to pull tokens if ERC-20 (not native sentinel)
+                                if (execute.funds.token.mechanism === 'approve') {
+                                    yield this.ensureErc20Allowance(evmClient, tokenAddr, gatewayAddress, amount);
+                                }
+                                else if (execute.funds.token.mechanism === 'permit2') {
+                                    throw new Error('Permit2 is not supported yet');
+                                }
+                                else if (execute.funds.token.mechanism === 'native') {
+                                    // Native flow uses msg.value == bridgeAmount and bridgeToken = address(0)
+                                }
+                            }
                             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);
-                                const ueaAddress = this.computeUEAOffchain();
+                                // FUNDS ONLY SELF
                                 if (execute.to.toLowerCase() === ueaAddress.toLowerCase()) {
+                                    // const payloadBytes = this.encodeUniversalPayload(
+                                    //   universalPayload as unknown as UniversalPayload
+                                    // );
+                                    // const req = this._buildUniversalTxRequest({
+                                    //   recipient: zeroAddress,
+                                    //   token: bridgeToken,
+                                    //   amount: bridgeAmount,
+                                    //   payload: '0x',
+                                    // });
+                                    // const req: UniversalTxRequest = {
+                                    //   recipient: zeroAddress,
+                                    //   token: bridgeToken,
+                                    //   amount: bridgeAmount,
+                                    //   payload: '0x',
+                                    //   // payload: payloadBytes,
+                                    //   revertInstruction: revertCFG,
+                                    //   signatureData: '0x',
+                                    // } as unknown as never;
                                     txHash = yield evmClient.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddress,
-                                        functionName: 'sendFunds',
-                                        args: [recipient, bridgeToken, bridgeAmount, revertCFG],
+                                        functionName: 'sendUniversalTx',
+                                        args: [req],
                                         signer: this.universalSigner,
                                         value: isNative ? bridgeAmount : BigInt(0),
                                     });
                                 }
                                 else {
+                                    // FUNDS ONLY OTHER
+                                    // const payloadBytes = this.encodeUniversalPayload(
+                                    //   universalPayload as unknown as UniversalPayload
+                                    // );
+                                    // const req: UniversalTxRequest = {
+                                    //   recipient,
+                                    //   token: bridgeToken,
+                                    //   amount: bridgeAmount,
+                                    //   payload: payloadBytes,
+                                    //   revertInstruction: revertCFG,
+                                    //   signatureData: '0x',
+                                    // } as unknown as never;
                                     txHash = yield evmClient.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddress,
-                                        functionName: 'sendTxWithFunds_new',
-                                        args: [
-                                            tokenAddr,
-                                            bridgeAmount,
-                                            universalPayload,
-                                            revertCFG,
-                                            '0x',
-                                        ],
+                                        functionName: 'sendUniversalTx',
+                                        args: [req],
                                         signer: this.universalSigner,
                                         value: nativeAmount,
                                     });
@@ -192,13 +193,16 @@ class Orchestrator {
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_04);
                                 throw err;
                             }
-                            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);
+                            const originTx = yield this.fetchOriginChainTransactionForProgress(chain, txHash, txHash);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
                             yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 4, 210000);
                             const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds');
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
                             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);
+                            // Funds Flow: Funds credited on Push Chain
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05, bridgeAmount, execute.funds.token.decimals, symbol);
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
                             return response;
                         }
@@ -209,7 +213,9 @@ class Orchestrator {
                             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 [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
+                            const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
                             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');
@@ -222,59 +228,43 @@ class Orchestrator {
                             };
                             // New gateway expects EVM recipient as [u8; 20]
                             const recipientEvm20 = Array.from(Buffer.from(execute.to.slice(2).padStart(40, '0'), 'hex').subarray(0, 20));
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
+                            const ueaAddress = this.computeUEAOffchain();
+                            const { nonce, deployed } = yield this.getUeaStatusAndNonce();
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
                             if (execute.funds.token.mechanism === 'native') {
                                 // 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);
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                //////// @@@@@@@
-                                // 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,
-                                        nativeAmount: yield this.calculateNativeAmountForDeposit(chain, BigInt(0), ueaBalanceForGas),
-                                    });
-                                }
+                                const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], programId);
+                                const recipientNative = execute.to === ueaAddress
+                                    ? Array.from(Buffer.alloc(20, 0))
+                                    : recipientEvm20;
+                                const reqNative = this._buildSvmUniversalTxRequest({
+                                    recipient: recipientNative,
+                                    token: web3_js_1.PublicKey.default,
+                                    amount: bridgeAmount,
+                                    payload: '0x',
+                                    fundRecipient: userPk,
+                                    signatureData: '0x',
+                                });
+                                txSignature = yield svmClient.writeContract({
+                                    abi: abi_1.SVM_GATEWAY_IDL,
+                                    address: programId.toBase58(),
+                                    functionName: 'sendUniversalTx',
+                                    args: [reqNative, bridgeAmount],
+                                    signer: this.universalSigner,
+                                    accounts: {
+                                        config: configPda,
+                                        vault: vaultPda,
+                                        userTokenAccount: vaultPda,
+                                        gatewayTokenAccount: vaultPda,
+                                        user: userPk,
+                                        priceUpdate: priceUpdatePk,
+                                        rateLimitConfig: rateLimitConfigPda,
+                                        tokenRateLimit: tokenRateLimitPda,
+                                        tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                                        systemProgram: web3_js_1.SystemProgram.programId,
+                                    },
+                                });
                             }
                             else if (execute.funds.token.mechanism === 'approve') {
                                 // SPL token funds-only (requires pre-existing ATAs)
@@ -292,57 +282,83 @@ class Orchestrator {
                                     TOKEN_PROGRAM_ID.toBuffer(),
                                     mintPk.toBuffer(),
                                 ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-                                const ueaAddress = this.computeUEAOffchain();
+                                const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), mintPk.toBuffer()], programId);
                                 if (execute.to === ueaAddress) {
-                                    // vitalik
+                                    const recipientSpl = Array.from(Buffer.alloc(20, 0));
+                                    const reqSpl = this._buildSvmUniversalTxRequest({
+                                        recipient: recipientSpl,
+                                        token: mintPk,
+                                        amount: bridgeAmount,
+                                        payload: '0x',
+                                        fundRecipient: userPk,
+                                        signatureData: '0x',
+                                    });
                                     txSignature = yield svmClient.writeContract({
                                         abi: abi_1.SVM_GATEWAY_IDL,
                                         address: programId.toBase58(),
-                                        functionName: 'sendFunds',
-                                        args: [recipientEvm20, mintPk, bridgeAmount, revertSvm],
+                                        functionName: 'sendUniversalTx',
+                                        args: [reqSpl, BigInt(0)],
                                         signer: this.universalSigner,
                                         accounts: {
                                             config: configPda,
                                             vault: vaultPda,
-                                            tokenWhitelist: whitelistPda,
                                             userTokenAccount: userAta,
                                             gatewayTokenAccount: vaultAta,
                                             user: userPk,
-                                            bridgeToken: mintPk,
                                             tokenProgram: TOKEN_PROGRAM_ID,
+                                            priceUpdate: priceUpdatePk,
+                                            rateLimitConfig: rateLimitConfigPda,
+                                            tokenRateLimit: tokenRateLimitPda,
                                             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),
+                                    const recipientSpl = recipientEvm20;
+                                    // vitalik
+                                    const reqSpl = this._buildSvmUniversalTxRequest({
+                                        recipient: recipientSpl,
+                                        token: mintPk,
+                                        amount: bridgeAmount,
+                                        payload: '0x',
+                                        fundRecipient: userPk,
+                                        signatureData: '0x',
+                                    });
+                                    txSignature = yield svmClient.writeContract({
+                                        abi: abi_1.SVM_GATEWAY_IDL,
+                                        address: programId.toBase58(),
+                                        functionName: 'sendUniversalTx',
+                                        args: [reqSpl, BigInt(0)],
+                                        signer: this.universalSigner,
+                                        accounts: {
+                                            config: configPda,
+                                            vault: vaultPda,
+                                            userTokenAccount: userAta,
+                                            gatewayTokenAccount: vaultAta,
+                                            user: userPk,
+                                            tokenProgram: TOKEN_PROGRAM_ID,
+                                            priceUpdate: priceUpdatePk,
+                                            rateLimitConfig: rateLimitConfigPda,
+                                            tokenRateLimit: tokenRateLimitPda,
+                                            systemProgram: web3_js_1.SystemProgram.programId,
+                                        },
                                     });
                                 }
                             }
                             else {
                                 throw new Error('Unsupported token mechanism on Solana');
                             }
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txSignature, bridgeAmount, execute.funds.token.decimals, symbol);
-                            yield svmClient.waitForConfirmations({
-                                txSignature,
-                                confirmations: 25,
-                                timeoutMs: 300000,
-                            });
+                            const originTx = yield this.fetchOriginChainTransactionForProgress(chain, '0x', txSignature);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txSignature, bridgeAmount, execute.funds.token.decimals, symbol, originTx);
+                            yield this.waitForSvmConfirmationsWithCountdown(svmClient, txSignature, 25, 300000);
                             // After origin confirmations, query Push Chain for UniversalTx status (SVM)
                             const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txSignature, 'sendFunds');
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
                             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);
+                            // Funds Flow: Funds credited on Push Chain
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05, bridgeAmount, execute.funds.token.decimals, symbol);
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
                             return response;
                         }
@@ -352,7 +368,7 @@ class Orchestrator {
                         // - EVM (Sepolia): ERC-20 approve path + native gas via msg.value
                         // - SVM (Solana Devnet): SPL or native SOL with gas_amount
                         const { chain, evmClient, gatewayAddress } = this.getOriginGatewayContext();
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain, this.universalSigner.account.address);
                         // Default token to native ETH if none provided
                         if (!execute.funds.token) {
                             const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
@@ -368,7 +384,7 @@ class Orchestrator {
                         }
                         const mechanism = execute.funds.token.mechanism;
                         const { deployed, nonce } = yield this.getUeaStatusAndNonce();
-                        const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendTxWithFunds', execute.funds.amount);
+                        const { payload: universalPayload, req } = 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);
@@ -455,7 +471,6 @@ class Orchestrator {
                         try {
                             if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                                 const tokenAddr = execute.funds.token.address;
-                                // Compute EIP-712 signature for the universal payload and hash to bytes32
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
                                 const ueaAddress = this.computeUEAOffchain();
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
@@ -464,21 +479,7 @@ class Orchestrator {
                                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
                                 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,
-                                // });
+                                const payloadBytes = this.encodeUniversalPayload(universalPayload);
                                 // 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;
@@ -511,37 +512,51 @@ class Orchestrator {
                                     // Approve gas token to gateway
                                     yield this.ensureErc20Allowance(evmClientEvm, gasTokenAddress, gatewayAddressEvm, gasAmount);
                                     // Approve bridge token already done above; now call new gateway signature (nonpayable)
+                                    // const reqToken: UniversalTokenTxRequest = {
+                                    //   recipient: zeroAddress,
+                                    //   token: tokenAddr,
+                                    //   amount: bridgeAmount,
+                                    //   gasToken: gasTokenAddress,
+                                    //   gasAmount,
+                                    //   payload: payloadBytes,
+                                    //   revertInstruction: revertCFG,
+                                    //   signatureData: '0x',
+                                    //   amountOutMinETH,
+                                    //   deadline,
+                                    // } as unknown as never;
+                                    const reqToken = Object.assign(Object.assign({}, req), { gasToken: gasTokenAddress, gasAmount,
+                                        amountOutMinETH,
+                                        deadline });
                                     txHash = yield evmClientEvm.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddressEvm,
-                                        functionName: 'sendTxWithFunds_new',
-                                        args: [
-                                            tokenAddr,
-                                            bridgeAmount,
-                                            gasTokenAddress,
-                                            gasAmount,
-                                            amountOutMinETH,
-                                            deadline,
-                                            universalPayload,
-                                            revertCFG,
-                                            '0x',
-                                        ],
+                                        functionName: 'sendUniversalTx',
+                                        args: [reqToken],
                                         signer: this.universalSigner,
                                     });
                                 }
                                 else {
                                     // Existing native-ETH value path
+                                    // const req: UniversalTxRequest = {
+                                    //   recipient: zeroAddress,
+                                    //   token: tokenAddr,
+                                    //   amount: bridgeAmount,
+                                    //   payload: payloadBytes,
+                                    //   revertInstruction: revertCFG,
+                                    //   signatureData: '0x',
+                                    // };
+                                    // const req = this._buildUniversalTxRequest({
+                                    //   recipient: zeroAddress,
+                                    //   token: tokenAddr,
+                                    //   amount: bridgeAmount,
+                                    //   payload: this.encodeUniversalPayload(universalPayload),
+                                    // });
+                                    // VALUE + PAYLOAD + FUNDS && PAYLOAD + FUNDS
                                     txHash = yield evmClientEvm.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddressEvm,
-                                        functionName: 'sendTxWithFunds_new',
-                                        args: [
-                                            tokenAddr,
-                                            bridgeAmount,
-                                            universalPayload,
-                                            revertCFG,
-                                            '0x',
-                                        ],
+                                        functionName: 'sendUniversalTx',
+                                        args: [req],
                                         signer: this.universalSigner,
                                         value: nativeAmount,
                                     });
@@ -554,6 +569,7 @@ class Orchestrator {
                                     universalPayload,
                                     bridgeAmount,
                                     nativeAmount,
+                                    req,
                                 });
                             }
                         }
@@ -575,11 +591,7 @@ class Orchestrator {
                                 rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
                                     chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
                             });
-                            yield svmClient.waitForConfirmations({
-                                txSignature: txHash,
-                                confirmations: 25,
-                                timeoutMs: 300000,
-                            });
+                            yield this.waitForSvmConfirmationsWithCountdown(svmClient, txHash, 25, 300000);
                         }
                         // Funds Flow: Confirmed on origin
                         let feeLockTxHash = txHash;
@@ -590,12 +602,14 @@ class Orchestrator {
                                 feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
                             }
                         }
-                        if (chain === enums_1.CHAIN.SOLANA_DEVNET ||
-                            chain === enums_1.CHAIN.SOLANA_TESTNET ||
-                            chain === enums_1.CHAIN.SOLANA_MAINNET) {
-                            yield this.sendUniversalTx(deployed, feeLockTxHash);
-                        }
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
+                        // if (
+                        //   chain === CHAIN.SOLANA_DEVNET ||
+                        //   chain === CHAIN.SOLANA_TESTNET ||
+                        //   chain === CHAIN.SOLANA_MAINNET
+                        // ) {
+                        //   await this.sendUniversalTx(deployed, feeLockTxHash);
+                        // }
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
                         // 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) {
@@ -620,13 +634,13 @@ class Orchestrator {
                     execute.value = BigInt(0);
                 }
                 const chain = this.universalSigner.account.chain;
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain, this.universalSigner.account.address);
                 this.validateMainnetConnection(chain);
                 /**
                  * Push to Push Tx
                  */
                 if (this.isPushChain(chain)) {
-                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06);
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_07);
                     const tx = yield this.sendPushTx(execute);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [tx]);
                     return tx;
@@ -667,6 +681,8 @@ class Orchestrator {
                 // Support multicall payload encoding when execute.data is an array
                 let payloadData;
                 let payloadTo;
+                let req;
+                // Here is only value and payload. No funds here
                 if (Array.isArray(execute.data)) {
                     // 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
@@ -675,19 +691,54 @@ class Orchestrator {
                     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 }));
+                    req = this._buildUniversalTxRequest({
+                        recipient: viem_1.zeroAddress,
+                        token: viem_1.zeroAddress,
+                        amount: BigInt(0),
+                        payload: payloadData,
+                    });
                 }
                 else {
                     if (execute.to.toLowerCase() !== UEA.toLowerCase()) {
                         // For Payload + Value we don't do multicall anymore.
                         // Multicall is only when Payload + Value;
                         // Payload + Value + Funds -> Multicall
+                        // TODO: Check but I beleive this code section is never reached.
                         if (execute.funds) {
                             payloadTo = viem_1.zeroAddress;
                             payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
+                            req = this._buildUniversalTxRequest({
+                                recipient: viem_1.zeroAddress,
+                                token: viem_1.zeroAddress,
+                                amount: BigInt(0),
+                                payload: payloadData,
+                            });
                         }
                         else {
+                            // VALUE ONLY OTHER
+                            // VALUE + PAYLOAD ONLY OTHER
                             payloadTo = execute.to;
                             payloadData = execute.data || '0x';
+                            const reqData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
+                            const universalPayload = JSON.parse(JSON.stringify({
+                                to: viem_1.zeroAddress,
+                                value: execute.value,
+                                data: reqData,
+                                gasLimit: execute.gasLimit || BigInt(5e7),
+                                maxFeePerGas: execute.maxFeePerGas || BigInt(1e10),
+                                maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
+                                nonce,
+                                deadline: execute.deadline || BigInt(9999999999),
+                                vType: feeLockingRequired
+                                    ? tx_1.VerificationType.universalTxVerification
+                                    : tx_1.VerificationType.signedVerification,
+                            }, this.bigintReplacer));
+                            req = this._buildUniversalTxRequest({
+                                recipient: viem_1.zeroAddress,
+                                token: viem_1.zeroAddress,
+                                amount: BigInt(0),
+                                payload: this.encodeUniversalPayload(universalPayload),
+                            });
                         }
                     }
                     else {
@@ -695,8 +746,16 @@ class Orchestrator {
                         if (execute.data && execute.to.toLowerCase() === UEA.toLowerCase()) {
                             throw new Error(`You can't execute data on the UEA address`);
                         }
+                        // VALUE ONLY SELF
                         payloadTo = execute.to;
                         payloadData = execute.data || '0x';
+                        req = this._buildUniversalTxRequest({
+                            // recipient: execute.to,
+                            recipient: viem_1.zeroAddress,
+                            token: viem_1.zeroAddress,
+                            amount: BigInt(0),
+                            payload: payloadData,
+                        });
                     }
                 }
                 const universalPayload = JSON.parse(JSON.stringify({
@@ -712,12 +771,6 @@ class Orchestrator {
                         ? tx_1.VerificationType.universalTxVerification
                         : tx_1.VerificationType.signedVerification,
                 }, this.bigintReplacer));
-                const ueaVersion = yield this.fetchUEAVersion();
-                const executionHash = this.computeExecutionHash({
-                    verifyingContract: UEA,
-                    payload: universalPayload,
-                    version: ueaVersion,
-                });
                 /**
                  * Prepare verification data by either signature or fund locking
                  */
@@ -729,13 +782,14 @@ class Orchestrator {
                  * 4. UEA not deployed + insufficient funds: Lock requiredFunds
                  */
                 if (!feeLockingRequired) {
+                    const ueaVersion = yield this.fetchUEAVersion();
                     /**
                      * Sign Universal Payload
                      */
-                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_01, executionHash);
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02);
                     const signature = yield this.signUniversalPayload(universalPayload, UEA, ueaVersion);
                     verificationData = (0, viem_1.bytesToHex)(signature);
-                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02, verificationData);
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
                 }
                 else {
                     /**
@@ -745,17 +799,20 @@ class Orchestrator {
                     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, universalPayload);
+                    const feeLockTxHashBytes = yield this.lockFee(lockAmountInUSD, universalPayload, req);
                     feeLockTxHash = (0, viem_1.bytesToHex)(feeLockTxHashBytes);
                     verificationData = (0, viem_1.bytesToHex)(feeLockTxHashBytes);
                     const { vm } = chain_1.CHAIN_INFO[chain];
-                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_02, vm === enums_1.VM.SVM
+                    const feeLockTxHashDisplay = vm === enums_1.VM.SVM
                         ? anchor_1.utils.bytes.bs58.encode(feeLockTxHashBytes)
-                        : feeLockTxHash, chain_1.CHAIN_INFO[chain].confirmations);
+                        : feeLockTxHash;
+                    // Gas Flow: Gas funding in progress (with full origin tx when available)
+                    const originTx = yield this.fetchOriginChainTransactionForProgress(chain, feeLockTxHash, feeLockTxHashDisplay);
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_01, feeLockTxHashDisplay, originTx);
                     // Waiting for blocks confirmations
                     yield this.waitForLockerFeeConfirmation(feeLockTxHashBytes);
-                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_03);
+                    // Gas Flow: Gas funding confirmed
+                    this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_05_02);
                     // 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');
@@ -763,7 +820,6 @@ class Orchestrator {
                      * 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);
@@ -774,7 +830,7 @@ class Orchestrator {
                 /**
                  * Non-fee-locking path: Broadcasting Tx to PC via sendUniversalTx
                  */
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06);
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_07);
                 // 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);
@@ -806,7 +862,7 @@ class Orchestrator {
      * @returns Transaction hash bytes
      */
     lockFee(amount, // USD with 8 decimals
-    universalPayload) {
+    universalPayload, req) {
         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];
@@ -833,23 +889,19 @@ class Orchestrator {
                         (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 req: UniversalTxRequest = {
+                    //   recipient: zeroAddress,
+                    //   token: zeroAddress,
+                    //   amount: BigInt(0),
+                    //   payload: payloadBytes,
+                    //   revertInstruction: revertCFG,
+                    //   signatureData: '0x',
+                    // } as unknown as never;
                     const txHash = yield evmClient.writeContract({
                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                         address: lockerContract,
-                        functionName: 'sendTxWithGas',
-                        args: [universalPayload, revertCFG, '0x'],
+                        functionName: 'sendUniversalTx',
+                        args: [req],
                         signer: this.universalSigner,
                         value: nativeAmount,
                     });
@@ -877,44 +929,146 @@ class Orchestrator {
                     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 [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
+                    const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], 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.SVM_GATEWAY_IDL,
-                        address: programId.toBase58(),
-                        functionName: 'sendTxWithGas',
-                        args: [
-                            universalPayload,
-                            revertSvm,
-                            new anchor.BN(nativeAmount.toString()),
-                            '0x',
-                        ],
-                        signer: this.universalSigner,
-                        accounts: {
-                            config: configPda,
-                            vault: vaultPda,
-                            user: userPk,
-                            priceUpdate: new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE'),
-                            systemProgram: web3_js_1.SystemProgram.programId,
-                        },
-                    });
-                    return new Uint8Array(anchor_1.utils.bytes.bs58.decode(txHash));
+                    const gasReq = this._buildSvmUniversalTxRequestFromReq(req, userPk);
+                    try {
+                        const txHash = yield svmClient.writeContract({
+                            abi: abi_1.SVM_GATEWAY_IDL,
+                            address: programId.toBase58(),
+                            functionName: 'sendUniversalTx',
+                            args: [gasReq, nativeAmount],
+                            signer: this.universalSigner,
+                            accounts: {
+                                config: configPda,
+                                vault: vaultPda,
+                                userTokenAccount: vaultPda,
+                                gatewayTokenAccount: vaultPda,
+                                user: userPk,
+                                priceUpdate: new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE'),
+                                rateLimitConfig: rateLimitConfigPda,
+                                tokenRateLimit: tokenRateLimitPda,
+                                tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            },
+                        });
+                        return new Uint8Array(anchor_1.utils.bytes.bs58.decode(txHash));
+                    }
+                    catch (error) {
+                        console.error('Error sending UniversalTx:', error);
+                        throw error;
+                    }
                 }
                 default:
                     throw new Error(`Unsupported VM type: ${vm}`);
             }
         });
     }
+    _buildUniversalTxRequest({ recipient, token, amount, payload, }) {
+        const revertInstruction = {
+            fundRecipient: this.universalSigner.account.address,
+            revertMsg: '0x',
+        };
+        return {
+            recipient,
+            token,
+            amount,
+            payload,
+            revertInstruction,
+            signatureData: '0x',
+        };
+    }
+    /**
+     * Builds the SVM UniversalTxRequest object from an existing EVM-style UniversalTxRequest.
+     * This allows reusing the same request shape for both EVM and SVM while only translating
+     * field encodings (addresses, bytes) to the Solana program format.
+     */
+    _buildSvmUniversalTxRequestFromReq(req, fundRecipient, signatureDataOverride) {
+        // recipient in EVM is a 20-byte address; the SVM gateway expects this as [u8; 20]
+        const recipientBytes = (0, viem_1.hexToBytes)(req.recipient);
+        const recipient = Array.from(recipientBytes.subarray(0, 20));
+        // token in EVM is a 20-byte address. For zeroAddress or the Solana-native sentinel we map to
+        // PublicKey.default (all zeros), which mirrors the existing behavior for native SOL paths.
+        // For non-zero addresses we embed the 20-byte value into a 32-byte buffer (left-padded with
+        // zeros) to obtain a deterministic PublicKey representation.
+        const tokenAddress = req.token;
+        let token;
+        if (tokenAddress === viem_1.zeroAddress || tokenAddress === 'solana-native') {
+            // Native SOL on SVM is represented by a sentinel string `solana-native` in token metadata.
+            // The SVM gateway expects the "native" token to be encoded as the default (all-zero) Pubkey.
+            token = web3_js_1.PublicKey.default;
+        }
+        else {
+            if (!tokenAddress.startsWith('0x')) {
+                throw new Error('Unsupported token format for SVM UniversalTxRequest: ' + tokenAddress);
+            }
+            const token20 = (0, viem_1.hexToBytes)(tokenAddress);
+            const token32 = new Uint8Array(32);
+            token32.set(token20, 12);
+            token = new web3_js_1.PublicKey(token32);
+        }
+        return this._buildSvmUniversalTxRequest({
+            recipient,
+            token,
+            amount: req.amount,
+            payload: req.payload,
+            fundRecipient,
+            signatureData: signatureDataOverride !== null && signatureDataOverride !== void 0 ? signatureDataOverride : req.signatureData,
+        });
+    }
+    /**
+     * Builds the SVM UniversalTxRequest object expected by the Solana gateway program.
+     * Shape mirrors the request used in `svm-gateway` tests.
+     */
+    _buildSvmUniversalTxRequest({ recipient, token, amount, payload, fundRecipient, signatureData, }) {
+        const payloadBuf = typeof payload === 'string' && payload.startsWith('0x')
+            ? (() => {
+                const hex = payload.slice(2);
+                if (!hex.length)
+                    return Buffer.alloc(0);
+                const normalized = hex.length % 2 === 1 ? `0${hex}` : hex;
+                return Buffer.from(normalized, 'hex');
+            })()
+            : Buffer.from(payload);
+        let signatureBuf;
+        if (!signatureData) {
+            signatureBuf = Buffer.alloc(0);
+        }
+        else if (typeof signatureData === 'string' &&
+            signatureData.startsWith('0x')) {
+            const hex = signatureData.slice(2);
+            if (!hex.length) {
+                signatureBuf = Buffer.alloc(0);
+            }
+            else {
+                const normalized = hex.length % 2 === 1 ? `0${hex}` : hex;
+                signatureBuf = Buffer.from(normalized, 'hex');
+            }
+        }
+        else {
+            // vitalik
+            // I'm testing to see if it's possible to pass 0x as signature, the same way we did for EVM.
+            // @@@@
+            signatureBuf = Buffer.from(signatureData);
+            // signatureBuf = Buffer.alloc(0);
+        }
+        return {
+            recipient,
+            token,
+            amount,
+            payload: payloadBuf,
+            revertInstruction: {
+                fundRecipient,
+                revertMsg: Buffer.alloc(0),
+            },
+            signatureData: signatureBuf,
+        };
+    }
     signUniversalPayload(universalPayload, verifyingContract, version) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const chain = this.universalSigner.account.chain;
@@ -1111,6 +1265,118 @@ class Orchestrator {
         // 4. Final digest
         return (0, viem_1.keccak256)((0, viem_1.encodePacked)(['string', 'bytes32', 'bytes32'], ['\x19\x01', domainSeparator, structHash]));
     }
+    /**
+     * ABI-encodes a UniversalPayload struct to bytes, matching the Solidity layout.
+     * This mirrors abi.encode(UniversalPayload) in the EVM contracts.
+     */
+    encodeUniversalPayload(payload) {
+        return (0, viem_1.encodeAbiParameters)([
+            { name: 'to', type: 'address' },
+            { name: 'value', type: 'uint256' },
+            { name: 'data', type: 'bytes' },
+            { name: 'gasLimit', type: 'uint256' },
+            { name: 'maxFeePerGas', type: 'uint256' },
+            { name: 'maxPriorityFeePerGas', type: 'uint256' },
+            { name: 'nonce', type: 'uint256' },
+            { name: 'deadline', type: 'uint256' },
+            { name: 'vType', type: 'uint8' },
+        ], [
+            payload.to,
+            BigInt(payload.value),
+            payload.data,
+            BigInt(payload.gasLimit),
+            BigInt(payload.maxFeePerGas),
+            BigInt(payload.maxPriorityFeePerGas),
+            BigInt(payload.nonce),
+            BigInt(payload.deadline),
+            Number(payload.vType),
+        ]);
+    }
+    /**
+     * Encodes a UniversalPayload into Borsh bytes for the SVM universal gateway.
+     * Layout mirrors Rust `UniversalPayload`:
+     *   to: [u8; 20],
+     *   value: u64,
+     *   data: Vec<u8> (u32 LE len + bytes),
+     *   gas_limit: u64,
+     *   max_fee_per_gas: u64,
+     *   max_priority_fee_per_gas: u64,
+     *   nonce: u64,
+     *   deadline: i64,
+     *   v_type: u8 (0 = SignedVerification, 1 = UniversalTxVerification)
+     */
+    encodeUniversalPayloadSvm(payload) {
+        const writeU64 = (val) => {
+            const b = Buffer.alloc(8);
+            const big = BigInt(val);
+            b.writeBigUInt64LE(big, 0);
+            return b;
+        };
+        const writeI64 = (val) => {
+            const b = Buffer.alloc(8);
+            const big = BigInt(val);
+            b.writeBigInt64LE(big, 0);
+            return b;
+        };
+        const writeVecU8 = (val) => {
+            const bytes = Buffer.isBuffer(val)
+                ? val
+                : Buffer.from(val);
+            const len = Buffer.alloc(4);
+            len.writeUInt32LE(bytes.length, 0);
+            return Buffer.concat([len, bytes]);
+        };
+        const writeU8 = (val) => Buffer.from([val]);
+        // 1. to: address (20 bytes)
+        const toBytes = (() => {
+            // EVM-style 0x-address string
+            const to = payload.to;
+            const hex = to.slice(2).padStart(40, '0');
+            return Buffer.from(hex, 'hex');
+        })();
+        // 2. value: u64
+        const valueBytes = writeU64(payload.value);
+        // 3. data: bytes -> Vec<u8>
+        const dataBytes = (() => {
+            const data = payload.data;
+            const hex = data.slice(2);
+            const buf = hex.length ? Buffer.from(hex, 'hex') : Buffer.alloc(0);
+            return writeVecU8(buf);
+        })();
+        // 4. gasLimit: u64
+        const gasLimitBytes = writeU64(payload.gasLimit);
+        // 5. maxFeePerGas: u64
+        const maxFeePerGasBytes = writeU64(payload.maxFeePerGas);
+        // 6. maxPriorityFeePerGas: u64
+        const maxPriorityFeePerGasBytes = writeU64(payload.maxPriorityFeePerGas);
+        // 7. nonce: u64
+        const nonceBytes = writeU64(payload.nonce);
+        // 8. deadline: i64
+        const deadlineBytes = writeI64(payload.deadline);
+        // 9. vType: u8
+        const vTypeVal = (() => {
+            // When coming from EVM, vType is numeric (0/1) in most paths
+            const v = payload.vType;
+            if (typeof v === 'number')
+                return v;
+            if (typeof v === 'string')
+                return Number(v);
+            // Fallback: treat anything else as SignedVerification
+            return 0;
+        })();
+        const vTypeBytes = writeU8(vTypeVal);
+        return Buffer.concat([
+            toBytes,
+            valueBytes,
+            dataBytes,
+            gasLimitBytes,
+            maxFeePerGasBytes,
+            maxPriorityFeePerGasBytes,
+            nonceBytes,
+            deadlineBytes,
+            vTypeBytes,
+        ]);
+    }
     /**
      * Computes UEA for given UniversalAccount
      * @dev - This fn calls a view fn of Factory Contract
@@ -1195,7 +1461,7 @@ class Orchestrator {
         return (selector + encodedCalls.slice(2));
     }
     _sendSVMTxWithFunds(_a) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* ({ execute, mechanism, universalPayload, bridgeAmount, nativeAmount, }) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* ({ execute, mechanism, universalPayload, bridgeAmount, nativeAmount, req, }) {
             var _b, _c, _d, _e;
             // SVM funds+payload path
             const svmClient = new svm_client_1.SvmClient({
@@ -1205,9 +1471,9 @@ class Orchestrator {
             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');
+            const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
             // 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');
@@ -1227,29 +1493,32 @@ class Orchestrator {
             if (isNative) {
                 // Native SOL as bridge + gas
                 const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
+                const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], programId);
+                const nativeReq = this._buildSvmUniversalTxRequest({
+                    recipient: Array.from(Buffer.alloc(20, 0)),
+                    token: web3_js_1.PublicKey.default,
+                    amount: bridgeAmount,
+                    payload: Uint8Array.from(this.encodeUniversalPayloadSvm(universalPayload)),
+                    fundRecipient: userPk,
+                    signatureData: svmSignature,
+                });
                 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),
-                    ],
+                    functionName: 'sendUniversalTx',
+                    args: [nativeReq, nativeAmount],
                     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
+                        userTokenAccount: vaultPda, // dummy for native SOL
+                        gatewayTokenAccount: vaultPda, // dummy for native SOL
                         user: userPk,
                         priceUpdate: priceUpdatePk,
-                        bridgeToken: web3_js_1.PublicKey.default,
                         tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                        rateLimitConfig: rateLimitConfigPda,
+                        tokenRateLimit: tokenRateLimitPda,
                         systemProgram: web3_js_1.SystemProgram.programId,
                     },
                 });
@@ -1265,18 +1534,20 @@ class Orchestrator {
                 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);
+                const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), mintPk.toBuffer()], programId);
+                const splReq = this._buildSvmUniversalTxRequest({
+                    recipient: Array.from(Buffer.alloc(20, 0)),
+                    token: mintPk,
+                    amount: bridgeAmount,
+                    payload: Uint8Array.from(this.encodeUniversalPayloadSvm(universalPayload)),
+                    fundRecipient: userPk,
+                    signatureData: svmSignature,
+                });
                 return yield svmClient.writeContract({
                     abi: abi_1.SVM_GATEWAY_IDL,
                     address: programId.toBase58(),
-                    functionName: 'sendTxWithFunds',
-                    args: [
-                        mintPk,
-                        bridgeAmount,
-                        universalPayload,
-                        revertSvm2,
-                        nativeAmount,
-                        Buffer.from(svmSignature),
-                    ],
+                    functionName: 'sendUniversalTx',
+                    args: [splReq, nativeAmount],
                     signer: this.universalSigner,
                     accounts: {
                         config: configPda,
@@ -1286,8 +1557,9 @@ class Orchestrator {
                         gatewayTokenAccount: vaultAta,
                         user: userPk,
                         priceUpdate: priceUpdatePk,
-                        bridgeToken: mintPk,
                         tokenProgram: TOKEN_PROGRAM_ID,
+                        rateLimitConfig: rateLimitConfigPda,
+                        tokenRateLimit: tokenRateLimitPda,
                         systemProgram: web3_js_1.SystemProgram.programId,
                     },
                 });
@@ -1397,6 +1669,40 @@ class Orchestrator {
             }
         });
     }
+    /**
+     * Internal helper: fetches the full origin-chain transaction for a given hash,
+     * used only for progress-hook context (EVM or Solana).
+     */
+    fetchOriginChainTransactionForProgress(chain, txHashHex, txHashDisplay) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
+            const rpcUrls = this.rpcUrls[chain] || defaultRPC;
+            try {
+                if (vm === enums_1.VM.EVM) {
+                    if (!txHashHex.startsWith('0x')) {
+                        throw new Error('EVM transaction hash must be 0x-prefixed');
+                    }
+                    const evmClient = new evm_client_1.EvmClient({ rpcUrls });
+                    const tx = yield evmClient.publicClient.getTransaction({
+                        hash: txHashHex,
+                    });
+                    return tx !== null && tx !== void 0 ? tx : undefined;
+                }
+                if (vm === enums_1.VM.SVM) {
+                    const connection = new web3_js_1.Connection(rpcUrls[0], 'confirmed');
+                    const tx = yield connection.getTransaction(txHashDisplay, {
+                        maxSupportedTransactionVersion: 0,
+                        commitment: 'confirmed',
+                    });
+                    return tx !== null && tx !== void 0 ? tx : undefined;
+                }
+                return undefined;
+            }
+            catch (_a) {
+                return undefined;
+            }
+        });
+    }
     /**
      * Quotes exact-output on Uniswap V3 for EVM origin chains using QuoterV2.
      * Returns the minimum required input (amountIn) to receive the target amountOut.
@@ -1623,7 +1929,7 @@ class Orchestrator {
      */
     buildGatewayPayloadAndGas(execute, nonce, type, fundsValue) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             const gasEstimate = execute.gasLimit || BigInt(1e7);
             const gasAmount = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
             if (type === 'sendTxWithFunds') {
@@ -1646,7 +1952,19 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                return { payload: universalPayload, gasAmount };
+                // Temporary while we don't change the native address from 0xeee... to 0x0000...
+                let tokenAddress = (_f = (_e = execute.funds) === null || _e === void 0 ? void 0 : _e.token) === null || _f === void 0 ? void 0 : _f.address;
+                if (((_h = (_g = execute.funds) === null || _g === void 0 ? void 0 : _g.token) === null || _h === void 0 ? void 0 : _h.address) ===
+                    '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee') {
+                    tokenAddress = viem_1.zeroAddress;
+                }
+                const req = this._buildUniversalTxRequest({
+                    recipient: viem_1.zeroAddress,
+                    token: tokenAddress,
+                    amount: (_j = execute.funds) === null || _j === void 0 ? void 0 : _j.amount,
+                    payload: this.encodeUniversalPayload(universalPayload),
+                });
+                return { payload: universalPayload, gasAmount, req };
             }
             else {
                 if (!fundsValue)
@@ -1662,12 +1980,12 @@ class Orchestrator {
                 //   functionName: 'transfer',
                 //   args: [execute.to, fundsValue],
                 // });
-                // const pushChainTo = PushChain.utils.tokens.getPRC20Mapping(
+                // const pushChainTo = PushChain.utils.tokens.getPRC20Address(
                 //   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),
+                    value: (_k = execute.value) !== null && _k !== void 0 ? _k : BigInt(0),
                     data: this._buildMulticallPayloadData(execute.to, multicallData),
                     // data: this._buildMulticallPayloadData(execute.to, [
                     //   { to: pushChainTo, value: execute.value ?? BigInt(0), data },
@@ -1679,7 +1997,19 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                return { payload: universalPayload, gasAmount };
+                // Temporary while we don't change the native address from 0xeee... to 0x0000...
+                let tokenAddress = (_m = (_l = execute.funds) === null || _l === void 0 ? void 0 : _l.token) === null || _m === void 0 ? void 0 : _m.address;
+                if (((_p = (_o = execute.funds) === null || _o === void 0 ? void 0 : _o.token) === null || _p === void 0 ? void 0 : _p.address) ===
+                    '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee') {
+                    tokenAddress = viem_1.zeroAddress;
+                }
+                const req = this._buildUniversalTxRequest({
+                    recipient: viem_1.zeroAddress,
+                    token: tokenAddress,
+                    amount: (_q = execute.funds) === null || _q === void 0 ? void 0 : _q.amount,
+                    payload: this.encodeUniversalPayload(universalPayload),
+                });
+                return { payload: universalPayload, gasAmount, req };
             }
         });
     }
@@ -1910,6 +2240,8 @@ class Orchestrator {
         if (!Array.isArray(logs) || logs.length === 0)
             return 0;
         const prefix = 'Program data: ';
+        let matchCount = 0;
+        let lastMatchIndex = -1;
         for (let i = 0; i < logs.length; i++) {
             const log = logs[i] || '';
             if (!log.startsWith(prefix))
@@ -1925,12 +2257,19 @@ class Orchestrator {
             if (!decoded || decoded.length < 8)
                 continue;
             const discriminatorHex = (0, viem_1.bytesToHex)(decoded.slice(0, 8)).slice(2);
-            // Skip add_funds discriminator; return the first other Program data event
+            // Skip add_funds discriminator; return the second matching Program data event
             // if (discriminatorHex === '7f1f6cffbb134644') continue;
-            if (discriminatorHex === '6c9ad829b5ea1d7c')
-                return i;
+            if (discriminatorHex === '6c9ad829b5ea1d7c') {
+                matchCount++;
+                lastMatchIndex = i;
+                if (matchCount === 2)
+                    return i;
+            }
             // return i;
         }
+        // If only one match was found, keep previous behavior and return that one.
+        if (lastMatchIndex !== -1)
+            return lastMatchIndex;
         // Fallback to first log
         return 0;
     }
@@ -2013,25 +2352,9 @@ class Orchestrator {
                     }
                     yield new Promise((r) => setTimeout(r, 1500));
                 }
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) || (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status));
-                // this.printLog(
-                //   `UniversalTx fetched via gRPC: ${JSON.stringify(
-                //     {
-                //       gatewayTx: txHashHex,
-                //       id: idHex,
-                //       status:
-                //         universalTxObj?.universalStatus ||
-                //         universalTxObj?.universal_status,
-                //     },
-                //     this.bigintReplacer,
-                //     2
-                //   )}`
-                // );
                 return universalTxObj;
             }
             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;
             }
         });
@@ -2057,7 +2380,7 @@ class Orchestrator {
                 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);
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, confirmations, confirmations);
                     }
                     return;
                 }
@@ -2065,7 +2388,9 @@ class Orchestrator {
                 const completed = Math.max(1, confirmations - remaining + 1);
                 // 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);
+                    this.executeProgressHook(completed >= confirmations
+                        ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02
+                        : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_01, completed, confirmations);
                     lastEmitted = completed;
                     // If we've reached required confirmations, we're done
                     if (completed >= confirmations) {
@@ -2082,7 +2407,6 @@ 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();
@@ -2094,19 +2418,35 @@ class Orchestrator {
                 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);
+                    // Surface transaction failures explicitly
+                    if (status.err) {
+                        throw new Error(`SVM transaction ${txSignature} failed: ${JSON.stringify(status.err)}`);
+                    }
+                    const rawConfirmations = status.confirmations;
+                    const hasNumericConfirmations = rawConfirmations != null;
+                    const currentConfirms = hasNumericConfirmations ? rawConfirmations : 0;
+                    // Align "finalized" semantics with SvmClient.waitForConfirmations:
+                    // treat either an explicit "finalized" status or a rooted tx
+                    // (confirmations === null) with no error as final.
+                    const isFinalized = status.err === null &&
+                        (status.confirmationStatus === 'finalized' ||
+                            status.confirmations === null);
+                    const hasEnoughConfirmations = hasNumericConfirmations && currentConfirms >= confirmations;
+                    // Emit progress only when the visible confirmation count increases.
+                    // We never "jump" straight to the requested confirmations unless
+                    // we're finalizing and haven't yet emitted a final step.
+                    if (currentConfirms > lastConfirmed) {
+                        const clamped = currentConfirms >= confirmations ? confirmations : currentConfirms;
+                        this.executeProgressHook(clamped >= confirmations
+                            ? progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02
+                            : progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_01, Math.max(1, clamped), confirmations);
                         lastConfirmed = currentConfirms;
                     }
-                    if (hasEnoughConfirmations || isSuccessfullyFinalized) {
+                    if (hasEnoughConfirmations || isFinalized) {
+                        // Ensure we emit a final "all confirmations" step if we haven't yet.
+                        if (lastConfirmed < confirmations) {
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, confirmations, confirmations);
+                        }
                         return;
                     }
                 }
@@ -2185,6 +2525,7 @@ class Orchestrator {
     calculateNativeAmountForDeposit(chain, requiredFunds, ueaBalance) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01);
             // 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);
@@ -2194,7 +2535,6 @@ class Orchestrator {
                 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({
@@ -2236,6 +2576,7 @@ class Orchestrator {
                 nativeTokenUsdPrice;
             // Add 1 unit safety to avoid BelowMinCap from rounding differences
             nativeAmount = nativeAmount + BigInt(1);
+            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02, nativeAmount);
             return nativeAmount;
         });
     }