@pushchain/core 6.0.10 → 6.0.12

package/package.json

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

package/src/lib/orchestrator/internals/cascade.js

@@ -925,6 +925,21 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
         }
         for (let segIdxLoop = segments.length - 1; segIdxLoop >= 0; segIdxLoop--) {
             const segment = segments[segIdxLoop];
+            const gasPriceForOutboundRequest = (chainForLog) => {
+                var _a;
+                const quotedGasPrice = (_a = segment.gasPrice) !== null && _a !== void 0 ? _a : BigInt(0);
+                // If this outbound is being accumulated into an earlier Route 3
+                // inbound payload, it may execute minutes after the quote. Keep
+                // immediate outbounds pinned to the quote, but let delayed nested
+                // outbounds resolve the live base gas price at execution time.
+                const executesAfterInbound = segments
+                    .slice(0, segIdxLoop)
+                    .some((s) => s.type === 'INBOUND_FROM_CEA');
+                if (executesAfterInbound && quotedGasPrice > BigInt(0)) {
+                    (0, context_1.printLog)(ctx, `composeCascade — delayed outbound to ${chainForLog !== null && chainForLog !== void 0 ? chainForLog : 'unknown chain'}: using gasPrice=0 instead of quoted ${quotedGasPrice} so UGPC resolves the live base price at execution time`);
+                }
+                return executesAfterInbound ? BigInt(0) : quotedGasPrice;
+            };
             switch (segment.type) {
                 case 'PUSH_EXECUTION': {
                     // Prepend Push Chain multicalls to accumulated
@@ -1026,7 +1041,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         }
                     }
                     // Build outbound request
-                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0));
+                    const outboundReq = (0, payload_builders_1.buildOutboundRequest)(targetForOutbound, segment.prc20Token || selectors_1.ZERO_ADDRESS, segment.totalBurnAmount || BigInt(0), (_e = segment.gasLimit) !== null && _e !== void 0 ? _e : BigInt(0), outboundPayload, ueaAddress, (_f = segment.maxPCForGas) !== null && _f !== void 0 ? _f : BigInt(0), gasPriceForOutboundRequest(firstHop === null || firstHop === void 0 ? void 0 : firstHop.targetChain));
                     // Build approval + outbound multicalls
                     const segGasFee = segment.gasFee || BigInt(0);
                     const svmOverride = svmNativeValueBySegment.get(segment);
@@ -1158,7 +1173,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         });
                         const svmBurnAmount = segment.totalBurnAmount || BigInt(0);
                         const outboundReq = (0, payload_builders_1.buildOutboundRequest)(gatewayProgramHex, segment.prc20Token ||
-                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_l = segment.gasLimit) !== null && _l !== void 0 ? _l : BigInt(0), svmPayload, ueaAddress, (_m = segment.maxPCForGas) !== null && _m !== void 0 ? _m : BigInt(0));
+                            (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), svmBurnAmount, (_l = segment.gasLimit) !== null && _l !== void 0 ? _l : BigInt(0), svmPayload, ueaAddress, (_m = segment.maxPCForGas) !== null && _m !== void 0 ? _m : BigInt(0), gasPriceForOutboundRequest(sourceChain));
                         const inboundGasFee = segment.gasFee || BigInt(0);
                         let svmInboundFallback;
                         if (effectiveUeaBalance > BigInt(0)) {
@@ -1245,7 +1260,7 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         ? segment.gasLimit
                         : selectors_1.DEFAULT_CEA_TO_PUSH_GAS_LIMIT;
                     const outboundReq = (0, payload_builders_1.buildOutboundRequest)(ceaAddress, segment.prc20Token ||
-                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_q = segment.maxPCForGas) !== null && _q !== void 0 ? _q : BigInt(0));
+                        (0, helpers_1.getNativePRC20ForChain)(sourceChain, ctx.pushNetwork), segment.totalBurnAmount || BigInt(0), effectiveGasLimit, ceaPayload, ueaAddress, (_q = segment.maxPCForGas) !== null && _q !== void 0 ? _q : BigInt(0), gasPriceForOutboundRequest(sourceChain));
                     const inboundGasFee = segment.gasFee || BigInt(0);
                     let evmInboundFallback;
                     if (effectiveUeaBalance > BigInt(0)) {

package/src/lib/orchestrator/internals/inbound-tracker.js

@@ -112,7 +112,7 @@ function findChildUtxIdFromExternalTx(ctx, externalTxHash, sourceChain) {
  */
 function waitForInboundPushTx(ctx_1, outboundExternalTxHash_1, sourceChain_1) {
     return tslib_1.__awaiter(this, arguments, void 0, function* (ctx, outboundExternalTxHash, sourceChain, opts = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const initialWaitMs = (_a = opts.initialWaitMs) !== null && _a !== void 0 ? _a : 30000;
         const pollingIntervalMs = (_b = opts.pollingIntervalMs) !== null && _b !== void 0 ? _b : 5000;
         const timeout = (_c = opts.timeout) !== null && _c !== void 0 ? _c : 300000;
@@ -183,6 +183,10 @@ function waitForInboundPushTx(ctx_1, outboundExternalTxHash_1, sourceChain_1) {
                         pushTxHash = utx.pcTx[0].txHash;
                     }
                     (0, context_1.printLog)(ctx, `[waitForInboundPushTx] Poll #${pollCount} utx-status | status: ${status} | pcTx[0].txHash: '${pushTxHash !== null && pushTxHash !== void 0 ? pushTxHash : ''}' | pcTx len: ${(_j = (_h = utx === null || utx === void 0 ? void 0 : utx.pcTx) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0}`);
+                    const failedPcTx = (_k = utx === null || utx === void 0 ? void 0 : utx.pcTx) === null || _k === void 0 ? void 0 : _k.find((pcTx) => {
+                        const pcTxStatus = String(pcTx.status || '').toUpperCase();
+                        return pcTxStatus === 'FAILED' || Boolean(pcTx.errorMsg);
+                    });
                     if (TERMINAL_SUCCESS_STATUSES.has(status)) {
                         // Wait one more poll cycle if pcTx hasn't populated yet — the
                         // indexer occasionally flips status before the pcTx hash is queryable.
@@ -206,8 +210,8 @@ function waitForInboundPushTx(ctx_1, outboundExternalTxHash_1, sourceChain_1) {
                         }
                     }
                     else if (TERMINAL_FAILURE_STATUSES.has(status)) {
-                        const errMsg = ((_l = (_k = utx === null || utx === void 0 ? void 0 : utx.pcTx) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.errorMsg)
-                            ? (0, formatters_1.normalizePcInsufficientFundsError)(utx.pcTx[0].errorMsg)
+                        const errMsg = (failedPcTx === null || failedPcTx === void 0 ? void 0 : failedPcTx.errorMsg)
+                            ? (0, formatters_1.normalizePcInsufficientFundsError)(failedPcTx.errorMsg)
                             : `inbound terminated with status ${status}`;
                         progressHook === null || progressHook === void 0 ? void 0 : progressHook({
                             status: 'failed',
@@ -224,6 +228,25 @@ function waitForInboundPushTx(ctx_1, outboundExternalTxHash_1, sourceChain_1) {
                             errorMessage: errMsg,
                         };
                     }
+                    else if (failedPcTx) {
+                        const errMsg = failedPcTx.errorMsg
+                            ? (0, formatters_1.normalizePcInsufficientFundsError)(failedPcTx.errorMsg)
+                            : `inbound Push tx failed while universalStatus=${status}`;
+                        progressHook === null || progressHook === void 0 ? void 0 : progressHook({
+                            status: 'failed',
+                            elapsedMs: elapsed(),
+                            childUtxId,
+                            pushTxHash,
+                        });
+                        return {
+                            childUtxId,
+                            pushTxHash: pushTxHash !== null && pushTxHash !== void 0 ? pushTxHash : '',
+                            sourceChain,
+                            outboundExternalTxHash,
+                            status: 'failed',
+                            errorMessage: errMsg,
+                        };
+                    }
                     else if (pushTxHash) {
                         // Tiebreaker: cosmos has the Push Chain tx hash populated but the
                         // indexer hasn't transitioned universalStatus to a terminal yet.

package/src/lib/orchestrator/internals/push-chain-tx.js

@@ -21,6 +21,40 @@ const error_decoder_1 = require("./error-decoder");
 const errors_1 = require("./errors");
 Object.defineProperty(exports, "PushChainExecutionError", { enumerable: true, get: function () { return errors_1.PushChainExecutionError; } });
 const formatters_1 = require("../../formatters");
+const PUSH_TX_INDEX_TIMEOUT_MS = 30000;
+const PUSH_TX_INDEX_POLL_MS = 1000;
+const TX_NOT_INDEXED_RE = /not found|TransactionNotFound|TransactionReceiptNotFound|could not be found|No transaction found/i;
+function getIndexedPushTransaction(ctx, txHash, label) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const startedAt = Date.now();
+        let receiptWaited = false;
+        let retryLogged = false;
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            try {
+                if (!receiptWaited) {
+                    yield ctx.pushClient.publicClient.waitForTransactionReceipt({
+                        hash: txHash,
+                    });
+                    receiptWaited = true;
+                }
+                return yield ctx.pushClient.getTransaction(txHash);
+            }
+            catch (err) {
+                const msg = (err === null || err === void 0 ? void 0 : err.shortMessage) || (err === null || err === void 0 ? void 0 : err.message) || String(err);
+                const retryable = TX_NOT_INDEXED_RE.test(msg);
+                if (!retryable || Date.now() - startedAt >= PUSH_TX_INDEX_TIMEOUT_MS) {
+                    throw err;
+                }
+                if (!retryLogged) {
+                    (0, context_1.printLog)(ctx, `${label} — Push tx ${txHash} has a receipt but is not indexed yet; retrying transaction lookup`);
+                    retryLogged = true;
+                }
+                yield new Promise((r) => setTimeout(r, PUSH_TX_INDEX_POLL_MS));
+            }
+        }
+    });
+}
 // ============================================================================
 // sendPushTx
 // ============================================================================
@@ -107,7 +141,7 @@ function sendPushTx(ctx, execute, eventBuffer, transformFn) {
                 (0, context_1.printLog)(ctx, `sendPushTx — operation ${i + 1}/${calls.length} confirmed in block ${receipt.blockNumber}`);
                 nonce++;
             }
-            const txResponse = yield ctx.pushClient.getTransaction(lastTxHash);
+            const txResponse = yield getIndexedPushTransaction(ctx, lastTxHash, 'sendPushTx');
             return yield transformFn(txResponse, eventBuffer);
         }
         const txHash = yield ctx.pushClient.sendTransaction({
@@ -116,7 +150,7 @@ function sendPushTx(ctx, execute, eventBuffer, transformFn) {
             value: execute.value,
             signer: ctx.universalSigner,
         });
-        const txResponse = yield ctx.pushClient.getTransaction(txHash);
+        const txResponse = yield getIndexedPushTransaction(ctx, txHash, 'sendPushTx');
         return yield transformFn(txResponse, eventBuffer);
     });
 }
@@ -275,9 +309,7 @@ function sendUniversalTx(ctx, isUEADeployed, feeLockTxHash, universalPayload, ve
         if (ethTxHashes.length === 0) {
             throw new Error('No ethereumTxHash found in transaction events');
         }
-        const evmTxs = yield Promise.all(ethTxHashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield ctx.pushClient.getTransaction(hash);
-        })));
+        const evmTxs = yield Promise.all(ethTxHashes.map((hash) => tslib_1.__awaiter(this, void 0, void 0, function* () { return getIndexedPushTransaction(ctx, hash, 'sendUniversalTx'); })));
         const responses = yield Promise.all(evmTxs.map((tx, index) => transformFn(tx, index === evmTxs.length - 1 ? eventBuffer : [])));
         return responses;
     });
@@ -341,7 +373,7 @@ function extractPcTxAndTransform(ctx, pushChainUniversalTx, gatewayTxHash, event
                 decodedError: decodedForPayload,
             });
         }
-        const tx = yield ctx.pushClient.getTransaction(lastPcTransaction.txHash);
+        const tx = yield getIndexedPushTransaction(ctx, lastPcTransaction.txHash, label);
         return transformFn(tx, eventBuffer);
     });
 }