@layerzerolabs/oft-v2-solana-sdk 3.0.52 → 3.0.54

package/dist/index.mjs

@@ -1,11 +1,12 @@
 import { hexlify } from '@ethersproject/bytes';
 import { deserializeAccount, publicKey as publicKey$1, assertAccountExists, gpaBuilder, ProgramError, isPda, isSigner, transactionBuilder, publicKeyBytes, createNullRpc, some, none, defaultPublicKey } from '@metaplex-foundation/umi';
 import { createDefaultProgramRepository } from '@metaplex-foundation/umi-program-repository';
-import { fromWeb3JsPublicKey, toWeb3JsPublicKey, fromWeb3JsInstruction, toWeb3JsInstruction } from '@metaplex-foundation/umi-web3js-adapters';
-import { PublicKey, Connection, ComputeBudgetProgram } from '@solana/web3.js';
-import { EndpointProgram, UlnProgram, LZ_RECEIVE_TYPES_SEED, EndpointPDADeriver, EventPDADeriver, SimpleMessageLibProgram, simulateTransaction, UlnPDADeriver } from '@layerzerolabs/lz-solana-sdk-v2';
+import { fromWeb3JsPublicKey, toWeb3JsInstruction, toWeb3JsPublicKey } from '@metaplex-foundation/umi-web3js-adapters';
+import { PublicKey, ComputeBudgetProgram } from '@solana/web3.js';
+import { EndpointProgram, UlnProgram, SimpleMessageLibProgram, EventPDA, simulateWeb3JsTransaction, EndpointPDA, UlnPDA } from '@layerzerolabs/lz-solana-sdk-v2/umi';
 import { mapSerializer, struct, bytes, publicKey, u32, bool, u64, string, scalarEnum, dataEnum, tuple, option, u16, array, u8, Endian } from '@metaplex-foundation/umi/serializers';
 import { createWeb3JsEddsa } from '@metaplex-foundation/umi-eddsa-web3js';
+import { LZ_RECEIVE_TYPES_SEED } from '@layerzerolabs/lz-solana-sdk-v2';
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -1488,8 +1489,8 @@ function getOftProgramId(context, clusterFilter) {
 }
 
 // src/oft302.ts
-var ENDPOINT_PROGRAM_ID = fromWeb3JsPublicKey(EndpointProgram.PROGRAM_ID);
-var ULN_PROGRAM_ID = fromWeb3JsPublicKey(UlnProgram.PROGRAM_ID);
+var ENDPOINT_PROGRAM_ID = EndpointProgram.ENDPOINT_PROGRAM_ID;
+var ULN_PROGRAM_ID = UlnProgram.ULN_PROGRAM_ID;
 function createOFTProgramRepo(oftProgram, rpc) {
   if (rpc === void 0) {
     rpc = createNullRpc();
@@ -1514,7 +1515,7 @@ function createOFTProgramRepo(oftProgram, rpc) {
 function initOft2(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
   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 [lzReceiveTypes3] = deriver.lzReceiveTypesAccounts(oftStore);
@@ -1534,13 +1535,13 @@ function initOft2(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
       oftType,
       admin,
       sharedDecimals,
-      endpointProgram: fromWeb3JsPublicKey(endpoint.program)
+      endpointProgram: endpoint.programId
     }
   );
   const retval = txBuilder.addRemainingAccounts(
-    endpoint.getRegisterOappIxAccountMetaForCPI(toWeb3JsPublicKey(payer.publicKey), toWeb3JsPublicKey(oftStore)).map((acc) => {
+    endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1552,7 +1553,6 @@ function initOft2(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
 function setOFTConfig(accounts, params, programs) {
   let actualParams;
   const { oftStore, admin } = accounts;
-  const oftStoreWeb3Js = toWeb3JsPublicKey(oftStore);
   const remainingAccounts = [];
   if (params.__kind === "Admin") {
     if (params.admin === void 0) {
@@ -1570,29 +1570,13 @@ function setOFTConfig(accounts, params, programs) {
       __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 === void 0) {
       throw new Error("DefaultFee is required");
@@ -1631,7 +1615,7 @@ function setOFTConfig(accounts, params, programs) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1687,60 +1671,34 @@ function setPeerConfig2(accounts, param, oftProgramId) {
 }
 function initSendLibrary(accounts, remoteEid, endpointProgram = ENDPOINT_PROGRAM_ID) {
   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 });
 }
 function initReceiveLibrary(accounts, remoteEid, endpointProgram = ENDPOINT_PROGRAM_ID) {
   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 });
 }
 function setSendLibrary(accounts, params, endpointProgram = ENDPOINT_PROGRAM_ID) {
   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
+  });
 }
 function setReceiveLibrary(accounts, params, endpointProgram = ENDPOINT_PROGRAM_ID) {
   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
+  });
 }
 function initConfig(accounts, remoteEid, programs) {
   const { admin, oftStore, payer } = accounts;
@@ -1752,28 +1710,26 @@ function initConfig(accounts, remoteEid, programs) {
     msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID;
     endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID;
   }
-  const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(endpointProgram));
+  const endpoint = new EndpointProgram.Endpoint(endpointProgram);
   let msgLib;
-  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));
+    msgLib = new UlnProgram.Uln(msgLibProgram);
   }
-  return {
-    instruction: fromWeb3JsInstruction(
-      endpoint.initOAppConfig(
-        toWeb3JsPublicKey(admin.publicKey),
-        msgLib,
-        toWeb3JsPublicKey(payer.publicKey),
-        toWeb3JsPublicKey(oftStore),
-        remoteEid
-      )
-    ),
-    signers: [admin, payer],
-    bytesCreatedOnChain: 0
-  };
+  return endpoint.initOAppConfig(
+    {
+      delegate: admin,
+      payer: payer.publicKey
+    },
+    {
+      msgLibSDK: msgLib,
+      oapp: oftStore,
+      remote: remoteEid
+    }
+  );
 }
-async function setConfig(connection, accounts, params, programs) {
+async function setConfig(rpc, accounts, params, programs) {
   const { signer, oftStore } = accounts;
   const { remoteEid, configType, config } = params;
   let msgLibProgram, endpointProgram;
@@ -1784,20 +1740,16 @@ async function setConfig(connection, accounts, params, programs) {
     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
+  });
 }
 function withdrawFee2(accounts, amount, programs) {
   const { admin, mint, escrow, dest } = accounts;
@@ -1823,25 +1775,21 @@ async function send2(rpc, accounts, sendParams, programs, remainingAccounts) {
   const deriver = new OftPDA(programs.oft);
   const [oftStore] = deriver.oftStore(tokenEscrow);
   const [peer] = deriver.peer(oftStore, dstEid);
-  const connection = new Connection(rpc.getEndpoint());
   if (remainingAccounts === void 0 || remainingAccounts.length === 0) {
     const peerAddr = accounts.peerAddr ?? await 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 endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID);
+    const msgLibProgram = await getSendLibraryProgram(rpc, endpoint, payer.publicKey, oftStore, dstEid);
     const packetPath = {
-      srcEid: 0,
       dstEid,
-      sender: hexlify(publicKeyBytes(oftStore)),
-      receiver: hexlify(peerAddr)
+      sender: oftStore,
+      receiver: peerAddr
     };
-    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-      connection,
-      toWeb3JsPublicKey(payer.publicKey),
-      packetPath,
+    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+      path: packetPath,
       msgLibProgram
-    );
+    });
   }
-  const [eventAuthorityPDA] = new EventPDADeriver(toWeb3JsPublicKey(programs.oft)).eventAuthority();
+  const [eventAuthorityPDA] = new EventPDA(programs.oft).eventAuthority();
   const tokenProgram = programs.token ?? fromWeb3JsPublicKey(TOKEN_PROGRAM_ID);
   const txBuilder = send(
     { programs: createOFTProgramRepo(programs.oft) },
@@ -1853,7 +1801,7 @@ async function send2(rpc, accounts, sendParams, programs, remainingAccounts) {
       tokenEscrow,
       tokenMint,
       tokenProgram,
-      eventAuthority: fromWeb3JsPublicKey(eventAuthorityPDA),
+      eventAuthority: eventAuthorityPDA,
       program: programs.oft,
       // params
       dstEid,
@@ -1869,7 +1817,7 @@ async function send2(rpc, accounts, sendParams, programs, remainingAccounts) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1882,21 +1830,14 @@ async function quote(rpc, accounts, quoteParams, programs, remainingAccounts, ad
   const deriver = new OftPDA(programs.oft);
   const [oftStore] = deriver.oftStore(tokenEscrow);
   const [peer] = deriver.peer(oftStore, dstEid);
-  const connection = new Connection(rpc.getEndpoint(), "confirmed");
   if (remainingAccounts === void 0 || remainingAccounts.length === 0) {
     const peerAddr = accounts.peerAddr ?? await 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,
-        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, receiver: peerAddr },
+      msgLibProgram: messageLib
+    });
   }
   let txBuilder = quoteSend(
     { programs: createOFTProgramRepo(programs.oft) },
@@ -1918,7 +1859,7 @@ async function quote(rpc, accounts, quoteParams, programs, remainingAccounts, ad
     // 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
       };
@@ -1928,17 +1869,16 @@ async function quote(rpc, accounts, quoteParams, programs, remainingAccounts, ad
   const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
     units: 1e6
   });
-  const buffer = await simulateTransaction(
-    connection,
+  return simulateWeb3JsTransaction(
+    rpc,
     [modifyComputeUnits, web3Ix],
     web3Ix.programId,
     toWeb3JsPublicKey(payer),
+    EndpointProgram.types.getMessagingFeeSerializer(),
     "confirmed",
     void 0,
     addressLookupTable === void 0 ? void 0 : toWeb3JsPublicKey(addressLookupTable)
   );
-  const fee = EndpointProgram.types.messagingFeeBeet.read(buffer, 0);
-  return { nativeFee: BigInt(fee.nativeFee.toString()), lzTokenFee: BigInt(fee.lzTokenFee.toString()) };
 }
 async function quoteOft2(rpc, accounts, quoteParams, oftProgram) {
   const { payer, tokenMint, tokenEscrow } = accounts;
@@ -1963,32 +1903,23 @@ async function quoteOft2(rpc, accounts, quoteParams, oftProgram) {
     }
   ).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),
+    getQuoteOFTResultSerializer(),
     "confirmed"
   );
-  const [result] = getQuoteOFTResultSerializer().deserialize(returnedValues, 0);
-  return result;
 }
 function initOAppNonce(accounts, remoteEid, remoteOappAddr, endpointProgram = ENDPOINT_PROGRAM_ID) {
   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
+  });
 }
 async function getEndpointConfig(rpc, oftStore, endpointId, programs) {
   let msgLibProgram, endpointProgram;
@@ -1999,38 +1930,33 @@ async function getEndpointConfig(rpc, oftStore, endpointId, programs) {
     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 [sendLib] = endpointDeriver.sendLibraryConfig(web3OftStore, endpointId);
+  const endpointDeriver = new EndpointPDA(endpointProgram);
+  const ulnDeriver = new UlnPDA(msgLibProgram);
+  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 = await EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, sendLib);
-  let receiveLibraryConfig = await EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, receiveLib);
-  const defaultSendLibraryConfig = await EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, defaultSendLib);
-  const defaultReceiveLibraryConfig = await EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, defaultReceiveLib);
-  const nil64 = "18446744073709551615";
+  let sendLibraryConfig = await EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, sendLib);
+  let receiveLibraryConfig = await EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, receiveLib);
+  const defaultSendLibraryConfig = await EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, defaultSendLib);
+  const defaultReceiveLibraryConfig = await EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, defaultReceiveLib);
+  const nil64 = 18446744073709551615n;
   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;
   }
-  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
-    );
-    if (nil64 === ulnSendConfig.uln.confirmations.toString()) {
-      ulnSendConfig.uln.confirmations = 0;
-    } else if (ulnSendConfig.uln.confirmations == 0) {
+    const [ulnSendConfigPDA] = ulnDeriver.sendConfig(endpointId, oftStore);
+    const ulnSendConfig = await UlnProgram.accounts.fetchSendConfig({ rpc }, ulnSendConfigPDA);
+    const ulnDefaultSendConfig = await UlnProgram.accounts.fetchSendConfig({ rpc }, ulnDefaultSendConfigPDA);
+    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) {
@@ -2049,20 +1975,17 @@ async function getEndpointConfig(rpc, oftStore, endpointId, programs) {
     }
     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) {
@@ -2092,30 +2015,25 @@ async function getPeerAddress(rpc, oftInstance, remoteEid, oftProgramId) {
   return hexlify(peerInfo.peerAddress);
 }
 async function getDelegate(rpc, oftInstance, endpointProgram = ENDPOINT_PROGRAM_ID) {
-  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;
 }
 async function getEnforcedOptions(rpc, oftInstance, remoteEid, oftProgramId) {
   const [peer] = new OftPDA(oftProgramId).peer(oftInstance, remoteEid);
   const peerInfo = await fetchPeerConfig({ rpc }, peer);
   return peerInfo.enforcedOptions;
 }
-async function getSendLibraryProgram(connection, endpoint, payer, oftStore, remoteEid) {
-  const sendLibInfo = await endpoint.getSendLibrary(connection, toWeb3JsPublicKey(oftStore), remoteEid);
-  if (!sendLibInfo?.programId) {
+async function getSendLibraryProgram(rpc, endpoint, payer, oftStore, remoteEid) {
+  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.minor == 0 && msgLibVersion.endpointVersion == 2) {
+  } else if (msgLibVersion.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
     return new UlnProgram.Uln(msgLibProgram);
   }
   throw new Error(`Unsupported message library version: ${JSON.stringify(msgLibVersion, null, 2)}`);
@@ -3541,7 +3459,7 @@ function getOftProgramId2(context, clusterFilter) {
 }
 
 // src/oft202.ts
-var ENDPOINT_PROGRAM_ID2 = fromWeb3JsPublicKey(EndpointProgram.PROGRAM_ID);
+var { ENDPOINT_PROGRAM_ID: ENDPOINT_PROGRAM_ID2 } = EndpointProgram;
 var PROGRAM_NAME = "oft";
 function createOFTProgramRepo2(oftProgram, rpc) {
   if (rpc === void 0) {
@@ -3567,7 +3485,7 @@ function createOFTProgramRepo2(oftProgram, rpc) {
 function initOft4(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
   const programsRepo = createOFTProgramRepo2(programs.oft);
   const deriver = new OftPDA(programsRepo.getPublicKey(PROGRAM_NAME));
-  const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
+  const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
   const { payer, admin, mint, escrow } = accounts;
   const [oftStore] = deriver.oftStore(escrow.publicKey);
   const [lzReceiveTypes3] = deriver.lzReceiveTypesAccounts(oftStore);
@@ -3587,13 +3505,13 @@ function initOft4(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
       oftType,
       admin,
       sharedDecimals,
-      endpointProgram: fromWeb3JsPublicKey(endpoint.program)
+      endpointProgram: endpoint.programId
     }
   );
   const retval = txBuilder.addRemainingAccounts(
-    endpoint.getRegisterOappIxAccountMetaForCPI(toWeb3JsPublicKey(payer.publicKey), toWeb3JsPublicKey(oftStore)).map((acc) => {
+    endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -3605,7 +3523,6 @@ function initOft4(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
 function setOFTConfig2(accounts, params, programs) {
   let actualParams;
   const { oftStore, admin } = accounts;
-  const oftStoreWeb3Js = toWeb3JsPublicKey(oftStore);
   const remainingAccounts = [];
   if (params.__kind === "Admin") {
     if (params.admin === void 0) {
@@ -3623,18 +3540,9 @@ function setOFTConfig2(accounts, params, programs) {
       __kind: "Delegate",
       fields: [params.delegate]
     };
-    const endpointProgram = toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
-    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_ID2;
+    const endpointSDK = new EndpointProgram.Endpoint(endpointProgram);
+    const keys = endpointSDK.getSetDelegateIxAccountMetaForCPI(oftStore);
     for (const acc of keys) {
       acc.isSigner = false;
     }
@@ -3684,7 +3592,7 @@ function setOFTConfig2(accounts, params, programs) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -3766,25 +3674,21 @@ async function send4(rpc, accounts, sendParams, programs, remainingAccounts) {
   const deriver = new OftPDA(oftProgramId);
   const [oftStore] = deriver.oftStore(tokenEscrow);
   const [peer] = deriver.peer(oftStore, dstEid);
-  const connection = new Connection(rpc.getEndpoint());
   if (remainingAccounts === void 0 || remainingAccounts.length === 0) {
     const peerAddr = accounts.peerAddr ?? await fetchPeerConfig2({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress);
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
-    const msgLibProgram = await getSendLibraryProgram2(connection, endpoint, payer.publicKey, oftStore, dstEid);
+    const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
+    const msgLibProgram = await getSendLibraryProgram2(rpc, endpoint, payer.publicKey, oftStore, dstEid);
     const packetPath = {
-      srcEid: 0,
       dstEid,
-      sender: hexlify(publicKeyBytes(oftStore)),
-      receiver: hexlify(peerAddr)
+      sender: oftStore,
+      receiver: peerAddr
     };
-    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-      connection,
-      toWeb3JsPublicKey(payer.publicKey),
-      packetPath,
+    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+      path: packetPath,
       msgLibProgram
-    );
+    });
   }
-  const [eventAuthorityPDA] = new EventPDADeriver(toWeb3JsPublicKey(oftProgramId)).eventAuthority();
+  const [eventAuthorityPDA] = new EventPDA(oftProgramId).eventAuthority();
   const tokenProgram = programs.token ?? fromWeb3JsPublicKey(TOKEN_PROGRAM_ID);
   const txBuilder = send3(
     { programs: programsRepo },
@@ -3796,7 +3700,7 @@ async function send4(rpc, accounts, sendParams, programs, remainingAccounts) {
       tokenEscrow,
       tokenMint,
       tokenProgram,
-      eventAuthority: fromWeb3JsPublicKey(eventAuthorityPDA),
+      eventAuthority: eventAuthorityPDA,
       program: oftProgramId,
       // params
       dstEid,
@@ -3812,35 +3716,28 @@ async function send4(rpc, accounts, sendParams, programs, remainingAccounts) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
     })
   ).items[0];
 }
-async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts) {
+async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts, addressLookupTable) {
   const { dstEid, to, amountLd, minAmountLd, options, payInLzToken, composeParams } = quoteParams;
   const { payer, tokenMint, tokenEscrow } = accounts;
   const programsRepo = typeof programs.oft === "string" ? createOFTProgramRepo2(programs.oft) : programs.oft;
   const deriver = new OftPDA(programsRepo.getPublicKey(PROGRAM_NAME));
   const [oftStore] = deriver.oftStore(tokenEscrow);
   const [peer] = deriver.peer(oftStore, dstEid);
-  const connection = new Connection(rpc.getEndpoint(), "confirmed");
   if (remainingAccounts === void 0 || remainingAccounts.length === 0) {
     const peerAddr = accounts.peerAddr ?? await fetchPeerConfig2({ rpc }, peer).then((peerInfo) => peerInfo.peerAddress);
-    const endpoint = new EndpointProgram.Endpoint(toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
-    const messageLib = await getSendLibraryProgram2(connection, endpoint, payer, oftStore, dstEid);
-    remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
-      connection,
-      toWeb3JsPublicKey(payer),
-      {
-        sender: hexlify(publicKeyBytes(oftStore)),
-        dstEid,
-        receiver: hexlify(peerAddr)
-      },
-      messageLib
-    );
+    const endpoint = new EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
+    const messageLib = await getSendLibraryProgram2(rpc, endpoint, payer, oftStore, dstEid);
+    remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(rpc, payer, {
+      path: { sender: oftStore, dstEid, receiver: peerAddr },
+      msgLibProgram: messageLib
+    });
   }
   let txBuilder = quoteSend2(
     { programs: programsRepo },
@@ -3862,7 +3759,7 @@ async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts) {
     // 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
       };
@@ -3872,15 +3769,16 @@ async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts) {
   const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
     units: 1e6
   });
-  const buffer = await simulateTransaction(
-    connection,
+  return simulateWeb3JsTransaction(
+    rpc,
     [modifyComputeUnits, web3Ix],
     web3Ix.programId,
     toWeb3JsPublicKey(payer),
-    "confirmed"
+    EndpointProgram.types.getMessagingFeeSerializer(),
+    "confirmed",
+    void 0,
+    addressLookupTable === void 0 ? void 0 : toWeb3JsPublicKey(addressLookupTable)
   );
-  const fee = EndpointProgram.types.messagingFeeBeet.read(buffer, 0);
-  return { nativeFee: BigInt(fee.nativeFee.toString()), lzTokenFee: BigInt(fee.lzTokenFee.toString()) };
 }
 async function quoteOft4(rpc, accounts, quoteParams, oftProgram) {
   const { payer, tokenMint, tokenEscrow } = accounts;
@@ -3906,27 +3804,25 @@ async function quoteOft4(rpc, accounts, quoteParams, oftProgram) {
     }
   ).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),
+    getQuoteOFTResultSerializer2(),
     "confirmed"
   );
-  const [result] = getQuoteOFTResultSerializer2().deserialize(returnedValues, 0);
-  return result;
 }
-async function getSendLibraryProgram2(connection, endpoint, payer, oftStore, remoteEid) {
-  const sendLibInfo = await endpoint.getSendLibrary(connection, toWeb3JsPublicKey(oftStore), remoteEid);
-  if (!sendLibInfo?.programId) {
+async function getSendLibraryProgram2(rpc, endpoint, payer, oftStore, remoteEid) {
+  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.minor == 0 && msgLibVersion.endpointVersion == 2) {
+  } else if (msgLibVersion.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
     return new UlnProgram.Uln(msgLibProgram);
   }
   throw new Error(`Unsupported message library version: ${JSON.stringify(msgLibVersion, null, 2)}`);