@pushchain/core 4.0.12-alpha.0 → 4.0.12

package/src/lib/orchestrator/orchestrator.js

@@ -65,6 +65,15 @@ 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);
+            };
             try {
                 if (execute.funds) {
                     if (!execute.data || execute.data === '0x') {
@@ -114,7 +123,7 @@ class Orchestrator {
                             const { nonce, deployed } = yield this.getUeaStatusAndNonce();
                             const { payload: universalPayload, req } = yield this.buildGatewayPayloadAndGas(execute, nonce, 'sendFunds', bridgeAmount);
                             const ueaAddress = this.computeUEAOffchain();
-                            console.log('[DEBUG] sendFunds — buildGatewayPayloadAndGas result:', JSON.stringify({
+                            this.printLog('sendFunds — buildGatewayPayloadAndGas result: ' + JSON.stringify({
                                 recipient: execute.to,
                                 ueaAddress,
                                 isSelfBridge: execute.to.toLowerCase() === ueaAddress.toLowerCase(),
@@ -128,11 +137,11 @@ class Orchestrator {
                             // 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);
-                            console.log('[DEBUG] sendFunds — nativeAmount:', nativeAmount.toString(), 'ueaBalanceForGas:', ueaBalanceForGas.toString());
+                            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);
-                            console.log('[DEBUG] UEA resolved:', ueaAddress, 'deployed:', 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 });
@@ -171,7 +180,7 @@ class Orchestrator {
                                     //   revertInstruction: revertCFG,
                                     //   signatureData: '0x',
                                     // } as unknown as never;
-                                    console.log('[DEBUG] FUNDS ONLY SELF — gateway call payload:', JSON.stringify({
+                                    this.printLog('FUNDS ONLY SELF — gateway call payload: ' + JSON.stringify({
                                         gatewayAddress, functionName: 'sendUniversalTx', req,
                                         value: (isNative ? nativeAmount + bridgeAmount : nativeAmount).toString(),
                                         isNative, bridgeAmount: bridgeAmount.toString(),
@@ -199,7 +208,7 @@ class Orchestrator {
                                     //   revertInstruction: revertCFG,
                                     //   signatureData: '0x',
                                     // } as unknown as never;
-                                    console.log('[DEBUG] FUNDS ONLY OTHER — gateway call payload:', JSON.stringify({
+                                    this.printLog('FUNDS ONLY OTHER — gateway call payload: ' + JSON.stringify({
                                         gatewayAddress, functionName: 'sendUniversalTx', req,
                                         value: nativeAmount.toString(),
                                         isNative, bridgeAmount: bridgeAmount.toString(),
@@ -226,10 +235,10 @@ class Orchestrator {
                             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);
-                            console.log('[DEBUG] sendFunds — querying Push Chain status:', {
+                            this.printLog('sendFunds — querying Push Chain status: ' + JSON.stringify({
                                 txHash,
                                 evmGatewayMethod: execute.to === ueaAddress ? 'sendFunds' : 'sendTxWithFunds',
-                            });
+                            }));
                             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}. ` +
@@ -238,8 +247,8 @@ class Orchestrator {
                             // 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);
-                            console.log('[DEBUG] 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));
-                            console.log('[DEBUG] sendFunds — using lastPcTransaction:', JSON.stringify(lastPcTransaction, null, 2));
+                            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);
@@ -249,7 +258,7 @@ class Orchestrator {
                                 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);
+                            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);
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
@@ -416,7 +425,7 @@ class Orchestrator {
                                 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);
+                            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);
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
@@ -710,7 +719,7 @@ class Orchestrator {
                             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);
+                        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);
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
@@ -729,7 +738,7 @@ class Orchestrator {
                  */
                 if (this.isPushChain(chain)) {
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_07);
-                    const tx = yield this.sendPushTx(execute);
+                    const tx = yield this.sendPushTx(execute, eventBuffer);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [tx]);
                     return tx;
                 }
@@ -778,7 +787,7 @@ class Orchestrator {
                     // execute.to = zeroAddress;
                     payloadTo = viem_1.zeroAddress;
                     console.warn(`Multicalls should have execute.to as ${viem_1.zeroAddress}`);
-                    payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
+                    payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA, logger: this.printLog.bind(this) }));
                     req = this._buildUniversalTxRequest({
                         recipient: viem_1.zeroAddress,
                         token: viem_1.zeroAddress,
@@ -794,7 +803,7 @@ class Orchestrator {
                         // 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 }));
+                            payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA, logger: this.printLog.bind(this) }));
                             req = this._buildUniversalTxRequest({
                                 recipient: viem_1.zeroAddress,
                                 token: viem_1.zeroAddress,
@@ -807,7 +816,7 @@ class Orchestrator {
                             // 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 reqData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA, logger: this.printLog.bind(this) }));
                             const universalPayload = JSON.parse(JSON.stringify({
                                 to: viem_1.zeroAddress,
                                 value: execute.value,
@@ -923,7 +932,7 @@ class Orchestrator {
                         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);
+                    const response = yield this.transformToUniversalTxResponse(tx, eventBuffer);
                     this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, [response]);
                     return response;
                 }
@@ -932,7 +941,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);
+                const transactions = yield this.sendUniversalTx(isUEADeployed, feeLockTxHash, universalPayload, verificationData, eventBuffer);
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01, transactions);
                 return transactions[transactions.length - 1];
             }
@@ -952,6 +961,10 @@ class Orchestrator {
                 this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_02, errMessage);
                 throw err;
             }
+            finally {
+                // Restore original progressHook
+                this.progressHook = originalHook;
+            }
         });
     }
     /**
@@ -1218,8 +1231,8 @@ class Orchestrator {
     /**
      * Sends a custom Cosmos tx to Push Chain (gasless) to execute user intent.
      */
-    sendUniversalTx(isUEADeployed, feeLockTxHash, universalPayload, verificationData) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    sendUniversalTx(isUEADeployed_1, feeLockTxHash_1, universalPayload_1, verificationData_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (isUEADeployed, feeLockTxHash, universalPayload, verificationData, eventBuffer = []) {
             var _a, _b;
             const { chain, address } = this.universalSigner.account;
             const { vm, chainId } = chain_1.CHAIN_INFO[chain];
@@ -1280,7 +1293,8 @@ 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);
             })));
-            return yield Promise.all(evmTxs.map((tx) => this.transformToUniversalTxResponse(tx)));
+            // 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 : [])));
         });
     }
     /**
@@ -1289,8 +1303,8 @@ class Orchestrator {
      * @param execute
      * @returns Cosmos Tx Response for a given Evm Tx
      */
-    sendPushTx(execute) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    sendPushTx(execute_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (execute, eventBuffer = []) {
             // 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');
@@ -1302,7 +1316,7 @@ class Orchestrator {
                 signer: this.universalSigner,
             });
             const txResponse = yield this.pushClient.getTransaction(txHash);
-            return yield this.transformToUniversalTxResponse(txResponse);
+            return yield this.transformToUniversalTxResponse(txResponse, eventBuffer);
         });
     }
     /**
@@ -1487,13 +1501,22 @@ class Orchestrator {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { chain = this.getPushChainForNetwork(), progress, waitForCompletion = true, advanced = {}, } = options !== null && options !== void 0 ? options : {};
             const { pollingIntervalMs = 1000, timeout = 300000, rpcUrls = {}, } = advanced;
-            // Use custom progress hook if provided, otherwise use instance hook
-            const progressHookFn = progress !== null && progress !== void 0 ? progress : this.progressHook;
+            // Helper to invoke both per-transaction and orchestrator hooks
+            const invokeProgressHook = (hookPayload) => {
+                this.printLog(hookPayload.message);
+                // Per-transaction hook called FIRST
+                if (progress) {
+                    progress(hookPayload);
+                }
+                // Orchestrator-level hook called SECOND
+                if (this.progressHook) {
+                    this.progressHook(hookPayload);
+                }
+            };
             // Emit TRACK_TX_01 - tracking started
-            if (progressHookFn) {
+            if (progress || this.progressHook) {
                 const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_01](txHash, chain);
-                this.printLog(hookPayload.message);
-                progressHookFn(hookPayload);
+                invokeProgressHook(hookPayload);
             }
             // Create client for target chain with optional RPC override
             const chainRPCs = rpcUrls[chain] || this.rpcUrls[chain] || chain_1.CHAIN_INFO[chain].defaultRPC;
@@ -1514,10 +1537,9 @@ class Orchestrator {
                 const receipt = yield tx.wait(1);
                 const universalTxResponse = yield this.transformToUniversalTxResponse(tx);
                 // Emit TRACK_TX_99_01 - tracking complete
-                if (progressHookFn) {
+                if (progress || this.progressHook) {
                     const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_99_01](txHash, universalTxResponse);
-                    this.printLog(hookPayload.message);
-                    progressHookFn(hookPayload);
+                    invokeProgressHook(hookPayload);
                 }
                 return this.transformToUniversalTxReceipt(receipt, universalTxResponse);
             }
@@ -1526,31 +1548,29 @@ class Orchestrator {
                 if (!waitForCompletion) {
                     // Non-blocking and tx not found - throw error
                     const errorMsg = initialError instanceof Error ? initialError.message : 'Transaction not found';
-                    if (progressHookFn) {
+                    if (progress || this.progressHook) {
                         const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_99_02](txHash, errorMsg);
-                        this.printLog(hookPayload.message);
-                        progressHookFn(hookPayload);
+                        invokeProgressHook(hookPayload);
                     }
                     throw new Error(`Transaction ${txHash} not found: ${errorMsg}`);
                 }
                 // Blocking mode: poll until found or timeout
                 const start = Date.now();
+                // eslint-disable-next-line no-constant-condition
                 while (true) {
                     // Emit TRACK_TX_02 - querying status
-                    if (progressHookFn) {
+                    if (progress || this.progressHook) {
                         const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_02](txHash);
-                        this.printLog(hookPayload.message);
-                        progressHookFn(hookPayload);
+                        invokeProgressHook(hookPayload);
                     }
                     try {
                         const tx = yield client.getTransaction(txHash);
                         const receipt = yield tx.wait(1);
                         const universalTxResponse = yield this.transformToUniversalTxResponse(tx);
                         // Success - emit TRACK_TX_99_01
-                        if (progressHookFn) {
+                        if (progress || this.progressHook) {
                             const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_99_01](txHash, universalTxResponse);
-                            this.printLog(hookPayload.message);
-                            progressHookFn(hookPayload);
+                            invokeProgressHook(hookPayload);
                         }
                         return this.transformToUniversalTxReceipt(receipt, universalTxResponse);
                     }
@@ -1561,10 +1581,9 @@ class Orchestrator {
                     // Check timeout
                     if (Date.now() - start > timeout) {
                         const timeoutMsg = `Timeout: transaction ${txHash} not confirmed within ${timeout}ms`;
-                        if (progressHookFn) {
+                        if (progress || this.progressHook) {
                             const hookPayload = progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.TRACK_TX_99_02](txHash, 'Timeout');
-                            this.printLog(hookPayload.message);
-                            progressHookFn(hookPayload);
+                            invokeProgressHook(hookPayload);
                         }
                         throw new Error(timeoutMsg);
                     }
@@ -1631,7 +1650,7 @@ class Orchestrator {
         });
     }
     _buildMulticallPayloadData(to, data) {
-        console.log('[DEBUG] _buildMulticallPayloadData — input:', data.length, 'calls:', JSON.stringify(data, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2));
+        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,
@@ -2151,6 +2170,7 @@ class Orchestrator {
                 const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
                     execute,
                     ueaAddress: this.computeUEAOffchain(),
+                    logger: this.printLog.bind(this),
                 });
                 // THIS ABOVE WILL CHANGE WHEN FUNDS ARE PASSED
                 const universalPayload = {
@@ -2165,7 +2185,7 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                console.log('[DEBUG] (universalPayload) ' + universalPayload);
+                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) ===
@@ -2186,6 +2206,7 @@ class Orchestrator {
                 const multicallData = (0, payload_builders_1.buildExecuteMulticall)({
                     execute,
                     ueaAddress: this.computeUEAOffchain(),
+                    logger: this.printLog.bind(this),
                 });
                 // // The data will be the abi-encoded transfer function from erc-20 function. The recipient will be `execute.to`, the value
                 // // will be the fundsValue property.
@@ -2197,7 +2218,7 @@ class Orchestrator {
                 // const pushChainTo = PushChain.utils.tokens.getPRC20Address(
                 //   execute.funds!.token as MoveableToken
                 // );
-                console.log('[DEBUG] sendFunds — execute params:', JSON.stringify({
+                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',
@@ -2207,9 +2228,9 @@ class Orchestrator {
                     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));
-                console.log('[DEBUG] sendFunds — multicallData:', JSON.stringify(multicallData, (_, v) => typeof v === 'bigint' ? v.toString() : v, 2), '(length:', multicallData.length, ')');
+                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);
-                console.log('[DEBUG] sendFunds — multicallPayloadData (first 66 chars):', multicallPayloadData.slice(0, 66), '(full length:', multicallPayloadData.length, ')');
+                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),
@@ -2224,7 +2245,7 @@ class Orchestrator {
                     deadline: execute.deadline || BigInt(9999999999),
                     vType: tx_1.VerificationType.universalTxVerification,
                 };
-                console.log('[DEBUG] sendFunds — universalPayload (pre-encode):', JSON.stringify({
+                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,
@@ -2241,14 +2262,14 @@ class Orchestrator {
                     tokenAddress = viem_1.zeroAddress;
                 }
                 const encodedPayload = this.encodeUniversalPayload(universalPayload);
-                console.log('[DEBUG] sendFunds — encodedPayload (first 66 chars):', encodedPayload.slice(0, 66), '(full length:', encodedPayload.length, ')');
+                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,
                 });
-                console.log('[DEBUG] sendFunds — final req:', JSON.stringify({
+                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(),
@@ -2294,8 +2315,8 @@ class Orchestrator {
     /**
      * Transforms a TxResponse to the new UniversalTxResponse format
      */
-    transformToUniversalTxResponse(tx) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+    transformToUniversalTxResponse(tx_2) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* (tx, eventBuffer = []) {
             const chain = this.universalSigner.account.chain;
             const { vm, chainId } = chain_1.CHAIN_INFO[chain];
             let from;
@@ -2324,6 +2345,32 @@ 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),
@@ -2370,7 +2417,7 @@ class Orchestrator {
                     yParity: tx.yParity,
                 };
             }
-            catch (_a) {
+            catch (_b) {
                 // Fallback signature if parsing fails
                 signature = {
                     r: '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -2401,6 +2448,8 @@ class Orchestrator {
                     typeVerbose = 'eip4844';
                 }
             }
+            // Storage for registered progress callback (used by progressHook method)
+            let registeredProgressHook;
             const universalTxResponse = {
                 // 1. Identity
                 hash: tx.hash,
@@ -2425,9 +2474,25 @@ 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) {
+                        return this.trackTransaction(tx.hash, {
+                            waitForCompletion: true,
+                            progress: registeredProgressHook,
+                        });
+                    }
                     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,
@@ -2473,10 +2538,9 @@ class Orchestrator {
         const hookEntry = progress_hook_1.default[hookId];
         const hookPayload = hookEntry(...args);
         this.printLog(hookPayload.message);
-        if (!this.progressHook)
-            return;
-        // invoke the user-provided callback
-        this.progressHook(hookPayload);
+        if (this.progressHook) {
+            this.progressHook(hookPayload);
+        }
     }
     // Derive the SVM gateway log index from a Solana transaction's log messages
     getSvmGatewayLogIndexFromTx(txResp) {
@@ -2545,14 +2609,14 @@ class Orchestrator {
                         });
                     }
                     const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() === gatewayAddress.toLowerCase());
-                    console.log('[DEBUG] queryUniversalTxStatus — receipt logs count:', (_a = receipt.logs) === null || _a === void 0 ? void 0 : _a.length, 'gateway logs count:', gatewayLogs.length, 'evmGatewayMethod:', evmGatewayMethod);
-                    console.log('[DEBUG] 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));
+                    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 firstLog = (gatewayLogs[logIndexToUse] ||
                         (receipt.logs || []).at(-1));
                     const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
-                    console.log('[DEBUG] queryUniversalTxStatus — logIndexToUse:', logIndexToUse, 'firstLog.logIndex:', firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex, 'logIndexVal:', logIndexVal);
+                    this.printLog(`queryUniversalTxStatus — logIndexToUse: ${logIndexToUse}, firstLog.logIndex: ${firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex}, logIndexVal: ${logIndexVal}`);
                     logIndexStr =
                         typeof logIndexVal === 'bigint'
                             ? logIndexVal.toString()
@@ -2586,7 +2650,7 @@ 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);
-                console.log('[DEBUG] Query ID extraction:', JSON.stringify({
+                this.printLog('Query ID extraction: ' + JSON.stringify({
                     sourceChain,
                     txHashHex,
                     logIndexStr,
@@ -2600,7 +2664,7 @@ class Orchestrator {
                 const MAX_ATTEMPTS = 20;
                 let universalTxObj;
                 for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-                    console.log(`[Sync] Attempt ${attempt + 1}/${MAX_ATTEMPTS} | Query ID: ${idHex}`);
+                    this.printLog(`[Sync] Attempt ${attempt + 1}/${MAX_ATTEMPTS} | Query ID: ${idHex}`);
                     try {
                         const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
                         universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;