@pushchain/core 5.1.18 → 6.0.0

package/src/lib/orchestrator/payload-builders.js

@@ -6,6 +6,7 @@ exports.buildCeaMulticallPayload = buildCeaMulticallPayload;
 exports.buildInboundUniversalPayload = buildInboundUniversalPayload;
 exports.buildSendUniversalTxToUEA = buildSendUniversalTxToUEA;
 exports.buildOutboundRequest = buildOutboundRequest;
+exports.assertCeaFundsParkingInvariant = assertCeaFundsParkingInvariant;
 exports.buildErc20Transfer = buildErc20Transfer;
 exports.buildErc20WithdrawalMulticall = buildErc20WithdrawalMulticall;
 exports.buildMigrationPayload = buildMigrationPayload;
@@ -225,27 +226,38 @@ function buildSendUniversalTxToUEA(ceaAddress, token, amount, payload, revertRec
 /**
  * Build UniversalOutboundTxRequest for Push Chain outbound
  *
- * @param target - LEGACY/DUMMY: Any non-zero address for contract compatibility.
- *                 This value is NOT used by the relay to determine the actual destination.
- *                 The relay determines the destination from the PRC-20 token's SOURCE_CHAIN_NAMESPACE.
- *                 Will be removed in future contract upgrades.
+ * @param target - Raw recipient bytes for the destination chain. For EVM CEA
+ *                 funds-parking, use the zero recipient when payload is empty.
  * @param prc20Token - PRC20 token address to burn (or address(0) for native)
  * @param amount - Amount to burn
  * @param gasLimit - Gas limit for fee calculation
- * @param payload - CEA multicall payload
+ * @param payload - Destination execution payload
  * @param revertRecipient - Address to receive funds on revert
+ * @param maxPCForGas - Max native PC used for gas swap (0 = uncapped)
+ * @param gasPrice - Destination-chain gas price override (0 = UniversalCore default)
  * @returns UniversalOutboundTxRequest object
  */
-function buildOutboundRequest(target, prc20Token, amount, gasLimit, payload, revertRecipient) {
+function buildOutboundRequest(target, prc20Token, amount, gasLimit, payload, revertRecipient, maxPCForGas = BigInt(0), gasPrice = BigInt(0)) {
     return {
         target,
         token: prc20Token,
         amount,
         gasLimit,
+        gasPrice,
+        maxPCForGas,
         payload,
         revertRecipient,
     };
 }
+function assertCeaFundsParkingInvariant(recipient, payload) {
+    if (payload !== '0x')
+        return;
+    if (recipient === '0x')
+        return;
+    if (recipient.toLowerCase() === selectors_1.ZERO_ADDRESS.toLowerCase())
+        return;
+    throw new Error('Empty CEA payloads must use the zero recipient to park funds');
+}
 /**
  * Build ERC20 transfer multicall
  *

package/src/lib/progress-hook/progress-hook.js

@@ -251,13 +251,16 @@ const RAW_HOOKS_R1 = {
             level: 'SUCCESS',
         };
     },
-    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02]: (errMessage, decodedError) => ({
-        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02,
-        title: 'Push Chain Tx Failed',
-        message: errMessage,
-        response: Object.assign({ error: errMessage }, (decodedError ? { decodedError } : {})),
-        level: 'ERROR',
-    }),
+    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02]: (errMessage, decodedError) => {
+        const normalizedErrMessage = (0, formatters_1.normalizePcInsufficientFundsError)(errMessage);
+        return {
+            id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_199_02,
+            title: 'Push Chain Tx Failed',
+            message: normalizedErrMessage,
+            response: Object.assign({ error: normalizedErrMessage }, (decodedError ? { decodedError } : {})),
+            level: 'ERROR',
+        };
+    },
 };
 // =============================================================================
 // Route 2 — UEA → UGPC → CEA on target chain (201–299, signature-only)
@@ -664,17 +667,22 @@ const RAW_HOOKS_R3 = {
     // Phase is passed by the emission site so the title matches the leg that
     // actually failed. Default stays 'inbound' for callers that don't specify
     // (backwards-compat with fixtures + response-builder's inbound block).
-    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02]: (errorMessage, phase = 'inbound', chain, decodedError) => ({
-        id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02,
-        title: phase === 'outbound'
-            ? `${friendlyChain(chain)} Tx Failed`
-            : phase === 'push'
-                ? 'Push Chain Tx Failed'
-                : 'Push Chain Inbound Tx Failed',
-        message: errorMessage,
-        response: Object.assign({ error: errorMessage, phase, chain: chain !== null && chain !== void 0 ? chain : null }, (decodedError ? { decodedError } : {})),
-        level: 'ERROR',
-    }),
+    [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02]: (errorMessage, phase = 'inbound', chain, decodedError) => {
+        const normalizedErrorMessage = phase === 'push'
+            ? (0, formatters_1.normalizePcInsufficientFundsError)(errorMessage)
+            : errorMessage;
+        return {
+            id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_02,
+            title: phase === 'outbound'
+                ? `${friendlyChain(chain)} Tx Failed`
+                : phase === 'push'
+                    ? 'Push Chain Tx Failed'
+                    : 'Push Chain Inbound Tx Failed',
+            message: normalizedErrorMessage,
+            response: Object.assign({ error: normalizedErrorMessage, phase, chain: chain !== null && chain !== void 0 ? chain : null }, (decodedError ? { decodedError } : {})),
+            level: 'ERROR',
+        };
+    },
     [progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_03]: (sourceChain, elapsedMs, phase = 'inbound') => ({
         id: progress_hook_types_1.PROGRESS_HOOK.SEND_TX_399_03,
         title: phase === 'outbound'

package/src/lib/universal-tx-detector/events.d.ts

@@ -2,8 +2,10 @@
  * Event ABI fragments used by the universal-tx detector.
  *
  * Sourced from push-chain-gateway-contracts and push-chain-core-contracts:
- *   - UniversalTx, UniversalTxExecuted, RevertUniversalTx, FundsRescued
+ *   - UniversalTx, RevertUniversalTx, FundsRescued
  *       → contracts/evm-gateway/src/interfaces/IUniversalGateway.sol
+ *   - UniversalTxExecuted
+ *       → push-chain-core-contracts/src/Interfaces/ICEA.sol
  *   - UniversalTxFinalized, UniversalTxReverted, FundsRescued (vault)
  *       → contracts/evm-gateway/src/interfaces/IVault.sol
  *   - UniversalTxOutbound

package/src/lib/universal-tx-detector/events.js

@@ -3,8 +3,10 @@
  * Event ABI fragments used by the universal-tx detector.
  *
  * Sourced from push-chain-gateway-contracts and push-chain-core-contracts:
- *   - UniversalTx, UniversalTxExecuted, RevertUniversalTx, FundsRescued
+ *   - UniversalTx, RevertUniversalTx, FundsRescued
  *       → contracts/evm-gateway/src/interfaces/IUniversalGateway.sol
+ *   - UniversalTxExecuted
+ *       → push-chain-core-contracts/src/Interfaces/ICEA.sol
  *   - UniversalTxFinalized, UniversalTxReverted, FundsRescued (vault)
  *       → contracts/evm-gateway/src/interfaces/IVault.sol
  *   - UniversalTxOutbound

package/src/lib/universal-tx-detector/svm-events.d.ts

@@ -10,7 +10,7 @@
 /**
  * Mapping: 8-byte discriminator (lowercase hex, no 0x) → Anchor event name.
  * Only events with EVM classifier parity are listed; the keeper-agnostic
- * ones (BlockUsdCapUpdated, ProtocolFeeCollected, etc.) are intentionally
+ * ones (BlockUsdCapUpdated, inbound-fee events, etc.) are intentionally
  * skipped — they wouldn't classify to any UniversalTxKind anyway.
  */
 export declare const SVM_EVENT_DISCRIMINATORS: Record<string, string>;

package/src/lib/universal-tx-detector/svm-events.js

@@ -15,7 +15,7 @@ const toHex = (bytes) => bytes.map((b) => b.toString(16).padStart(2, '0')).join(
 /**
  * Mapping: 8-byte discriminator (lowercase hex, no 0x) → Anchor event name.
  * Only events with EVM classifier parity are listed; the keeper-agnostic
- * ones (BlockUsdCapUpdated, ProtocolFeeCollected, etc.) are intentionally
+ * ones (BlockUsdCapUpdated, inbound-fee events, etc.) are intentionally
  * skipped — they wouldn't classify to any UniversalTxKind anyway.
  */
 exports.SVM_EVENT_DISCRIMINATORS = {