@pushchain/core 5.1.2 → 5.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushchain/core",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "homepage": "https://push.org",
   "keywords": [
     "pushchain",

package/src/lib/orchestrator/orchestrator.d.ts

@@ -375,6 +375,11 @@ export declare class Orchestrator {
      * @returns Array of ProgressEvent objects to emit
      */
     private reconstructProgressEvents;
+    /**
+     * Detect the transaction route from UniversalTxV2 data.
+     * Used by trackTransaction to infer the route when it's not set by execute().
+     */
+    private detectRouteFromUniversalTxData;
     /**
      * Tracks a transaction by hash on Push Chain and returns UniversalTxResponse.
      * Reconstructs and replays SEND-TX-* progress events for completed transactions.

package/src/lib/orchestrator/orchestrator.js

@@ -1010,7 +1010,9 @@ class Orchestrator {
                     // passed as zeroAddress in the future.
                     // execute.to = zeroAddress;
                     payloadTo = viem_1.zeroAddress;
-                    console.warn(`Multicalls should have execute.to as ${viem_1.zeroAddress}`);
+                    if (execute.to.toLowerCase() !== viem_1.zeroAddress) {
+                        console.warn(`Multicalls should have execute.to as ${viem_1.zeroAddress}`);
+                    }
                     payloadData = this._buildMulticallPayloadData(execute.to, (0, payload_builders_1.buildExecuteMulticall)({ execute, ueaAddress: UEA }));
                     req = this._buildUniversalTxRequest({
                         recipient: viem_1.zeroAddress,
@@ -2431,16 +2433,18 @@ class Orchestrator {
             // Get UniversalGatewayPC address
             const gatewayPcAddress = this.getUniversalGatewayPCAddress();
             // Pre-fetch UEA status early — balance is needed for gas value calculation
+            const signerChain = this.universalSigner.account.chain;
+            const isNativePushEOA = this.isPushChain(signerChain);
             const [ueaCode, ueaBalance] = yield Promise.all([
                 this.pushClient.publicClient.getCode({ address: ueaAddress }),
                 this.pushClient.getBalance(ueaAddress),
             ]);
-            const isUEADeployed = ueaCode !== undefined;
+            const isUEADeployed = isNativePushEOA || ueaCode !== undefined;
             if (!isUEADeployed) {
                 throw new Error('UEA is not deployed. Please send an inbound transaction to Push Chain first ' +
                     '(e.g. sendTransaction with value) to deploy your Universal Execution Account before using outbound transfers.');
             }
-            const ueaNonce = yield this.getUEANonce(ueaAddress);
+            const ueaNonce = isNativePushEOA ? BigInt(0) : yield this.getUEANonce(ueaAddress);
             // Build the multicall that will execute ON Push Chain from UEA context
             // This includes: 1) approve PRC-20 (if needed), 2) call sendUniversalTxOutbound
             const pushChainMulticalls = [];
@@ -2626,16 +2630,18 @@ class Orchestrator {
             }, null, 2)}`);
             // --- Pre-fetch UEA status early — balance is needed for gas value calculation ---
             const gatewayPcAddress = this.getUniversalGatewayPCAddress();
+            const signerChainSvm = this.universalSigner.account.chain;
+            const isNativePushEOASvm = this.isPushChain(signerChainSvm);
             const [ueaCode, ueaBalance] = yield Promise.all([
                 this.pushClient.publicClient.getCode({ address: ueaAddress }),
                 this.pushClient.getBalance(ueaAddress),
             ]);
-            const isUEADeployed = ueaCode !== undefined;
+            const isUEADeployed = isNativePushEOASvm || ueaCode !== undefined;
             if (!isUEADeployed) {
                 throw new Error('UEA is not deployed. Please send an inbound transaction to Push Chain first ' +
                     '(e.g. sendTransaction with value) to deploy your Universal Execution Account before using outbound transfers.');
             }
-            const ueaNonce = yield this.getUEANonce(ueaAddress);
+            const ueaNonce = isNativePushEOASvm ? BigInt(0) : yield this.getUEANonce(ueaAddress);
             // --- Query gas fee (identical to EVM path) ---
             let gasFee = BigInt(0);
             let gasToken = selectors_1.ZERO_ADDRESS;
@@ -4312,18 +4318,46 @@ class Orchestrator {
         }
         // 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
+        // Determine outcome from pcTx status and outbound status
         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';
+        const isOutboundFailed = (universalTxData === null || universalTxData === void 0 ? void 0 : universalTxData.universalStatus) === types_1.UniversalTxStatus.OUTBOUND_FAILED;
+        const isPcFailed = (pcTx === null || pcTx === void 0 ? void 0 : pcTx.status) === 'FAILED';
+        const isFailed = isPcFailed || isOutboundFailed;
         // 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'));
+            const errorMsg = isOutboundFailed
+                ? 'Outbound transaction failed (status: OUTBOUND_FAILED)'
+                : ((pcTx === null || pcTx === void 0 ? void 0 : pcTx.errorMsg) || 'Unknown error');
+            events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_02](errorMsg));
         }
         else {
             events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_99_01]([universalTxResponse]));
         }
         return events;
     }
+    /**
+     * Detect the transaction route from UniversalTxV2 data.
+     * Used by trackTransaction to infer the route when it's not set by execute().
+     */
+    detectRouteFromUniversalTxData(universalTxData) {
+        if (!universalTxData)
+            return undefined;
+        const hasOutbound = universalTxData.outboundTx.length > 0;
+        const hasInbound = !!universalTxData.inboundTx;
+        const statusIndicatesOutbound = [
+            types_1.UniversalTxStatus.OUTBOUND_PENDING,
+            types_1.UniversalTxStatus.OUTBOUND_SUCCESS,
+            types_1.UniversalTxStatus.OUTBOUND_FAILED,
+        ].includes(universalTxData.universalStatus);
+        if (hasOutbound || statusIndicatesOutbound) {
+            return hasInbound
+                ? route_detector_1.TransactionRoute.CEA_TO_CEA
+                : route_detector_1.TransactionRoute.UOA_TO_CEA;
+        }
+        if (hasInbound)
+            return route_detector_1.TransactionRoute.CEA_TO_PUSH;
+        return route_detector_1.TransactionRoute.UOA_TO_PUSH;
+    }
     /**
      * Tracks a transaction by hash on Push Chain and returns UniversalTxResponse.
      * Reconstructs and replays SEND-TX-* progress events for completed transactions.
@@ -4380,20 +4414,53 @@ class Orchestrator {
             }
             // Try to get UniversalTx data for richer progress reconstruction
             // (may not exist for direct Push Chain transactions)
+            // Three-tier lookup: direct hash → computed keccak ID → Cosmos event extraction
             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.getUniversalTxByIdV2(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
+                // Ignore - try computed ID next
+            }
+            if (!universalTxData) {
+                try {
+                    const computedId = this.computeUniversalTxId(txHash);
+                    const queryId = computedId.startsWith('0x') ? computedId.slice(2) : computedId;
+                    const utxResponse = yield this.pushClient.getUniversalTxByIdV2(queryId);
+                    if (utxResponse === null || utxResponse === void 0 ? void 0 : utxResponse.universalTx) {
+                        universalTxData = utxResponse.universalTx;
+                    }
+                }
+                catch (_b) {
+                    // Ignore - try Cosmos event extraction next
+                }
+            }
+            if (!universalTxData) {
+                try {
+                    const extractedId = yield this.extractUniversalSubTxIdFromTx(txHash);
+                    if (extractedId) {
+                        const queryId = extractedId.startsWith('0x') ? extractedId.slice(2) : extractedId;
+                        const utxResponse = yield this.pushClient.getUniversalTxByIdV2(queryId);
+                        if (utxResponse === null || utxResponse === void 0 ? void 0 : utxResponse.universalTx) {
+                            universalTxData = utxResponse.universalTx;
+                        }
+                    }
+                }
+                catch (_c) {
+                    // Ignore - no universal tx data available
+                }
             }
             // Transform to UniversalTxResponse
             const universalTxResponse = yield this.transformToUniversalTxResponse(tx, eventBuffer);
+            // Detect route from UniversalTxV2 data and set on response
+            // This enables wait() to trigger outbound polling via waitForOutboundTx()
+            const detectedRoute = this.detectRouteFromUniversalTxData(universalTxData);
+            if (detectedRoute) {
+                universalTxResponse.route = detectedRoute;
+            }
             // Reconstruct and emit SEND-TX-* progress events
             const reconstructedEvents = this.reconstructProgressEvents(universalTxResponse, universalTxData);
             for (const event of reconstructedEvents) {
@@ -5562,7 +5629,7 @@ class Orchestrator {
             let value;
             let data;
             let rawTransactionData;
-            const ueaOrigin = yield push_chain_1.PushChain.utils.account.convertExecutorToOriginAccount(tx.to);
+            const ueaOrigin = yield push_chain_1.PushChain.utils.account.convertExecutorToOrigin(tx.to);
             let originAddress;
             if (ueaOrigin.exists) {
                 if (!ueaOrigin.account) {
@@ -5760,9 +5827,11 @@ class Orchestrator {
                         const receipt = yield tx.wait();
                         baseReceipt = this.transformToUniversalTxReceipt(receipt, universalTxResponse);
                     }
-                    // If outbound route (Route 2: UOA → CEA, Route 3: CEA → Push), poll for external chain details
-                    if (universalTxResponse.route === route_detector_1.TransactionRoute.UOA_TO_CEA ||
-                        universalTxResponse.route === route_detector_1.TransactionRoute.CEA_TO_PUSH) {
+                    // If outbound route, poll for external chain details
+                    const routeInfo = universalTxResponse.route
+                        ? (0, route_detector_1.getRouteInfo)(universalTxResponse.route)
+                        : undefined;
+                    if (routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.isOutbound) {
                         try {
                             const outboundDetails = yield this.waitForOutboundTx(tx.hash, {
                                 initialWaitMs: Orchestrator.OUTBOUND_INITIAL_WAIT_MS,