@pushchain/core 4.0.14-alpha.0 → 5.0.0

package/src/lib/orchestrator/orchestrator.js

@@ -15,7 +15,6 @@ const price_fetch_1 = require("../price-fetch/price-fetch");
 const progress_hook_1 = tslib_1.__importDefault(require("../progress-hook/progress-hook"));
 const progress_hook_types_1 = require("../progress-hook/progress-hook.types");
 const push_chain_1 = require("../push-chain/push-chain");
-const utils_1 = require("../utils");
 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");
@@ -64,16 +63,7 @@ class Orchestrator {
      */
     execute(execute) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-            // Create buffer to collect events during execution for tx.progressHook() replay
-            const eventBuffer = [];
-            // Store original progressHook and wrap to collect events
-            const originalHook = this.progressHook;
-            this.progressHook = (event) => {
-                eventBuffer.push(event);
-                if (originalHook)
-                    originalHook(event);
-            };
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             try {
                 if (execute.funds) {
                     if (!execute.data || execute.data === '0x') {
@@ -123,25 +113,12 @@ class Orchestrator {
                             const { nonce, deployed } = yield this.getUeaStatusAndNonce();
                             const { payload: universalPayload, req } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', bridgeAmount);
                             const ueaAddress = this.computeUEAOffchain();
-                            this.printLog('sendFunds — buildGatewayPayloadAndGas result: ' + JSON.stringify({
-                                recipient: execute.to,
-                                ueaAddress,
-                                isSelfBridge: execute.to.toLowerCase() === ueaAddress.toLowerCase(),
-                                bridgeAmount: bridgeAmount.toString(),
-                                bridgeToken,
-                                isNative,
-                                tokenAddr,
-                                nonce: nonce.toString(),
-                                deployed,
-                            }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
                             // 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);
-                            this.printLog(`sendFunds — nativeAmount: ${nativeAmount.toString()}, ueaBalanceForGas: ${ueaBalanceForGas.toString()}`);
                             // 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.printLog(`UEA resolved: ${ueaAddress}, deployed: ${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 });
@@ -180,19 +157,13 @@ class Orchestrator {
                                     //   revertInstruction: revertCFG,
                                     //   signatureData: '0x',
                                     // } as unknown as never;
-                                    this.printLog('FUNDS ONLY SELF — gateway call payload: ' + JSON.stringify({
-                                        gatewayAddress, functionName: 'sendUniversalTx', req,
-                                        value: (isNative ? nativeAmount + bridgeAmount : nativeAmount).toString(),
-                                        isNative, bridgeAmount: bridgeAmount.toString(),
-                                        nativeAmount: nativeAmount.toString(), bridgeToken,
-                                    }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
                                     txHash = yield evmClient.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddress,
                                         functionName: 'sendUniversalTx',
                                         args: [req],
                                         signer: this.universalSigner,
-                                        value: isNative ? nativeAmount + bridgeAmount : nativeAmount,
+                                        value: isNative ? bridgeAmount : BigInt(0),
                                     });
                                 }
                                 else {
@@ -208,19 +179,13 @@ class Orchestrator {
                                     //   revertInstruction: revertCFG,
                                     //   signatureData: '0x',
                                     // } as unknown as never;
-                                    this.printLog('FUNDS ONLY OTHER — gateway call payload: ' + JSON.stringify({
-                                        gatewayAddress, functionName: 'sendUniversalTx', req,
-                                        value: nativeAmount.toString(),
-                                        isNative, bridgeAmount: bridgeAmount.toString(),
-                                        nativeAmount: nativeAmount.toString(), bridgeToken,
-                                    }, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
                                     txHash = yield evmClient.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddress,
                                         functionName: 'sendUniversalTx',
                                         args: [req],
                                         signer: this.universalSigner,
-                                        value: isNative ? nativeAmount + bridgeAmount : nativeAmount,
+                                        value: nativeAmount,
                                     });
                                 }
                             }
@@ -230,37 +195,14 @@ class Orchestrator {
                             }
                             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, chain_1.CHAIN_INFO[chain].confirmations, chain_1.CHAIN_INFO[chain].timeout);
-                            // Funds Confirmed - emit immediately after confirmations
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-                            // Syncing with Push Chain - emit before query
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
-                            this.printLog('sendFunds — querying Push Chain status: ' + JSON.stringify({
-                                txHash,
-                                evmGatewayMethod: execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds',
-                            }));
+                            yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 4, 210000);
                             const pushChainUniversalTx = yield this.queryUniversalTxStatusFromGatewayTx(evmClient, gatewayAddress, txHash, execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds');
-                            if (!((_a = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx) === null || _a === void 0 ? void 0 : _a.length)) {
-                                throw new Error(`Failed to retrieve Push Chain transaction status for gateway tx: ${txHash}. ` +
-                                    `The transaction may have failed on Push Chain or not been indexed yet.`);
-                            }
-                            // For sendFunds operations, MintPC (first) succeeds and executePayload (second) may fail
-                            // Always use the last pcTx entry as it represents the final execution result
-                            const lastPcTransaction = pushChainUniversalTx.pcTx.at(-1);
-                            this.printLog('sendFunds — pushChainUniversalTx pcTx: ' + JSON.stringify((_b = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx) === null || _b === void 0 ? void 0 : _b.map((p) => ({ txHash: p.txHash, status: p.status, errorMsg: p.errorMsg })), null, 2));
-                            this.printLog('sendFunds — using lastPcTransaction: ' + JSON.stringify(lastPcTransaction, null, 2));
-                            if (!(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash)) {
-                                // Check for error messages in failed entries
-                                const failedPcTx = pushChainUniversalTx.pcTx.find((pcTx) => pcTx.status === 'FAILED' && pcTx.errorMsg);
-                                const errorDetails = (failedPcTx === null || failedPcTx === void 0 ? void 0 : failedPcTx.errorMsg)
-                                    ? `: ${failedPcTx.errorMsg}`
-                                    : '';
-                                throw new Error(`No transaction hash found in Push Chain response for gateway tx: ${txHash}${errorDetails}`);
-                            }
-                            const tx = yield this.pushClient.getTransaction(lastPcTransaction.txHash);
-                            const response = yield this.transformToUniversalTxResponse(tx, eventBuffer);
+                            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_06, bridgeAmount, execute.funds.token.decimals, symbol);
+                            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;
                         }
@@ -293,8 +235,11 @@ class Orchestrator {
                             if (execute.funds.token.mechanism === 'native') {
                                 // Native SOL funds-only
                                 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: recipientEvm20,
+                                    recipient: recipientNative,
                                     token: web3_js_1.PublicKey.default,
                                     amount: bridgeAmount,
                                     payload: '0x',
@@ -339,8 +284,9 @@ class Orchestrator {
                                 ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
                                 const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), mintPk.toBuffer()], programId);
                                 if (execute.to === ueaAddress) {
+                                    const recipientSpl = Array.from(Buffer.alloc(20, 0));
                                     const reqSpl = this._buildSvmUniversalTxRequest({
-                                        recipient: recipientEvm20,
+                                        recipient: recipientSpl,
                                         token: mintPk,
                                         amount: bridgeAmount,
                                         payload: '0x',
@@ -404,30 +350,15 @@ class Orchestrator {
                             }
                             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, chain_1.CHAIN_INFO[chain].confirmations, chain_1.CHAIN_INFO[chain].timeout);
-                            // Funds Confirmed - emit immediately after confirmations
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-                            // Syncing with Push Chain - emit before query
-                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
+                            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');
-                            if (!((_c = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx) === null || _c === void 0 ? void 0 : _c.length)) {
-                                throw new Error(`Failed to retrieve Push Chain transaction status for gateway tx: ${txSignature}. ` +
-                                    `The transaction may have failed on Push Chain or not been indexed yet.`);
-                            }
-                            // Always use the last pcTx entry as it represents the final execution result
-                            const lastPcTransaction = pushChainUniversalTx.pcTx.at(-1);
-                            if (!(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash)) {
-                                const failedPcTx = pushChainUniversalTx.pcTx.find((pcTx) => pcTx.status === 'FAILED' && pcTx.errorMsg);
-                                const errorDetails = (failedPcTx === null || failedPcTx === void 0 ? void 0 : failedPcTx.errorMsg)
-                                    ? `: ${failedPcTx.errorMsg}`
-                                    : '';
-                                throw new Error(`No transaction hash found in Push Chain response for gateway tx: ${txSignature}${errorDetails}`);
-                            }
-                            const tx = yield this.pushClient.getTransaction(lastPcTransaction.txHash);
-                            const response = yield this.transformToUniversalTxResponse(tx, eventBuffer);
+                            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_06, bridgeAmount, execute.funds.token.decimals, symbol);
+                            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;
                         }
@@ -459,7 +390,7 @@ class Orchestrator {
                         const gasEstimate = execute.gasLimit || BigInt(1e7);
                         const gasPrice = yield this.pushClient.getGasPrice();
                         const requiredGasFee = gasEstimate * gasPrice;
-                        const payloadValue = (_d = execute.value) !== null && _d !== void 0 ? _d : BigInt(0);
+                        const payloadValue = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
                         const requiredFunds = requiredGasFee + payloadValue;
                         const ueaAddress = this.computeUEAOffchain();
                         const [ueaBalance] = yield Promise.all([
@@ -468,8 +399,8 @@ class Orchestrator {
                         // UEA resolved (address, deployment status, balance, nonce)
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
                         // Determine USD to deposit via gateway (8 decimals) with caps: min=$1, max=$10
-                        const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-                        const tenUsd = utils_1.Utils.helpers.parseUnits('10', 8);
+                        const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+                        const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
                         const deficit = requiredFunds > ueaBalance ? requiredFunds - ueaBalance : BigInt(0);
                         let depositUsd = deficit > BigInt(0) ? this.pushClient.pushToUSDC(deficit) : oneUsd;
                         if (depositUsd < oneUsd)
@@ -492,8 +423,8 @@ class Orchestrator {
                                     functionName: 'config',
                                     args: [configPda.toBase58()],
                                 });
-                                const minField = (_e = cfg.minCapUniversalTxUsd) !== null && _e !== void 0 ? _e : cfg.min_cap_universal_tx_usd;
-                                const maxField = (_f = cfg.maxCapUniversalTxUsd) !== null && _f !== void 0 ? _f : cfg.max_cap_universal_tx_usd;
+                                const minField = (_b = cfg.minCapUniversalTxUsd) !== null && _b !== void 0 ? _b : cfg.min_cap_universal_tx_usd;
+                                const maxField = (_c = cfg.maxCapUniversalTxUsd) !== null && _c !== void 0 ? _c : cfg.max_cap_universal_tx_usd;
                                 const minCapUsd = BigInt(minField.toString());
                                 const maxCapUsd = BigInt(maxField.toString());
                                 if (depositUsd < minCapUsd)
@@ -505,14 +436,14 @@ class Orchestrator {
                                 if (depositUsd > maxCapUsd)
                                     depositUsd = maxCapUsd;
                             }
-                            catch (_q) {
+                            catch (_k) {
                                 // best-effort; fallback to previous bounds if read fails
                             }
                         }
                         // Convert USD(8) -> native units using pricing path
                         const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain); // 8 decimals
                         const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
-                        const oneNativeUnit = utils_1.Utils.helpers.parseUnits('1', nativeDecimals);
+                        const oneNativeUnit = push_chain_1.PushChain.utils.helpers.parseUnits('1', nativeDecimals);
                         // Ceil division to avoid rounding below min USD on-chain
                         let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
                             nativeTokenUsdPrice;
@@ -529,16 +460,12 @@ class Orchestrator {
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01, bridgeAmount, execute.funds.token.decimals, symbol);
                         if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                             const tokenAddr = execute.funds.token.address;
-                            if (mechanism === 'approve') {
-                                // ERC-20 tokens: ensure gateway has approval
-                                const evmClientEvm = evmClient;
-                                const gatewayAddressEvm = gatewayAddress;
-                                yield this.ensureErc20Allowance(evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
-                            }
-                            else if (mechanism === 'permit2') {
-                                throw new Error('Permit2 is not supported yet');
+                            if (mechanism !== 'approve') {
+                                throw new Error('Only ERC-20 tokens are supported for funds+payload on EVM; native and permit2 are not supported yet');
                             }
-                            // Native tokens (mechanism === 'native') don't need approval - handled via msg.value
+                            const evmClientEvm = evmClient;
+                            const gatewayAddressEvm = gatewayAddress;
+                            yield this.ensureErc20Allowance(evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
                         }
                         let txHash;
                         try {
@@ -556,7 +483,7 @@ class Orchestrator {
                                 // 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;
-                                const gasTokenAddress = (_g = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _g === void 0 ? void 0 : _g.address;
+                                const gasTokenAddress = (_d = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _d === void 0 ? void 0 : _d.address;
                                 if (gasTokenAddress) {
                                     if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
                                         throw new Error(`Only ${push_chain_1.PushChain.utils.chains.getChainName(enums_1.CHAIN.ETHEREUM_SEPOLIA)} is supported for paying gas fees with ERC-20 tokens`);
@@ -564,7 +491,7 @@ class Orchestrator {
                                     let amountOutMinETH = (payWith === null || payWith === void 0 ? void 0 : payWith.minAmountOut) !== undefined
                                         ? BigInt(payWith.minAmountOut)
                                         : nativeAmount;
-                                    const slippageBps = (_h = payWith === null || payWith === void 0 ? void 0 : payWith.slippageBps) !== null && _h !== void 0 ? _h : 100;
+                                    const slippageBps = (_e = payWith === null || payWith === void 0 ? void 0 : payWith.slippageBps) !== null && _e !== void 0 ? _e : 100;
                                     amountOutMinETH = BigInt(push_chain_1.PushChain.utils.conversion.slippageToMinAmount(amountOutMinETH.toString(), { slippageBps }));
                                     const { gasAmount } = yield this.calculateGasAmountFromAmountOutMinETH(gasTokenAddress, amountOutMinETH);
                                     const deadline = BigInt(0);
@@ -576,10 +503,10 @@ class Orchestrator {
                                         ownerAddress,
                                     });
                                     if (gasTokenBalance < gasAmount) {
-                                        const sym = (_k = (_j = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _j === void 0 ? void 0 : _j.symbol) !== null && _k !== void 0 ? _k : 'gas token';
-                                        const decimals = (_m = (_l = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _l === void 0 ? void 0 : _l.decimals) !== null && _m !== void 0 ? _m : 18;
-                                        const needFmt = utils_1.Utils.helpers.formatUnits(gasAmount, decimals);
-                                        const haveFmt = utils_1.Utils.helpers.formatUnits(gasTokenBalance, decimals);
+                                        const sym = (_g = (_f = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _f === void 0 ? void 0 : _f.symbol) !== null && _g !== void 0 ? _g : 'gas token';
+                                        const decimals = (_j = (_h = payWith === null || payWith === void 0 ? void 0 : payWith.token) === null || _h === void 0 ? void 0 : _h.decimals) !== null && _j !== void 0 ? _j : 18;
+                                        const needFmt = push_chain_1.PushChain.utils.helpers.formatUnits(gasAmount, decimals);
+                                        const haveFmt = push_chain_1.PushChain.utils.helpers.formatUnits(gasTokenBalance, decimals);
                                         throw new Error(`Insufficient ${sym} balance to cover gas fees: need ${needFmt}, have ${haveFmt}`);
                                     }
                                     // Approve gas token to gateway
@@ -625,19 +552,13 @@ class Orchestrator {
                                     //   payload: this.encodeUniversalPayload(universalPayload),
                                     // });
                                     // VALUE + PAYLOAD + FUNDS && PAYLOAD + FUNDS
-                                    // For native tokens: msg.value = gas amount + bridge amount
-                                    // For ERC-20 tokens: msg.value = gas amount only (bridge handled via token transfer)
-                                    const isNativeToken = mechanism === 'native';
-                                    const totalValue = isNativeToken
-                                        ? nativeAmount + bridgeAmount
-                                        : nativeAmount;
                                     txHash = yield evmClientEvm.writeContract({
                                         abi: abi_1.UNIVERSAL_GATEWAY_V0,
                                         address: gatewayAddressEvm,
                                         functionName: 'sendUniversalTx',
                                         args: [req],
                                         signer: this.universalSigner,
-                                        value: totalValue,
+                                        value: nativeAmount,
                                     });
                                 }
                             }
@@ -661,17 +582,16 @@ class Orchestrator {
                         // Funds Flow: Funds lock submitted
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
                         // Awaiting confirmations
-                        const signerChain = this.universalSigner.account.chain;
-                        if (chain_1.CHAIN_INFO[signerChain].vm === enums_1.VM.EVM) {
+                        if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                             const evmClientEvm = evmClient;
-                            yield this.waitForEvmConfirmationsWithCountdown(evmClientEvm, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
+                            yield this.waitForEvmConfirmationsWithCountdown(evmClientEvm, txHash, 4, 300000);
                         }
                         else {
                             const svmClient = new svm_client_1.SvmClient({
                                 rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
                                     chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
                             });
-                            yield this.waitForSvmConfirmationsWithCountdown(svmClient, txHash, chain_1.CHAIN_INFO[signerChain].confirmations, chain_1.CHAIN_INFO[signerChain].timeout);
+                            yield this.waitForSvmConfirmationsWithCountdown(svmClient, txHash, 25, 300000);
                         }
                         // Funds Flow: Confirmed on origin
                         let feeLockTxHash = txHash;
@@ -689,10 +609,7 @@ class Orchestrator {
                         // ) {
                         //   await this.sendUniversalTx(deployed, feeLockTxHash);
                         // }
-                        // Funds Confirmed - emit immediately after confirmations
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04);
-                        // Syncing with Push Chain - emit before query
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05);
                         // 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) {
@@ -705,23 +622,9 @@ class Orchestrator {
                             pushChainUniversalTx =
                                 yield this.queryUniversalTxStatusFromGatewayTx(undefined, undefined, txHash, 'sendTxWithFunds');
                         }
-                        if (!((_o = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx) === null || _o === void 0 ? void 0 : _o.length)) {
-                            throw new Error(`Failed to retrieve Push Chain transaction status for gateway tx: ${txHash}. ` +
-                                `The transaction may have failed on Push Chain or not been indexed yet.`);
-                        }
-                        // Always use the last pcTx entry as it represents the final execution result
-                        const lastPcTransaction = pushChainUniversalTx.pcTx.at(-1);
-                        if (!(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash)) {
-                            const failedPcTx = pushChainUniversalTx.pcTx.find((pcTx) => pcTx.status === 'FAILED' && pcTx.errorMsg);
-                            const errorDetails = (failedPcTx === null || failedPcTx === void 0 ? void 0 : failedPcTx.errorMsg)
-                                ? `: ${failedPcTx.errorMsg}`
-                                : '';
-                            throw new Error(`No transaction hash found in Push Chain response for gateway tx: ${txHash}${errorDetails}`);
-                        }
-                        const tx = yield this.pushClient.getTransaction(lastPcTransaction.txHash);
-                        const response = yield this.transformToUniversalTxResponse(tx, eventBuffer);
-                        // Funds Flow: Funds credited on Push Chain
-                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, bridgeAmount, execute.funds.token.decimals, symbol);
+                        const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                        const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                        const response = yield this.transformToUniversalTxResponse(tx);
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
                         return response;
                     }
@@ -738,7 +641,7 @@ class Orchestrator {
                  */
                 if (this.isPushChain(chain)) {
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_07);
-                    const tx = yield this.sendPushTx(execute, eventBuffer);
+                    const tx = yield this.sendPushTx(execute);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [tx]);
                     return tx;
                 }
@@ -840,31 +743,18 @@ class Orchestrator {
                     }
                     else {
                         // For value only we don't check below. Only if there is payload to be executed
-                        // if (execute.data && execute.to.toLowerCase() === UEA.toLowerCase()) {
-                        //   throw new Error(`You can't execute data on the UEA address`);
-                        // }
-                        // VALUE ONLY SELF - using multicall for consistency
+                        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';
-                        const reqData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
-                        const universalPayloadSelf = 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: execute.to,
                             recipient: viem_1.zeroAddress,
                             token: viem_1.zeroAddress,
                             amount: BigInt(0),
-                            payload: this.encodeUniversalPayload(universalPayloadSelf),
+                            payload: payloadData,
                         });
                     }
                 }
@@ -906,7 +796,7 @@ class Orchestrator {
                      * Fee Locking - For all chains, EVM and Solana
                      */
                     const fundDifference = requiredFunds - funds;
-                    const fixedPushAmount = utils_1.Utils.helpers.parseUnits('0.001', 18); // Minimum lock 0.001 Push tokens
+                    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);
                     const feeLockTxHashBytes = yield this.lockFee(lockAmountInUSD, universalPayload, req);
@@ -931,21 +821,9 @@ class Orchestrator {
                      * Note: queryTx may be undefined since validators don't recognize new UniversalTx event yet
                      */
                     // Transform to UniversalTxResponse (follow sendFunds pattern)
-                    if (!((_p = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx) === null || _p === void 0 ? void 0 : _p.length)) {
-                        throw new Error(`Failed to retrieve Push Chain transaction status for gateway tx: ${feeLockTxHash}. ` +
-                            `The transaction may have failed on Push Chain or not been indexed yet.`);
-                    }
-                    // Always use the last pcTx entry as it represents the final execution result
-                    const lastPcTransaction = pushChainUniversalTx.pcTx.at(-1);
-                    if (!(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash)) {
-                        const failedPcTx = pushChainUniversalTx.pcTx.find((pcTx) => pcTx.status === 'FAILED' && pcTx.errorMsg);
-                        const errorDetails = (failedPcTx === null || failedPcTx === void 0 ? void 0 : failedPcTx.errorMsg)
-                            ? `: ${failedPcTx.errorMsg}`
-                            : '';
-                        throw new Error(`No transaction hash found in Push Chain response for gateway tx: ${feeLockTxHash}${errorDetails}`);
-                    }
-                    const tx = yield this.pushClient.getTransaction(lastPcTransaction.txHash);
-                    const response = yield this.transformToUniversalTxResponse(tx, eventBuffer);
+                    const lastPcTransaction = pushChainUniversalTx === null || pushChainUniversalTx === void 0 ? void 0 : pushChainUniversalTx.pcTx.at(-1);
+                    const tx = yield this.pushClient.getTransaction(lastPcTransaction === null || lastPcTransaction === void 0 ? void 0 : lastPcTransaction.txHash);
+                    const response = yield this.transformToUniversalTxResponse(tx);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
                     return response;
                 }
@@ -954,7 +832,7 @@ class Orchestrator {
                  */
                 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, eventBuffer);
+                const transactions = yield this.sendUniversalTx(isUEADeployed, feeLockTxHash, universalPayload, verificationData);
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, transactions);
                 return transactions[transactions.length - 1];
             }
@@ -974,10 +852,6 @@ class Orchestrator {
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_02, errMessage);
                 throw err;
             }
-            finally {
-                // Restore original progressHook
-                this.progressHook = originalHook;
-            }
         });
     }
     /**
@@ -1005,8 +879,8 @@ class Orchestrator {
                     ]);
                     const nativeDecimals = 18; // ETH, MATIC, etc.
                     // Ensure deposit respects gateway USD caps (min $1, max $10) and avoid rounding below min
-                    const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-                    const tenUsd = utils_1.Utils.helpers.parseUnits('10', 8);
+                    const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+                    const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
                     let depositUsd = amount < oneUsd ? oneUsd : amount;
                     if (depositUsd > tenUsd)
                         depositUsd = tenUsd;
@@ -1041,8 +915,8 @@ class Orchestrator {
                     ]);
                     // Ensure deposit respects gateway USD caps (min $1, max $10) and avoid rounding below min
                     const nativeDecimals = 9; // SOL lamports
-                    const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-                    const tenUsd = utils_1.Utils.helpers.parseUnits('10', 8);
+                    const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+                    const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
                     let depositUsd = amount < oneUsd ? oneUsd : amount;
                     if (depositUsd > tenUsd)
                         depositUsd = tenUsd;
@@ -1244,8 +1118,8 @@ class Orchestrator {
     /**
      * Sends a custom Cosmos tx to Push Chain (gasless) to execute user intent.
      */
-    sendUniversalTx(isUEADeployed_1, feeLockTxHash_1, universalPayload_1, verificationData_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (isUEADeployed, feeLockTxHash, universalPayload, verificationData, eventBuffer = []) {
+    sendUniversalTx(isUEADeployed, feeLockTxHash, universalPayload, verificationData) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             const { chain, address } = this.universalSigner.account;
             const { vm, chainId } = chain_1.CHAIN_INFO[chain];
@@ -1306,8 +1180,7 @@ class Orchestrator {
             const evmTxs = yield Promise.all(ethTxHashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                 return yield this.pushClient.getTransaction(hash);
             })));
-            // Pass eventBuffer only to the last transaction (which is the one returned to user)
-            return yield Promise.all(evmTxs.map((tx, index) => this.transformToUniversalTxResponse(tx, index === evmTxs.length - 1 ? eventBuffer : [])));
+            return yield Promise.all(evmTxs.map((tx) => this.transformToUniversalTxResponse(tx)));
         });
     }
     /**
@@ -1316,8 +1189,8 @@ class Orchestrator {
      * @param execute
      * @returns Cosmos Tx Response for a given Evm Tx
      */
-    sendPushTx(execute_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (execute, eventBuffer = []) {
+    sendPushTx(execute) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // For PushChain, multicall is not supported. Ensure data is hex string.
             if (Array.isArray(execute.data)) {
                 throw new Error('Multicall is not supported on PushChain');
@@ -1329,7 +1202,7 @@ class Orchestrator {
                 signer: this.universalSigner,
             });
             const txResponse = yield this.pushClient.getTransaction(txHash);
-            return yield this.transformToUniversalTxResponse(txResponse, eventBuffer);
+            return yield this.transformToUniversalTxResponse(txResponse);
         });
     }
     /**
@@ -1504,167 +1377,6 @@ class Orchestrator {
             vTypeBytes,
         ]);
     }
-    /**
-     * Reconstructs SEND-TX-* progress events from on-chain transaction data.
-     * Used by trackTransaction to replay progress for already-completed transactions.
-     *
-     * @param universalTxResponse - The transformed transaction response
-     * @param universalTxData - Optional UniversalTx data from gRPC query (for cross-chain txs)
-     * @returns Array of ProgressEvent objects to emit
-     */
-    reconstructProgressEvents(universalTxResponse, universalTxData) {
-        var _a;
-        const events = [];
-        // Parse origin from CAIP format: "eip155:11155111:0xabc..."
-        const originParts = universalTxResponse.origin.split(':');
-        const chainNamespace = originParts.length >= 2 ? `${originParts[0]}:${originParts[1]}` : originParts[0];
-        const originAddress = originParts.length >= 3 ? originParts[2] : universalTxResponse.from;
-        // SEND_TX_01: Origin Chain Detected (always emit)
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01](chainNamespace, originAddress));
-        // SEND_TX_02_01/02: Gas estimation (always emit for reconstructed flow)
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01]());
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02](universalTxResponse.gasLimit));
-        // Determine if this is a cross-chain tx (non-Push origin)
-        const isPushOrigin = chainNamespace.includes('eip155:42101') ||
-            chainNamespace.includes('eip155:9') ||
-            chainNamespace.includes('eip155:9001');
-        // SEND_TX_03_01/02: UEA resolution (emit if origin is not Push Chain)
-        if (!isPushOrigin) {
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01]());
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02](universalTxResponse.from, true // Assume deployed since tx executed
-            ));
-        }
-        // Determine transaction type from universalTxData if available
-        const inboundTx = universalTxData === null || universalTxData === void 0 ? void 0 : universalTxData.inboundTx;
-        const hasFundsFlow = inboundTx && BigInt(inboundTx.amount || '0') > BigInt(0);
-        // SEND_TX_04_02/03: Signature verification (emit for universal tx)
-        if (!isPushOrigin) {
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02]());
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03]());
-        }
-        // Funds flow hooks (06-x) - only if funds were bridged
-        if (hasFundsFlow && inboundTx) {
-            const amount = BigInt(inboundTx.amount);
-            // Determine decimals and symbol from asset - default to 18/native for now
-            const decimals = 18;
-            const symbol = 'TOKEN';
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_01](amount, decimals, symbol));
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02](inboundTx.txHash, amount, decimals, symbol));
-            // Confirmations - emit final state only
-            const confirmations = 1;
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03](confirmations));
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02](confirmations, confirmations));
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04]());
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_05]());
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06](amount, decimals, symbol));
-        }
-        // SEND_TX_07: Broadcasting (always emit)
-        events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_07]());
-        // Determine outcome from pcTx status if available
-        const pcTx = (_a = universalTxData === null || universalTxData === void 0 ? void 0 : universalTxData.pcTx) === null || _a === void 0 ? void 0 : _a[0];
-        const isFailed = (pcTx === null || pcTx === void 0 ? void 0 : pcTx.status) === 'FAILED';
-        // SEND_TX_99_01/02: Final outcome
-        if (isFailed) {
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_02]((pcTx === null || pcTx === void 0 ? void 0 : pcTx.errorMsg) || 'Unknown error'));
-        }
-        else {
-            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01]([universalTxResponse]));
-        }
-        return events;
-    }
-    /**
-     * Tracks a transaction by hash on Push Chain and returns UniversalTxResponse.
-     * Reconstructs and replays SEND-TX-* progress events for completed transactions.
-     *
-     * @param txHash - Transaction hash to track (Push Chain tx hash)
-     * @param options - Tracking options (chain, progressHook, waitForCompletion, advanced config)
-     * @returns Promise resolving to UniversalTxResponse with wait() and progressHook() methods
-     */
-    trackTransaction(txHash, options) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const { chain = this.getPushChainForNetwork(), progressHook, waitForCompletion = true, advanced = {}, } = options !== null && options !== void 0 ? options : {};
-            const { timeout = 300000, rpcUrls = {} } = advanced;
-            // Event buffer for replay via response.progressHook()
-            const eventBuffer = [];
-            // Helper to emit progress events
-            const emitProgress = (event) => {
-                eventBuffer.push(event);
-                this.printLog(event.message);
-                // Per-transaction hook called FIRST
-                if (progressHook) {
-                    progressHook(event);
-                }
-                // Orchestrator-level hook called SECOND
-                if (this.progressHook) {
-                    this.progressHook(event);
-                }
-            };
-            // Create client for target chain with optional RPC override
-            const chainRPCs = rpcUrls[chain] || this.rpcUrls[chain] || chain_1.CHAIN_INFO[chain].defaultRPC;
-            const client = new push_client_1.PushClient({
-                rpcUrls: chainRPCs,
-                network: this.pushNetwork,
-            });
-            // Poll for transaction
-            const start = Date.now();
-            let tx;
-            // eslint-disable-next-line no-constant-condition
-            while (true) {
-                try {
-                    tx = yield client.getTransaction(txHash);
-                    break; // Found transaction
-                }
-                catch (err) {
-                    if (!waitForCompletion) {
-                        throw new Error(`Transaction ${txHash} not found`);
-                    }
-                    // Check timeout
-                    if (Date.now() - start > timeout) {
-                        throw new Error(`Timeout: transaction ${txHash} not confirmed within ${timeout}ms`);
-                    }
-                    // Brief delay before retry
-                    yield new Promise((r) => setTimeout(r, 1000));
-                }
-            }
-            // Try to get UniversalTx data for richer progress reconstruction
-            // (may not exist for direct Push Chain transactions)
-            let universalTxData;
-            try {
-                // Attempt to find UniversalTx by searching pcTx entries
-                // For now, we'll try to look up by the tx hash
-                const utxResponse = yield this.pushClient.getUniversalTxById(txHash);
-                if (utxResponse === null || utxResponse === void 0 ? void 0 : utxResponse.universalTx) {
-                    universalTxData = utxResponse.universalTx;
-                }
-            }
-            catch (_a) {
-                // Ignore - direct Push Chain tx or tx not indexed yet
-            }
-            // Transform to UniversalTxResponse
-            const universalTxResponse = yield this.transformToUniversalTxResponse(tx, eventBuffer);
-            // Reconstruct and emit SEND-TX-* progress events
-            const reconstructedEvents = this.reconstructProgressEvents(universalTxResponse, universalTxData);
-            for (const event of reconstructedEvents) {
-                emitProgress(event);
-            }
-            return universalTxResponse;
-        });
-    }
-    /**
-     * Returns the Push Chain enum value for the current network
-     */
-    getPushChainForNetwork() {
-        if (this.pushNetwork === enums_1.PUSH_NETWORK.MAINNET) {
-            return enums_1.CHAIN.PUSH_MAINNET;
-        }
-        else if (this.pushNetwork === enums_1.PUSH_NETWORK.TESTNET_DONUT ||
-            this.pushNetwork === enums_1.PUSH_NETWORK.TESTNET) {
-            return enums_1.CHAIN.PUSH_TESTNET_DONUT;
-        }
-        else {
-            return enums_1.CHAIN.PUSH_LOCALNET;
-        }
-    }
     /**
      * Computes UEA for given UniversalAccount
      * @dev - This fn calls a view fn of Factory Contract
@@ -1707,7 +1419,6 @@ class Orchestrator {
         });
     }
     _buildMulticallPayloadData(to, data) {
-        this.printLog('_buildMulticallPayloadData — input: ' + data.length + ' calls: ' + JSON.stringify(data, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
         const allowedChains = [
             enums_1.CHAIN.ETHEREUM_SEPOLIA,
             enums_1.CHAIN.ARBITRUM_SEPOLIA,
@@ -1940,17 +1651,17 @@ class Orchestrator {
     waitForLockerFeeConfirmation(txHashBytes) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const chain = this.universalSigner.account.chain;
-            const { vm, defaultRPC, fastConfirmations, timeout } = chain_1.CHAIN_INFO[chain];
+            const { vm, defaultRPC, confirmations, timeout } = chain_1.CHAIN_INFO[chain];
             const rpcUrls = this.rpcUrls[chain] || defaultRPC;
             switch (vm) {
                 case enums_1.VM.EVM: {
                     const evmClient = new evm_client_1.EvmClient({ rpcUrls });
-                    yield this.waitForEvmConfirmationsWithCountdown(evmClient, (0, viem_1.bytesToHex)(txHashBytes), fastConfirmations, timeout);
+                    yield this.waitForEvmConfirmationsWithCountdown(evmClient, (0, viem_1.bytesToHex)(txHashBytes), confirmations, timeout);
                     return;
                 }
                 case enums_1.VM.SVM: {
                     const svmClient = new svm_client_1.SvmClient({ rpcUrls });
-                    yield this.waitForSvmConfirmationsWithCountdown(svmClient, anchor_1.utils.bytes.bs58.encode(txHashBytes), fastConfirmations, timeout);
+                    yield this.waitForSvmConfirmationsWithCountdown(svmClient, anchor_1.utils.bytes.bs58.encode(txHashBytes), confirmations, timeout);
                     return;
                 }
                 default:
@@ -2090,10 +1801,10 @@ class Orchestrator {
                 throw new Error('No direct Uniswap V3 pool found for the given token pair on common fee tiers');
             }
             const amountInBig = BigInt(bestAmountIn);
-            const amountInHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountInBig, {
+            const amountInHuman = parseFloat(push_chain_1.PushChain.utils.helpers.formatUnits(amountInBig, {
                 decimals: from.decimals,
             }));
-            const amountOutHuman = parseFloat(utils_1.Utils.helpers.formatUnits(amountOut, { decimals: to.decimals }));
+            const amountOutHuman = parseFloat(push_chain_1.PushChain.utils.helpers.formatUnits(amountOut, { decimals: to.decimals }));
             const rate = amountInHuman > 0 ? amountOutHuman / amountInHuman : 0;
             return {
                 amountIn: bestAmountIn.toString(),
@@ -2218,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, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
+            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') {
@@ -2241,7 +1952,6 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                this.printLog('(universalPayload) ' + universalPayload);
                 // 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) ===
@@ -2273,23 +1983,10 @@ class Orchestrator {
                 // const pushChainTo = PushChain.utils.tokens.getPRC20Address(
                 //   execute.funds!.token as MoveableToken
                 // );
-                this.printLog('sendFunds — execute params: ' + JSON.stringify({
-                    to: execute.to,
-                    value: (_l = (_k = execute.value) === null || _k === void 0 ? void 0 : _k.toString()) !== null && _l !== void 0 ? _l : 'undefined',
-                    data: (_m = execute.data) !== null && _m !== void 0 ? _m : 'undefined',
-                    fundsAmount: (_p = (_o = execute.funds) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.toString(),
-                    fundsToken: (_r = (_q = execute.funds) === null || _q === void 0 ? void 0 : _q.token) === null || _r === void 0 ? void 0 : _r.symbol,
-                    tokenMechanism: (_t = (_s = execute.funds) === null || _s === void 0 ? void 0 : _s.token) === null || _t === void 0 ? void 0 : _t.mechanism,
-                    tokenAddress: (_v = (_u = execute.funds) === null || _u === void 0 ? void 0 : _u.token) === null || _v === void 0 ? void 0 : _v.address,
-                    gasLimit: (_x = (_w = execute.gasLimit) === null || _w === void 0 ? void 0 : _w.toString()) !== null && _x !== void 0 ? _x : 'undefined',
-                }, null, 2));
-                this.printLog('sendFunds — multicallData: ' + JSON.stringify(multicallData, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2) + ' (length: ' + multicallData.length + ')');
-                const multicallPayloadData = this._buildMulticallPayloadData(execute.to, multicallData);
-                this.printLog('sendFunds — multicallPayloadData (first 66 chars): ' + multicallPayloadData.slice(0, 66) + ' (full length: ' + multicallPayloadData.length + ')');
                 const universalPayload = {
                     to: viem_1.zeroAddress, // We can't simply do `0x` because we will get an error when eip712 signing the transaction.
-                    value: (_y = execute.value) !== null && _y !== void 0 ? _y : BigInt(0),
-                    data: multicallPayloadData,
+                    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 },
                     // ]),
@@ -2300,36 +1997,18 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                this.printLog('sendFunds — universalPayload (pre-encode): ' + JSON.stringify({
-                    to: viem_1.zeroAddress,
-                    value: ((_z = execute.value) !== null && _z !== void 0 ? _z : BigInt(0)).toString(),
-                    data: multicallPayloadData,
-                    gasLimit: gasEstimate.toString(),
-                    maxFeePerGas: (execute.maxFeePerGas || BigInt(1e10)).toString(),
-                    maxPriorityFeePerGas: (execute.maxPriorityFeePerGas || BigInt(0)).toString(),
-                    nonce: nonce.toString(),
-                    deadline: (execute.deadline || BigInt(9999999999)).toString(),
-                }, null, 2));
                 // Temporary while we don't change the native address from 0xeee... to 0x0000...
-                let tokenAddress = (_1 = (_0 = execute.funds) === null || _0 === void 0 ? void 0 : _0.token) === null || _1 === void 0 ? void 0 : _1.address;
-                if (((_3 = (_2 = execute.funds) === null || _2 === void 0 ? void 0 : _2.token) === null || _3 === void 0 ? void 0 : _3.address) ===
+                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 encodedPayload = this.encodeUniversalPayload(universalPayload);
-                this.printLog('sendFunds — encodedPayload (first 66 chars): ' + encodedPayload.slice(0, 66) + ' (full length: ' + encodedPayload.length + ')');
                 const req = this._buildUniversalTxRequest({
                     recipient: viem_1.zeroAddress,
                     token: tokenAddress,
-                    amount: (_4 = execute.funds) === null || _4 === void 0 ? void 0 : _4.amount,
-                    payload: encodedPayload,
+                    amount: (_q = execute.funds) === null || _q === void 0 ? void 0 : _q.amount,
+                    payload: this.encodeUniversalPayload(universalPayload),
                 });
-                this.printLog('sendFunds — final req: ' + JSON.stringify({
-                    recipient: viem_1.zeroAddress,
-                    token: tokenAddress,
-                    amount: (_6 = (_5 = execute.funds) === null || _5 === void 0 ? void 0 : _5.amount) === null || _6 === void 0 ? void 0 : _6.toString(),
-                    payloadLength: encodedPayload.length,
-                }, null, 2));
                 return { payload: universalPayload, gasAmount, req };
             }
         });
@@ -2370,8 +2049,8 @@ class Orchestrator {
     /**
      * Transforms a TxResponse to the new UniversalTxResponse format
      */
-    transformToUniversalTxResponse(tx_2) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (tx, eventBuffer = []) {
+    transformToUniversalTxResponse(tx) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const chain = this.universalSigner.account.chain;
             const { vm, chainId } = chain_1.CHAIN_INFO[chain];
             let from;
@@ -2400,32 +2079,6 @@ class Orchestrator {
                     to = universalPayload.to;
                     value = BigInt(universalPayload.value);
                     data = universalPayload.data;
-                    // Extract 'to' from single-element multicall
-                    if (data && data.length >= 10) {
-                        const multicallSelector = (0, viem_1.keccak256)((0, viem_1.toBytes)('UEA_MULTICALL')).slice(0, 10);
-                        if (data.slice(0, 10) === multicallSelector) {
-                            try {
-                                const innerData = ('0x' + data.slice(10));
-                                const [decodedCalls] = (0, viem_1.decodeAbiParameters)([
-                                    {
-                                        type: 'tuple[]',
-                                        components: [
-                                            { name: 'to', type: 'address' },
-                                            { name: 'value', type: 'uint256' },
-                                            { name: 'data', type: 'bytes' },
-                                        ],
-                                    },
-                                ], innerData);
-                                // If single call, use its 'to' address
-                                if (decodedCalls.length === 1) {
-                                    to = (0, viem_1.getAddress)(decodedCalls[0].to);
-                                }
-                            }
-                            catch (_a) {
-                                // Keep original 'to' if decoding fails
-                            }
-                        }
-                    }
                     rawTransactionData = {
                         from: (0, viem_1.getAddress)(tx.from),
                         to: (0, viem_1.getAddress)(tx.to),
@@ -2461,39 +2114,6 @@ class Orchestrator {
                     value: tx.value,
                 };
             }
-            // Extract 'to' and 'from' from depositPRC20WithAutoSwap (precompile call)
-            if (data && data.length >= 10) {
-                const depositPRC20Selector = '0x780ad827';
-                if (data.slice(0, 10) === depositPRC20Selector) {
-                    try {
-                        const decoded = (0, viem_1.decodeFunctionData)({
-                            abi: [
-                                {
-                                    name: 'depositPRC20WithAutoSwap',
-                                    type: 'function',
-                                    inputs: [
-                                        { name: 'prc20', type: 'address' },
-                                        { name: 'amount', type: 'uint256' },
-                                        { name: 'target', type: 'address' },
-                                        { name: 'fee', type: 'uint24' },
-                                        { name: 'minPCOut', type: 'uint256' },
-                                        { name: 'deadline', type: 'uint256' },
-                                    ],
-                                },
-                            ],
-                            data: data,
-                        });
-                        if (decoded.args) {
-                            const target = decoded.args[2];
-                            to = (0, viem_1.getAddress)(target);
-                            from = '0x0000000000000000000000000000000000000000';
-                        }
-                    }
-                    catch (_b) {
-                        // Keep original values if decoding fails
-                    }
-                }
-            }
             const origin = `${chain_1.VM_NAMESPACE[vm]}:${chainId}:${originAddress}`;
             // Create signature from transaction r, s, v values
             let signature;
@@ -2505,7 +2125,7 @@ class Orchestrator {
                     yParity: tx.yParity,
                 };
             }
-            catch (_c) {
+            catch (_a) {
                 // Fallback signature if parsing fails
                 signature = {
                     r: '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -2536,8 +2156,6 @@ class Orchestrator {
                     typeVerbose = 'eip4844';
                 }
             }
-            // Storage for registered progress callback (used by progressHook method)
-            let registeredProgressHook;
             const universalTxResponse = {
                 // 1. Identity
                 hash: tx.hash,
@@ -2562,28 +2180,9 @@ class Orchestrator {
                 accessList: Array.isArray(tx.accessList) ? [...tx.accessList] : [],
                 // 6. Utilities
                 wait: () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    // Use trackTransaction with registered hook if available
-                    if (registeredProgressHook) {
-                        const trackedResponse = yield this.trackTransaction(tx.hash, {
-                            waitForCompletion: true,
-                            progressHook: registeredProgressHook,
-                        });
-                        // Get receipt from the tracked response
-                        const receipt = yield tx.wait();
-                        return this.transformToUniversalTxReceipt(receipt, trackedResponse);
-                    }
                     const receipt = yield tx.wait();
                     return this.transformToUniversalTxReceipt(receipt, universalTxResponse);
                 }),
-                progressHook: (callback) => {
-                    registeredProgressHook = callback;
-                    // Immediately replay buffered events from execution
-                    if (eventBuffer.length > 0) {
-                        for (const event of eventBuffer) {
-                            callback(event);
-                        }
-                    }
-                },
                 // 7. Metadata
                 type,
                 typeVerbose,
@@ -2629,9 +2228,10 @@ class Orchestrator {
         const hookEntry = progress_hook_1.default[hookId];
         const hookPayload = hookEntry(...args);
         this.printLog(hookPayload.message);
-        if (this.progressHook) {
-            this.progressHook(hookPayload);
-        }
+        if (!this.progressHook)
+            return;
+        // invoke the user-provided callback
+        this.progressHook(hookPayload);
     }
     // Derive the SVM gateway log index from a Solana transaction's log messages
     getSvmGatewayLogIndexFromTx(txResp) {
@@ -2700,14 +2300,10 @@ class Orchestrator {
                         });
                     }
                     const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() === gatewayAddress.toLowerCase());
-                    this.printLog(`queryUniversalTxStatus — receipt logs count: ${(_a = receipt.logs) === null || _a === void 0 ? void 0 : _a.length}, gateway logs count: ${gatewayLogs.length}, evmGatewayMethod: ${evmGatewayMethod}`);
-                    this.printLog('queryUniversalTxStatus — gatewayLogs: ' + JSON.stringify(gatewayLogs.map((l) => { var _a; return ({ address: l.address, logIndex: l.logIndex, topics: (_a = l.topics) === null || _a === void 0 ? void 0 : _a[0] }); }), null, 2));
-                    // TEMP: use last gateway log instead of hardcoded 0/1 index
-                    const logIndexToUse = gatewayLogs.length - 1;
+                    const logIndexToUse = evmGatewayMethod === 'sendTxWithFunds' ? 1 : 0;
                     const firstLog = (gatewayLogs[logIndexToUse] ||
-                        (receipt.logs || []).at(-1));
+                        ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[logIndexToUse]));
                     const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
-                    this.printLog(`queryUniversalTxStatus — logIndexToUse: ${logIndexToUse}, firstLog.logIndex: ${firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex}, logIndexVal: ${logIndexVal}`);
                     logIndexStr =
                         typeof logIndexVal === 'bigint'
                             ? logIndexVal.toString()
@@ -2741,21 +2337,9 @@ class Orchestrator {
                 // ID = sha256("${sourceChain}:${txHash}:${logIndex}") as hex string (no 0x)
                 const idInput = `${sourceChain}:${txHashHex}:${logIndexStr}`;
                 const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
-                this.printLog('Query ID extraction: ' + JSON.stringify({
-                    sourceChain,
-                    txHashHex,
-                    logIndexStr,
-                    idInput,
-                    idHex,
-                }, null, 2));
-                // Fetch UniversalTx via gRPC with linear-then-exponential retry
-                const LINEAR_ATTEMPTS = 25;
-                const LINEAR_DELAY_MS = 1500;
-                const EXPONENTIAL_BASE_MS = 2000;
-                const MAX_ATTEMPTS = 30;
+                // Fetch UniversalTx via gRPC with a brief retry window
                 let universalTxObj;
-                for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-                    this.printLog(`[Sync] Attempt ${attempt + 1}/${MAX_ATTEMPTS} | Query ID: ${idHex}`);
+                for (let attempt = 0; attempt < 15; attempt++) {
                     try {
                         const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
                         universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
@@ -2766,17 +2350,7 @@ class Orchestrator {
                         // ignore and retry
                         // console.log(error);
                     }
-                    // Linear delay for first N attempts, then exponential backoff
-                    let delay;
-                    if (attempt < LINEAR_ATTEMPTS) {
-                        delay = LINEAR_DELAY_MS;
-                    }
-                    else {
-                        // Exponential: 2000, 4000, 8000, 16000, ...
-                        const exponentialAttempt = attempt - LINEAR_ATTEMPTS;
-                        delay = EXPONENTIAL_BASE_MS * Math.pow(2, exponentialAttempt);
-                    }
-                    yield new Promise((r) => setTimeout(r, delay));
+                    yield new Promise((r) => setTimeout(r, 1500));
                 }
                 return universalTxObj;
             }
@@ -2788,11 +2362,6 @@ class Orchestrator {
     // Emit countdown updates while waiting for EVM confirmations
     waitForEvmConfirmationsWithCountdown(evmClient, txHash, confirmations, timeoutMs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            // Skip waiting if zero confirmations requested
-            if (confirmations <= 0) {
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, 0, 0);
-                return;
-            }
             // initial emit
             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, confirmations);
             const start = Date.now();
@@ -2838,11 +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* () {
-            // Skip waiting if zero confirmations requested
-            if (confirmations <= 0) {
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03_02, 0, 0);
-                return;
-            }
             // initial emit
             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, confirmations);
             const start = Date.now();
@@ -2963,8 +2527,8 @@ class Orchestrator {
             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 = utils_1.Utils.helpers.parseUnits('1', 8);
-            const tenUsd = utils_1.Utils.helpers.parseUnits('10', 8);
+            const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
+            const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
             const deficit = requiredFunds > ueaBalance ? requiredFunds - ueaBalance : BigInt(0);
             let depositUsd = deficit > BigInt(0) ? this.pushClient.pushToUSDC(deficit) : oneUsd;
             if (depositUsd < oneUsd)
@@ -3006,7 +2570,7 @@ class Orchestrator {
             // Convert USD(8) -> native units using pricing path
             const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain); // 8 decimals
             const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
-            const oneNativeUnit = utils_1.Utils.helpers.parseUnits('1', nativeDecimals);
+            const oneNativeUnit = push_chain_1.PushChain.utils.helpers.parseUnits('1', nativeDecimals);
             // Ceil division to avoid rounding below min USD on-chain
             let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
                 nativeTokenUsdPrice;