@layerzerolabs/oft-v2-solana-sdk 3.0.53 → 3.0.56

package/src/oft302.ts

@@ -6,8 +6,8 @@
 // 4. Set the DVN etc. options
 import { hexlify } from '@ethersproject/bytes'
 import {
+    AccountMeta,
     Cluster,
-    Instruction,
     Program,
     ProgramError,
     ProgramRepositoryInterface,
@@ -18,31 +18,25 @@ import {
     createNullRpc,
     defaultPublicKey,
     none,
-    publicKeyBytes,
     some,
 } from '@metaplex-foundation/umi'
 import { createDefaultProgramRepository } from '@metaplex-foundation/umi-program-repository'
-import {
-    fromWeb3JsInstruction,
-    fromWeb3JsPublicKey,
-    toWeb3JsInstruction,
-    toWeb3JsPublicKey,
-} from '@metaplex-foundation/umi-web3js-adapters'
+import { fromWeb3JsPublicKey, toWeb3JsInstruction, toWeb3JsPublicKey } from '@metaplex-foundation/umi-web3js-adapters'
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token'
-import { AccountMeta, ComputeBudgetProgram, Connection } from '@solana/web3.js'
+import { ComputeBudgetProgram } from '@solana/web3.js'
 
 import {
-    EndpointPDADeriver,
+    EndpointPDA,
     EndpointProgram,
-    EventPDADeriver,
+    EventPDA,
     MessageLibInterface,
     SetConfigType,
     SimpleMessageLibProgram,
-    UlnPDADeriver,
+    SolanaPacketPath,
+    UlnPDA,
     UlnProgram,
-    simulateTransaction,
-} from '@layerzerolabs/lz-solana-sdk-v2'
-import { PacketPath } from '@layerzerolabs/lz-v2-utilities'
+    simulateWeb3JsTransaction,
+} from '@layerzerolabs/lz-solana-sdk-v2/umi'
 
 import { OFT_DECIMALS } from './consts'
 import * as OFTAccounts from './generated/oft302/accounts'
@@ -65,8 +59,8 @@ export * as shared from './generated/oft302/shared'
 export * as types from './generated/oft302/types'
 export * as errors from './generated/oft302/errors'
 
-const ENDPOINT_PROGRAM_ID = fromWeb3JsPublicKey(EndpointProgram.PROGRAM_ID)
-const ULN_PROGRAM_ID = fromWeb3JsPublicKey(UlnProgram.PROGRAM_ID)
+const ENDPOINT_PROGRAM_ID: PublicKey = EndpointProgram.ENDPOINT_PROGRAM_ID
+const ULN_PROGRAM_ID: PublicKey = UlnProgram.ULN_PROGRAM_ID
 
 export function createOFTProgramRepo(oftProgram: PublicKey, rpc?: RpcInterface): ProgramRepositoryInterface {
     if (rpc === undefined) {
@@ -98,7 +92,7 @@ export function initOft(
 ): WrappedInstruction {
     const programsRepo = typeof programs.oft === 'string' ? createOFTProgramRepo(programs.oft) : programs.oft
     const deriver = new OftPDA(programsRepo.getPublicKey('oft'))
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
+    const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
     const { payer, admin, mint, escrow } = accounts
     const [oftStore] = deriver.oftStore(escrow.publicKey)
     const [lzReceiveTypes] = deriver.lzReceiveTypesAccounts(oftStore)
@@ -119,19 +113,17 @@ export function initOft(
             oftType: oftType,
             admin: admin,
             sharedDecimals: sharedDecimals,
-            endpointProgram: fromWeb3JsPublicKey(endpoint.program),
+            endpointProgram: endpoint.programId,
         }
     )
     const retval = txBuilder.addRemainingAccounts(
-        endpoint
-            .getRegisterOappIxAccountMetaForCPI(toWeb3JsPublicKey(payer.publicKey), toWeb3JsPublicKey(oftStore))
-            .map((acc) => {
-                return {
-                    pubkey: fromWeb3JsPublicKey(acc.pubkey),
-                    isSigner: acc.isSigner,
-                    isWritable: acc.isWritable,
-                }
-            })
+        endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
+            return {
+                pubkey: acc.pubkey,
+                isSigner: acc.isSigner,
+                isWritable: acc.isWritable,
+            }
+        })
     ).items[0]
     retval.signers = [payer, escrow]
     return retval
@@ -150,7 +142,6 @@ export function setOFTConfig(
 ): WrappedInstruction {
     let actualParams: types.SetOFTConfigParamsArgs
     const { oftStore, admin } = accounts
-    const oftStoreWeb3Js = toWeb3JsPublicKey(oftStore)
     const remainingAccounts: AccountMeta[] = []
     if (params.__kind === 'Admin') {
         if (params.admin === undefined) {
@@ -168,29 +159,13 @@ export function setOFTConfig(
             __kind: 'Delegate',
             fields: [params.delegate],
         }
-        const endpointProgram = toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
-        const [oAppRegistry] = new EndpointPDADeriver(endpointProgram).oappRegistry(oftStoreWeb3Js)
-        const [endpointEventAuthority] = new EventPDADeriver(endpointProgram).eventAuthority()
-        const keys = EndpointProgram.instructions.createSetDelegateInstructionAccounts(
-            {
-                oapp: oftStoreWeb3Js,
-                oappRegistry: oAppRegistry,
-                eventAuthority: endpointEventAuthority,
-                program: endpointProgram,
-            },
-            endpointProgram
-        )
+        const endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID
+        const endpointSDK = new EndpointProgram.Endpoint(endpointProgram)
+        const keys = endpointSDK.getSetDelegateIxAccountMetaForCPI(oftStore)
         for (const acc of keys) {
             acc.isSigner = false
         }
-        remainingAccounts.push(
-            {
-                pubkey: endpointProgram,
-                isSigner: false,
-                isWritable: false,
-            },
-            ...keys
-        )
+        remainingAccounts.push(...keys)
     } else if (params.__kind === 'DefaultFee') {
         if (params.defaultFee === undefined) {
             throw new Error('DefaultFee is required')
@@ -230,7 +205,7 @@ export function setOFTConfig(
     return txBuilder.addRemainingAccounts(
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -328,14 +303,8 @@ export function initSendLibrary(
     endpointProgram: PublicKey = ENDPOINT_PROGRAM_ID
 ): WrappedInstruction {
     const { admin, oftStore } = accounts
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.initSendLibrary(toWeb3JsPublicKey(admin.publicKey), toWeb3JsPublicKey(oftStore), remoteEid)
-        ),
-        signers: [admin],
-        bytesCreatedOnChain: 0,
-    }
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+    return endpoint.initOAppSendLibrary(admin, { sender: oftStore, remote: remoteEid })
 }
 
 export function initReceiveLibrary(
@@ -347,14 +316,8 @@ export function initReceiveLibrary(
     endpointProgram: PublicKey = ENDPOINT_PROGRAM_ID
 ): WrappedInstruction {
     const { admin, oftStore } = accounts
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.initReceiveLibrary(toWeb3JsPublicKey(admin.publicKey), toWeb3JsPublicKey(oftStore), remoteEid)
-        ),
-        signers: [admin],
-        bytesCreatedOnChain: 0,
-    }
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+    return endpoint.initOAppReceiveLibrary(admin, { receiver: oftStore, remote: remoteEid })
 }
 
 export function setSendLibrary(
@@ -370,19 +333,12 @@ export function setSendLibrary(
 ): WrappedInstruction {
     const { sendLibraryProgram, remoteEid } = params
     const { admin, oftStore } = accounts
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.setSendLibrary(
-                toWeb3JsPublicKey(admin.publicKey),
-                toWeb3JsPublicKey(oftStore),
-                toWeb3JsPublicKey(sendLibraryProgram),
-                remoteEid
-            )
-        ),
-        signers: [admin],
-        bytesCreatedOnChain: 0,
-    }
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+    return endpoint.setOAppSendLibrary(admin, {
+        sender: oftStore,
+        remote: remoteEid,
+        msgLibProgram: sendLibraryProgram,
+    })
 }
 
 export function setReceiveLibrary(
@@ -399,20 +355,13 @@ export function setReceiveLibrary(
 ): WrappedInstruction {
     const { receiveLibraryProgram, remoteEid, gracePeriod } = params
     const { admin, oftStore } = accounts
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.setReceiveLibrary(
-                toWeb3JsPublicKey(admin.publicKey),
-                toWeb3JsPublicKey(oftStore),
-                toWeb3JsPublicKey(receiveLibraryProgram),
-                remoteEid,
-                gracePeriod
-            )
-        ),
-        signers: [admin],
-        bytesCreatedOnChain: 0,
-    }
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+    return endpoint.setOAppReceiveLibrary(admin, {
+        receiver: oftStore,
+        remote: remoteEid,
+        msgLibProgram: receiveLibraryProgram,
+        gracePeriod: gracePeriod,
+    })
 }
 
 export function initConfig(
@@ -438,32 +387,30 @@ export function initConfig(
         endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID
     }
 
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
     let msgLib: MessageLibInterface
-    if (msgLibProgram.toString() === SimpleMessageLibProgram.PROGRAM_ID.toBase58()) {
-        msgLib = new SimpleMessageLibProgram.SimpleMessageLib(SimpleMessageLibProgram.PROGRAM_ID)
+    if (msgLibProgram === SimpleMessageLibProgram.SIMPLE_MESSAGELIB_PROGRAM_ID) {
+        msgLib = new SimpleMessageLibProgram.SimpleMessageLib(SimpleMessageLibProgram.SIMPLE_MESSAGELIB_PROGRAM_ID)
     } else {
-        msgLib = new UlnProgram.Uln(toWeb3JsPublicKey(msgLibProgram))
-    }
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.initOAppConfig(
-                toWeb3JsPublicKey(admin.publicKey),
-                msgLib,
-                toWeb3JsPublicKey(payer.publicKey),
-                toWeb3JsPublicKey(oftStore),
-                remoteEid
-            )
-        ),
-        signers: [admin, payer],
-        bytesCreatedOnChain: 0,
+        msgLib = new UlnProgram.Uln(msgLibProgram)
     }
+    return endpoint.initOAppConfig(
+        {
+            delegate: admin,
+            payer: payer.publicKey,
+        },
+        {
+            msgLibSDK: msgLib,
+            oapp: oftStore,
+            remote: remoteEid,
+        }
+    )
 }
 
 export async function setConfig(
-    connection: Connection,
+    rpc: RpcInterface,
     accounts: {
-        signer: PublicKey
+        signer: Signer
         oftStore: PublicKey
     },
     params: {
@@ -475,7 +422,7 @@ export async function setConfig(
         msgLib?: PublicKey
         endpoint?: PublicKey
     }
-): Promise<Instruction> {
+): Promise<WrappedInstruction> {
     const { signer, oftStore } = accounts
     const { remoteEid, configType, config } = params
     let msgLibProgram: PublicKey, endpointProgram: PublicKey
@@ -486,20 +433,16 @@ export async function setConfig(
         msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID
         endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID
     }
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return fromWeb3JsInstruction(
-        await endpoint.setOappConfig(
-            connection,
-            toWeb3JsPublicKey(signer),
-            toWeb3JsPublicKey(oftStore),
-            toWeb3JsPublicKey(msgLibProgram),
-            remoteEid,
-            {
-                configType,
-                value: config,
-            }
-        )
-    )
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+    return endpoint.setOAppConfig(rpc, signer, {
+        oapp: oftStore,
+        eid: remoteEid,
+        config: {
+            configType,
+            value: config,
+        },
+        msgLibProgram: msgLibProgram,
+    })
 }
 
 export function withdrawFee(
@@ -565,40 +508,25 @@ export async function send(
     const [oftStore] = deriver.oftStore(tokenEscrow)
     const [peer] = deriver.peer(oftStore, dstEid)
 
-    const connection = new Connection(rpc.getEndpoint())
     if (remainingAccounts === undefined || remainingAccounts.length === 0) {
         const peerAddr: Uint8Array =
             accounts.peerAddr ??
             (await OFTAccounts.fetchPeerConfig({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress))
 
-        const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
-        const msgLibProgram = await getSendLibraryProgram(connection, endpoint, payer.publicKey, oftStore, dstEid)
-        const packetPath: PacketPath = {
-            srcEid: 0,
+        const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
+        const msgLibProgram = await getSendLibraryProgram(rpc, endpoint, payer.publicKey, oftStore, dstEid)
+        const packetPath: SolanaPacketPath = {
             dstEid,
-            sender: hexlify(publicKeyBytes(oftStore)),
-            receiver: hexlify(peerAddr),
+            sender: oftStore,
+            receiver: peerAddr,
         }
-        // const [endpointSettings] = endpoint.deriver.setting()
-        // invariant(await isAccountInitialized(connection, endpointSettings), 'endpointSettings account not initialized')
-        // invariant(await isAccountInitialized(connection, peer), 'peer account not initialized')
-        // invariant(await isAccountInitialized(connection, payer), 'payer account not initialized')
-        // invariant(
-        //     await isAccountInitialized(
-        //         connection,
-        //         endpoint.deriver.nonce(oftStore, dstEid, Uint8Array.from(peerAddr))[0]
-        //     ),
-        //     'nonce account not initialized'
-        // )
-        remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-            connection,
-            toWeb3JsPublicKey(payer.publicKey),
-            packetPath,
-            msgLibProgram
-        )
+        remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+            path: packetPath,
+            msgLibProgram: msgLibProgram,
+        })
     }
 
-    const [eventAuthorityPDA] = new EventPDADeriver(toWeb3JsPublicKey(programs.oft)).eventAuthority()
+    const [eventAuthorityPDA] = new EventPDA(programs.oft).eventAuthority()
     const tokenProgram: PublicKey = programs.token ?? fromWeb3JsPublicKey(TOKEN_PROGRAM_ID)
     const txBuilder = instructions.send(
         { programs: createOFTProgramRepo(programs.oft) },
@@ -610,7 +538,7 @@ export async function send(
             tokenEscrow: tokenEscrow,
             tokenMint: tokenMint,
             tokenProgram: tokenProgram,
-            eventAuthority: fromWeb3JsPublicKey(eventAuthorityPDA),
+            eventAuthority: eventAuthorityPDA,
             program: programs.oft,
             // params
             dstEid: dstEid,
@@ -628,7 +556,7 @@ export async function send(
     return txBuilder.addRemainingAccounts(
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -667,25 +595,17 @@ export async function quote(
     const [oftStore] = deriver.oftStore(tokenEscrow)
     const [peer] = deriver.peer(oftStore, dstEid)
 
-    const connection = new Connection(rpc.getEndpoint(), 'confirmed')
     if (remainingAccounts === undefined || remainingAccounts.length === 0) {
         const peerAddr: Uint8Array =
             accounts.peerAddr ??
             (await OFTAccounts.fetchPeerConfig({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress))
 
-        const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID))
-        const messageLib = await getSendLibraryProgram(connection, endpoint, payer, oftStore, dstEid)
-
-        remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
-            connection,
-            toWeb3JsPublicKey(payer),
-            {
-                sender: hexlify(publicKeyBytes(oftStore)),
-                dstEid: dstEid,
-                receiver: hexlify(peerAddr),
-            },
-            messageLib
-        )
+        const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID)
+        const messageLib = await getSendLibraryProgram(rpc, endpoint, payer, oftStore, dstEid)
+        remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(rpc, payer, {
+            path: { sender: oftStore, dstEid: dstEid, receiver: peerAddr },
+            msgLibProgram: messageLib,
+        })
     }
 
     let txBuilder = instructions.quoteSend(
@@ -709,7 +629,7 @@ export async function quote(
         // Get remaining accounts from msgLib(simple_msgLib or uln)
         remainingAccounts.map((acc) => {
             return {
-                pubkey: fromWeb3JsPublicKey(acc.pubkey),
+                pubkey: acc.pubkey,
                 isSigner: acc.isSigner,
                 isWritable: acc.isWritable,
             }
@@ -719,17 +639,16 @@ export async function quote(
     const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
         units: 1000000,
     })
-    const buffer = await simulateTransaction(
-        connection,
+    return simulateWeb3JsTransaction(
+        rpc,
         [modifyComputeUnits, web3Ix],
         web3Ix.programId,
         toWeb3JsPublicKey(payer),
+        EndpointProgram.types.getMessagingFeeSerializer(),
         'confirmed',
         undefined,
         addressLookupTable === undefined ? undefined : toWeb3JsPublicKey(addressLookupTable)
     )
-    const fee = EndpointProgram.types.messagingFeeBeet.read(buffer, 0)
-    return { nativeFee: BigInt(fee.nativeFee.toString()), lzTokenFee: BigInt(fee.lzTokenFee.toString()) }
 }
 
 export async function quoteOft(
@@ -773,17 +692,16 @@ export async function quoteOft(
             }
         )
         .getInstructions()[0]
+
     const web3Ix = toWeb3JsInstruction(ix)
-    const connection = new Connection(rpc.getEndpoint())
-    const returnedValues = await simulateTransaction(
-        connection,
+    return simulateWeb3JsTransaction(
+        rpc.getEndpoint(),
         [web3Ix],
         web3Ix.programId,
         toWeb3JsPublicKey(payer),
+        types.getQuoteOFTResultSerializer(),
         'confirmed'
     )
-    const [result] = types.getQuoteOFTResultSerializer().deserialize(returnedValues, 0)
-    return result
 }
 
 export function initOAppNonce(
@@ -796,19 +714,13 @@ export function initOAppNonce(
     endpointProgram: PublicKey = ENDPOINT_PROGRAM_ID
 ): WrappedInstruction {
     const { admin, oftStore } = accounts
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram))
-    return {
-        instruction: fromWeb3JsInstruction(
-            endpoint.initOAppNonce(
-                toWeb3JsPublicKey(admin.publicKey),
-                remoteEid,
-                toWeb3JsPublicKey(oftStore),
-                remoteOappAddr
-            )
-        ),
-        signers: [admin],
-        bytesCreatedOnChain: 0,
-    }
+    const endpoint = new EndpointProgram.Endpoint(endpointProgram)
+
+    return endpoint.initOAppNonce(admin, {
+        localOApp: oftStore,
+        remote: remoteEid,
+        remoteOApp: remoteOappAddr,
+    })
 }
 
 export async function getEndpointConfig(
@@ -820,9 +732,9 @@ export async function getEndpointConfig(
         endpoint?: PublicKey
     }
 ): Promise<{
-    sendLibraryConfig: EndpointProgram.accounts.SendLibraryConfig & { ulnSendConfig?: UlnProgram.SendConfig }
+    sendLibraryConfig: EndpointProgram.accounts.SendLibraryConfig & { ulnSendConfig?: UlnProgram.accounts.SendConfig }
     receiveLibraryConfig: EndpointProgram.accounts.ReceiveLibraryConfig & {
-        ulnReceiveConfig?: UlnProgram.ReceiveConfig
+        ulnReceiveConfig?: UlnProgram.accounts.ReceiveConfig
     }
 }> {
     let msgLibProgram: PublicKey, endpointProgram: PublicKey
@@ -833,54 +745,50 @@ export async function getEndpointConfig(
         msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID
         endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID
     }
-    const endpointDeriver = new EndpointPDADeriver(toWeb3JsPublicKey(endpointProgram))
-    const ulnDeriver = new UlnPDADeriver(toWeb3JsPublicKey(msgLibProgram))
-    const web3OftStore = toWeb3JsPublicKey(oftStore)
+    const endpointDeriver = new EndpointPDA(endpointProgram)
+    const ulnDeriver = new UlnPDA(msgLibProgram)
 
-    const [sendLib] = endpointDeriver.sendLibraryConfig(web3OftStore, endpointId)
+    const [sendLib] = endpointDeriver.sendLibraryConfig(oftStore, endpointId)
     const [defaultSendLib] = endpointDeriver.defaultSendLibraryConfig(endpointId)
-    const [receiveLib] = endpointDeriver.receiveLibraryConfig(web3OftStore, endpointId)
+    const [receiveLib] = endpointDeriver.receiveLibraryConfig(oftStore, endpointId)
     const [defaultReceiveLib] = endpointDeriver.defaultReceiveLibraryConfig(endpointId)
 
     const [msgLib] = ulnDeriver.messageLib()
-    const connection = new Connection(rpc.getEndpoint())
-    let sendLibraryConfig: EndpointProgram.accounts.SendLibraryConfig & { ulnSendConfig?: UlnProgram.SendConfig } =
-        await EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, sendLib)
+    let sendLibraryConfig: EndpointProgram.accounts.SendLibraryConfig & {
+        ulnSendConfig?: UlnProgram.accounts.SendConfig
+    } = await EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, sendLib)
 
     let receiveLibraryConfig: EndpointProgram.accounts.ReceiveLibraryConfig & {
-        ulnReceiveConfig?: UlnProgram.ReceiveConfig
-    } = await EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, receiveLib)
+        ulnReceiveConfig?: UlnProgram.accounts.ReceiveConfig
+    } = await EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, receiveLib)
 
     const defaultSendLibraryConfig: EndpointProgram.accounts.SendLibraryConfig & {
-        ulnSendConfig?: UlnProgram.SendConfig
-    } = await EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, defaultSendLib)
+        ulnSendConfig?: UlnProgram.accounts.SendConfig
+    } = await EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, defaultSendLib)
 
     const defaultReceiveLibraryConfig: EndpointProgram.accounts.ReceiveLibraryConfig & {
-        ulnReceiveConfig?: UlnProgram.ReceiveConfig
-    } = await EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, defaultReceiveLib)
+        ulnReceiveConfig?: UlnProgram.accounts.ReceiveConfig
+    } = await EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, defaultReceiveLib)
 
-    const nil64 = '18446744073709551615' // max u64
+    const nil64 = 18446744073709551615n // max u64
     const nil8 = 255
 
-    if (sendLibraryConfig.messageLib.toBase58() === defaultPublicKey().toString()) {
+    if (sendLibraryConfig.messageLib === defaultPublicKey()) {
         sendLibraryConfig = defaultSendLibraryConfig
     }
-    if (receiveLibraryConfig.messageLib.toBase58() === defaultPublicKey().toString()) {
+    if (receiveLibraryConfig.messageLib === defaultPublicKey()) {
         receiveLibraryConfig = defaultReceiveLibraryConfig
     }
     // get the uln config if necessary
-    if (sendLibraryConfig.messageLib.equals(msgLib)) {
+    if (sendLibraryConfig.messageLib === msgLib) {
         const [ulnDefaultSendConfigPDA] = ulnDeriver.defaultSendConfig(endpointId)
-        const [ulnSendConfigPDA] = ulnDeriver.sendConfig(endpointId, web3OftStore)
-        const ulnSendConfig = await UlnProgram.accounts.SendConfig.fromAccountAddress(connection, ulnSendConfigPDA)
-        const ulnDefaultSendConfig = await UlnProgram.accounts.SendConfig.fromAccountAddress(
-            connection,
-            ulnDefaultSendConfigPDA
-        )
+        const [ulnSendConfigPDA] = ulnDeriver.sendConfig(endpointId, oftStore)
+        const ulnSendConfig = await UlnProgram.accounts.fetchSendConfig({ rpc }, ulnSendConfigPDA)
+        const ulnDefaultSendConfig = await UlnProgram.accounts.fetchSendConfig({ rpc }, ulnDefaultSendConfigPDA)
         // get the uln config for the send library
-        if (nil64 === ulnSendConfig.uln.confirmations.toString()) {
-            ulnSendConfig.uln.confirmations = 0
-        } else if (ulnSendConfig.uln.confirmations == 0) {
+        if (nil64 === ulnSendConfig.uln.confirmations) {
+            ulnSendConfig.uln.confirmations = 0n
+        } else if (ulnSendConfig.uln.confirmations == 0n) {
             ulnSendConfig.uln.confirmations = ulnDefaultSendConfig.uln.confirmations
         }
         if (ulnSendConfig.uln.requiredDvnCount == nil8) {
@@ -899,20 +807,17 @@ export async function getEndpointConfig(
         }
         sendLibraryConfig.ulnSendConfig = ulnSendConfig
     }
-    if (receiveLibraryConfig.messageLib.equals(msgLib)) {
+    if (receiveLibraryConfig.messageLib === msgLib) {
         const [ulnDefaultReceiveConfigPDA] = ulnDeriver.defaultReceiveConfig(endpointId)
-        const [ulnReceiveConfigPDA] = ulnDeriver.receiveConfig(endpointId, web3OftStore)
-        const ulnReceiveConfig = await UlnProgram.accounts.ReceiveConfig.fromAccountAddress(
-            connection,
-            ulnReceiveConfigPDA
-        )
-        const ulnDefaultReceiveConfig = await UlnProgram.accounts.ReceiveConfig.fromAccountAddress(
-            connection,
+        const [ulnReceiveConfigPDA] = ulnDeriver.receiveConfig(endpointId, oftStore)
+        const ulnReceiveConfig = await UlnProgram.accounts.fetchReceiveConfig({ rpc }, ulnReceiveConfigPDA)
+        const ulnDefaultReceiveConfig = await UlnProgram.accounts.fetchReceiveConfig(
+            { rpc },
             ulnDefaultReceiveConfigPDA
         )
-        if (nil64 === ulnReceiveConfig.uln.confirmations.toString()) {
-            ulnReceiveConfig.uln.confirmations = 0
-        } else if (ulnReceiveConfig.uln.confirmations == 0) {
+        if (nil64 === ulnReceiveConfig.uln.confirmations) {
+            ulnReceiveConfig.uln.confirmations = 0n
+        } else if (ulnReceiveConfig.uln.confirmations == 0n) {
             ulnReceiveConfig.uln.confirmations = ulnDefaultReceiveConfig.uln.confirmations
         }
         if (ulnReceiveConfig.uln.requiredDvnCount == nil8) {
@@ -957,14 +862,9 @@ export async function getDelegate(
     oftInstance: PublicKey,
     endpointProgram: PublicKey = ENDPOINT_PROGRAM_ID
 ): Promise<PublicKey> {
-    const [oAppRegistry] = new EndpointPDADeriver(toWeb3JsPublicKey(endpointProgram)).oappRegistry(
-        toWeb3JsPublicKey(oftInstance)
-    )
-    const oAppRegistryInfo = await EndpointProgram.accounts.OAppRegistry.fromAccountAddress(
-        new Connection(rpc.getEndpoint()),
-        oAppRegistry
-    )
-    return fromWeb3JsPublicKey(oAppRegistryInfo.delegate)
+    const [oAppRegistry] = new EndpointPDA(endpointProgram).oappRegistry(oftInstance)
+    const oAppRegistryInfo = await EndpointProgram.accounts.fetchOAppRegistry({ rpc }, oAppRegistry)
+    return oAppRegistryInfo.delegate
 }
 
 export async function getEnforcedOptions(
@@ -979,22 +879,22 @@ export async function getEnforcedOptions(
 }
 
 async function getSendLibraryProgram(
-    connection: Connection,
+    rpc: RpcInterface,
     endpoint: EndpointProgram.Endpoint,
     payer: PublicKey,
     oftStore: PublicKey,
     remoteEid: number
 ): Promise<SimpleMessageLibProgram.SimpleMessageLib | UlnProgram.Uln> {
-    const sendLibInfo = await endpoint.getSendLibrary(connection, toWeb3JsPublicKey(oftStore), remoteEid)
-    if (!sendLibInfo?.programId) {
+    const sendLibInfo = await endpoint.getSendLibrary(rpc, oftStore, remoteEid)
+    if (!sendLibInfo.programId) {
         throw new Error('Send library not initialized or blocked message library')
     }
     const { programId: msgLibProgram } = sendLibInfo
-    const msgLibVersion = await endpoint.getMessageLibVersion(connection, toWeb3JsPublicKey(payer), msgLibProgram)
-    if (msgLibVersion?.major.toString() === '0' && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    const msgLibVersion = await endpoint.getMessageLibVersion(rpc, payer, msgLibProgram)
+    if (msgLibVersion.major.toString() === '0' && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
         return new SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram)
     } else if (
-        msgLibVersion?.major.toString() === '3' &&
+        msgLibVersion.major.toString() === '3' &&
         msgLibVersion.minor == 0 &&
         msgLibVersion.endpointVersion == 2
     ) {