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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-solana-sdk-v2",
-  "version": "3.0.116",
+  "version": "3.0.117",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -39,12 +39,12 @@
     "test-uln": "TEST_SCOPES=uln anchor test --skip-build"
   },
   "dependencies": {
-    "@layerzerolabs/lz-corekit-solana": "^3.0.116",
-    "@layerzerolabs/lz-definitions": "^3.0.116",
-    "@layerzerolabs/lz-foundation": "^3.0.116",
-    "@layerzerolabs/lz-serdes": "^3.0.116",
-    "@layerzerolabs/lz-utilities": "^3.0.116",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.116",
+    "@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",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/mpl-toolbox": "^0.9.2",
@@ -67,8 +67,8 @@
     "@kinobi-so/renderers": "^0.21.3",
     "@kinobi-so/renderers-js-umi": "^0.21.6",
     "@layerzerolabs/layerzero-v2-solana": "^0.0.0",
-    "@layerzerolabs/tsup-config-next": "^3.0.116",
-    "@layerzerolabs/typescript-config-next": "^3.0.116",
+    "@layerzerolabs/tsup-config-next": "^3.0.117",
+    "@layerzerolabs/typescript-config-next": "^3.0.117",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@types/bn.js": "^5.1.5",
     "@types/chai": "^4.3.11",

package/src/endpoint.ts

@@ -21,12 +21,14 @@ import {
 import { createDefaultProgramRepository } from '@metaplex-foundation/umi-program-repository'
 import { toWeb3JsPublicKey } from '@metaplex-foundation/umi-web3js-adapters'
 import { TransactionInstruction } from '@solana/web3.js'
+import invariant from 'tiny-invariant'
 
 import { keccak_256 } from '@layerzerolabs/lz-foundation'
 import { arrayify } from '@layerzerolabs/lz-utilities'
 import { PacketV1Codec, addressToBytes32 } from '@layerzerolabs/lz-v2-utilities'
 
 import {
+    BlockedMessageLibProgram,
     MessageLibInterface,
     SetConfigType,
     SimpleMessageLibProgram,
@@ -635,9 +637,6 @@ export class Endpoint {
         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 = instructions.quote(
             { programs: this.programRepo },
@@ -690,9 +689,6 @@ export class Endpoint {
         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 = instructions.send(
             { programs: this.programRepo },
@@ -1022,13 +1018,13 @@ export 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.
      */
     async getDefaultReceiveLibrary(
         rpc: RpcInterface,
         srcEid: number,
         commitment: Commitment = 'confirmed'
-    ): Promise<{ msgLib: PublicKey; owner?: PublicKey } | null> {
+    ): Promise<{ msgLib: PublicKey; owner: PublicKey } | null> {
         const [defaultReceiveLibConfig] = this.pda.defaultReceiveLibraryConfig(srcEid)
 
         const defaultInfo = await accounts.safeFetchReceiveLibraryConfig({ rpc }, defaultReceiveLibConfig, {
@@ -1037,15 +1033,18 @@ export class Endpoint {
         if (defaultInfo == null) {
             return null
         }
-        const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment })
-        // notice: BlockedMessageLib is not initialized its PDA, so it will be null if defaultInfo.messageLib is BlockedMessageLib
-        if (!messageLibInfo.exists) {
-            return {
-                msgLib: defaultInfo.messageLib,
-            }
+
+        let msgLibProgram: PublicKey | undefined
+
+        if (Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+            msgLibProgram = BlockedMessageLibProgram.BLOCKED_MESSAGELIB_PROGRAM_ID
+        } else {
+            const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment })
+            invariant(messageLibInfo.exists, 'messageLibInfo should not be null')
+            msgLibProgram = messageLibInfo.owner
         }
         return {
-            owner: messageLibInfo.owner,
+            owner: msgLibProgram,
             msgLib: defaultInfo.messageLib,
         }
     }
@@ -1056,28 +1055,29 @@ export 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.
      */
     async getDefaultSendLibrary(
         rpc: RpcInterface,
         dstEid: number,
         commitment: Commitment = 'confirmed'
-    ): Promise<{ msgLib: PublicKey; owner?: PublicKey } | null> {
+    ): Promise<{ msgLib: PublicKey; owner: PublicKey } | null> {
         const [defaultSendLibConfig] = this.pda.defaultSendLibraryConfig(dstEid)
 
         const defaultInfo = await accounts.safeFetchSendLibraryConfig({ rpc }, defaultSendLibConfig, { commitment })
         if (defaultInfo == null) {
             return null
         }
-        const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment })
-        // notice: BlockedMessageLib is not initialized its PDA, so it will be null if defaultInfo.messageLib is BlockedMessageLib
-        if (!messageLibInfo.exists) {
-            return {
-                msgLib: defaultInfo.messageLib,
-            }
+        let msgLibProgram: PublicKey | undefined
+        if (Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+            msgLibProgram = BlockedMessageLibProgram.BLOCKED_MESSAGELIB_PROGRAM_ID
+        } else {
+            const messageLibInfo = await rpc.getAccount(defaultInfo.messageLib, { commitment })
+            invariant(messageLibInfo.exists, 'messageLibInfo should not be null')
+            msgLibProgram = messageLibInfo.owner
         }
         return {
-            owner: messageLibInfo.owner,
+            owner: msgLibProgram,
             msgLib: defaultInfo.messageLib,
         }
     }
@@ -1089,14 +1089,14 @@ export 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.
      */
     async getSendLibrary(
         rpc: RpcInterface,
         oappPda: PublicKey,
         dstEid: number,
         commitment: Commitment = 'confirmed'
-    ): Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean }> {
+    ): Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean }> {
         const [sendLibConfig] = this.pda.sendLibraryConfig(oappPda, dstEid)
         const [defaultSendLibConfig] = this.pda.defaultSendLibraryConfig(dstEid)
         const [defaultSendLibConfigBuf, sendLibConfigBuf] = await rpc.getAccounts(
@@ -1115,21 +1115,18 @@ export class Endpoint {
                 ? defaultSendLibConfigInfo.messageLib
                 : sendLibConfigInfo.messageLib
         const isDefault = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString()
-        const msgLibInfo = await rpc.getAccount(msgLib, { commitment })
-
-        // notice: BlockedMessageLib is not initialized its PDA, so programId will be null if msgLib is BlockedMessageLib
-        if (!msgLibInfo.exists) {
-            return {
-                programId: undefined,
-                msgLib,
-                isDefault,
-            }
+        let msgLibProgram: PublicKey | undefined
+        if (Endpoint.checkIfBlockedMessageLib(msgLib)) {
+            msgLibProgram = BlockedMessageLibProgram.BLOCKED_MESSAGELIB_PROGRAM_ID
         } else {
-            return {
-                programId: msgLibInfo.owner,
-                msgLib,
-                isDefault,
-            }
+            const msgLibInfo = await rpc.getAccount(msgLib, { commitment })
+            invariant(msgLibInfo.exists, 'msgLibInfo should not be null')
+            msgLibProgram = msgLibInfo.owner
+        }
+        return {
+            programId: msgLibProgram,
+            msgLib,
+            isDefault,
         }
     }
 
@@ -1140,7 +1137,7 @@ export 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.
      */
     async getReceiveLibrary(
         rpc: RpcInterface,
@@ -1148,8 +1145,8 @@ export class Endpoint {
         srcEid: number,
         commitment: Commitment = 'confirmed'
     ): Promise<{
-        msgLib: PublicKey // message library pda, it might be null if the message lib is blocked
-        programId?: PublicKey
+        msgLib: PublicKey
+        programId: PublicKey
         isDefault: boolean
         timeout?: { msgLib: PublicKey; expiry: bigint }
     }> {
@@ -1172,26 +1169,23 @@ export class Endpoint {
                 : receiveLibConfigInfo
         const msgLib = finalReceiveLibConfigInfo.messageLib
         const isDefault = receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString()
-        const msgLibInfo = await rpc.getAccount(msgLib, { commitment })
-
+        let msgLibProgram: PublicKey | undefined
+        if (Endpoint.checkIfBlockedMessageLib(msgLib)) {
+            msgLibProgram = BlockedMessageLibProgram.BLOCKED_MESSAGELIB_PROGRAM_ID
+        } else {
+            const msgLibInfo = await rpc.getAccount(msgLib, { commitment })
+            invariant(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,
               }
             : undefined
-        // notice: BlockedMessageLib is not initialized its PDA, so programId will be undefined if msgLib is BlockedMessageLib
-        if (!msgLibInfo.exists) {
-            return {
-                programId: undefined,
-                msgLib,
-                isDefault,
-                timeout: receiveTimeout,
-            }
-        }
 
         return {
-            programId: msgLibInfo.owner,
+            programId: msgLibProgram,
             msgLib,
             isDefault,
             timeout: receiveTimeout,
@@ -1344,4 +1338,11 @@ export class Endpoint {
             }
         ).items[0]
     }
+
+    static checkIfBlockedMessageLib(msgLib: PublicKey): boolean {
+        const [blockedMessageLib] = new MessageLibPDA(
+            BlockedMessageLibProgram.BLOCKED_MESSAGELIB_PROGRAM_ID
+        ).messageLib()
+        return msgLib.toString() === blockedMessageLib.toString()
+    }
 }

package/src/solita/endpoint.ts

@@ -14,6 +14,7 @@ import { arrayify } from '@layerzerolabs/lz-utilities'
 import { PacketV1Codec, addressToBytes32 } from '@layerzerolabs/lz-v2-utilities'
 
 import {
+    BlockedMessageLibProgram,
     MessageLibInterface,
     SetConfigType,
     SimpleMessageLibProgram,
@@ -587,9 +588,6 @@ export class Endpoint {
         const sender = new PublicKey(arrayify(sender_))
         const receiver = 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)
@@ -644,9 +642,6 @@ export class Endpoint {
         const sender = new PublicKey(arrayify(sender_))
         const receiver = 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)
@@ -1158,13 +1153,13 @@ export 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.
      */
     async getDefaultReceiveLibrary(
         connection: Connection,
         srcEid: number,
         commitmentOrConfig?: Commitment | GetAccountInfoConfig
-    ): Promise<{ msgLib: PublicKey; owner?: PublicKey } | null> {
+    ): Promise<{ msgLib: PublicKey; owner: PublicKey } | null> {
         const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid)
         try {
             const defaultInfo = await accounts.ReceiveLibraryConfig.fromAccountAddress(
@@ -1172,15 +1167,17 @@ export class Endpoint {
                 defaultReceiveLibConfig,
                 commitmentOrConfig
             )
-            const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig)
-            // notice: BlockedMessageLib is not initialized its PDA, so it will be null if defaultInfo.messageLib is BlockedMessageLib
-            if (!messageLibInfo) {
-                return {
-                    msgLib: defaultInfo.messageLib,
-                }
+            let msgLibProgram: PublicKey | undefined
+
+            if (Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+                msgLibProgram = BlockedMessageLibProgram.PROGRAM_ID
+            } else {
+                const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig)
+                invariant(messageLibInfo, 'messageLibInfo should not be null')
+                msgLibProgram = messageLibInfo.owner
             }
             return {
-                owner: messageLibInfo.owner,
+                owner: msgLibProgram,
                 msgLib: defaultInfo.messageLib,
             }
         } catch (e) {
@@ -1194,13 +1191,13 @@ export 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.
      */
     async getDefaultSendLibrary(
         connection: Connection,
         dstEid: number,
         commitmentOrConfig?: Commitment | GetAccountInfoConfig
-    ): Promise<{ msgLib: PublicKey; owner?: PublicKey } | null> {
+    ): Promise<{ msgLib: PublicKey; owner: PublicKey } | null> {
         const [defaultSendLibConfig] = this.deriver.defaultSendLibraryConfig(dstEid)
         try {
             const defaultInfo = await accounts.SendLibraryConfig.fromAccountAddress(
@@ -1208,15 +1205,16 @@ export class Endpoint {
                 defaultSendLibConfig,
                 commitmentOrConfig
             )
-            const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig)
-            // notice: BlockedMessageLib is not initialized its PDA, so it will be null if defaultInfo.messageLib is BlockedMessageLib
-            if (!messageLibInfo) {
-                return {
-                    msgLib: defaultInfo.messageLib,
-                }
+            let msgLibProgram: PublicKey | undefined
+            if (Endpoint.checkIfBlockedMessageLib(defaultInfo.messageLib)) {
+                msgLibProgram = BlockedMessageLibProgram.PROGRAM_ID
+            } else {
+                const messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig)
+                invariant(messageLibInfo, 'messageLibInfo should not be null')
+                msgLibProgram = messageLibInfo.owner
             }
             return {
-                owner: messageLibInfo.owner,
+                owner: msgLibProgram,
                 msgLib: defaultInfo.messageLib,
             }
         } catch (e) {
@@ -1231,14 +1229,14 @@ export 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.
      */
     async getSendLibrary(
         connection: Connection,
         oappPda: PublicKey,
         dstEid: number,
         commitmentOrConfig: Commitment | GetAccountInfoConfig = 'confirmed'
-    ): Promise<{ msgLib: PublicKey; programId?: PublicKey; isDefault: boolean } | null> {
+    ): Promise<{ msgLib: PublicKey; programId: PublicKey; isDefault: boolean }> {
         const [sendLibConfig] = this.deriver.sendLibraryConfig(oappPda, dstEid)
         const [defaultSendLibConfig] = this.deriver.defaultSendLibraryConfig(dstEid)
         const [defaultSendLibConfigBuf, sendLibConfigBuf] = await connection.getMultipleAccountsInfo(
@@ -1246,8 +1244,9 @@ export class Endpoint {
             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] = accounts.SendLibraryConfig.fromAccountInfo(sendLibConfigBuf, 0)
         const [defaultSendLibConfigInfo] = accounts.SendLibraryConfig.fromAccountInfo(defaultSendLibConfigBuf, 0)
@@ -1256,21 +1255,18 @@ export class Endpoint {
                 ? defaultSendLibConfigInfo.messageLib
                 : sendLibConfigInfo.messageLib
         const isDefault = sendLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString()
-        const msgLibInfo = await connection.getAccountInfo(msgLib, commitmentOrConfig)
-
-        // notice: BlockedMessageLib is not initialized its PDA, so it will be null if msgLib is BlockedMessageLib
-        if (!msgLibInfo) {
-            return {
-                programId: undefined,
-                msgLib,
-                isDefault,
-            }
+        let msgLibProgram: PublicKey | undefined
+        if (Endpoint.checkIfBlockedMessageLib(msgLib)) {
+            msgLibProgram = BlockedMessageLibProgram.PROGRAM_ID
         } else {
-            return {
-                programId: msgLibInfo.owner,
-                msgLib,
-                isDefault,
-            }
+            const msgLibAccountInfo = await connection.getAccountInfo(msgLib, commitmentOrConfig)
+            invariant(msgLibAccountInfo, 'msgLibAccountInfo should not be null')
+            msgLibProgram = msgLibAccountInfo.owner
+        }
+        return {
+            programId: msgLibProgram,
+            msgLib,
+            isDefault,
         }
     }
 
@@ -1290,60 +1286,52 @@ export class Endpoint {
         commitmentOrConfig?: Commitment | GetAccountInfoConfig
     ): Promise<{
         msgLib: PublicKey // message library pda, it might be null if the message lib is blocked
-        programId?: PublicKey
+        programId: PublicKey
         isDefault: boolean
-        timeout: { msgLib: PublicKey; expiry: bigint } | null
-    } | null> {
+        timeout?: { msgLib: PublicKey; expiry: bigint }
+    }> {
         const [receiveLibConfig] = this.deriver.receiveLibraryConfig(oappPda, srcEid)
-        const accountInfo = await connection.getAccountInfo(receiveLibConfig, commitmentOrConfig)
-        if (accountInfo == null) {
-            // throw new Error(`Unable to find MessageLibConfig account at ${sendLibPda}`)
-            return null
-        }
-        const [info] = accounts.ReceiveLibraryConfig.fromAccountInfo(accountInfo, 0)
-        if (info.messageLib.toString() == DefaultMessageLib.toString()) {
-            // use default message lib
-            const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid)
-            const defaultInfo = await accounts.ReceiveLibraryConfig.fromAccountAddress(
-                connection,
-                defaultReceiveLibConfig,
-                commitmentOrConfig
+        const [defaultReceiveLibConfig] = this.deriver.defaultReceiveLibraryConfig(srcEid)
+        // const accountInfo = await connection.getAccountInfo(receiveLibConfig, commitmentOrConfig)
+        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 messageLibInfo = await connection.getAccountInfo(defaultInfo.messageLib, commitmentOrConfig)
-            if (messageLibInfo) {
-                const { timeout } = defaultInfo
-                if (timeout) {
-                    return {
-                        programId: defaultInfo.messageLib,
-                        msgLib: defaultInfo.messageLib,
-                        isDefault: true,
-                        timeout: { msgLib: timeout.messageLib, expiry: BigInt(timeout.expiry.toString()) },
-                    }
-                }
-            }
-            return {
-                programId: messageLibInfo?.owner,
-                msgLib: defaultInfo.messageLib,
-                isDefault: true,
-                timeout: null,
-            }
         }
-        const messageLibInfo = await connection.getAccountInfo(info.messageLib, commitmentOrConfig)
-        invariant(messageLibInfo, 'messageLibInfo should not be null')
-        const { timeout } = info
-        if (timeout) {
-            // const slot = await connection.getSlot()
-            // const timestamp = await connection.getBlockTime(slot)
-            // invariant(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, expiry: BigInt(timeout.expiry.toString()) },
-            }
+
+        const [receiveLibConfigInfo] = accounts.ReceiveLibraryConfig.fromAccountInfo(receiveLibConfigBuf, 0)
+        const [defaultReceiveLibConfigInfo] = accounts.ReceiveLibraryConfig.fromAccountInfo(
+            defaultReceiveLibConfigBuf,
+            0
+        )
+        const finalReceiveLibConfigInfo =
+            receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString()
+                ? defaultReceiveLibConfigInfo
+                : receiveLibConfigInfo
+
+        const { messageLib, timeout } = finalReceiveLibConfigInfo
+
+        let msgLibProgram: PublicKey | undefined
+        if (Endpoint.checkIfBlockedMessageLib(messageLib)) {
+            msgLibProgram = BlockedMessageLibProgram.PROGRAM_ID
+        } else {
+            const msgLibAccountInfo = await connection.getAccountInfo(messageLib, commitmentOrConfig)
+            invariant(msgLibAccountInfo, 'msgLibAccountInfo should not be null')
+            msgLibProgram = msgLibAccountInfo.owner
+        }
+        return {
+            programId: msgLibProgram,
+            msgLib: messageLib,
+            isDefault: receiveLibConfigInfo.messageLib.toString() === DefaultMessageLib.toString(),
+            timeout:
+                timeout === null
+                    ? undefined
+                    : { msgLib: timeout.messageLib, expiry: BigInt(timeout.expiry.toString()) },
         }
-        return { programId: messageLibInfo.owner, msgLib: info.messageLib, isDefault: false, timeout: null }
     }
 
     // rename to a more generic name
@@ -1514,4 +1502,9 @@ export class Endpoint {
             this.program
         )
     }
+
+    static checkIfBlockedMessageLib(msgLib: PublicKey): boolean {
+        const [blockedMessageLib] = new MessageLibPDADeriver(BlockedMessageLibProgram.PROGRAM_ID).messageLib()
+        return msgLib.toString() === blockedMessageLib.toString()
+    }
 }