@pushchain/core 2.0.3 → 2.0.6

package/src/lib/orchestrator/orchestrator.js

@@ -79,8 +79,8 @@ class Orchestrator {
                         }
                         const chain = this.universalSigner.account.chain;
                         const { vm } = chain_1.CHAIN_INFO[chain];
-                        if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA)) {
-                            throw new Error('Funds bridging is only supported on Ethereum Sepolia for now');
+                        if (!(chain === enums_1.CHAIN.ETHEREUM_SEPOLIA || chain === enums_1.CHAIN.SOLANA_DEVNET)) {
+                            throw new Error('Funds bridging is only supported on Ethereum Sepolia and Solana Devnet for now');
                         }
                         // Progress: Origin chain detected
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
@@ -153,92 +153,50 @@ class Orchestrator {
                             this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
                             yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 14, 210000);
                             // After origin confirmations, query Push Chain for UniversalTx status
-                            try {
-                                const receipt = yield evmClient.publicClient.getTransactionReceipt({
-                                    hash: txHash,
-                                });
-                                const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() ===
-                                    gatewayAddress.toLowerCase());
-                                const firstLog = (gatewayLogs[0] || ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[0]));
-                                const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
-                                const logIndexStr = typeof logIndexVal === 'bigint'
-                                    ? logIndexVal.toString()
-                                    : String(logIndexVal);
-                                const sourceChain = `${chain_1.VM_NAMESPACE[vm]}:${chain_1.CHAIN_INFO[this.universalSigner.account.chain].chainId}`;
-                                // ID = sha256("${sourceChain}:${txHash}:${logIndex}") as hex string (no 0x)
-                                const idInput = `${sourceChain}:${txHash}:${logIndexStr}`;
-                                const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
-                                // Fetch UniversalTx via gRPC with a brief retry window
-                                let universalTxObj;
-                                for (let attempt = 0; attempt < 10; attempt++) {
-                                    try {
-                                        const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
-                                        universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
-                                        if (universalTxObj)
-                                            break;
-                                    }
-                                    catch (_d) {
-                                        // ignore and retry
-                                    }
-                                    yield new Promise((r) => setTimeout(r, 1500));
-                                }
-                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) ||
-                                    (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status));
-                            }
-                            catch (_e) {
-                                // Best-effort; do not fail flow if PC query is unavailable
-                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
-                            }
+                            yield this.queryUniversalTxStatusFromEvmGatewayTx(evmClient, gatewayAddress, txHash, 'sendFunds');
                             const tx = yield evmClient.getTransaction(txHash);
                             return yield this.transformToUniversalTxResponse(tx);
                         }
                         else {
                             // SVM path (Solana Devnet)
                             const svmClient = new svm_client_1.SvmClient({ rpcUrls });
-                            const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.metadata.address);
+                            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 [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                             const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
                             let txSignature;
                             // SVM-specific RevertSettings: bytes must be a Buffer
                             const revertSvm = {
                                 fundRecipient: userPk,
-                                revertMsg: Buffer.alloc(0),
+                                revertMsg: Buffer.from([]),
                             };
+                            // New gateway expects EVM recipient as [u8; 20]
+                            const recipientEvm20 = Array.from(Buffer.from(execute.to.slice(2).padStart(40, '0'), 'hex').subarray(0, 20));
                             if (execute.funds.token.mechanism === 'native') {
                                 // Native SOL funds-only
-                                const recipientPk = userPk; // must be non-default per program checks
-                                console.log('recipientPk', recipientPk);
-                                console.log('bridgeAmount', bridgeAmount);
-                                console.log('userPk', userPk);
-                                console.log('configPda', configPda);
-                                console.log('vaultPda', vaultPda);
-                                console.log('systemProgram', web3_js_1.SystemProgram.programId);
-                                console.log('programId', programId.toBase58());
-                                console.log('SVM_GATEWAY_IDL', abi_1.SVM_GATEWAY_IDL);
-                                console.log('sendFundsNative', 'sendFundsNative');
-                                console.log('args', [
-                                    recipientPk,
-                                    bridgeAmount,
-                                    { fundRecipient: userPk, revertMsg: new Uint8Array([]) },
-                                ]);
-                                console.log('signer', this.universalSigner);
-                                console.log('accounts', {
-                                    config: configPda,
-                                    vault: vaultPda,
-                                    user: userPk,
-                                    systemProgram: web3_js_1.SystemProgram.programId,
-                                });
+                                // Compute a local whitelist PDA to avoid TS scope issues
+                                const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                                 txSignature = yield svmClient.writeContract({
                                     abi: abi_1.SVM_GATEWAY_IDL,
                                     address: programId.toBase58(),
-                                    functionName: 'sendFundsNative',
-                                    args: [recipientPk, bridgeAmount, revertSvm],
+                                    functionName: 'sendFunds', // -> unified sendFunds(recipient, bridge_token, bridge_amount, revert_cfg)
+                                    args: [
+                                        recipientEvm20,
+                                        web3_js_1.PublicKey.default,
+                                        bridgeAmount,
+                                        revertSvm,
+                                    ],
                                     signer: this.universalSigner,
                                     accounts: {
                                         config: configPda,
                                         vault: vaultPda,
                                         user: userPk,
+                                        tokenWhitelist: whitelistPdaLocal,
+                                        userTokenAccount: userPk,
+                                        gatewayTokenAccount: vaultPda,
+                                        bridgeToken: web3_js_1.PublicKey.default,
+                                        tokenProgram: new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
                                         systemProgram: web3_js_1.SystemProgram.programId,
                                     },
                                 });
@@ -246,7 +204,6 @@ class Orchestrator {
                             else if (execute.funds.token.mechanism === 'approve') {
                                 // SPL token funds-only (requires pre-existing ATAs)
                                 const mintPk = new web3_js_1.PublicKey(execute.funds.token.address);
-                                const [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                                 // Associated Token Accounts
                                 const TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
                                 const ASSOCIATED_TOKEN_PROGRAM_ID = new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
@@ -260,12 +217,11 @@ class Orchestrator {
                                     TOKEN_PROGRAM_ID.toBuffer(),
                                     mintPk.toBuffer(),
                                 ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
-                                const recipientPk = userPk; // must be non-default per program checks
                                 txSignature = yield svmClient.writeContract({
                                     abi: abi_1.SVM_GATEWAY_IDL,
                                     address: programId.toBase58(),
                                     functionName: 'sendFunds',
-                                    args: [recipientPk, mintPk, bridgeAmount, revertSvm],
+                                    args: [recipientEvm20, mintPk, bridgeAmount, revertSvm],
                                     signer: this.universalSigner,
                                     accounts: {
                                         config: configPda,
@@ -350,7 +306,8 @@ class Orchestrator {
                         // Bridge funds + execute payload. Support:
                         // - EVM (Sepolia): ERC-20 approve path + native gas via msg.value
                         // - SVM (Solana Devnet): SPL or native SOL with gas_amount
-                        const { chain, evmClient, gatewayAddress } = this.ensureSepoliaGateway();
+                        const { chain, evmClient, gatewayAddress } = this.getOriginGatewayContext();
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_01, chain);
                         // Default token to native ETH if none provided
                         if (!execute.funds.token) {
                             const available = tokens_1.MOVEABLE_TOKENS[chain] || [];
@@ -367,16 +324,19 @@ class Orchestrator {
                         const mechanism = execute.funds.token.mechanism;
                         const { deployed, nonce } = yield this.getUeaStatusAndNonce();
                         const { payload: universalPayload } = yield this.buildGatewayPayloadAndGas(execute, nonce);
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_01);
                         // Compute required gas funding on Push Chain and current UEA balance
                         const gasEstimate = execute.gasLimit || BigInt(1e7);
                         const gasPrice = yield this.pushClient.getGasPrice();
                         const requiredGasFee = gasEstimate * gasPrice;
-                        const payloadValue = (_c = execute.value) !== null && _c !== void 0 ? _c : BigInt(0);
+                        const payloadValue = (_a = execute.value) !== null && _a !== void 0 ? _a : BigInt(0);
                         const requiredFunds = requiredGasFee + payloadValue;
                         const ueaAddress = this.computeUEAOffchain();
                         const [ueaBalance] = yield Promise.all([
                             this.pushClient.getBalance(ueaAddress),
                         ]);
+                        // UEA resolved (address, deployment status, balance, nonce)
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
                         // Determine USD to deposit via gateway (8 decimals) with caps: min=$1, max=$10
                         const oneUsd = push_chain_1.PushChain.utils.helpers.parseUnits('1', 8);
                         const tenUsd = push_chain_1.PushChain.utils.helpers.parseUnits('10', 8);
@@ -386,10 +346,48 @@ class Orchestrator {
                             depositUsd = oneUsd;
                         if (depositUsd > tenUsd)
                             throw new Error('Deposit value exceeds max $10 worth of native token');
-                        // Convert USD(8) -> native wei using the same pricing path as fee locking
+                        this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_02_02, depositUsd);
+                        // If SVM, clamp depositUsd to on-chain Config caps
+                        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
+                            const svmClient = new svm_client_1.SvmClient({
+                                rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
+                                    chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
+                            });
+                            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);
+                            try {
+                                const cfg = yield svmClient.readContract({
+                                    abi: abi_1.SVM_GATEWAY_IDL,
+                                    address: abi_1.SVM_GATEWAY_IDL.address,
+                                    functionName: 'config',
+                                    args: [configPda.toBase58()],
+                                });
+                                const minField = (_b = cfg.minCapUniversalTxUsd) !== null && _b !== void 0 ? _b : cfg.min_cap_universal_tx_usd;
+                                const maxField = (_c = cfg.maxCapUniversalTxUsd) !== null && _c !== void 0 ? _c : cfg.max_cap_universal_tx_usd;
+                                const minCapUsd = BigInt(minField.toString());
+                                const maxCapUsd = BigInt(maxField.toString());
+                                if (depositUsd < minCapUsd)
+                                    depositUsd = minCapUsd;
+                                // Add 20% safety margin to avoid BelowMinCap due to price drift
+                                const withMargin = (minCapUsd * BigInt(12)) / BigInt(10);
+                                if (depositUsd < withMargin)
+                                    depositUsd = withMargin;
+                                if (depositUsd > maxCapUsd)
+                                    depositUsd = maxCapUsd;
+                            }
+                            catch (_d) {
+                                // best-effort; fallback to previous bounds if read fails
+                            }
+                        }
+                        // Convert USD(8) -> native units using pricing path
                         const nativeTokenUsdPrice = yield new price_fetch_1.PriceFetch(this.rpcUrls).getPrice(chain); // 8 decimals
-                        const oneEthWei = push_chain_1.PushChain.utils.helpers.parseUnits('1', 18);
-                        const nativeAmount = (depositUsd * oneEthWei) / nativeTokenUsdPrice;
+                        const nativeDecimals = chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM ? 9 : 18;
+                        const oneNativeUnit = push_chain_1.PushChain.utils.helpers.parseUnits('1', nativeDecimals);
+                        // Ceil division to avoid rounding below min USD on-chain
+                        let nativeAmount = (depositUsd * oneNativeUnit + (nativeTokenUsdPrice - BigInt(1))) /
+                            nativeTokenUsdPrice;
+                        // Add 1 unit safety to avoid BelowMinCap from rounding differences
+                        nativeAmount = nativeAmount + BigInt(1);
                         const revertCFG = {
                             fundRecipient: this.universalSigner.account
                                 .address,
@@ -404,31 +402,37 @@ class Orchestrator {
                             if (mechanism !== 'approve') {
                                 throw new Error('Only ERC-20 tokens are supported for funds+payload on EVM; native and permit2 are not supported yet');
                             }
-                            yield this.ensureErc20Allowance(evmClient, tokenAddr, gatewayAddress, bridgeAmount);
+                            const evmClientEvm = evmClient;
+                            const gatewayAddressEvm = gatewayAddress;
+                            yield this.ensureErc20Allowance(evmClientEvm, tokenAddr, gatewayAddressEvm, bridgeAmount);
                         }
                         let txHash;
                         try {
                             if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
                                 const tokenAddr = execute.funds.token.address;
                                 // Compute EIP-712 signature for the universal payload and hash to bytes32
+                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_01);
                                 const ueaAddress = this.computeUEAOffchain();
-                                const eip712Signature = yield this.signUniversalPayload(universalPayload, 
-                                // execute.to
-                                ueaAddress);
+                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, ueaAddress, deployed);
+                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_01);
+                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_02);
+                                const eip712Signature = yield this.signUniversalPayload(universalPayload, ueaAddress);
+                                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_04_03);
                                 const eip712SignatureHex = typeof eip712Signature === 'string'
                                     ? eip712Signature
                                     : (0, viem_1.bytesToHex)(eip712Signature);
-                                const signatureData = (0, viem_1.keccak256)(eip712SignatureHex);
-                                txHash = yield evmClient.writeContract({
+                                const evmClientEvm = evmClient;
+                                const gatewayAddressEvm = gatewayAddress;
+                                txHash = yield evmClientEvm.writeContract({
                                     abi: abi_1.UNIVERSAL_GATEWAY_V0,
-                                    address: gatewayAddress,
+                                    address: gatewayAddressEvm,
                                     functionName: 'sendTxWithFunds',
                                     args: [
                                         tokenAddr,
                                         bridgeAmount,
                                         universalPayload,
                                         revertCFG,
-                                        signatureData,
+                                        eip712SignatureHex,
                                     ],
                                     signer: this.universalSigner,
                                     value: nativeAmount,
@@ -440,19 +444,23 @@ class Orchestrator {
                                     rpcUrls: this.rpcUrls[enums_1.CHAIN.SOLANA_DEVNET] ||
                                         chain_1.CHAIN_INFO[enums_1.CHAIN.SOLANA_DEVNET].defaultRPC,
                                 });
-                                const programId = new web3_js_1.PublicKey(abi_1.SVM_GATEWAY_IDL.metadata.address);
+                                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 [whitelistPda] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
+                                // whitelistPda already computed above
                                 const userPk = new web3_js_1.PublicKey(this.universalSigner.account.address);
                                 const priceUpdatePk = new web3_js_1.PublicKey('7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE');
                                 const isNative = mechanism === 'native' || execute.funds.token.symbol === 'SOL';
                                 const revertSvm2 = {
                                     fundRecipient: userPk,
-                                    revertMsg: Buffer.alloc(0),
+                                    revertMsg: Buffer.from([]),
                                 };
+                                // Compute signature for universal payload on SVM
+                                const ueaAddressSvm = this.computeUEAOffchain();
+                                const svmSignature = yield this.signUniversalPayload(universalPayload, ueaAddressSvm);
                                 if (isNative) {
                                     // Native SOL as bridge + gas
+                                    const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                                     txHash = yield svmClient.writeContract({
                                         abi: abi_1.SVM_GATEWAY_IDL,
                                         address: programId.toBase58(),
@@ -463,15 +471,15 @@ class Orchestrator {
                                             universalPayload,
                                             revertSvm2,
                                             nativeAmount,
-                                            Buffer.alloc(32),
+                                            Buffer.from(svmSignature),
                                         ],
                                         signer: this.universalSigner,
                                         accounts: {
                                             config: configPda,
                                             vault: vaultPda,
-                                            tokenWhitelist: whitelistPda,
-                                            userTokenAccount: web3_js_1.PublicKey.default, // not used for native
-                                            gatewayTokenAccount: web3_js_1.PublicKey.default, // not used for native
+                                            tokenWhitelist: whitelistPdaLocal,
+                                            userTokenAccount: userPk, // for native SOL, can be any valid account
+                                            gatewayTokenAccount: vaultPda, // for native SOL, can be any valid account
                                             user: userPk,
                                             priceUpdate: priceUpdatePk,
                                             bridgeToken: web3_js_1.PublicKey.default,
@@ -495,6 +503,7 @@ class Orchestrator {
                                         TOKEN_PROGRAM_ID.toBuffer(),
                                         mintPk.toBuffer(),
                                     ], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+                                    const [whitelistPdaLocal] = web3_js_1.PublicKey.findProgramAddressSync([(0, viem_1.stringToBytes)('whitelist')], programId);
                                     txHash = yield svmClient.writeContract({
                                         abi: abi_1.SVM_GATEWAY_IDL,
                                         address: programId.toBase58(),
@@ -505,13 +514,13 @@ class Orchestrator {
                                             universalPayload,
                                             revertSvm2,
                                             nativeAmount,
-                                            Buffer.alloc(32),
+                                            Buffer.from(svmSignature),
                                         ],
                                         signer: this.universalSigner,
                                         accounts: {
                                             config: configPda,
                                             vault: vaultPda,
-                                            tokenWhitelist: whitelistPda,
+                                            tokenWhitelist: whitelistPdaLocal,
                                             userTokenAccount: userAta,
                                             gatewayTokenAccount: vaultAta,
                                             user: userPk,
@@ -534,7 +543,8 @@ class Orchestrator {
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_02, txHash, bridgeAmount, execute.funds.token.decimals, symbol);
                         // Awaiting confirmations
                         if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
-                            yield this.waitForEvmConfirmationsWithCountdown(evmClient, txHash, 14, 300000);
+                            const evmClientEvm = evmClient;
+                            yield this.waitForEvmConfirmationsWithCountdown(evmClientEvm, txHash, 14, 300000);
                         }
                         else {
                             const svmClient = new svm_client_1.SvmClient({
@@ -548,11 +558,26 @@ class Orchestrator {
                             });
                         }
                         // Funds Flow: Confirmed on origin
+                        let feeLockTxHash = txHash;
+                        if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.SVM) {
+                            if (feeLockTxHash && !feeLockTxHash.startsWith('0x')) {
+                                // decode svm base58
+                                const decoded = anchor_1.utils.bytes.bs58.decode(feeLockTxHash);
+                                feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
+                            }
+                        }
+                        yield this.sendUniversalTx(deployed, feeLockTxHash);
                         this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
-                        // If UEA is not deployed yet, deploy it now using the gateway tx hash
-                        yield this.sendUniversalTx(deployed, txHash);
+                        // After sending Cosmos tx to Push Chain, query UniversalTx status (Sepolia only)
+                        if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
+                            const evmClientEvm = evmClient;
+                            const gatewayAddressEvm = gatewayAddress;
+                            yield this.queryUniversalTxStatusFromEvmGatewayTx(evmClientEvm, gatewayAddressEvm, txHash, 'sendTxWithFunds');
+                        }
                         if (chain_1.CHAIN_INFO[this.universalSigner.account.chain].vm === enums_1.VM.EVM) {
-                            const evmTx = yield evmClient.getTransaction(txHash);
+                            const evmClientEvm = evmClient;
+                            const evmTx = yield evmClientEvm.getTransaction(txHash);
+                            this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_07, bridgeAmount, execute.funds.token.decimals, symbol);
                             return yield this.transformToUniversalTxResponse(evmTx);
                         }
                         else {
@@ -652,7 +677,7 @@ class Orchestrator {
                 ]);
                 const isUEADeployed = code !== undefined;
                 const nonce = isUEADeployed ? yield this.getUEANonce(UEA) : BigInt(0);
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, UEA, isUEADeployed, funds, nonce);
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_03_02, UEA, isUEADeployed);
                 /**
                  * Compute Universal Payload Hash
                  */
@@ -660,7 +685,7 @@ class Orchestrator {
                 if (feeLockTxHash && !feeLockTxHash.startsWith('0x')) {
                     // decode svm base58
                     const decoded = anchor_1.utils.bytes.bs58.decode(feeLockTxHash);
-                    feeLockTxHash = (0, viem_1.bytesToHex)(Uint8Array.from(decoded));
+                    feeLockTxHash = (0, viem_1.bytesToHex)(new Uint8Array(decoded));
                 }
                 // Fee locking is required if UEA is not deployed OR insufficient funds
                 const feeLockingRequired = (!isUEADeployed || funds < requiredFunds) && !feeLockTxHash;
@@ -672,10 +697,12 @@ class Orchestrator {
                     if (!allowedChains.includes(this.universalSigner.account.chain)) {
                         throw new Error('Multicall is only enabled for Ethereum Sepolia and Solana Devnet');
                     }
-                    // For multicall payloads, ExecuteParams.to must be the sentinel '0x'
-                    // Note: This is distinct from each call's `to` inside MulticallCall[]
-                    if (execute.to !== '0x') {
-                        throw new Error('When using multicall, "to" must be a 0x-prefixed address');
+                    // For multicall, `to` must be the executor account (UEA) of the sender
+                    // i.e., PushChain.universal.account
+                    const expectedUea = this.computeUEAOffchain();
+                    const toAddr = (0, viem_1.getAddress)(execute.to);
+                    if (toAddr !== (0, viem_1.getAddress)(expectedUea)) {
+                        throw new Error('Multicall requires `to` to be the executor account (UEA) of the sender.');
                     }
                     // Normalize and validate calls
                     const normalizedCalls = execute.data.map((c) => ({
@@ -702,10 +729,8 @@ class Orchestrator {
                 else {
                     payloadData = (execute.data || '0x');
                 }
-                // Determine payload `to` value. For multicall sentinel '0x', encode as zero address.
-                const payloadTo = Array.isArray(execute.data)
-                    ? '0x0000000000000000000000000000000000000000'
-                    : execute.to;
+                // Determine payload `to` value. For multicall, `to` must be UEA, pass-through as-is.
+                const payloadTo = execute.to;
                 const universalPayload = JSON.parse(JSON.stringify({
                     to: payloadTo,
                     value: execute.value,
@@ -847,7 +872,7 @@ class Orchestrator {
                             systemProgram: web3_js_1.SystemProgram.programId,
                         },
                     });
-                    return anchor_1.utils.bytes.bs58.decode(txHash);
+                    return new Uint8Array(anchor_1.utils.bytes.bs58.decode(txHash));
                 }
                 default:
                     throw new Error(`Unsupported VM type: ${vm}`);
@@ -914,7 +939,7 @@ class Orchestrator {
                 owner: vm === enums_1.VM.EVM
                     ? address
                     : vm === enums_1.VM.SVM
-                        ? (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address))
+                        ? (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)))
                         : address,
             };
             const { cosmosAddress: signer } = this.pushClient.getSignerAddress();
@@ -1080,7 +1105,7 @@ class Orchestrator {
                         owner: vm === enums_1.VM.EVM
                             ? address
                             : vm === enums_1.VM.SVM
-                                ? (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address))
+                                ? (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)))
                                 : address,
                     },
                 ],
@@ -1104,7 +1129,7 @@ class Orchestrator {
             ownerKey = address;
         }
         else if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.SVM) {
-            ownerKey = (0, viem_1.bytesToHex)(anchor_1.utils.bytes.bs58.decode(address));
+            ownerKey = (0, viem_1.bytesToHex)(new Uint8Array(anchor_1.utils.bytes.bs58.decode(address)));
         }
         else {
             throw new Error(`Unsupported VM type: ${chain_1.CHAIN_INFO[chain].vm}`);
@@ -1262,19 +1287,24 @@ class Orchestrator {
     /**
      * Ensures we're on Sepolia, returns EVM client and gateway address.
      */
-    ensureSepoliaGateway() {
+    getOriginGatewayContext() {
         const chain = this.universalSigner.account.chain;
-        if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA) {
-            throw new Error('Funds + payload bridging is only supported on Ethereum Sepolia for now');
+        if (chain !== enums_1.CHAIN.ETHEREUM_SEPOLIA && chain !== enums_1.CHAIN.SOLANA_DEVNET) {
+            throw new Error('Funds + payload bridging is only supported on Ethereum Sepolia and Solana Devnet for now');
         }
-        const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
-        const rpcUrls = this.rpcUrls[chain] || defaultRPC;
-        const evmClient = new evm_client_1.EvmClient({ rpcUrls });
-        const gatewayAddress = lockerContract;
-        if (!gatewayAddress) {
-            throw new Error('Universal Gateway address not configured');
+        // For EVM (Sepolia), return client and gateway address. For SVM (Solana Devnet), only chain is needed here.
+        if (chain_1.CHAIN_INFO[chain].vm === enums_1.VM.EVM) {
+            const { defaultRPC, lockerContract } = chain_1.CHAIN_INFO[chain];
+            const rpcUrls = this.rpcUrls[chain] || defaultRPC;
+            const evmClient = new evm_client_1.EvmClient({ rpcUrls });
+            const gatewayAddress = lockerContract;
+            if (!gatewayAddress) {
+                throw new Error('Universal Gateway address not configured');
+            }
+            return { chain, evmClient, gatewayAddress };
         }
-        return { chain, evmClient, gatewayAddress };
+        // SVM path (Solana Devnet) does not require evmClient/gatewayAddress
+        return { chain };
     }
     /**
      * Computes UEA and fetches its nonce if deployed; returns 0 otherwise.
@@ -1320,7 +1350,7 @@ class Orchestrator {
                 maxPriorityFeePerGas: execute.maxPriorityFeePerGas || BigInt(0),
                 nonce,
                 deadline: execute.deadline || BigInt(9999999999),
-                vType: tx_1.VerificationType.universalTxVerification,
+                vType: tx_1.VerificationType.signedVerification,
             };
             return { payload: universalPayload, gasAmount };
         });
@@ -1545,6 +1575,59 @@ class Orchestrator {
         // invoke the user-provided callback
         this.progressHook(hookPayload);
     }
+    // Query Push Chain for UniversalTx status given an EVM gateway tx
+    queryUniversalTxStatusFromEvmGatewayTx(evmClient, gatewayAddress, txHash, fromBranch) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            try {
+                const receipt = yield evmClient.publicClient.getTransactionReceipt({
+                    hash: txHash,
+                });
+                const gatewayLogs = (receipt.logs || []).filter((l) => (l.address || '').toLowerCase() === gatewayAddress.toLowerCase());
+                const logIndexToUse = fromBranch === 'sendTxWithFunds' ? 1 : 0;
+                const firstLog = (gatewayLogs[logIndexToUse] ||
+                    ((_a = receipt.logs) === null || _a === void 0 ? void 0 : _a[logIndexToUse]));
+                const logIndexVal = (_b = firstLog === null || firstLog === void 0 ? void 0 : firstLog.logIndex) !== null && _b !== void 0 ? _b : 0;
+                const logIndexStr = typeof logIndexVal === 'bigint'
+                    ? logIndexVal.toString()
+                    : String(logIndexVal);
+                const chain = this.universalSigner.account.chain;
+                const { vm } = chain_1.CHAIN_INFO[chain];
+                const sourceChain = `${chain_1.VM_NAMESPACE[vm]}:${chain_1.CHAIN_INFO[chain].chainId}`;
+                // ID = sha256("${sourceChain}:${txHash}:${logIndex}") as hex string (no 0x)
+                const idInput = `${sourceChain}:${txHash}:${logIndexStr}`;
+                const idHex = (0, viem_1.sha256)((0, viem_1.stringToBytes)(idInput)).slice(2);
+                // Fetch UniversalTx via gRPC with a brief retry window
+                let universalTxObj;
+                for (let attempt = 0; attempt < 10; attempt++) {
+                    try {
+                        const universalTxResp = yield this.pushClient.getUniversalTxById(idHex);
+                        universalTxObj = universalTxResp === null || universalTxResp === void 0 ? void 0 : universalTxResp.universalTx;
+                        if (universalTxObj)
+                            break;
+                    }
+                    catch (error) {
+                        // ignore and retry
+                        console.log(error);
+                    }
+                    yield new Promise((r) => setTimeout(r, 1500));
+                }
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06, (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) || (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status));
+                this.printLog(`UniversalTx fetched via gRPC: ${JSON.stringify({
+                    gatewayTx: txHash,
+                    id: idHex,
+                    status: (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universalStatus) ||
+                        (universalTxObj === null || universalTxObj === void 0 ? void 0 : universalTxObj.universal_status),
+                }, this.bigintReplacer, 2)}`);
+                return universalTxObj;
+            }
+            catch (_c) {
+                // Best-effort; do not fail flow if PC query is unavailable
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_06);
+                return undefined;
+            }
+        });
+    }
     // Emit countdown updates while waiting for EVM confirmations
     waitForEvmConfirmationsWithCountdown(evmClient, txHash, confirmations, timeoutMs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -1563,7 +1646,8 @@ class Orchestrator {
                 if (currentBlock >= targetBlock)
                     return;
                 const remaining = Number(targetBlock - currentBlock);
-                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_03, remaining);
+                const completed = Math.max(1, confirmations - remaining + 1);
+                this.executeProgressHook(progress_hook_types_1.PROGRESS_HOOK.SEND_TX_06_04, completed, confirmations);
                 if (Date.now() - start > timeoutMs) {
                     throw new Error(`Timeout: transaction ${txHash} not confirmed with ${confirmations} confirmations within ${timeoutMs} ms`);
                 }