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

package/dist/umi.d.mts

@@ -3466,11 +3466,11 @@ declare class Endpoint {
      * @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.
      */
     getDefaultReceiveLibrary(rpc: RpcInterface, srcEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        owner?: PublicKey;
+        owner: PublicKey;
     } | null>;
     /**
      * Gets the default send library.
@@ -3478,11 +3478,11 @@ declare class Endpoint {
      * @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.
      */
     getDefaultSendLibrary(rpc: RpcInterface, dstEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        owner?: PublicKey;
+        owner: PublicKey;
     } | null>;
     /**
      * Gets the configured send library for the app.
@@ -3491,11 +3491,11 @@ declare class Endpoint {
      * @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.
      */
     getSendLibrary(rpc: RpcInterface, oappPda: PublicKey, dstEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        programId?: PublicKey;
+        programId: PublicKey;
         isDefault: boolean;
     }>;
     /**
@@ -3505,11 +3505,11 @@ declare class Endpoint {
      * @param {PublicKey} oappPda - The OApp PDA.
      * @param {number} srcEid - The source endpoint ID.
      * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig] - The commitment level or account info configuration.
-     * @returns {Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
+     * @returns {Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
      */
     getReceiveLibrary(rpc: RpcInterface, oappPda: PublicKey, srcEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        programId?: PublicKey;
+        programId: PublicKey;
         isDefault: boolean;
         timeout?: {
             msgLib: PublicKey;
@@ -3581,6 +3581,7 @@ declare class Endpoint {
      * @returns {Promise<TransactionInstruction | null>} A promise that resolves to the transaction instruction or null if not needed.
      */
     transferAdmin(admin: Signer, newAdmin: PublicKey): WrappedInstruction;
+    static checkIfBlockedMessageLib(msgLib: PublicKey): boolean;
 }
 
 declare const endpoint_DefaultMessageLib: typeof DefaultMessageLib;
@@ -7684,7 +7685,8 @@ declare class Uln implements MessageLibInterface {
      */
     getFinalReceiveConfigState(rpc: RpcInterface, receiver: PublicKey, eid: number, commitment?: Commitment): Promise<UlnConfig>;
     getFinalSendConfigState(rpc: RpcInterface, sender: PublicKey, eid: number, commitment?: Commitment): Promise<UlnConfig>;
-    private getConfigState;
+    private getUlnConfigState;
+    private getExecutorConfigState;
 }
 
 type uln_InboundConfirmations = InboundConfirmations;

package/dist/umi.d.ts

@@ -3466,11 +3466,11 @@ declare class Endpoint {
      * @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.
      */
     getDefaultReceiveLibrary(rpc: RpcInterface, srcEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        owner?: PublicKey;
+        owner: PublicKey;
     } | null>;
     /**
      * Gets the default send library.
@@ -3478,11 +3478,11 @@ declare class Endpoint {
      * @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.
      */
     getDefaultSendLibrary(rpc: RpcInterface, dstEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        owner?: PublicKey;
+        owner: PublicKey;
     } | null>;
     /**
      * Gets the configured send library for the app.
@@ -3491,11 +3491,11 @@ declare class Endpoint {
      * @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.
      */
     getSendLibrary(rpc: RpcInterface, oappPda: PublicKey, dstEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        programId?: PublicKey;
+        programId: PublicKey;
         isDefault: boolean;
     }>;
     /**
@@ -3505,11 +3505,11 @@ declare class Endpoint {
      * @param {PublicKey} oappPda - The OApp PDA.
      * @param {number} srcEid - The source endpoint ID.
      * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig] - The commitment level or account info configuration.
-     * @returns {Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
+     * @returns {Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
      */
     getReceiveLibrary(rpc: RpcInterface, oappPda: PublicKey, srcEid: number, commitment?: Commitment): Promise<{
         msgLib: PublicKey;
-        programId?: PublicKey;
+        programId: PublicKey;
         isDefault: boolean;
         timeout?: {
             msgLib: PublicKey;
@@ -3581,6 +3581,7 @@ declare class Endpoint {
      * @returns {Promise<TransactionInstruction | null>} A promise that resolves to the transaction instruction or null if not needed.
      */
     transferAdmin(admin: Signer, newAdmin: PublicKey): WrappedInstruction;
+    static checkIfBlockedMessageLib(msgLib: PublicKey): boolean;
 }
 
 declare const endpoint_DefaultMessageLib: typeof DefaultMessageLib;
@@ -7684,7 +7685,8 @@ declare class Uln implements MessageLibInterface {
      */
     getFinalReceiveConfigState(rpc: RpcInterface, receiver: PublicKey, eid: number, commitment?: Commitment): Promise<UlnConfig>;
     getFinalSendConfigState(rpc: RpcInterface, sender: PublicKey, eid: number, commitment?: Commitment): Promise<UlnConfig>;
-    private getConfigState;
+    private getUlnConfigState;
+    private getExecutorConfigState;
 }
 
 type uln_InboundConfirmations = InboundConfirmations;

package/dist/umi.mjs

@@ -5,11 +5,11 @@ import { createDefaultProgramRepository } from '@metaplex-foundation/umi-program
 import { toWeb3JsPublicKey, fromWeb3JsPublicKey, toWeb3JsInstruction } from '@metaplex-foundation/umi-web3js-adapters';
 import * as web3 from '@solana/web3.js';
 import { TransactionInstruction } from '@solana/web3.js';
+import invariant3 from 'tiny-invariant';
 import { keccak_256, sha2_256 } from '@layerzerolabs/lz-foundation';
 import { arrayify } from '@layerzerolabs/lz-utilities';
 import { addressToBytes32, PacketV1Codec } from '@layerzerolabs/lz-v2-utilities';
 import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddress } from '@solana/spl-token';
-import invariant2 from 'tiny-invariant';
 import { fetchAllAddressLookupTable } from '@metaplex-foundation/mpl-toolbox';
 import { Environment } from '@layerzerolabs/lz-definitions';
 
@@ -5301,7 +5301,7 @@ var SIMPLE_MESSAGELIB_PROGRAM_ID = "6GsmxMTHAAiFKfemuM4zBjumTjNSX5CAiw4xSSXM2Toy
 // src/endpoint.ts
 var EventEmitDiscriminator = "e445a52e51cb9a1d";
 var DefaultMessageLib = defaultPublicKey();
-var Endpoint = class {
+var Endpoint = class _Endpoint {
   constructor(programId = ENDPOINT_PROGRAM_ID, rpc) {
     this.programId = programId;
     this.pda = new EndpointPDA(programId);
@@ -5777,9 +5777,6 @@ var Endpoint = class {
     const { path, msgLibProgram } = params;
     const { sender, dstEid, receiver } = path;
     const sendLibInfo = await this.getSendLibrary(rpc, sender, dstEid, commitment);
-    if (!sendLibInfo.programId) {
-      throw new Error("default send library not initialized or blocked message lib");
-    }
     const { msgLib, programId: owner } = sendLibInfo;
     const txBuilder = quote(
       { programs: this.programRepo },
@@ -5820,9 +5817,6 @@ var Endpoint = class {
     const { path, msgLibProgram } = params;
     const { sender, dstEid, receiver } = path;
     const info = await this.getSendLibrary(rpc, sender, dstEid, commitment);
-    if (!info.programId) {
-      throw new Error("default send library not initialized or blocked message lib");
-    }
     const sendLibrary = info.msgLib;
     const txBuilder = send(
       { programs: this.programRepo },
@@ -6111,7 +6105,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(rpc, srcEid, commitment = "confirmed") {
     const [defaultReceiveLibConfig] = this.pda.defaultReceiveLibraryConfig(srcEid);
@@ -6121,14 +6115,16 @@ var Endpoint = class {
     if (defaultInfo == null) {
       return null;
     }
-    const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment });
-    if (!messageLibInfo.exists) {
-      return {
-        msgLib: defaultInfo.messageLib
-      };
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+      msgLibProgram = blocked_messagelib_exports.BLOCKED_MESSAGELIB_PROGRAM_ID;
+    } else {
+      const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment });
+      invariant3(messageLibInfo.exists, "messageLibInfo should not be null");
+      msgLibProgram = messageLibInfo.owner;
     }
     return {
-      owner: messageLibInfo.owner,
+      owner: msgLibProgram,
       msgLib: defaultInfo.messageLib
     };
   }
@@ -6138,7 +6134,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(rpc, dstEid, commitment = "confirmed") {
     const [defaultSendLibConfig] = this.pda.defaultSendLibraryConfig(dstEid);
@@ -6146,14 +6142,16 @@ var Endpoint = class {
     if (defaultInfo == null) {
       return null;
     }
-    const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment });
-    if (!messageLibInfo.exists) {
-      return {
-        msgLib: defaultInfo.messageLib
-      };
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+      msgLibProgram = blocked_messagelib_exports.BLOCKED_MESSAGELIB_PROGRAM_ID;
+    } else {
+      const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment });
+      invariant3(messageLibInfo.exists, "messageLibInfo should not be null");
+      msgLibProgram = messageLibInfo.owner;
     }
     return {
-      owner: messageLibInfo.owner,
+      owner: msgLibProgram,
       msgLib: defaultInfo.messageLib
     };
   }
@@ -6164,7 +6162,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(rpc, oappPda, dstEid, commitment = "confirmed") {
     const [sendLibConfig] = this.pda.sendLibraryConfig(oappPda, dstEid);
@@ -6182,20 +6180,19 @@ var Endpoint = class {
     const defaultSendLibConfigInfo = deserializeSendLibraryConfig(defaultSendLibConfigBuf);
     const msgLib = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultSendLibConfigInfo.messageLib : sendLibConfigInfo.messageLib;
     const isDefault = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString();
-    const msgLibInfo = await rpc.getAccount(msgLib, { commitment });
-    if (!msgLibInfo.exists) {
-      return {
-        programId: void 0,
-        msgLib,
-        isDefault
-      };
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(msgLib)) {
+      msgLibProgram = blocked_messagelib_exports.BLOCKED_MESSAGELIB_PROGRAM_ID;
     } else {
-      return {
-        programId: msgLibInfo.owner,
-        msgLib,
-        isDefault
-      };
+      const msgLibInfo = await rpc.getAccount(msgLib, { commitment });
+      invariant3(msgLibInfo.exists, "msgLibInfo should not be null");
+      msgLibProgram = msgLibInfo.owner;
     }
+    return {
+      programId: msgLibProgram,
+      msgLib,
+      isDefault
+    };
   }
   /**
    * Gets the configured receive library for the app.
@@ -6204,7 +6201,7 @@ var Endpoint = class {
    * @param {PublicKey} oappPda - The OApp PDA.
    * @param {number} srcEid - The source endpoint ID.
    * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig] - The commitment level or account info configuration.
-   * @returns {Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
+   * @returns {Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean; timeout: { msgLib: PublicKey; expiry: bigint } | null } | null>} A promise that resolves to the configured receive library or null if not found.
    */
   async getReceiveLibrary(rpc, oappPda, srcEid, commitment = "confirmed") {
     const [receiveLibConfig] = this.pda.receiveLibraryConfig(oappPda, srcEid);
@@ -6223,21 +6220,20 @@ var Endpoint = class {
     const finalReceiveLibConfigInfo = receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultReceiveLibConfigInfo : receiveLibConfigInfo;
     const msgLib = finalReceiveLibConfigInfo.messageLib;
     const isDefault = receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString();
-    const msgLibInfo = await rpc.getAccount(msgLib, { commitment });
+    let msgLibProgram;
+    if (_Endpoint.checkIfBlockedMessageLib(msgLib)) {
+      msgLibProgram = blocked_messagelib_exports.BLOCKED_MESSAGELIB_PROGRAM_ID;
+    } else {
+      const msgLibInfo = await rpc.getAccount(msgLib, { commitment });
+      invariant3(msgLibInfo.exists, "msgLibInfo should not be null");
+      msgLibProgram = msgLibInfo.owner;
+    }
     const receiveTimeout = isSome(finalReceiveLibConfigInfo.timeout) ? {
       msgLib: finalReceiveLibConfigInfo.timeout.value.messageLib,
       expiry: finalReceiveLibConfigInfo.timeout.value.expiry
     } : void 0;
-    if (!msgLibInfo.exists) {
-      return {
-        programId: void 0,
-        msgLib,
-        isDefault,
-        timeout: receiveTimeout
-      };
-    }
     return {
-      programId: msgLibInfo.owner,
+      programId: msgLibProgram,
       msgLib,
       isDefault,
       timeout: receiveTimeout
@@ -6354,6 +6350,12 @@ var Endpoint = class {
       }
     ).items[0];
   }
+  static checkIfBlockedMessageLib(msgLib) {
+    const [blockedMessageLib] = new MessageLibPDA(
+      blocked_messagelib_exports.BLOCKED_MESSAGELIB_PROGRAM_ID
+    ).messageLib();
+    return msgLib.toString() === blockedMessageLib.toString();
+  }
 };
 
 // src/simple-message-lib.ts
@@ -10818,7 +10820,7 @@ async function lzReceive(rpc, payer, packet, callerParams = Uint8Array.from([0,
   };
   const receiverPubkey = publicKey(receiverBytes);
   const receiverInfo = await rpc.getAccount(receiverPubkey, { commitment });
-  invariant2(receiverInfo.exists, `Receiver account not found: ${receiverPubkey}`);
+  invariant3(receiverInfo.exists, `Receiver account not found: ${receiverPubkey}`);
   const receiverProgram = publicKey(receiverInfo.owner);
   let version4 = 1;
   let receiveTypesAccounts;
@@ -13116,9 +13118,9 @@ var Uln = class {
         }
       ).items[0];
     } else {
-      invariant2(isSome(sendUlnConfig), "sendUlnConfig is required");
-      invariant2(isSome(receiveUlnConfig), "receiveUlnConfig is required");
-      invariant2(isSome(executorConfig), "executorConfig is required");
+      invariant3(isSome(sendUlnConfig), "sendUlnConfig is required");
+      invariant3(isSome(receiveUlnConfig), "receiveUlnConfig is required");
+      invariant3(isSome(executorConfig), "executorConfig is required");
       return initDefaultConfig2(
         { programs: this.programRepo },
         {
@@ -13272,9 +13274,9 @@ var Uln = class {
     const { payer, tokenMint, tokenSource } = accounts;
     const { sender, dstEid } = path;
     const ulnState = await this.getSetting(rpc, commitment);
-    invariant2(ulnState !== null, "ULN not initialized");
-    invariant2(isSome(ulnState.treasury), "treasury not set");
-    invariant2(isSome(ulnState.treasury.value.lzToken), "lzToken treasury not set");
+    invariant3(ulnState !== null, "ULN not initialized");
+    invariant3(isSome(ulnState.treasury), "treasury not set");
+    invariant3(isSome(ulnState.treasury.value.lzToken), "lzToken treasury not set");
     const lzTokenTreasury = ulnState.treasury.value.lzToken.value.receiver;
     let txBuilder = sendWithLzToken2(
       { payer: createNoopSigner(payer), programs: this.programRepo },
@@ -13342,7 +13344,7 @@ var Uln = class {
     });
     const priceFeedInfos = await rpc.getAccounts(priceFeeds, { commitment });
     const priceFeedDict = priceFeedInfos.reduce((acc, info, i) => {
-      invariant2(info.exists, `priceFeed:${priceFeeds[i]} not initialized`);
+      invariant3(info.exists, `priceFeed:${priceFeeds[i]} not initialized`);
       acc.set(priceFeeds[i], info.owner);
       return acc;
     }, /* @__PURE__ */ new Map());
@@ -13378,38 +13380,25 @@ var Uln = class {
     const [defaultSendConfigBuf, sendConfigBuf] = await rpc.getAccounts([defaultSendConfig, sendConfig], {
       commitment
     });
-    invariant2(defaultSendConfigBuf.exists, "defaultSendConfig not initialized");
+    invariant3(defaultSendConfigBuf.exists, "defaultSendConfig not initialized");
     const defaultSendConfigState = deserializeSendConfig(defaultSendConfigBuf);
-    let {
-      executor,
-      uln: { requiredDvns, optionalDvns }
-    } = defaultSendConfigState;
     const sendConfigState = sendConfigBuf.exists ? deserializeSendConfig(sendConfigBuf) : null;
-    if (sendConfigState?.executor && sendConfigState.executor.executor !== defaultPublicKey()) {
-      ({ executor } = sendConfigState);
-    }
-    if (sendConfigState && sendConfigState.uln.requiredDvns.length > 0) {
-      requiredDvns = sendConfigState.uln.requiredDvns.filter((p) => {
-        return p !== defaultPublicKey();
-      });
-    }
-    if (sendConfigState && sendConfigState.uln.optionalDvns.length > 0) {
-      optionalDvns = sendConfigState.uln.optionalDvns.filter((p) => {
-        return p !== defaultPublicKey();
-      });
-    }
+    const finalConfigState = this.getUlnConfigState(defaultSendConfigState, sendConfigState);
+    const finalExecutorConfigState = this.getExecutorConfigState(defaultSendConfigState, sendConfigState);
+    const { requiredDvns, optionalDvns } = finalConfigState;
+    const { executor } = finalExecutorConfigState;
     const dvns = requiredDvns.concat(optionalDvns);
-    const [executorBuf, ...dvnBuf] = await rpc.getAccounts([executor.executor, ...dvns], {
+    const [executorBuf, ...dvnBuf] = await rpc.getAccounts([executor, ...dvns], {
       commitment
     });
-    invariant2(executorBuf.exists, `executor:${executor.executor} not initialized`);
+    invariant3(executorBuf.exists, `executor:${executor} not initialized`);
     return {
       executor: {
         config: accounts_exports4.deserializeExecutorConfig(executorBuf),
         owner: executorBuf.owner
       },
       dvns: dvnBuf.map((dvn, i) => {
-        invariant2(dvn.exists, `dvn:${dvns[i]} not initialized`);
+        invariant3(dvn.exists, `dvn:${dvns[i]} not initialized`);
         return {
           config: accounts_exports3.deserializeDvnConfig(dvn),
           owner: dvn.owner
@@ -13724,7 +13713,7 @@ var Uln = class {
     }
     const defaultConfigState = deserializeReceiveConfig2(defaultConfigInfo);
     const customConfigState = customConfigInfo.exists ? deserializeReceiveConfig2(customConfigInfo) : null;
-    return this.getConfigState(defaultConfigState, customConfigState);
+    return this.getUlnConfigState(defaultConfigState, customConfigState);
   }
   async getFinalSendConfigState(rpc, sender, eid, commitment = "confirmed") {
     const [defaultConfig] = this.pda.defaultSendConfig(eid);
@@ -13737,9 +13726,9 @@ var Uln = class {
     }
     const defaultConfigState = deserializeSendConfig(defaultConfigInfo);
     const customConfigState = customConfigInfo.exists ? deserializeSendConfig(customConfigInfo) : null;
-    return this.getConfigState(defaultConfigState, customConfigState);
+    return this.getUlnConfigState(defaultConfigState, customConfigState);
   }
-  getConfigState(defaultConfigState, customConfigState) {
+  getUlnConfigState(defaultConfigState, customConfigState) {
     const NIL_CONFIRMATIONS = "18446744073709551615";
     const NIL_DVN_COUNT = "255";
     const rtn_config = {
@@ -13780,6 +13769,23 @@ var Uln = class {
     }
     return rtn_config;
   }
+  getExecutorConfigState(defaultConfigState, customConfigState) {
+    const rtn_config = {
+      maxMessageSize: 0,
+      executor: defaultPublicKey()
+    };
+    if (customConfigState == null || customConfigState.executor.executor === defaultPublicKey()) {
+      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;
+  }
 };
 
 // src/pricefeed.ts
@@ -14807,7 +14813,7 @@ var SendHelper = class {
       [sendLibConfig, defaultSendLibConfig, simpleMsgLib, uln, ulnDefaultSendConfig, ulnSendConfig],
       commitment
     );
-    invariant2(defaultSendLibConfigBuf.exists && sendLibConfigBuf.exists, "endpoint send library not initialized");
+    invariant3(defaultSendLibConfigBuf.exists && sendLibConfigBuf.exists, "endpoint send library not initialized");
     const sendLibConfigInfo = endpoint_exports.accounts.deserializeSendLibraryConfig(sendLibConfigBuf);
     const defaultSendLibConfigInfo = endpoint_exports.accounts.deserializeSendLibraryConfig(defaultSendLibConfigBuf);
     const msgLib = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultSendLibConfigInfo.messageLib : sendLibConfigInfo.messageLib;
@@ -14873,7 +14879,7 @@ var SendHelper = class {
       [sendLibConfig, defaultSendLibConfig, simpleMsgLib, uln, ulnDefaultSendConfig, ulnSendConfig],
       commitment
     );
-    invariant2(defaultSendLibConfigBuf.exists && sendLibConfigBuf.exists, "endpoint send library not initialized");
+    invariant3(defaultSendLibConfigBuf.exists && sendLibConfigBuf.exists, "endpoint send library not initialized");
     const sendLibConfigInfo = endpoint_exports.accounts.deserializeSendLibraryConfig(sendLibConfigBuf);
     const defaultSendLibConfigInfo = endpoint_exports.accounts.deserializeSendLibraryConfig(defaultSendLibConfigBuf);
     const msgLib = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString() ? defaultSendLibConfigInfo.messageLib : sendLibConfigInfo.messageLib;
@@ -15056,7 +15062,7 @@ var SendHelper = class {
    * @returns {Promise<AccountMeta[]>} A promise that resolves to an array of account metadata.
    */
   async getUlnAccounts(rpc, payer, ulnInfo, ulnDefaultSendConfigInfo, ulnSendConfigInfo, quoteOrSend, commitment = "confirmed") {
-    invariant2(
+    invariant3(
       ulnInfo.accountInfo.exists && ulnDefaultSendConfigInfo.accountInfo.exists,
       "uln send library not initialized"
     );
@@ -15086,7 +15092,7 @@ var SendHelper = class {
       [executor.executor, ...dvnsKey],
       commitment
     );
-    invariant2(executorBuf.exists, `executor:${executor.executor} not initialized`);
+    invariant3(executorBuf.exists, `executor:${executor.executor} not initialized`);
     let executorAccounts, dvnAccounts;
     {
       const executor2 = {
@@ -15094,7 +15100,7 @@ var SendHelper = class {
         owner: executorBuf.owner
       };
       const dvns = dvnBuf.map((dvn, i) => {
-        invariant2(dvn.exists, `dvn:${dvnsKey[i]} not initialized`);
+        invariant3(dvn.exists, `dvn:${dvnsKey[i]} not initialized`);
         return {
           config: accounts_exports3.deserializeDvnConfig(dvn),
           owner: dvn.owner
@@ -15106,10 +15112,10 @@ var SendHelper = class {
       });
       const priceFeedInfos = await this.getMultipleAccountsInfo(rpc, priceFeeds, commitment);
       priceFeedInfos.forEach((info, i) => {
-        invariant2(info.exists, `priceFeed:${priceFeeds[i]} not initialized`);
+        invariant3(info.exists, `priceFeed:${priceFeeds[i]} not initialized`);
       });
       const executorPriceFeed = await this.getMultipleAccountsInfo(rpc, [executor2.config.priceFeed], commitment);
-      invariant2(executorPriceFeed[0].exists, `executor priceFeed:${executor2.config.priceFeed} not initialized`);
+      invariant3(executorPriceFeed[0].exists, `executor priceFeed:${executor2.config.priceFeed} not initialized`);
       executorAccounts = new Executor(executor2.owner).getQuoteIXAccountMetaForCPI(
         executor2.config.priceFeed,
         executorPriceFeed[0].owner,
@@ -15118,7 +15124,7 @@ var SendHelper = class {
       dvnAccounts = (await Promise.all(
         dvns.map(async (p, i) => {
           const dvnPriceFeed = await this.getMultipleAccountsInfo(rpc, [p.config.priceFeed], commitment);
-          invariant2(dvnPriceFeed[0].exists, `dvn priceFeed:${p.config.priceFeed} not initialized`);
+          invariant3(dvnPriceFeed[0].exists, `dvn priceFeed:${p.config.priceFeed} not initialized`);
           return new DVN(p.owner).getQuoteIXAccountMetaForCPI(
             p.config.priceFeed,
             dvnPriceFeed[0].owner,