@pushchain/core 6.0.19 → 6.0.21

package/src/lib/orchestrator/internals/gas-usd-sizer.js

@@ -4,7 +4,6 @@ exports.getPcUsdPrice = exports.__THRESHOLDS = void 0;
 exports.sizeOutboundGas = sizeOutboundGas;
 exports.sizeR1PushGas = sizeR1PushGas;
 exports.computeGasUsd = computeGasUsd;
-const tslib_1 = require("tslib");
 /**
  * Gas sizing for outbound transactions (Routes 2/3/4).
  *
@@ -31,66 +30,64 @@ const TEN_USD_8D = (0, viem_1.parseUnits)('10', 8); // 1_000_000_000
 // ============================================================================
 // Public API
 // ============================================================================
-function sizeOutboundGas(ctx, input) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { gasFee, originChain, destinationChain } = input;
-        // 1) Price gasFee in USD (8 decimals). gasFee is denominated in the
-        //    destination native (pETH = ETH value, pSOL = SOL value). The price
-        //    feed lives on the *origin* side (origin gateway's Chainlink/Pyth),
-        //    but we reuse the same feed via PriceFetch — the asset being priced
-        //    is ETH or SOL, not the route.
-        const destVm = chain_1.CHAIN_INFO[destinationChain].vm;
-        const priceSourceChain = destVm === enums_1.VM.SVM ? enums_1.CHAIN.SOLANA_DEVNET : enums_1.CHAIN.ETHEREUM_SEPOLIA;
-        const destDecimals = destVm === enums_1.VM.SVM ? 9 : 18;
-        let destUsdPrice;
-        try {
-            destUsdPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(priceSourceChain);
-        }
-        catch (err) {
-            (0, context_1.printLog)(ctx, `sizeOutboundGas — PriceFetch.getPrice failed (${err instanceof Error ? err.message : String(err)}); treating as Case B passthrough`);
-            // Degrade gracefully: assume the raw gasFee is already a sane size and
-            // convert 1:1 to native PC. Callers keep their existing fallback logic.
-            return passthroughAsCaseB(ctx, gasFee, originChain);
-        }
-        const oneDestNativeUnit = (0, viem_1.parseUnits)('1', destDecimals);
-        const gasUsd = (gasFee * destUsdPrice) / oneDestNativeUnit;
-        (0, context_1.printLog)(ctx, `sizeOutboundGas — gasFee=${gasFee.toString()} ${destVm === enums_1.VM.SVM ? 'pSOL' : 'pETH'} (${destDecimals}d), ` +
-            `destUsdPrice=${destUsdPrice.toString()} (1e8), gasUsd=${gasUsd.toString()} (1e8)`);
-        // 2) Categorize and compute target USD for each leg.
-        let category;
-        let gasLegUsd;
-        let overflowUsd;
-        if (gasUsd < ONE_USD_8D) {
-            category = 'A';
-            gasLegUsd = ONE_USD_8D;
-            overflowUsd = BigInt(0);
-        }
-        else if (gasUsd <= TEN_USD_8D) {
-            category = 'B';
-            gasLegUsd = gasUsd;
-            overflowUsd = BigInt(0);
-        }
-        else {
-            category = 'C';
-            gasLegUsd = TEN_USD_8D;
-            overflowUsd = gasUsd - TEN_USD_8D;
-        }
-        // 3) Convert USD targets back to native PC via the per-route WPC/stable oracle.
-        const gasLegNativePc = yield (0, pc_usd_oracle_1.usdToPc)(ctx, gasLegUsd, originChain);
-        const overflowNativePc = overflowUsd > BigInt(0)
-            ? yield (0, pc_usd_oracle_1.usdToPc)(ctx, overflowUsd, originChain)
-            : BigInt(0);
-        (0, context_1.printLog)(ctx, `sizeOutboundGas — category=${category}, gasLegUsd=${gasLegUsd.toString()}, ` +
-            `overflowUsd=${overflowUsd.toString()}, gasLegNativePc=${gasLegNativePc.toString()}, ` +
-            `overflowNativePc=${overflowNativePc.toString()}`);
-        return {
-            category,
-            gasLegNativePc,
-            overflowNativePc,
-            gasUsd,
-            overflowUsd,
-        };
-    });
+async function sizeOutboundGas(ctx, input) {
+    const { gasFee, originChain, destinationChain } = input;
+    // 1) Price gasFee in USD (8 decimals). gasFee is denominated in the
+    //    destination native (pETH = ETH value, pSOL = SOL value). The price
+    //    feed lives on the *origin* side (origin gateway's Chainlink/Pyth),
+    //    but we reuse the same feed via PriceFetch — the asset being priced
+    //    is ETH or SOL, not the route.
+    const destVm = chain_1.CHAIN_INFO[destinationChain].vm;
+    const priceSourceChain = destVm === enums_1.VM.SVM ? enums_1.CHAIN.SOLANA_DEVNET : enums_1.CHAIN.ETHEREUM_SEPOLIA;
+    const destDecimals = destVm === enums_1.VM.SVM ? 9 : 18;
+    let destUsdPrice;
+    try {
+        destUsdPrice = await new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(priceSourceChain);
+    }
+    catch (err) {
+        (0, context_1.printLog)(ctx, `sizeOutboundGas — PriceFetch.getPrice failed (${err instanceof Error ? err.message : String(err)}); treating as Case B passthrough`);
+        // Degrade gracefully: assume the raw gasFee is already a sane size and
+        // convert 1:1 to native PC. Callers keep their existing fallback logic.
+        return passthroughAsCaseB(ctx, gasFee, originChain);
+    }
+    const oneDestNativeUnit = (0, viem_1.parseUnits)('1', destDecimals);
+    const gasUsd = (gasFee * destUsdPrice) / oneDestNativeUnit;
+    (0, context_1.printLog)(ctx, `sizeOutboundGas — gasFee=${gasFee.toString()} ${destVm === enums_1.VM.SVM ? 'pSOL' : 'pETH'} (${destDecimals}d), ` +
+        `destUsdPrice=${destUsdPrice.toString()} (1e8), gasUsd=${gasUsd.toString()} (1e8)`);
+    // 2) Categorize and compute target USD for each leg.
+    let category;
+    let gasLegUsd;
+    let overflowUsd;
+    if (gasUsd < ONE_USD_8D) {
+        category = 'A';
+        gasLegUsd = ONE_USD_8D;
+        overflowUsd = BigInt(0);
+    }
+    else if (gasUsd <= TEN_USD_8D) {
+        category = 'B';
+        gasLegUsd = gasUsd;
+        overflowUsd = BigInt(0);
+    }
+    else {
+        category = 'C';
+        gasLegUsd = TEN_USD_8D;
+        overflowUsd = gasUsd - TEN_USD_8D;
+    }
+    // 3) Convert USD targets back to native PC via the per-route WPC/stable oracle.
+    const gasLegNativePc = await (0, pc_usd_oracle_1.usdToPc)(ctx, gasLegUsd, originChain);
+    const overflowNativePc = overflowUsd > BigInt(0)
+        ? await (0, pc_usd_oracle_1.usdToPc)(ctx, overflowUsd, originChain)
+        : BigInt(0);
+    (0, context_1.printLog)(ctx, `sizeOutboundGas — category=${category}, gasLegUsd=${gasLegUsd.toString()}, ` +
+        `overflowUsd=${overflowUsd.toString()}, gasLegNativePc=${gasLegNativePc.toString()}, ` +
+        `overflowNativePc=${overflowNativePc.toString()}`);
+    return {
+        category,
+        gasLegNativePc,
+        overflowNativePc,
+        gasUsd,
+        overflowUsd,
+    };
 }
 // ============================================================================
 // Internal helpers
@@ -100,62 +97,56 @@ function sizeOutboundGas(ctx, input) {
  * Orchestrator alive: return the raw gasFee as a Case B result, converting
  * through the existing PC/USD oracle (or its hardcoded fallback).
  */
-function passthroughAsCaseB(ctx, gasFee, originChain) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const oneUsd = ONE_USD_8D;
-        const gasLegNativePc = yield (0, pc_usd_oracle_1.usdToPc)(ctx, oneUsd, originChain);
-        void gasFee;
-        return {
-            category: 'B',
-            gasLegNativePc,
-            overflowNativePc: BigInt(0),
-            gasUsd: oneUsd,
-            overflowUsd: BigInt(0),
-        };
-    });
+async function passthroughAsCaseB(ctx, gasFee, originChain) {
+    const oneUsd = ONE_USD_8D;
+    const gasLegNativePc = await (0, pc_usd_oracle_1.usdToPc)(ctx, oneUsd, originChain);
+    void gasFee;
+    return {
+        category: 'B',
+        gasLegNativePc,
+        overflowNativePc: BigInt(0),
+        gasUsd: oneUsd,
+        overflowUsd: BigInt(0),
+    };
 }
-function sizeR1PushGas(ctx, input) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { pushGasFeeWei, originChain } = input;
-        // 1) Convert pushGasFeeWei (UPC wei, 18d) → USD (8d) via per-route oracle.
-        const pcUsdPrice = yield (0, pc_usd_oracle_1.getPcUsdPrice)(ctx, originChain);
-        const onePcUnit = (0, viem_1.parseUnits)('1', 18);
-        const pushGasUsd = (pushGasFeeWei * pcUsdPrice) / onePcUnit;
-        (0, context_1.printLog)(ctx, `sizeR1PushGas — pushGasFeeWei=${pushGasFeeWei.toString()} UPC (18d), ` +
-            `pcUsdPrice=${pcUsdPrice.toString()} (1e8), pushGasUsd=${pushGasUsd.toString()} (1e8)`);
-        // 2) Bucket.
-        let category;
-        let paddedDepositUsd;
-        if (pushGasUsd < ONE_USD_8D) {
-            category = 'A';
-            paddedDepositUsd = ONE_USD_8D;
-        }
-        else if (pushGasUsd <= TEN_USD_8D) {
-            category = 'B';
-            paddedDepositUsd = pushGasUsd;
-        }
-        else {
-            category = 'C';
-            paddedDepositUsd = pushGasUsd;
-        }
-        (0, context_1.printLog)(ctx, `sizeR1PushGas — category=${category}, paddedDepositUsd=${paddedDepositUsd.toString()} (1e8)`);
-        return { category, pushGasUsd, paddedDepositUsd };
-    });
+async function sizeR1PushGas(ctx, input) {
+    const { pushGasFeeWei, originChain } = input;
+    // 1) Convert pushGasFeeWei (UPC wei, 18d) → USD (8d) via per-route oracle.
+    const pcUsdPrice = await (0, pc_usd_oracle_1.getPcUsdPrice)(ctx, originChain);
+    const onePcUnit = (0, viem_1.parseUnits)('1', 18);
+    const pushGasUsd = (pushGasFeeWei * pcUsdPrice) / onePcUnit;
+    (0, context_1.printLog)(ctx, `sizeR1PushGas — pushGasFeeWei=${pushGasFeeWei.toString()} UPC (18d), ` +
+        `pcUsdPrice=${pcUsdPrice.toString()} (1e8), pushGasUsd=${pushGasUsd.toString()} (1e8)`);
+    // 2) Bucket.
+    let category;
+    let paddedDepositUsd;
+    if (pushGasUsd < ONE_USD_8D) {
+        category = 'A';
+        paddedDepositUsd = ONE_USD_8D;
+    }
+    else if (pushGasUsd <= TEN_USD_8D) {
+        category = 'B';
+        paddedDepositUsd = pushGasUsd;
+    }
+    else {
+        category = 'C';
+        paddedDepositUsd = pushGasUsd;
+    }
+    (0, context_1.printLog)(ctx, `sizeR1PushGas — category=${category}, paddedDepositUsd=${paddedDepositUsd.toString()} (1e8)`);
+    return { category, pushGasUsd, paddedDepositUsd };
 }
 /**
  * Given gasFee (in gasToken units) and destination VM, return gasFee in USD
  * (8 decimals). Exposed for direct use in places that already have the
  * destUsdPrice cached (e.g., rescue flows).
  */
-function computeGasUsd(ctx, gasFee, destinationChain) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const destVm = chain_1.CHAIN_INFO[destinationChain].vm;
-        const priceSourceChain = destVm === enums_1.VM.SVM ? enums_1.CHAIN.SOLANA_DEVNET : enums_1.CHAIN.ETHEREUM_SEPOLIA;
-        const destDecimals = destVm === enums_1.VM.SVM ? 9 : 18;
-        const destUsdPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(priceSourceChain);
-        const oneUnit = (0, viem_1.parseUnits)('1', destDecimals);
-        return (gasFee * destUsdPrice) / oneUnit;
-    });
+async function computeGasUsd(ctx, gasFee, destinationChain) {
+    const destVm = chain_1.CHAIN_INFO[destinationChain].vm;
+    const priceSourceChain = destVm === enums_1.VM.SVM ? enums_1.CHAIN.SOLANA_DEVNET : enums_1.CHAIN.ETHEREUM_SEPOLIA;
+    const destDecimals = destVm === enums_1.VM.SVM ? 9 : 18;
+    const destUsdPrice = await new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(priceSourceChain);
+    const oneUnit = (0, viem_1.parseUnits)('1', destDecimals);
+    return (gasFee * destUsdPrice) / oneUnit;
 }
 /** Test-only export of thresholds. @internal */
 exports.__THRESHOLDS = { ONE_USD_8D, TEN_USD_8D };

package/src/lib/orchestrator/internals/gateway-client.js

@@ -10,7 +10,6 @@ exports.sendGatewayTxWithFallback = sendGatewayTxWithFallback;
 exports.sendGatewayTokenTxWithFallback = sendGatewayTokenTxWithFallback;
 exports.lockFee = lockFee;
 exports.getOriginGatewayContext = getOriginGatewayContext;
-const tslib_1 = require("tslib");
 const bs58_1 = require("../../internal/bs58");
 const web3_js_1 = require("@solana/web3.js");
 const viem_1 = require("viem");
@@ -41,9 +40,8 @@ const SOURCE_NATIVE_SYMBOL = {
     [enums_1.CHAIN.SOLANA_DEVNET]: 'SOL',
 };
 function formatSourceNative(chain, amount) {
-    var _a;
     const decimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
-    const symbol = (_a = SOURCE_NATIVE_SYMBOL[chain]) !== null && _a !== void 0 ? _a : 'native token';
+    const symbol = SOURCE_NATIVE_SYMBOL[chain] ?? 'native token';
     return `${utils_1.Utils.helpers.formatUnits(amount, decimals)} ${symbol}`;
 }
 function insufficientSourceBalanceMessage(chain, available, required) {
@@ -81,120 +79,121 @@ function toGatewayTokenRequestV1(req) {
 // ============================================================================
 // Send Gateway Tx (V1 only)
 // ============================================================================
-function sendGatewayTxWithFallback(ctx, evmClient, address, req, signer, value) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return evmClient.writeContract({
-            abi: GATEWAY_ABI,
-            address,
-            functionName: 'sendUniversalTx',
-            args: [toGatewayRequestV1(req)],
-            signer,
-            value,
-        });
+async function sendGatewayTxWithFallback(ctx, evmClient, address, req, signer, value) {
+    return evmClient.writeContract({
+        abi: GATEWAY_ABI,
+        address,
+        functionName: 'sendUniversalTx',
+        args: [toGatewayRequestV1(req)],
+        signer,
+        value,
     });
 }
-function sendGatewayTokenTxWithFallback(ctx, evmClient, address, req, signer, value) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        return evmClient.writeContract(Object.assign({ abi: GATEWAY_ABI, address, functionName: 'sendUniversalTx', args: [toGatewayTokenRequestV1(req)], signer }, (value !== undefined && { value })));
+async function sendGatewayTokenTxWithFallback(ctx, evmClient, address, req, signer, value) {
+    return evmClient.writeContract({
+        abi: GATEWAY_ABI,
+        address,
+        functionName: 'sendUniversalTx',
+        args: [toGatewayTokenRequestV1(req)],
+        signer,
+        ...(value !== undefined && { value }),
     });
 }
 // ============================================================================
 // Fee Locking
 // ============================================================================
-function lockFee(ctx, amount, universalPayload, 
+async function lockFee(ctx, amount, universalPayload, 
 // DEBUG: lockFee entry
 req) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const chain = ctx.universalSigner.account.chain;
-        const { lockerContract, vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
-        if (!lockerContract) {
-            throw new Error(`Locker contract not configured for chain: ${chain}`);
+    const chain = ctx.universalSigner.account.chain;
+    const { lockerContract, vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
+    if (!lockerContract) {
+        throw new Error(`Locker contract not configured for chain: ${chain}`);
+    }
+    const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
+    switch (vm) {
+        case enums_1.VM.EVM: {
+            const evmClient = (0, context_1.getOriginEvmClient)(ctx);
+            const nativeTokenUsdPrice = await new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain);
+            const nativeDecimals = 18;
+            const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
+            const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
+            let depositUsd = amount < oneUsd ? oneUsd : amount;
+            if (depositUsd > maxUsd)
+                depositUsd = maxUsd;
+            let nativeAmount = (depositUsd * BigInt(10 ** nativeDecimals) +
+                (nativeTokenUsdPrice - BigInt(1))) /
+                nativeTokenUsdPrice;
+            nativeAmount = nativeAmount + BigInt(1);
+            const sourceAddress = ctx.universalSigner.account.address;
+            const sourceBalance = await evmClient.publicClient.getBalance({
+                address: sourceAddress,
+            });
+            if (sourceBalance < nativeAmount) {
+                throw new Error(insufficientSourceBalanceMessage(chain, sourceBalance, nativeAmount));
+            }
+            const txHash = await sendGatewayTxWithFallback(ctx, evmClient, lockerContract, req, ctx.universalSigner, nativeAmount);
+            return (0, viem_1.hexToBytes)(txHash);
         }
-        const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
-        switch (vm) {
-            case enums_1.VM.EVM: {
-                const evmClient = (0, context_1.getOriginEvmClient)(ctx);
-                const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain);
-                const nativeDecimals = 18;
-                const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-                const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
-                let depositUsd = amount < oneUsd ? oneUsd : amount;
-                if (depositUsd > maxUsd)
-                    depositUsd = maxUsd;
-                let nativeAmount = (depositUsd * BigInt(Math.pow(10, nativeDecimals)) +
-                    (nativeTokenUsdPrice - BigInt(1))) /
-                    nativeTokenUsdPrice;
-                nativeAmount = nativeAmount + BigInt(1);
-                const sourceAddress = ctx.universalSigner.account.address;
-                const sourceBalance = yield evmClient.publicClient.getBalance({
-                    address: sourceAddress,
+        case enums_1.VM.SVM: {
+            const [nativeTokenUsdPrice, svmClient] = await Promise.all([
+                new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain),
+                Promise.resolve(new svm_client_1.SvmClient({ rpcUrls })),
+            ]);
+            const nativeDecimals = 9;
+            const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
+            const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
+            let depositUsd = amount < oneUsd ? oneUsd : amount;
+            if (depositUsd > maxUsd)
+                depositUsd = maxUsd;
+            let nativeAmount = (depositUsd * BigInt(10 ** nativeDecimals) +
+                (nativeTokenUsdPrice - BigInt(1))) /
+                nativeTokenUsdPrice;
+            nativeAmount = nativeAmount + BigInt(1);
+            const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
+            const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
+            const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
+            const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
+            const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], programId);
+            const userPk = new web3_js_1.PublicKey(ctx.universalSigner.account.address);
+            const { feeVaultPda, protocolFeeLamports } = await (0, svm_helpers_2.getSvmProtocolFee)(svmClient, programId);
+            const gasReq = (0, svm_helpers_1.buildSvmUniversalTxRequestFromReq)(req, userPk);
+            const requiredLamports = nativeAmount + protocolFeeLamports;
+            const sourceBalance = await svmClient.getBalance(userPk.toBase58());
+            if (sourceBalance < requiredLamports) {
+                throw new Error(insufficientSourceBalanceMessage(chain, sourceBalance, requiredLamports));
+            }
+            try {
+                const txHash = await svmClient.writeContract({
+                    abi: abi_1.SVM_GATEWAY_IDL,
+                    address: programId.toBase58(),
+                    functionName: 'sendUniversalTx',
+                    args: [gasReq, requiredLamports],
+                    signer: ctx.universalSigner,
+                    accounts: {
+                        config: configPda,
+                        vault: vaultPda,
+                        feeVault: feeVaultPda,
+                        userTokenAccount: vaultPda,
+                        gatewayTokenAccount: vaultPda,
+                        user: userPk,
+                        priceUpdate: new web3_js_1.PublicKey(chain_1.SVM_PYTH_PRICE_FEED),
+                        rateLimitConfig: rateLimitConfigPda,
+                        tokenRateLimit: tokenRateLimitPda,
+                        tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+                        systemProgram: web3_js_1.SystemProgram.programId,
+                    },
                 });
-                if (sourceBalance < nativeAmount) {
-                    throw new Error(insufficientSourceBalanceMessage(chain, sourceBalance, nativeAmount));
-                }
-                const txHash = yield sendGatewayTxWithFallback(ctx, evmClient, lockerContract, req, ctx.universalSigner, nativeAmount);
-                return (0, viem_1.hexToBytes)(txHash);
+                return new Uint8Array(bs58_1.bs58.decode(txHash));
             }
-            case enums_1.VM.SVM: {
-                const [nativeTokenUsdPrice, svmClient] = yield Promise.all([
-                    new price_fetch_1.PriceFetch(ctx.rpcUrls).getPrice(chain),
-                    Promise.resolve(new svm_client_1.SvmClient({ rpcUrls })),
-                ]);
-                const nativeDecimals = 9;
-                const oneUsd = utils_1.Utils.helpers.parseUnits('1', 8);
-                const maxUsd = utils_1.Utils.helpers.parseUnits('1000', 8);
-                let depositUsd = amount < oneUsd ? oneUsd : amount;
-                if (depositUsd > maxUsd)
-                    depositUsd = maxUsd;
-                let nativeAmount = (depositUsd * BigInt(Math.pow(10, nativeDecimals)) +
-                    (nativeTokenUsdPrice - BigInt(1))) /
-                    nativeTokenUsdPrice;
-                nativeAmount = nativeAmount + BigInt(1);
-                const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.address);
-                const [configPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('config')], programId);
-                const [vaultPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('vault')], programId);
-                const [rateLimitConfigPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit_config')], programId);
-                const [tokenRateLimitPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('rate_limit'), web3_js_1.PublicKey.default.toBuffer()], programId);
-                const userPk = new web3_js_1.PublicKey(ctx.universalSigner.account.address);
-                const { feeVaultPda, protocolFeeLamports } = yield (0, svm_helpers_2.getSvmProtocolFee)(svmClient, programId);
-                const gasReq = (0, svm_helpers_1.buildSvmUniversalTxRequestFromReq)(req, userPk);
-                const requiredLamports = nativeAmount + protocolFeeLamports;
-                const sourceBalance = yield svmClient.getBalance(userPk.toBase58());
-                if (sourceBalance < requiredLamports) {
-                    throw new Error(insufficientSourceBalanceMessage(chain, sourceBalance, requiredLamports));
-                }
-                try {
-                    const txHash = yield svmClient.writeContract({
-                        abi: abi_1.SVM_GATEWAY_IDL,
-                        address: programId.toBase58(),
-                        functionName: 'sendUniversalTx',
-                        args: [gasReq, requiredLamports],
-                        signer: ctx.universalSigner,
-                        accounts: {
-                            config: configPda,
-                            vault: vaultPda,
-                            feeVault: feeVaultPda,
-                            userTokenAccount: vaultPda,
-                            gatewayTokenAccount: vaultPda,
-                            user: userPk,
-                            priceUpdate: new web3_js_1.PublicKey(chain_1.SVM_PYTH_PRICE_FEED),
-                            rateLimitConfig: rateLimitConfigPda,
-                            tokenRateLimit: tokenRateLimitPda,
-                            tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-                            systemProgram: web3_js_1.SystemProgram.programId,
-                        },
-                    });
-                    return new Uint8Array(bs58_1.bs58.decode(txHash));
-                }
-                catch (error) {
-                    (0, context_2.printLog)(ctx, `Error sending UniversalTx: ${error instanceof Error ? error.message : String(error)}`);
-                    throw error;
-                }
+            catch (error) {
+                (0, context_2.printLog)(ctx, `Error sending UniversalTx: ${error instanceof Error ? error.message : String(error)}`);
+                throw error;
             }
-            default:
-                throw new Error(`Unsupported VM type: ${vm}`);
         }
-    });
+        default:
+            throw new Error(`Unsupported VM type: ${vm}`);
+    }
 }
 // ============================================================================
 // Origin Gateway Context

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

@@ -16,7 +16,6 @@ exports.validateMainnetConnection = validateMainnetConnection;
 exports.bigintReplacer = bigintReplacer;
 exports.toExecuteParams = toExecuteParams;
 exports.fetchOriginChainTransactionForProgress = fetchOriginChainTransactionForProgress;
-const tslib_1 = require("tslib");
 const web3_js_1 = require("@solana/web3.js");
 const chain_1 = require("../../constants/chain");
 const context_1 = require("./context");
@@ -141,6 +140,12 @@ function toExecuteParams(params) {
         value: params.value,
         data: params.data,
         funds: params.funds,
+        // Internal PC20 descriptor must survive param transformation — the payload
+        // builders branch on it, and losing it here silently reroutes a resolved
+        // PC20 through the static synthetic-token lookup (which throws).
+        ...(('_pc20' in params)
+            ? { _pc20: params._pc20 }
+            : {}),
         gasLimit: params.gasLimit,
         maxPCForGas: params.maxPCForGas,
         maxFeePerGas: params.maxFeePerGas,
@@ -154,34 +159,32 @@ function toExecuteParams(params) {
 // ============================================================================
 // Origin Chain Transaction for Progress
 // ============================================================================
-function fetchOriginChainTransactionForProgress(ctx, chain, txHashHex, txHashDisplay) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const { vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
-        const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
-        try {
-            if (vm === enums_1.VM.EVM) {
-                if (!txHashHex.startsWith('0x')) {
-                    throw new Error('EVM transaction hash must be 0x-prefixed');
-                }
-                const evmClient = (0, context_1.getOriginEvmClient)(ctx);
-                const tx = yield evmClient.publicClient.getTransaction({
-                    hash: txHashHex,
-                });
-                return tx !== null && tx !== void 0 ? tx : undefined;
+async function fetchOriginChainTransactionForProgress(ctx, chain, txHashHex, txHashDisplay) {
+    const { vm, defaultRPC } = chain_1.CHAIN_INFO[chain];
+    const rpcUrls = ctx.rpcUrls[chain] || defaultRPC;
+    try {
+        if (vm === enums_1.VM.EVM) {
+            if (!txHashHex.startsWith('0x')) {
+                throw new Error('EVM transaction hash must be 0x-prefixed');
             }
-            if (vm === enums_1.VM.SVM) {
-                const connection = new web3_js_1.Connection(rpcUrls[0], 'confirmed');
-                const tx = yield connection.getTransaction(txHashDisplay, {
-                    maxSupportedTransactionVersion: 0,
-                    commitment: 'confirmed',
-                });
-                return tx !== null && tx !== void 0 ? tx : undefined;
-            }
-            return undefined;
+            const evmClient = (0, context_1.getOriginEvmClient)(ctx);
+            const tx = await evmClient.publicClient.getTransaction({
+                hash: txHashHex,
+            });
+            return tx ?? undefined;
         }
-        catch (_a) {
-            return undefined;
+        if (vm === enums_1.VM.SVM) {
+            const connection = new web3_js_1.Connection(rpcUrls[0], 'confirmed');
+            const tx = await connection.getTransaction(txHashDisplay, {
+                maxSupportedTransactionVersion: 0,
+                commitment: 'confirmed',
+            });
+            return tx ?? undefined;
         }
-    });
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
 }
 //# sourceMappingURL=helpers.js.map