@layerzerolabs/lz-solana-sdk-v2 3.0.116 → 3.0.117

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @layerzerolabs/lz-solana-sdk-v2
 
+## 3.0.117
+
+### Patch Changes
+
+- fd54ee9: fix bugs that caused TypeScript SDK to behave differently from Rust contracts.
+- Updated dependencies [fd54ee9]
+  - @layerzerolabs/lz-corekit-solana@3.0.117
+  - @layerzerolabs/lz-definitions@3.0.117
+  - @layerzerolabs/lz-foundation@3.0.117
+  - @layerzerolabs/lz-serdes@3.0.117
+  - @layerzerolabs/lz-utilities@3.0.117
+  - @layerzerolabs/lz-v2-utilities@3.0.117
+
 ## 3.0.116
 
 ### Patch Changes

package/dist/index.cjs

@@ -5918,7 +5918,7 @@ var sendLibrarySetEventBeet = new beet159__namespace.BeetArgsStruct(
 // src/solita/endpoint.ts
 var EventEmitDiscriminator = "e445a52e51cb9a1d";
 var DefaultMessageLib = web314.PublicKey.default;
-var Endpoint = class {
+var Endpoint = class _Endpoint {
   /**
    * Creates an instance of the Endpoint class.
    *
@@ -6373,9 +6373,6 @@ var Endpoint = class {
     const sender = new web314.PublicKey(lzUtilities.arrayify(sender_));
     const receiver = lzV2Utilities.addressToBytes32(receiver_);
     const sendLibInfo = await this.getSendLibrary(connection, sender, dstEid);
-    if (!sendLibInfo?.programId) {
-      throw new Error("default send library not initialized or blocked message lib");
-    }
     const { msgLib, programId: owner } = sendLibInfo;
     const [sendLibraryInfo] = this.deriver.messageLibraryInfo(msgLib);
     const remainingAccounts = await msgLibProgram.getQuoteIXAccountMetaForCPI(connection, payer, path);
@@ -6421,9 +6418,6 @@ var Endpoint = class {
     const sender = new web314.PublicKey(lzUtilities.arrayify(sender_));
     const receiver = lzV2Utilities.addressToBytes32(receiver_);
     const info = await this.getSendLibrary(connection, sender, dstEid, commitmentOrConfig);
-    if (!info?.programId) {
-      throw new Error("default send library not initialized or blocked message lib");
-    }
     const sendLibrary = info.msgLib;
     const [sendLibraryInfo] = this.deriver.messageLibraryInfo(sendLibrary);
     const remainingAccounts = await msgLibProgram.getSendIXAccountMetaForCPI(connection, payer, path);
@@ -6879,7 +6873,7 @@ var Endpoint = class {
    * @param {Connection} connection - The connection to the Solana cluster.
    * @param {number} srcEid - The source endpoint ID.
    * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig] - The commitment level or account info configuration.
-   * @returns {Promise<{ msgLib: PublicKey; owner?: PublicKey } | null>} A promise that resolves to the default receive library or null if not found.
+   * @returns {Promise<{ msgLib: PublicKey; owner: PublicKey } | null>} A promise that resolves to the default receive library or null if not found.
    */
   async getDefaultReceiveLibrary(connection, srcEid, commitmentOrConfig) {
     const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid);
@@ -6889,14 +6883,16 @@ var Endpoint = class {
         defaultReceiveLibConfig,
         commitmentOrConfig
       );
-      const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig);
-      if (!messageLibInfo) {
-        return {
-          msgLib: defaultInfo.messageLib
-        };
+      let msgLibProgram;
+      if (_Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+        msgLibProgram = blocked_messagelib_exports.PROGRAM_ID;
+      } else {
+        const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig);
+        invariant3__default.default(messageLibInfo, "messageLibInfo should not be null");
+        msgLibProgram = messageLibInfo.owner;
       }
       return {
-        owner: messageLibInfo.owner,
+        owner: msgLibProgram,
         msgLib: defaultInfo.messageLib
       };
     } catch (e) {
@@ -6909,7 +6905,7 @@ var Endpoint = class {
    * @param {Connection} connection - The connection to the Solana cluster.
    * @param {number} dstEid - The destination endpoint ID.
    * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig] - The commitment level or account info configuration.
-   * @returns {Promise<{ msgLib: PublicKey; owner?: PublicKey } | null>} A promise that resolves to the default send library or null if not found.
+   * @returns {Promise<{ msgLib: PublicKey; owner: PublicKey } | null>} A promise that resolves to the default send library or null if not found.
    */
   async getDefaultSendLibrary(connection, dstEid, commitmentOrConfig) {
     const [defaultSendLibConfig] = this.deriver.defaultSendLibraryConfig(dstEid);
@@ -6919,14 +6915,16 @@ var Endpoint = class {
         defaultSendLibConfig,
         commitmentOrConfig
       );
-      const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig);
-      if (!messageLibInfo) {
-        return {
-          msgLib: defaultInfo.messageLib
-        };
+      let msgLibProgram;
+      if (_Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+        msgLibProgram = blocked_messagelib_exports.PROGRAM_ID;
+      } else {
+        const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig);
+        invariant3__default.default(messageLibInfo, "messageLibInfo should not be null");
+        msgLibProgram = messageLibInfo.owner;
       }
       return {
-        owner: messageLibInfo.owner,
+        owner: msgLibProgram,
         msgLib: defaultInfo.messageLib
       };
     } catch (e) {
@@ -6940,7 +6938,7 @@ var Endpoint = class {
    * @param {PublicKey} oappPda - The OApp PDA.
    * @param {number} dstEid - The destination endpoint ID.
    * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig='confirmed'] - The commitment level or account info configuration.
-   * @returns {Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean } | null>} A promise that resolves to the configured send library or null if not found.
+   * @returns {Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean } | null>} A promise that resolves to the configured send library or null if not found.
    */
   async getSendLibrary(connection, oappPda, dstEid, commitmentOrConfig = "confirmed") {
     const [sendLibConfig] = this.deriver.sendLibraryConfig(oappPda, dstEid);
@@ -6950,27 +6948,27 @@ var Endpoint = class {
       commitmentOrConfig
     );
     if (!defaultSendLibConfigBuf || !sendLibConfigBuf) {
-      console.warn("send library not initialized, return empty array");
-      return null;
+      throw new Error(
+        `Unable to find defaultSendLibraryConfig/sendLibraryConfig account at ${defaultSendLibConfig.toString()}/${sendLibConfig.toString()}`
+      );
     }
     const [sendLibConfigInfo] = SendLibraryConfig.fromAccountInfo(sendLibConfigBuf, 0);
     const [defaultSendLibConfigInfo] = SendLibraryConfig.fromAccountInfo(defaultSendLibConfigBuf, 0);
     const msgLib = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultSendLibConfigInfo.messageLib : sendLibConfigInfo.messageLib;
     const isDefault = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString();
-    const msgLibInfo = await connection.getAccountInfo(msgLib, commitmentOrConfig);
-    if (!msgLibInfo) {
-      return {
-        programId: void 0,
-        msgLib,
-        isDefault
-      };
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(msgLib)) {
+      msgLibProgram = blocked_messagelib_exports.PROGRAM_ID;
     } else {
-      return {
-        programId: msgLibInfo.owner,
-        msgLib,
-        isDefault
-      };
+      const msgLibAccountInfo = await connection.getAccountInfo(msgLib, commitmentOrConfig);
+      invariant3__default.default(msgLibAccountInfo, "msgLibAccountInfo should not be null");
+      msgLibProgram = msgLibAccountInfo.owner;
     }
+    return {
+      programId: msgLibProgram,
+      msgLib,
+      isDefault
+    };
   }
   /**
    * Gets the configured receive library for the app.
@@ -6983,49 +6981,37 @@ var Endpoint = class {
    */
   async getReceiveLibrary(connection, oappPda, srcEid, commitmentOrConfig) {
     const [receiveLibConfig] = this.deriver.receiveLibraryConfig(oappPda, srcEid);
-    const accountInfo = await connection.getAccountInfo(receiveLibConfig, commitmentOrConfig);
-    if (accountInfo == null) {
-      return null;
-    }
-    const [info] = ReceiveLibraryConfig.fromAccountInfo(accountInfo, 0);
-    if (info.messageLib.toString() == DefaultMessageLib.toString()) {
-      const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid);
-      const defaultInfo = await ReceiveLibraryConfig.fromAccountAddress(
-        connection,
-        defaultReceiveLibConfig,
-        commitmentOrConfig
+    const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid);
+    const [defaultReceiveLibConfigBuf, receiveLibConfigBuf] = await connection.getMultipleAccountsInfo(
+      [defaultReceiveLibConfig, receiveLibConfig],
+      commitmentOrConfig
+    );
+    if (!defaultReceiveLibConfigBuf || !receiveLibConfigBuf) {
+      throw new Error(
+        `Unable to find defaultReceiveLibraryConfig/receiveLibraryConfig account at ${defaultReceiveLibConfig.toString()}/${receiveLibConfig.toString()}`
       );
-      const messageLibInfo2 = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig);
-      if (messageLibInfo2) {
-        const { timeout: timeout2 } = defaultInfo;
-        if (timeout2) {
-          return {
-            programId: defaultInfo.messageLib,
-            msgLib: defaultInfo.messageLib,
-            isDefault: true,
-            timeout: { msgLib: timeout2.messageLib, expiry: BigInt(timeout2.expiry.toString()) }
-          };
-        }
-      }
-      return {
-        programId: messageLibInfo2?.owner,
-        msgLib: defaultInfo.messageLib,
-        isDefault: true,
-        timeout: null
-      };
     }
-    const messageLibInfo = await connection.getAccountInfo(info.messageLib, commitmentOrConfig);
-    invariant3__default.default(messageLibInfo, "messageLibInfo should not be null");
-    const { timeout } = info;
-    if (timeout) {
-      return {
-        programId: messageLibInfo.owner,
-        msgLib: info.messageLib,
-        isDefault: false,
-        timeout: { msgLib: timeout.messageLib, expiry: BigInt(timeout.expiry.toString()) }
-      };
+    const [receiveLibConfigInfo] = ReceiveLibraryConfig.fromAccountInfo(receiveLibConfigBuf, 0);
+    const [defaultReceiveLibConfigInfo] = ReceiveLibraryConfig.fromAccountInfo(
+      defaultReceiveLibConfigBuf,
+      0
+    );
+    const finalReceiveLibConfigInfo = receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultReceiveLibConfigInfo : receiveLibConfigInfo;
+    const { messageLib, timeout } = finalReceiveLibConfigInfo;
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(messageLib)) {
+      msgLibProgram = blocked_messagelib_exports.PROGRAM_ID;
+    } else {
+      const msgLibAccountInfo = await connection.getAccountInfo(messageLib, commitmentOrConfig);
+      invariant3__default.default(msgLibAccountInfo, "msgLibAccountInfo should not be null");
+      msgLibProgram = msgLibAccountInfo.owner;
     }
-    return { programId: messageLibInfo.owner, msgLib: info.messageLib, isDefault: false, timeout: null };
+    return {
+      programId: msgLibProgram,
+      msgLib: messageLib,
+      isDefault: receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString(),
+      timeout: timeout === null ? void 0 : { msgLib: timeout.messageLib, expiry: BigInt(timeout.expiry.toString()) }
+    };
   }
   // rename to a more generic name
   /**
@@ -7154,6 +7140,10 @@ var Endpoint = class {
       this.program
     );
   }
+  static checkIfBlockedMessageLib(msgLib) {
+    const [blockedMessageLib] = new MessageLibPDADeriver(blocked_messagelib_exports.PROGRAM_ID).messageLib();
+    return msgLib.toString() === blockedMessageLib.toString();
+  }
 };
 
 // src/solita/simple-message-lib.ts
@@ -17416,30 +17406,14 @@ var Uln = class {
     );
     invariant3__default.default(defaultSendConfigBuf, "defaultSendConfig not initialized");
     const [defaultSendConfigState] = SendConfig.fromAccountInfo(defaultSendConfigBuf);
-    let {
-      executor,
-      uln: { requiredDvns, optionalDvns }
-    } = defaultSendConfigState;
     const sendConfigState = sendConfigBuf ? SendConfig.fromAccountInfo(sendConfigBuf)[0] : null;
-    if (sendConfigState?.executor && !sendConfigState.executor.executor.equals(web314.PublicKey.default)) {
-      ({ executor } = sendConfigState);
-    }
-    if (sendConfigState && sendConfigState.uln.requiredDvns.length > 0) {
-      requiredDvns = sendConfigState.uln.requiredDvns.filter((p) => {
-        return !p.equals(web314.PublicKey.default);
-      });
-    }
-    if (sendConfigState && sendConfigState.uln.optionalDvns.length > 0) {
-      optionalDvns = sendConfigState.uln.optionalDvns.filter((p) => {
-        return !p.equals(web314.PublicKey.default);
-      });
-    }
+    const finalConfigState = this.getUlnConfigState(defaultSendConfigState, sendConfigState);
+    const finalExecutorConfigState = this.getExecutorConfigState(defaultSendConfigState, sendConfigState);
+    const { executor } = finalExecutorConfigState;
+    const { requiredDvns, optionalDvns } = finalConfigState;
     const dvns = requiredDvns.concat(optionalDvns);
-    const [executorBuf, ...dvnBuf] = await connection.getMultipleAccountsInfo(
-      [executor.executor, ...dvns],
-      commitment
-    );
-    invariant3__default.default(executorBuf, `executor:${executor.executor.toBase58()} not initialized`);
+    const [executorBuf, ...dvnBuf] = await connection.getMultipleAccountsInfo([executor, ...dvns], commitment);
+    invariant3__default.default(executorBuf, `executor:${executor.toBase58()} not initialized`);
     return {
       executor: {
         config: accounts_exports4.ExecutorConfig.fromAccountInfo(executorBuf)[0],
@@ -17829,16 +17803,6 @@ var Uln = class {
    * @throws {Error} If no DVN is found.
    */
   async getFinalReceiveConfigState(connection, receiver, eid, commitmentOrConfig = "confirmed") {
-    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(
@@ -17850,7 +17814,24 @@ var Uln = class {
     }
     const defaultConfigState = ReceiveConfig2.fromAccountInfo(defaultConfigInfo)[0];
     const customConfigState = customConfigInfo ? ReceiveConfig2.fromAccountInfo(customConfigInfo)[0] : null;
-    if (customConfigState == null || customConfigState.uln.confirmations == 0) {
+    const ulnConfigState = this.getUlnConfigState(defaultConfigState, customConfigState);
+    return ReceiveConfig2.fromArgs({
+      bump: defaultConfigState.bump,
+      uln: ulnConfigState
+    });
+  }
+  getUlnConfigState(defaultConfigState, customConfigState) {
+    const NIL_CONFIRMATIONS = "18446744073709551615";
+    const NIL_DVN_COUNT = "255";
+    const rtn_config = {
+      confirmations: 0,
+      requiredDvnCount: 0,
+      optionalDvnCount: 0,
+      optionalDvnThreshold: 0,
+      requiredDvns: [],
+      optionalDvns: []
+    };
+    if (customConfigState == null || customConfigState.uln.confirmations.toString() === "0") {
       rtn_config.confirmations = defaultConfigState.uln.confirmations;
     } else if (customConfigState.uln.confirmations.toString() !== NIL_CONFIRMATIONS) {
       rtn_config.confirmations = customConfigState.uln.confirmations;
@@ -17878,10 +17859,24 @@ var Uln = class {
     if (rtn_config.requiredDvnCount === 0 && rtn_config.optionalDvnCount === 0) {
       throw new Error("no dvn");
     }
-    return ReceiveConfig2.fromArgs({
-      bump: defaultConfigState.bump,
-      uln: rtn_config
-    });
+    return rtn_config;
+  }
+  getExecutorConfigState(defaultConfigState, customConfigState) {
+    const rtn_config = {
+      maxMessageSize: 0,
+      executor: web314.PublicKey.default
+    };
+    if (customConfigState == null || customConfigState.executor.executor.equals(web314.PublicKey.default)) {
+      rtn_config.executor = defaultConfigState.executor.executor;
+    } else {
+      rtn_config.executor = customConfigState.executor.executor;
+    }
+    if (customConfigState == null || customConfigState.executor.maxMessageSize === 0) {
+      rtn_config.maxMessageSize = defaultConfigState.executor.maxMessageSize;
+    } else {
+      rtn_config.maxMessageSize = customConfigState.executor.maxMessageSize;
+    }
+    return rtn_config;
   }
 };