@pushchain/core 6.0.9 → 6.0.10

package/package.json

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

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

@@ -444,8 +444,8 @@ function buildHopDescriptor(ctx, params, route, ueaAddress) {
                         effectiveGasLimit = result.gasLimitUsed;
                     }
                     return Object.assign(Object.assign({}, baseDescriptor), { sourceChain, ceaAddress: ceaPdaHex, isSvmTarget: true, prc20Token, 
-                        // Route 3 is payload-only on Push: the drain amount lives inside the
-                        // SVM payload. Burning here would require the UEA to pre-hold pSOL.
+                        // Route 3 drains pre-existing funds from the external CEA. The
+                        // Push-side outbound is a payload relay, so no PRC-20 is burned.
                         burnAmount: BigInt(0), gasToken,
                         gasFee,
                         gasPrice, gasLimit: effectiveGasLimit, sizing });
@@ -966,12 +966,10 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                             : (firstHop === null || firstHop === void 0 ? void 0 : firstHop.ceaAddress) || ueaAddress;
                         (0, payload_builders_1.assertCeaFundsParkingInvariant)(targetForOutbound, outboundPayload);
                     }
-                    // Per-segment PRC-20 burn-balance pre-check (cascade R2-style segments
-                    // only — INBOUND_FROM_CEA segments are payload-only with totalBurnAmount=0
-                    // per the 2026-03-19 fix). Skip MIGRATION (totalBurnAmount=0). Fires
-                    // whenever burnAmount > 0 even when burn token equals gas token — the
-                    // gateway's transferFrom happens BEFORE the gas swap, so user must
-                    // pre-hold the burn amount.
+                    // Per-segment PRC-20 burn-balance pre-check. Fires whenever
+                    // burnAmount > 0 even when burn token equals gas token — the gateway's
+                    // transferFrom happens BEFORE the gas swap, so user must pre-hold the
+                    // burn amount.
                     const segBurnAmount = segment.totalBurnAmount || BigInt(0);
                     const segBurnToken = segment.prc20Token;
                     if (segBurnAmount > BigInt(0) && segBurnToken && !isMigration) {
@@ -1107,18 +1105,18 @@ function composeCascadeDetailed(ctx, segments, ueaAddress, ueaBalance, ueaNonce,
                         ];
                     }
                     // Primary hop carries the sourceChain / CEA address (shared across merged hops).
-                    const hop0 = segment.hops[0];
+                    const hop = segment.hops[0];
+                    const sourceChain = hop.sourceChain;
+                    const ceaAddress = hop.ceaAddress || ueaAddress;
                     let intermediatePayload = '0x';
                     if (accumulatedPushMulticalls.length > 0) {
                         const multicallPayload = (0, payload_builder_1.buildMulticallPayloadData)(ctx, ueaAddress, accumulatedPushMulticalls);
                         // +1: the outbound tx consumes one nonce via execute()
-                        intermediatePayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
-                            nonce: (ueaNonce !== null && ueaNonce !== void 0 ? ueaNonce : BigInt(0)) + BigInt(1),
-                        });
+                        const nonce = (ueaNonce !== null && ueaNonce !== void 0 ? ueaNonce : BigInt(0)) + BigInt(1);
+                        intermediatePayload = (0, payload_builders_1.isSvmChain)(sourceChain)
+                            ? (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, { nonce })
+                            : (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, { nonce });
                     }
-                    const hop = segment.hops[0];
-                    const sourceChain = hop.sourceChain;
-                    const ceaAddress = hop.ceaAddress || ueaAddress;
                     // SVM chains: build SVM CPI payload instead of EVM CEA multicall
                     if ((0, payload_builders_1.isSvmChain)(sourceChain)) {
                         const lockerContract = chain_1.CHAIN_INFO[sourceChain].lockerContract;

package/src/lib/orchestrator/internals/route-handlers.d.ts

@@ -62,8 +62,8 @@ export declare function executeCeaToPush(ctx: OrchestratorContext, params: Unive
  *
  * Unlike EVM Route 3 which builds CEA multicalls, SVM Route 3 encodes a
  * `send_universal_tx_to_uea` instruction as an execute payload targeting
- * the SVM gateway program (self-call). The drain amount is embedded in
- * the instruction data, not in the outbound request amount.
+ * the SVM gateway program (self-call). For funds-bearing calls the outbound
+ * request amount must match the drain amount embedded in the instruction data.
  */
 export declare function executeCeaToPushSvm(ctx: OrchestratorContext, params: UniversalExecuteParams, sourceChain: CHAIN, executeFn: ExecuteFn): Promise<UniversalTxResponse>;
 /**

package/src/lib/orchestrator/internals/route-handlers.js

@@ -137,6 +137,7 @@ function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
     var _a;
     let drainAmount = BigInt(0);
     let tokenMintHex;
+    let splMintBase58;
     let prc20Token = (0, helpers_1.getNativePRC20ForChain)(sourceChain, pushNetwork);
     if (((_a = params.funds) === null || _a === void 0 ? void 0 : _a.amount) && params.funds.amount > BigInt(0)) {
         drainAmount = params.funds.amount;
@@ -144,13 +145,14 @@ function resolveR3SvmDrain(params, sourceChain, pushNetwork) {
         if ((token === null || token === void 0 ? void 0 : token.mechanism) === 'approve') {
             const mintPk = new web3_js_1.PublicKey(token.address);
             tokenMintHex = ('0x' + Buffer.from(mintPk.toBytes()).toString('hex'));
+            splMintBase58 = token.address;
             prc20Token = push_chain_1.PushChain.utils.tokens.getPRC20Address(token).address;
         }
     }
     else if (params.value && params.value > BigInt(0)) {
         drainAmount = params.value;
     }
-    return { prc20Token, drainAmount, tokenMintHex };
+    return { prc20Token, drainAmount, tokenMintHex, splMintBase58 };
 }
 function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNonce) {
     var _a, _b;
@@ -166,7 +168,7 @@ function buildR3SvmExtraPayload(ctx, params, ueaAddress, sourceChain, inboundNon
         ueaAddress,
         allowSelfValueCall: true,
     }));
-    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayload)(multicallPayload, {
+    const inboundPayload = (0, payload_builders_1.buildInboundUniversalPayloadSvm)(multicallPayload, {
         nonce: inboundNonce !== null && inboundNonce !== void 0 ? inboundNonce : BigInt(0),
     });
     return (0, viem_1.hexToBytes)(inboundPayload);
@@ -1143,8 +1145,8 @@ function executeCeaToPush(ctx, params, executeFn) {
  *
  * Unlike EVM Route 3 which builds CEA multicalls, SVM Route 3 encodes a
  * `send_universal_tx_to_uea` instruction as an execute payload targeting
- * the SVM gateway program (self-call). The drain amount is embedded in
- * the instruction data, not in the outbound request amount.
+ * the SVM gateway program (self-call). For funds-bearing calls the outbound
+ * request amount must match the drain amount embedded in the instruction data.
  */
 function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1162,10 +1164,9 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         const gatewayProgramHex = ('0x' + Buffer.from(programPk.toBytes()).toString('hex'));
         (0, context_1.fireProgressHook)(ctx, progress_hook_types_1.PROGRESS_HOOK.SEND_TX_301, sourceChain, lockerContract);
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — sourceChain: ${sourceChain}, gateway: ${lockerContract}`);
-        // Route 3 SVM: CEA uses its own pre-existing balance — no PRC-20 burn
-        // needed on Push Chain. The outer request token must still match the source
-        // asset so the relayer supplies the same Solana mint that the payload
-        // encodes; otherwise the gateway rejects with InvalidMint.
+        // Route 3 SVM drains pre-existing funds from the Solana CEA. The Push-side
+        // outbound is a payload relay; do not burn pSOL/pSPL from the UEA for the
+        // drain amount.
         const { prc20Token, drainAmount, tokenMintHex } = resolveR3SvmDrain(params, sourceChain, ctx.pushNetwork);
         // Derive CEA PDA as revert recipient: ["push_identity", ueaAddress_20_bytes]
         const ueaBytes = Buffer.from(ueaAddress.slice(2), 'hex'); // 20 bytes
@@ -1190,12 +1191,6 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
             revertRecipientHex: ceaPdaHex,
         });
         (0, context_1.printLog)(ctx, `executeCeaToPushSvm — drainAmount: ${drainAmount.toString()}, payload length: ${(svmPayload.length - 2) / 2} bytes`);
-        // burnAmount = 0 (payload-only outbound — drain amount lives inside ixData).
-        // Mirrors the 2026-03-19 cascade fix that removed the 1-wei workaround for
-        // SVM payload-only hops because it caused `InsufficientBalance (0xf4d678b8)`
-        // reverts on fresh UEAs that don't hold the source-chain native PRC-20
-        // (e.g. pSOL). The UGPC upgrade post-2026-03-19 already accepts amount = 0
-        // on the cascade path, and the same precompile is used here.
         const burnAmount = BigInt(0);
         let effectiveGasLimit = (_a = params.gasLimit) !== null && _a !== void 0 ? _a : BigInt(0);
         // Build outbound request: recipient = gateway program (self-call)
@@ -1218,7 +1213,7 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
                     prc20Token,
                     quote: result,
                     splMintBase58: undefined,
-                    burnAmount: BigInt(0),
+                    burnAmount,
                     pathTag: 'executeCeaToPushSvm',
                 });
                 gasToken = result.gasToken;
@@ -1290,8 +1285,8 @@ function executeCeaToPushSvm(ctx, params, sourceChain, executeFn) {
         }
         // SVM warn-threshold telemetry (no truncation — pre-flight handles drain protection).
         (0, preflight_1.maybeFireSvmWarnThreshold)(ctx, nativeValueForGas, gasToken, 'R3_SVM');
-        // Pre-flight (R3 SVM): no PRC-20 burn check. R3 SVM uses burnAmount=0
-        // because the drain amount lives inside the SVM instruction data.
+        // Pre-flight (R3 SVM): no PRC-20 burn check. The drain amount lives in the
+        // embedded Solana instruction and is withdrawn from the external CEA.
         (0, preflight_1.runPreflight)({
             ctx,
             ueaAddress,

package/src/lib/orchestrator/internals/tx-transformer.js

@@ -172,8 +172,9 @@ function reconstructR3(universalTxResponse, universalTxData, isFailed, errorMsg)
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_302_02](sourceChain, BigInt(0), BigInt(0)));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_01](sourceChain));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_02](universalTxResponse.from, ceaAddress, sourceChain));
-    // R3 pre-flight reconstruction — R3 EVM burnAmount=0, R3 SVM burnAmount=0
-    // (post-fix). Only the NATIVE pre-flight check fires; no PRC-20 second hook.
+    // R3 pre-flight reconstruction is intentionally approximate: historical
+    // response data does not include the SDK-side PRC-20 balance snapshot, so
+    // replay only the native check.
     // R3 single-route uses 303-04 (R3 bucket); see runPreflight in preflight.ts.
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_303_04](BigInt(0), BigInt(0), true, universalTxResponse.from, 'R3_EVM', { kind: 'NATIVE' }));
     events.push(progress_hook_1.default[progress_hook_types_1.PROGRESS_HOOK.SEND_TX_304_01]());

package/src/lib/orchestrator/payload-builders.d.ts

@@ -35,7 +35,8 @@ export declare const MULTICALL_TUPLE_TYPE: {
  */
 export declare function buildCeaMulticallPayload(multicalls: MultiCall[]): `0x${string}`;
 /**
- * Build an ABI-encoded UniversalPayload struct for inbound relay (Route 3 CEA→Push).
+ * Build an ABI-encoded UniversalPayload struct for EVM-origin inbound relay
+ * (Route 3 CEA→Push).
  *
  * The relay and Push Chain gateway expect the payload parameter of sendUniversalTxToUEA
  * to be a full UniversalPayload struct: (address to, uint256 value, bytes data, uint256 gasLimit,
@@ -53,6 +54,17 @@ export declare function buildInboundUniversalPayload(multicallData: `0x${string}
     nonce?: bigint;
     deadline?: bigint;
 }): `0x${string}`;
+/**
+ * Build a Borsh-encoded UniversalPayload for SVM-origin inbound relay.
+ *
+ * Push Chain decodes SVM-origin UniversalTx payloads with
+ * DecodeUniversalPayloadSolana, not the EVM ABI decoder used for EVM origins.
+ */
+export declare function buildInboundUniversalPayloadSvm(multicallData: `0x${string}`, opts?: {
+    gasLimit?: bigint;
+    nonce?: bigint;
+    deadline?: bigint;
+}): `0x${string}`;
 /**
  * Build sendUniversalTxToUEA call for CEA self-call (Route 3)
  *

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

@@ -4,6 +4,7 @@ exports.MULTICALL_TUPLE_TYPE = void 0;
 exports.buildExecuteMulticall = buildExecuteMulticall;
 exports.buildCeaMulticallPayload = buildCeaMulticallPayload;
 exports.buildInboundUniversalPayload = buildInboundUniversalPayload;
+exports.buildInboundUniversalPayloadSvm = buildInboundUniversalPayloadSvm;
 exports.buildSendUniversalTxToUEA = buildSendUniversalTxToUEA;
 exports.buildOutboundRequest = buildOutboundRequest;
 exports.assertCeaFundsParkingInvariant = assertCeaFundsParkingInvariant;
@@ -24,6 +25,8 @@ const selectors_1 = require("../constants/selectors");
 const chain_1 = require("../constants/chain");
 const enums_1 = require("../constants/enums");
 const data_utils_1 = require("./data-utils");
+const tx_1 = require("../generated/v1/tx");
+const signing_1 = require("./internals/signing");
 function buildExecuteMulticall({ execute, ueaAddress, logger, allowSelfValueCall = false, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const log = (msg) => logger === null || logger === void 0 ? void 0 : logger(msg);
@@ -161,7 +164,8 @@ function buildCeaMulticallPayload(multicalls) {
     return `${selectors_1.UEA_MULTICALL_SELECTOR}${encoded.slice(2)}`;
 }
 /**
- * Build an ABI-encoded UniversalPayload struct for inbound relay (Route 3 CEA→Push).
+ * Build an ABI-encoded UniversalPayload struct for EVM-origin inbound relay
+ * (Route 3 CEA→Push).
  *
  * The relay and Push Chain gateway expect the payload parameter of sendUniversalTxToUEA
  * to be a full UniversalPayload struct: (address to, uint256 value, bytes data, uint256 gasLimit,
@@ -205,6 +209,27 @@ function buildInboundUniversalPayload(multicallData, opts) {
         },
     ]);
 }
+/**
+ * Build a Borsh-encoded UniversalPayload for SVM-origin inbound relay.
+ *
+ * Push Chain decodes SVM-origin UniversalTx payloads with
+ * DecodeUniversalPayloadSolana, not the EVM ABI decoder used for EVM origins.
+ */
+function buildInboundUniversalPayloadSvm(multicallData, opts) {
+    var _a, _b, _c;
+    const payload = {
+        to: selectors_1.ZERO_ADDRESS,
+        value: BigInt(0).toString(),
+        data: multicallData,
+        gasLimit: ((_a = opts === null || opts === void 0 ? void 0 : opts.gasLimit) !== null && _a !== void 0 ? _a : BigInt(100000000)).toString(),
+        maxFeePerGas: BigInt(10000000000).toString(),
+        maxPriorityFeePerGas: BigInt(0).toString(),
+        nonce: ((_b = opts === null || opts === void 0 ? void 0 : opts.nonce) !== null && _b !== void 0 ? _b : BigInt(0)).toString(),
+        deadline: ((_c = opts === null || opts === void 0 ? void 0 : opts.deadline) !== null && _c !== void 0 ? _c : BigInt(9999999999)).toString(),
+        vType: tx_1.VerificationType.universalTxVerification,
+    };
+    return `0x${(0, signing_1.encodeUniversalPayloadSvm)(payload).toString('hex')}`;
+}
 /**
  * Build sendUniversalTxToUEA call for CEA self-call (Route 3)
  *

package/src/lib/universal-tx-detector/child-inbounds.d.ts

@@ -6,6 +6,9 @@
  *   utxId = sha256(`<sourceChainCaip>:<txHash>:<logIndex>`)
  * See push-chain/x/uexecutor/types/keys.go:49-53 (GetInboundUniversalTxKey).
  *
+ * For SVM sources, `<txHash>` is the 0x-prefixed hex encoding of the 64-byte
+ * Solana signature and `<logIndex>` is the event's index in `meta.logMessages`.
+ *
  * For Push-initiated outbounds (pcTx entries) the formula drops the log index:
  *   utxId = sha256(`<pcChainCaip>:<pcTxHash>`)
  * See push-chain/x/uexecutor/types/keys.go:63-67 (GetPcUniversalTxKey).

package/src/lib/universal-tx-detector/child-inbounds.js

@@ -14,6 +14,9 @@ const tslib_1 = require("tslib");
  *   utxId = sha256(`<sourceChainCaip>:<txHash>:<logIndex>`)
  * See push-chain/x/uexecutor/types/keys.go:49-53 (GetInboundUniversalTxKey).
  *
+ * For SVM sources, `<txHash>` is the 0x-prefixed hex encoding of the 64-byte
+ * Solana signature and `<logIndex>` is the event's index in `meta.logMessages`.
+ *
  * For Push-initiated outbounds (pcTx entries) the formula drops the log index:
  *   utxId = sha256(`<pcChainCaip>:<pcTxHash>`)
  * See push-chain/x/uexecutor/types/keys.go:63-67 (GetPcUniversalTxKey).
@@ -22,6 +25,7 @@ const tslib_1 = require("tslib");
  * `pushClient.getUniversalTxByIdV2`, no event-attribute predicate needed.
  */
 const viem_1 = require("viem");
+const bs58_1 = require("../internal/bs58");
 const normalize_1 = require("./normalize");
 const STATUS_NAMES = {
     0: 'UNIVERSAL_TX_STATUS_UNSPECIFIED',
@@ -45,14 +49,25 @@ const INBOUND_EVENT_NAMES = new Set([
     'UniversalTx',
     'RevertUniversalTx',
 ]);
+const HEX_64_BYTE_RE = /^(?:0x)?[0-9a-fA-F]{128}$/;
+function normalizeInboundTxHashForKey(sourceChainCaip, externalTxHash) {
+    if (!sourceChainCaip.startsWith('solana:')) {
+        return externalTxHash.startsWith('0x')
+            ? externalTxHash
+            : `0x${externalTxHash}`;
+    }
+    if (externalTxHash.startsWith('0x'))
+        return externalTxHash;
+    if (HEX_64_BYTE_RE.test(externalTxHash))
+        return `0x${externalTxHash}`;
+    return (0, viem_1.toHex)(bs58_1.bs58.decode(externalTxHash));
+}
 /**
  * Deterministic child universalTxId for an inbound event on an external chain.
  * Mirrors `GetInboundUniversalTxKey` from the chain module.
  */
 function deriveChildUniversalTxId(sourceChainCaip, externalTxHash, logIndex) {
-    const normHash = externalTxHash.startsWith('0x')
-        ? externalTxHash
-        : `0x${externalTxHash}`;
+    const normHash = normalizeInboundTxHashForKey(sourceChainCaip, externalTxHash);
     const input = `${sourceChainCaip}:${normHash}:${logIndex}`;
     return (0, viem_1.sha256)((0, viem_1.toBytes)(input));
 }

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

@@ -15,12 +15,9 @@ const tslib_1 = require("tslib");
  * return, same universalTxId derivation strategy (primary-log fallback
  * via deriveChildUniversalTxId on source-chain inbounds).
  *
- * Open contract with the push-chain cosmos keeper (documented in the
- * plan): the keeper must derive SVM inbound universalTxIds using the
- * Solana base58 signature verbatim inside `${caip}:${sig}:${logIndex}`.
- * If the keeper uses a different representation (hex bytes, sub_tx_id
- * field, etc.) the `rawSource` argument to deriveChildUniversalTxId below
- * needs to swap — single line.
+ * The Push keeper stores SVM inbound ids using the 0x-prefixed hex encoding
+ * of the 64-byte Solana signature and the index of the Anchor event inside
+ * `meta.logMessages`: `${caip}:${hexSig}:${logMessageIndex}`.
  */
 const anchor_1 = require("@coral-xyz/anchor");
 const web3_js_1 = require("@solana/web3.js");
@@ -91,12 +88,11 @@ function detectUniversalTxSvm(signature_1, chain_2) {
         }
         const eventCoder = new anchor_1.BorshEventCoder(universalGatewayV0_json_1.default);
         const matchingLogs = [];
-        // Walk logMessages for `Program data:` entries. Each matched event gets
-        // assigned an ordinal logIndex — its position among matching events.
-        // This is the deterministic integer the cosmos keeper is expected to use
-        // when it derives an inbound universalTxId for SVM sources.
-        let ordinal = 0;
-        for (const rawLog of logMessages) {
+        // Walk logMessages for `Program data:` entries. Each matched event keeps
+        // the actual Solana log-message index because that is the value validators
+        // submit as the inbound log_index and the keeper uses for the UTX key.
+        for (let logIndex = 0; logIndex < logMessages.length; logIndex++) {
+            const rawLog = logMessages[logIndex];
             if (typeof rawLog !== 'string')
                 continue;
             const prefix = 'Program data: ';
@@ -135,10 +131,9 @@ function detectUniversalTxSvm(signature_1, chain_2) {
             matchingLogs.push({
                 eventName,
                 address: emitter,
-                logIndex: ordinal,
+                logIndex,
                 args,
             });
-            ordinal += 1;
         }
         if (matchingLogs.length === 0) {
             notes.push('svm tx has no decoded universal-tx events');
@@ -148,8 +143,7 @@ function detectUniversalTxSvm(signature_1, chain_2) {
         notes.push(...classified.notes);
         const decoded = Object.assign({}, classified.decoded);
         // Inbound fallback for universalTxId: same formula the EVM branch uses,
-        // but the raw signature flows through untouched (no 0x-prefix rewrite,
-        // see deriveSvmChildUniversalTxId in child-inbounds.ts).
+        // with the canonical 0x-hex Solana signature and log-message index.
         if (!decoded.universalTxId) {
             const caip = chain;
             if (INBOUND_KINDS.has(classified.kind) &&