@layerzerolabs/lz-solana-sdk-v2 2.3.32 → 2.3.34

package/dist/index.d.mts

@@ -6581,7 +6581,7 @@ declare class Endpoint {
         isDefault: boolean;
         timeout: {
             msgLib: PublicKey;
-            isValid: boolean;
+            expiry: bigint;
         } | null;
     } | null>;
     getInboundPayloadHash(connection: Connection, receiver: PublicKey, srcEid: number, sender: Uint8Array, nonce: number, _payloadHash: Uint8Array, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<PayloadHash | null>;
@@ -12887,6 +12887,7 @@ declare class Uln implements MessageLibInterface {
     getSendConfigState(connection: Connection, sender: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<SendConfig | null>;
     getDefaultReceiveConfigState(connection: Connection, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig | null>;
     getReceiveConfigState(connection: Connection, receiver: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig | null>;
+    getFinalReceiveConfigState(connection: Connection, receiver: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig>;
 }
 
 type uln_AtLeastOneDVNError = AtLeastOneDVNError;

package/dist/index.d.ts

@@ -6581,7 +6581,7 @@ declare class Endpoint {
         isDefault: boolean;
         timeout: {
             msgLib: PublicKey;
-            isValid: boolean;
+            expiry: bigint;
         } | null;
     } | null>;
     getInboundPayloadHash(connection: Connection, receiver: PublicKey, srcEid: number, sender: Uint8Array, nonce: number, _payloadHash: Uint8Array, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<PayloadHash | null>;
@@ -12887,6 +12887,7 @@ declare class Uln implements MessageLibInterface {
     getSendConfigState(connection: Connection, sender: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<SendConfig | null>;
     getDefaultReceiveConfigState(connection: Connection, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig | null>;
     getReceiveConfigState(connection: Connection, receiver: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig | null>;
+    getFinalReceiveConfigState(connection: Connection, receiver: PublicKey, eid: number, commitmentOrConfig?: Commitment | GetAccountInfoConfig): Promise<ReceiveConfig>;
 }
 
 type uln_AtLeastOneDVNError = AtLeastOneDVNError;

package/dist/index.mjs

@@ -9087,15 +9087,11 @@ var Endpoint = class {
       if (messageLibInfo2) {
         const { timeout: timeout2 } = defaultInfo;
         if (timeout2) {
-          const slot = await connection.getSlot();
-          const timestamp = await connection.getBlockTime(slot);
-          invariant5(timestamp, "timestamp should not be null");
-          const isValid = parseInt(timeout2.expiry.toString()) > timestamp;
           return {
             programId: defaultInfo.messageLib,
             msgLib: defaultInfo.messageLib,
             isDefault: true,
-            timeout: { msgLib: timeout2.messageLib, isValid }
+            timeout: { msgLib: timeout2.messageLib, expiry: BigInt(timeout2.expiry.toString()) }
           };
         }
       }
@@ -9110,15 +9106,11 @@ var Endpoint = class {
     invariant5(messageLibInfo, "messageLibInfo should not be null");
     const { timeout } = info;
     if (timeout) {
-      const slot = await connection.getSlot();
-      const timestamp = await connection.getBlockTime(slot);
-      invariant5(timestamp, "timestamp should not be null");
-      const isValid = parseInt(timeout.expiry.toString()) > timestamp;
       return {
         programId: messageLibInfo.owner,
         msgLib: info.messageLib,
         isDefault: false,
-        timeout: { msgLib: timeout.messageLib, isValid }
+        timeout: { msgLib: timeout.messageLib, expiry: BigInt(timeout.expiry.toString()) }
       };
     }
     return { programId: messageLibInfo.owner, msgLib: info.messageLib, isDefault: false, timeout: null };
@@ -19205,13 +19197,7 @@ var Uln = class {
     const [receiveConfig] = this.deriver.receiveConfig(srcEid, receiver);
     const [setting] = this.deriver.setting();
     const [msgLib] = this.deriver.messageLib();
-    let receiveConfigState = await this.getReceiveConfigState(connection, receiver, srcEid);
-    if (!receiveConfigState) {
-      receiveConfigState = await this.getDefaultReceiveConfigState(connection, srcEid);
-    }
-    if (!receiveConfigState) {
-      throw new Error("receive config not initialized");
-    }
+    const receiveConfigState = await this.getFinalReceiveConfigState(connection, receiver, srcEid);
     const headerHash = packet.headerHash();
     const headerHashBytes = Uint8Array.from(Buffer.from(headerHash.slice(2), "hex"));
     const confirmations = receiveConfigState.uln.requiredDvns.concat(receiveConfigState.uln.optionalDvns).map((p) => {
@@ -19349,6 +19335,61 @@ var Uln = class {
       return null;
     }
   }
+  async getFinalReceiveConfigState(connection, receiver, eid, commitmentOrConfig) {
+    const NIL_CONFIRMATIONS = "18446744073709551615";
+    const NIL_DVN_COUNT = "255";
+    const rtn_config = {
+      confirmations: 0,
+      requiredDvnCount: 0,
+      optionalDvnCount: 0,
+      optionalDvnThreshold: 0,
+      requiredDvns: [],
+      optionalDvns: []
+    };
+    const [defaultConfig] = this.deriver.defaultReceiveConfig(eid);
+    const [customConfig] = this.deriver.receiveConfig(eid, receiver);
+    const [defaultConfigInfo, customConfigInfo] = await connection.getMultipleAccountsInfo(
+      [defaultConfig, customConfig],
+      commitmentOrConfig
+    );
+    if (defaultConfigInfo == null) {
+      throw new Error(`please init default receive config first. ${defaultConfig.toBase58()}`);
+    }
+    const defaultConfigState = ReceiveConfig2.fromAccountInfo(defaultConfigInfo)[0];
+    const customConfigState = customConfigInfo ? ReceiveConfig2.fromAccountInfo(customConfigInfo)[0] : null;
+    if (customConfigState == null || customConfigState.uln.confirmations == 0) {
+      rtn_config.confirmations = defaultConfigState.uln.confirmations;
+    } else if (customConfigState.uln.confirmations.toString() !== NIL_CONFIRMATIONS) {
+      rtn_config.confirmations = customConfigState.uln.confirmations;
+    }
+    if (customConfigState == null || customConfigState.uln.requiredDvnCount == 0) {
+      if (defaultConfigState.uln.requiredDvnCount > 0) {
+        rtn_config.requiredDvns = defaultConfigState.uln.requiredDvns;
+        rtn_config.requiredDvnCount = defaultConfigState.uln.requiredDvnCount;
+      }
+    } else if (customConfigState.uln.requiredDvnCount.toString() !== NIL_DVN_COUNT) {
+      rtn_config.requiredDvns = customConfigState.uln.requiredDvns;
+      rtn_config.requiredDvnCount = customConfigState.uln.requiredDvnCount;
+    }
+    if (customConfigState == null || customConfigState.uln.optionalDvnCount == 0) {
+      if (defaultConfigState.uln.optionalDvnCount > 0) {
+        rtn_config.optionalDvns = defaultConfigState.uln.optionalDvns;
+        rtn_config.optionalDvnCount = defaultConfigState.uln.optionalDvnCount;
+        rtn_config.optionalDvnThreshold = defaultConfigState.uln.optionalDvnThreshold;
+      }
+    } else if (customConfigState.uln.optionalDvnCount.toString() !== NIL_DVN_COUNT) {
+      rtn_config.optionalDvns = customConfigState.uln.optionalDvns;
+      rtn_config.optionalDvnCount = customConfigState.uln.optionalDvnCount;
+      rtn_config.optionalDvnThreshold = customConfigState.uln.optionalDvnThreshold;
+    }
+    if (rtn_config.requiredDvnCount === 0 && rtn_config.optionalDvnCount === 0) {
+      throw new Error("no dvn");
+    }
+    return ReceiveConfig2.fromArgs({
+      bump: defaultConfigState.bump,
+      uln: rtn_config
+    });
+  }
 };
 
 // src/pricefeed.ts