@layerzerolabs/protocol-stellar-v2 0.2.21 → 0.2.23

package/sdk/test/suites/constants.ts

@@ -27,7 +27,13 @@ export const DVN_SIGNER = new Secp256k1KeyPair(
 // DVN configuration
 export const DVN_VID = 1;
 
-export const EID = 30400;
+// Two-chain EIDs for cross-chain testing
+export const EID_A = 30401; // Chain A
+export const EID_B = 30402; // Chain B
+
+// Legacy single EID (kept for backwards compatibility)
+export const EID = EID_A;
+
 export const NATIVE_TOKEN_ADDRESS = Asset.native().contractId(NETWORK_PASSPHRASE);
 export const ZRO_ASSET = new Asset('ZRO', DEFAULT_DEPLOYER.publicKey());
 export const ZRO_TOKEN_ADDRESS = ZRO_ASSET.contractId(NETWORK_PASSPHRASE);

package/sdk/test/suites/globalSetup.ts

@@ -17,7 +17,8 @@ import {
     DEFAULT_DEPLOYER,
     DVN_SIGNER,
     DVN_VID,
-    EID,
+    EID_A,
+    EID_B,
     EXECUTOR_ADMIN,
     NATIVE_TOKEN_ADDRESS,
     ZRO_TOKEN_ADDRESS,
@@ -25,7 +26,11 @@ import {
 import { deployContract } from './deploy';
 import { startStellarLocalnet, stopStellarLocalnet } from './localnet';
 
-export interface ProtocolAddresses {
+/**
+ * Addresses for a single chain's protocol contracts
+ */
+export interface ChainAddresses {
+    eid: number;
     endpointV2: string;
     uln302: string;
     sml: string;
@@ -38,7 +43,10 @@ export interface ProtocolAddresses {
     dvn: string;
 }
 
-export interface ProtocolClients {
+/**
+ * Clients for a single chain's protocol contracts
+ */
+interface ChainClients {
     endpointClient: EndpointClient;
     uln302Client: Uln302Client;
     smlClient: SMLClient;
@@ -51,21 +59,26 @@ export interface ProtocolClients {
     dvnClient: DvnClient;
 }
 
+/**
+ * Complete chain setup with addresses and clients
+ */
+interface ChainSetup {
+    addresses: ChainAddresses;
+    clients: ChainClients;
+}
+
 // Declare the injection key type for vitest
 declare module 'vitest' {
     export interface ProvidedContext {
-        protocolAddresses: ProtocolAddresses;
+        chainA: ChainAddresses;
+        chainB: ChainAddresses;
     }
 }
 
 /**
- * Deploy all protocol contracts and wire them together
- * Returns the deployed contract addresses
+ * Deploy all protocol contracts for a single chain
  */
-async function deployProtocolContracts(): Promise<{
-    addresses: ProtocolAddresses;
-    clients: ProtocolClients;
-}> {
+async function deployChainContracts(eid: number, chainLabel: string): Promise<ChainSetup> {
     const repoRoot = await getFullyQualifiedRepoRootPath();
     const wasmDir = path.join(
         repoRoot,
@@ -77,7 +90,8 @@ async function deployProtocolContracts(): Promise<{
         'release',
     );
 
-    const addresses: ProtocolAddresses = {
+    const addresses: ChainAddresses = {
+        eid,
         endpointV2: '',
         uln302: '',
         sml: '',
@@ -91,22 +105,22 @@ async function deployProtocolContracts(): Promise<{
     };
 
     // 1. Deploy Endpoint
-    console.log('🚀 Deploying Endpoint...');
+    console.log(`🚀 [${chainLabel}] Deploying Endpoint (EID: ${eid})...`);
     const endpointClient = await deployContract<EndpointClient>(
         EndpointClient,
         path.join(wasmDir, 'endpoint_v2.wasm'),
         {
-            eid: EID,
+            eid: eid,
             owner: DEFAULT_DEPLOYER.publicKey(),
             native_token: NATIVE_TOKEN_ADDRESS,
         },
         DEFAULT_DEPLOYER,
     );
     addresses.endpointV2 = endpointClient.options.contractId;
-    console.log('✅ Endpoint deployed:', addresses.endpointV2);
+    console.log(`✅ [${chainLabel}] Endpoint deployed:`, addresses.endpointV2);
 
     // 2. Deploy Treasury
-    console.log('🚀 Deploying Treasury...');
+    console.log(`🚀 [${chainLabel}] Deploying Treasury...`);
     const treasuryClient = await deployContract<TreasuryClient>(
         TreasuryClient,
         path.join(wasmDir, 'treasury.wasm'),
@@ -114,10 +128,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.treasury = treasuryClient.options.contractId;
-    console.log('✅ Treasury deployed:', addresses.treasury);
+    console.log(`✅ [${chainLabel}] Treasury deployed:`, addresses.treasury);
 
     // 3. Deploy ULN302
-    console.log('🚀 Deploying ULN302...');
+    console.log(`🚀 [${chainLabel}] Deploying ULN302...`);
     const uln302Client = await deployContract<Uln302Client>(
         Uln302Client,
         path.join(wasmDir, 'uln302.wasm'),
@@ -129,10 +143,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.uln302 = uln302Client.options.contractId;
-    console.log('✅ ULN302 deployed:', addresses.uln302);
+    console.log(`✅ [${chainLabel}] ULN302 deployed:`, addresses.uln302);
 
     // 4. Deploy SML (SimpleMessageLib)
-    console.log('🚀 Deploying SimpleMessageLib...');
+    console.log(`🚀 [${chainLabel}] Deploying SimpleMessageLib...`);
     const smlClient = await deployContract<SMLClient>(
         SMLClient,
         path.join(wasmDir, 'simple_message_lib.wasm'),
@@ -144,10 +158,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.sml = smlClient.options.contractId;
-    console.log('✅ SimpleMessageLib deployed:', addresses.sml);
+    console.log(`✅ [${chainLabel}] SimpleMessageLib deployed:`, addresses.sml);
 
     // 5. Deploy Price Feed
-    console.log('🚀 Deploying Price Feed...');
+    console.log(`🚀 [${chainLabel}] Deploying Price Feed...`);
     const priceFeedClient = await deployContract<PriceFeedClient>(
         PriceFeedClient,
         path.join(wasmDir, 'price_feed.wasm'),
@@ -158,10 +172,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.priceFeed = priceFeedClient.options.contractId;
-    console.log('✅ Price Feed deployed:', addresses.priceFeed);
+    console.log(`✅ [${chainLabel}] Price Feed deployed:`, addresses.priceFeed);
 
     // 6. Deploy Executor Fee Lib
-    console.log('🚀 Deploying Executor Fee Lib...');
+    console.log(`🚀 [${chainLabel}] Deploying Executor Fee Lib...`);
     const executorFeeLibClient = await deployContract<ExecutorFeeLibClient>(
         ExecutorFeeLibClient,
         path.join(wasmDir, 'executor_fee_lib.wasm'),
@@ -169,10 +183,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.executorFeeLib = executorFeeLibClient.options.contractId;
-    console.log('✅ Executor Fee Lib deployed:', addresses.executorFeeLib);
+    console.log(`✅ [${chainLabel}] Executor Fee Lib deployed:`, addresses.executorFeeLib);
 
     // 7. Deploy DVN Fee Lib
-    console.log('🚀 Deploying DVN Fee Lib...');
+    console.log(`🚀 [${chainLabel}] Deploying DVN Fee Lib...`);
     const dvnFeeLibClient = await deployContract<DvnFeeLibClient>(
         DvnFeeLibClient,
         path.join(wasmDir, 'dvn_fee_lib.wasm'),
@@ -180,10 +194,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.dvnFeeLib = dvnFeeLibClient.options.contractId;
-    console.log('✅ DVN Fee Lib deployed:', addresses.dvnFeeLib);
+    console.log(`✅ [${chainLabel}] DVN Fee Lib deployed:`, addresses.dvnFeeLib);
 
-    // 8. Deploy DVN
-    console.log('🚀 Deploying DVN...');
+    // 8. Deploy DVN (same signer for both chains)
+    console.log(`🚀 [${chainLabel}] Deploying DVN...`);
     const dvnClient = await deployContract<DvnClient>(
         DvnClient,
         path.join(wasmDir, 'dvn.wasm'),
@@ -201,10 +215,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.dvn = dvnClient.options.contractId;
-    console.log('✅ DVN deployed:', addresses.dvn);
+    console.log(`✅ [${chainLabel}] DVN deployed:`, addresses.dvn);
 
     // 9. Deploy Executor Helper
-    console.log('🚀 Deploying Executor Helper...');
+    console.log(`🚀 [${chainLabel}] Deploying Executor Helper...`);
     const executorHelperClient = await deployContract<ExecutorHelperClient>(
         ExecutorHelperClient,
         path.join(wasmDir, 'executor_helper.wasm'),
@@ -212,10 +226,10 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.executorHelper = executorHelperClient.options.contractId;
-    console.log('✅ Executor Helper deployed:', addresses.executorHelper);
+    console.log(`✅ [${chainLabel}] Executor Helper deployed:`, addresses.executorHelper);
 
     // 10. Deploy Executor (supports both ULN302 and SML)
-    console.log('🚀 Deploying Executor...');
+    console.log(`🚀 [${chainLabel}] Deploying Executor...`);
     const whitelist = [
         [addresses.executorHelper, 'native_drop_and_execute'],
         [addresses.executorHelper, 'execute'],
@@ -238,9 +252,9 @@ async function deployProtocolContracts(): Promise<{
         DEFAULT_DEPLOYER,
     );
     addresses.executor = executorClient.options.contractId;
-    console.log('✅ Executor deployed:', addresses.executor);
+    console.log(`✅ [${chainLabel}] Executor deployed:`, addresses.executor);
 
-    const clients: ProtocolClients = {
+    const clients: ChainClients = {
         endpointClient,
         uln302Client,
         smlClient,
@@ -257,47 +271,63 @@ async function deployProtocolContracts(): Promise<{
 }
 
 /**
- * Wire protocol contracts (register libraries, set defaults, configure workers)
+ * Wire a single chain's protocol contracts for cross-chain communication
+ *
+ * @param chain - The chain to wire (this chain)
+ * @param otherChain - The other chain (for cross-references)
+ * @param chainLabel - Label for logging
  */
-async function wireProtocolContracts(
-    addresses: ProtocolAddresses,
-    clients: ProtocolClients,
+async function wireChainContracts(
+    chain: ChainSetup,
+    otherChain: ChainSetup,
+    chainLabel: string,
 ): Promise<void> {
+    const { addresses, clients } = chain;
     const { endpointClient, uln302Client, priceFeedClient, executorClient, dvnClient } = clients;
 
-    console.log('🔗 Wiring protocol contracts...');
+    const thisEid = addresses.eid;
+    const otherEid = otherChain.addresses.eid;
+
+    console.log(
+        `\n🔗 [${chainLabel}] Wiring protocol contracts (EID: ${thisEid} ↔ ${otherEid})...`,
+    );
 
     // Register libraries
     await (await endpointClient.register_library({ new_lib: addresses.uln302 })).signAndSend();
     await (await endpointClient.register_library({ new_lib: addresses.sml })).signAndSend();
-    console.log('✅ Libraries registered (ULN302 + SML)');
+    console.log(`✅ [${chainLabel}] Libraries registered (ULN302 + SML)`);
 
     // Set ZRO token
     await (await endpointClient.set_zro({ zro: ZRO_TOKEN_ADDRESS })).signAndSend();
-    console.log('✅ ZRO token set');
+    console.log(`✅ [${chainLabel}] ZRO token set`);
+
+    // ========================================================================
+    // Configure for SENDING to the other chain (dst_eid = otherEid)
+    // ========================================================================
 
-    // Configure ULN302 executor config FIRST (so is_supported_eid returns true)
+    // ULN302 executor config for sending to other chain
     await (
         await uln302Client.set_default_executor_configs({
             params: [
                 {
-                    dst_eid: EID,
+                    dst_eid: otherEid,
                     config: { executor: addresses.executor, max_message_size: 10000 },
                 },
             ],
         })
     ).signAndSend();
-    console.log('✅ ULN302 executor config set');
+    console.log(`✅ [${chainLabel}] ULN302 executor config set for dst_eid=${otherEid}`);
 
-    // Configure ULN302 send/receive configs
+    // ULN302 send config: when sending to otherEid, use THIS chain's DVN for fee quoting
+    // (The DVN needs dst_config for the destination EID to calculate fees)
     await (
         await uln302Client.set_default_send_uln_configs({
             params: [
                 {
-                    eid: EID,
+                    eid: otherEid,
                     config: {
                         confirmations: 1n,
-                        required_dvns: [addresses.dvn],
+                        required_dvns: [addresses.dvn], // THIS chain's DVN (has dst_config for otherEid)
                         optional_dvns: [],
                         optional_dvn_threshold: 0,
                     },
@@ -305,15 +335,23 @@ async function wireProtocolContracts(
             ],
         })
     ).signAndSend();
+    console.log(
+        `✅ [${chainLabel}] ULN302 send config set for eid=${otherEid} (DVN: ${addresses.dvn})`,
+    );
+
+    // ========================================================================
+    // Configure for RECEIVING from the other chain (src_eid = otherEid)
+    // ========================================================================
 
+    // ULN302 receive config: when receiving from otherEid, THIS chain's DVN verifies
     await (
         await uln302Client.set_default_receive_uln_configs({
             params: [
                 {
-                    eid: EID,
+                    eid: otherEid,
                     config: {
                         confirmations: 1n,
-                        required_dvns: [addresses.dvn],
+                        required_dvns: [addresses.dvn], // THIS chain's DVN verifies incoming
                         optional_dvns: [],
                         optional_dvn_threshold: 0,
                     },
@@ -321,22 +359,30 @@ async function wireProtocolContracts(
             ],
         })
     ).signAndSend();
-    console.log('✅ ULN302 send/receive configs set');
+    console.log(
+        `✅ [${chainLabel}] ULN302 receive config set for eid=${otherEid} (DVN: ${addresses.dvn})`,
+    );
 
-    // NOW set default send/receive libraries to ULN302 (after configs are set)
+    // Set default send/receive libraries for the other chain
     await (
-        await endpointClient.set_default_send_library({ dst_eid: EID, new_lib: addresses.uln302 })
+        await endpointClient.set_default_send_library({
+            dst_eid: otherEid,
+            new_lib: addresses.uln302,
+        })
     ).signAndSend();
     await (
         await endpointClient.set_default_receive_library({
-            src_eid: EID,
+            src_eid: otherEid,
             new_lib: addresses.uln302,
             grace_period: 0n,
         })
     ).signAndSend();
-    console.log('✅ Default libraries set to ULN302');
+    console.log(`✅ [${chainLabel}] Default libraries set to ULN302 for eid=${otherEid}`);
+
+    // ========================================================================
+    // Configure Price Feed for both chains
+    // ========================================================================
 
-    // Configure Price Feed
     await (
         await priceFeedClient.set_price_ratio_denominator({ denominator: 100000000000000000000n })
     ).signAndSend();
@@ -347,13 +393,14 @@ async function wireProtocolContracts(
         })
     ).signAndSend();
 
-    const NORMALIZED_EID = EID % 30000;
+    // Set prices for the other chain
+    const NORMALIZED_OTHER_EID = otherEid % 30000;
     await (
         await priceFeedClient.set_price({
             price_updater: DEFAULT_DEPLOYER.publicKey(),
             prices: [
                 {
-                    eid: NORMALIZED_EID,
+                    eid: NORMALIZED_OTHER_EID,
                     price: {
                         gas_per_byte: 1,
                         gas_price_in_unit: 1n,
@@ -363,15 +410,18 @@ async function wireProtocolContracts(
             ],
         })
     ).signAndSend();
-    console.log('✅ Price Feed configured');
+    console.log(`✅ [${chainLabel}] Price Feed configured for eid=${otherEid}`);
+
+    // ========================================================================
+    // Configure Executor for sending to other chain
+    // ========================================================================
 
-    // Configure Executor
     await (
         await executorClient.set_dst_config({
             admin: DEFAULT_DEPLOYER.publicKey(),
             params: [
                 {
-                    dst_eid: EID,
+                    dst_eid: otherEid,
                     dst_config: {
                         floor_margin_usd: 0n,
                         lz_compose_base_gas: 50000n,
@@ -383,15 +433,18 @@ async function wireProtocolContracts(
             ],
         })
     ).signAndSend();
-    console.log('✅ Executor configured');
+    console.log(`✅ [${chainLabel}] Executor configured for dst_eid=${otherEid}`);
+
+    // ========================================================================
+    // Configure DVN for verifying packets going to other chain
+    // ========================================================================
 
-    // Configure DVN
     await (
         await dvnClient.set_dst_config({
             admin: DEFAULT_DEPLOYER.publicKey(),
             params: [
                 {
-                    dst_eid: EID,
+                    dst_eid: otherEid,
                     config: {
                         floor_margin_usd: 0n,
                         gas: 100000n,
@@ -401,14 +454,14 @@ async function wireProtocolContracts(
             ],
         })
     ).signAndSend();
-    console.log('✅ DVN configured');
+    console.log(`✅ [${chainLabel}] DVN configured for dst_eid=${otherEid}`);
 
-    console.log('🎉 Protocol wiring complete!');
+    console.log(`🎉 [${chainLabel}] Protocol wiring complete!`);
 }
 
 /**
  * Vitest Global Setup - runs ONCE before all test files
- * Uses vitest's provide() to share data in memory with test files
+ * Deploys two complete protocol stacks (Chain A and Chain B) for cross-chain testing
  */
 export default async function globalSetup({
     provide,
@@ -420,23 +473,36 @@ export default async function globalSetup({
     await startStellarLocalnet();
 
     console.log('\n========================================');
-    console.log('📦 GLOBAL SETUP: Deploying Protocol Contracts');
+    console.log('📦 GLOBAL SETUP: Deploying Protocol Contracts (Two Chains)');
     console.log('========================================\n');
 
-    const { addresses, clients } = await deployProtocolContracts();
+    // Deploy Chain A
+    console.log('\n--- CHAIN A (EID: ' + EID_A + ') ---');
+    const chainA = await deployChainContracts(EID_A, 'Chain A');
+
+    // Deploy Chain B
+    console.log('\n--- CHAIN B (EID: ' + EID_B + ') ---');
+    const chainB = await deployChainContracts(EID_B, 'Chain B');
 
     console.log('\n========================================');
-    console.log('🔗 GLOBAL SETUP: Wiring Protocol Contracts');
+    console.log('🔗 GLOBAL SETUP: Wiring Protocol Contracts (Cross-Chain)');
     console.log('========================================\n');
 
-    await wireProtocolContracts(addresses, clients);
+    // Wire Chain A to communicate with Chain B
+    await wireChainContracts(chainA, chainB, 'Chain A');
+
+    // Wire Chain B to communicate with Chain A
+    await wireChainContracts(chainB, chainA, 'Chain B');
 
-    // Provide addresses in memory for test files to access via inject()
-    provide('protocolAddresses', addresses);
-    console.log('\n✅ Protocol addresses provided to tests (in-memory)');
+    // Provide addresses for both chains to tests
+    provide('chainA', chainA.addresses);
+    provide('chainB', chainB.addresses);
+    console.log('\n✅ Chain addresses provided to tests (in-memory)');
+    console.log('   Chain A (EID ' + EID_A + '):', chainA.addresses.endpointV2);
+    console.log('   Chain B (EID ' + EID_B + '):', chainB.addresses.endpointV2);
 
     console.log('\n========================================');
-    console.log('✅ GLOBAL SETUP COMPLETE');
+    console.log('✅ GLOBAL SETUP COMPLETE (Two-Chain Cross-Chain Ready)');
     console.log('========================================\n');
 
     // Return teardown function

package/sdk/turbo.json

@@ -2,7 +2,7 @@
     "extends": ["//"],
     "tasks": {
         "build": {
-            "dependsOn": ["@layerzerolabs/protocol-stellar-v2#build", "^build"]
+            "dependsOn": ["^build"]
         }
     }
 }

package/tools/ts-bindings-gen/Cargo.toml

@@ -9,8 +9,8 @@ name = "ts-bindings-gen"
 path = "src/main.rs"
 
 [dependencies]
-anyhow = "1.0"
-soroban-spec-typescript = "23.0.3"
-sha2 = "0.10"
-base64 = "0.22"
+soroban-spec-typescript = { workspace = true }
+anyhow = { workspace = true }
+sha2 = { workspace = true }
+base64 = { workspace = true }
 

package/tools/ts-bindings-gen/src/main.rs

@@ -180,6 +180,10 @@ fn main() -> Result<()> {
   }"#,
         );
 
+        // Also replace 'options?: MethodOptions' with 'txnOptions?: MethodOptions' for the same reason
+        // This handles functions that use the MethodOptions type alias instead of inline options
+        let ts_code = ts_code.replace(", options?: MethodOptions)", ", txnOptions?: MethodOptions)");
+
         // Combine imports header + embedded WASM + generated code
         let complete_code = format!("{}{}{}", generate_imports_header(), wasm_embed, ts_code);
 

package/turbo.json

@@ -7,6 +7,9 @@
                 "target/wasm32v1-none/release/*.wasm",
                 "target/wasm32v1-none/release/*.d"
             ]
+        },
+        "test": {
+            "dependsOn": ["build", "lint"]
         }
     }
 }