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

package/dist/index.cjs

@@ -1,13 +1,14 @@
 'use strict';
 
 var bytes = require('@ethersproject/bytes');
-var umi = require('@metaplex-foundation/umi');
+var umi$1 = require('@metaplex-foundation/umi');
 var umiProgramRepository = require('@metaplex-foundation/umi-program-repository');
 var umiWeb3jsAdapters = require('@metaplex-foundation/umi-web3js-adapters');
 var web3_js = require('@solana/web3.js');
-var lzSolanaSdkV2 = require('@layerzerolabs/lz-solana-sdk-v2');
+var umi = require('@layerzerolabs/lz-solana-sdk-v2/umi');
 var serializers = require('@metaplex-foundation/umi/serializers');
 var umiEddsaWeb3js = require('@metaplex-foundation/umi-eddsa-web3js');
+var lzSolanaSdkV2 = require('@layerzerolabs/lz-solana-sdk-v2');
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -98,39 +99,39 @@ function getLzReceiveTypesAccountsAccountDataSerializer() {
   );
 }
 function deserializeLzReceiveTypesAccounts(rawAccount) {
-  return umi.deserializeAccount(
+  return umi$1.deserializeAccount(
     rawAccount,
     getLzReceiveTypesAccountsAccountDataSerializer()
   );
 }
 async function fetchLzReceiveTypesAccounts(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
+  umi$1.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
   return deserializeLzReceiveTypesAccounts(maybeAccount);
 }
 async function safeFetchLzReceiveTypesAccounts(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializeLzReceiveTypesAccounts(maybeAccount) : null;
 }
 async function fetchAllLzReceiveTypesAccounts(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
+    umi$1.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
     return deserializeLzReceiveTypesAccounts(maybeAccount);
   });
 }
 async function safeFetchAllLzReceiveTypesAccounts(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map(
@@ -139,7 +140,7 @@ async function safeFetchAllLzReceiveTypesAccounts(context, publicKeys, options)
 }
 function getLzReceiveTypesAccountsGpaBuilder(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     oftStore: [8, serializers.publicKey()],
     tokenMint: [40, serializers.publicKey()]
@@ -414,43 +415,43 @@ function getOFTStoreAccountDataSerializer() {
   );
 }
 function deserializeOFTStore(rawAccount) {
-  return umi.deserializeAccount(rawAccount, getOFTStoreAccountDataSerializer());
+  return umi$1.deserializeAccount(rawAccount, getOFTStoreAccountDataSerializer());
 }
 async function fetchOFTStore(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "OFTStore");
+  umi$1.assertAccountExists(maybeAccount, "OFTStore");
   return deserializeOFTStore(maybeAccount);
 }
 async function safeFetchOFTStore(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializeOFTStore(maybeAccount) : null;
 }
 async function fetchAllOFTStore(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "OFTStore");
+    umi$1.assertAccountExists(maybeAccount, "OFTStore");
     return deserializeOFTStore(maybeAccount);
   });
 }
 async function safeFetchAllOFTStore(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map((maybeAccount) => deserializeOFTStore(maybeAccount));
 }
 function getOFTStoreGpaBuilder(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     oftType: [8, getOFTTypeSerializer()],
     ld2sdRate: [9, serializers.u64()],
@@ -490,43 +491,43 @@ function getPeerConfigAccountDataSerializer() {
   );
 }
 function deserializePeerConfig(rawAccount) {
-  return umi.deserializeAccount(rawAccount, getPeerConfigAccountDataSerializer());
+  return umi$1.deserializeAccount(rawAccount, getPeerConfigAccountDataSerializer());
 }
 async function fetchPeerConfig(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "PeerConfig");
+  umi$1.assertAccountExists(maybeAccount, "PeerConfig");
   return deserializePeerConfig(maybeAccount);
 }
 async function safeFetchPeerConfig(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializePeerConfig(maybeAccount) : null;
 }
 async function fetchAllPeerConfig(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "PeerConfig");
+    umi$1.assertAccountExists(maybeAccount, "PeerConfig");
     return deserializePeerConfig(maybeAccount);
   });
 }
 async function safeFetchAllPeerConfig(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map((maybeAccount) => deserializePeerConfig(maybeAccount));
 }
 function getPeerConfigGpaBuilder(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     peerAddress: [8, serializers.bytes({ size: 32 })],
     enforcedOptions: [40, getEnforcedOptionsSerializer()],
@@ -557,7 +558,7 @@ __export(errors_exports, {
 });
 var codeToErrorMap = /* @__PURE__ */ new Map();
 var nameToErrorMap = /* @__PURE__ */ new Map();
-var UnauthorizedError = class extends umi.ProgramError {
+var UnauthorizedError = class extends umi$1.ProgramError {
   // 6000
   constructor(program, cause) {
     super("", program, cause);
@@ -567,7 +568,7 @@ var UnauthorizedError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6e3, UnauthorizedError);
 nameToErrorMap.set("Unauthorized", UnauthorizedError);
-var InvalidSenderError = class extends umi.ProgramError {
+var InvalidSenderError = class extends umi$1.ProgramError {
   // 6001
   constructor(program, cause) {
     super("", program, cause);
@@ -577,7 +578,7 @@ var InvalidSenderError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6001, InvalidSenderError);
 nameToErrorMap.set("InvalidSender", InvalidSenderError);
-var InvalidDecimalsError = class extends umi.ProgramError {
+var InvalidDecimalsError = class extends umi$1.ProgramError {
   // 6002
   constructor(program, cause) {
     super("", program, cause);
@@ -587,7 +588,7 @@ var InvalidDecimalsError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6002, InvalidDecimalsError);
 nameToErrorMap.set("InvalidDecimals", InvalidDecimalsError);
-var SlippageExceededError = class extends umi.ProgramError {
+var SlippageExceededError = class extends umi$1.ProgramError {
   // 6003
   constructor(program, cause) {
     super("", program, cause);
@@ -597,7 +598,7 @@ var SlippageExceededError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6003, SlippageExceededError);
 nameToErrorMap.set("SlippageExceeded", SlippageExceededError);
-var InvalidTokenDestError = class extends umi.ProgramError {
+var InvalidTokenDestError = class extends umi$1.ProgramError {
   // 6004
   constructor(program, cause) {
     super("", program, cause);
@@ -607,7 +608,7 @@ var InvalidTokenDestError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6004, InvalidTokenDestError);
 nameToErrorMap.set("InvalidTokenDest", InvalidTokenDestError);
-var RateLimitExceededError = class extends umi.ProgramError {
+var RateLimitExceededError = class extends umi$1.ProgramError {
   // 6005
   constructor(program, cause) {
     super("", program, cause);
@@ -617,7 +618,7 @@ var RateLimitExceededError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6005, RateLimitExceededError);
 nameToErrorMap.set("RateLimitExceeded", RateLimitExceededError);
-var InvalidFeeError = class extends umi.ProgramError {
+var InvalidFeeError = class extends umi$1.ProgramError {
   // 6006
   constructor(program, cause) {
     super("", program, cause);
@@ -627,7 +628,7 @@ var InvalidFeeError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6006, InvalidFeeError);
 nameToErrorMap.set("InvalidFee", InvalidFeeError);
-var InvalidMintAuthorityError = class extends umi.ProgramError {
+var InvalidMintAuthorityError = class extends umi$1.ProgramError {
   // 6007
   constructor(program, cause) {
     super("", program, cause);
@@ -637,7 +638,7 @@ var InvalidMintAuthorityError = class extends umi.ProgramError {
 };
 codeToErrorMap.set(6007, InvalidMintAuthorityError);
 nameToErrorMap.set("InvalidMintAuthority", InvalidMintAuthorityError);
-var PausedError = class extends umi.ProgramError {
+var PausedError = class extends umi$1.ProgramError {
   // 6008
   constructor(program, cause) {
     super("", program, cause);
@@ -701,10 +702,10 @@ function expectPublicKey(value) {
   if (!value) {
     throw new Error("Expected a PublicKey.");
   }
-  return umi.publicKey(value, false);
+  return umi$1.publicKey(value, false);
 }
 function expectPda(value) {
-  if (!value || !Array.isArray(value) || !umi.isPda(value)) {
+  if (!value || !Array.isArray(value) || !umi$1.isPda(value)) {
     throw new Error("Expected a PDA.");
   }
   return value;
@@ -718,12 +719,12 @@ function getAccountMetasAndSigners(accounts, optionalAccountStrategy, programId)
       keys.push({ pubkey: programId, isSigner: false, isWritable: false });
       return;
     }
-    if (umi.isSigner(account.value)) {
+    if (umi$1.isSigner(account.value)) {
       signers.push(account.value);
     }
     keys.push({
-      pubkey: umi.publicKey(account.value, false),
-      isSigner: umi.isSigner(account.value),
+      pubkey: umi$1.publicKey(account.value, false),
+      isSigner: umi$1.isSigner(account.value),
       isWritable: account.isWritable
     });
   });
@@ -818,7 +819,7 @@ function initOft(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -932,7 +933,7 @@ function lzReceive(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -978,7 +979,7 @@ function lzReceiveTypes(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1006,7 +1007,7 @@ function oftVersion(context) {
   );
   const data = getOftVersionInstructionDataSerializer().serialize({});
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1059,7 +1060,7 @@ function quoteOft(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1112,7 +1113,7 @@ function quoteSend(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1203,7 +1204,7 @@ function send(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1249,7 +1250,7 @@ function setOftConfig(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1295,7 +1296,7 @@ function setPause(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1355,7 +1356,7 @@ function setPeerConfig(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1428,7 +1429,7 @@ function withdrawFee(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -1443,16 +1444,16 @@ var OftPDA = class {
   peer(oftStore, eid) {
     return eddsa.findPda(this.program, [
       Buffer.from(PEER_SEED, "utf8"),
-      umi.publicKeyBytes(oftStore),
+      umi$1.publicKeyBytes(oftStore),
       serializers.u32({ endian: serializers.Endian.Big }).serialize(eid)
       // new BN(eid).toArrayLike(Buffer, 'be', 4),
     ]);
   }
   oftStore(escrow) {
-    return eddsa.findPda(this.program, [Buffer.from(OFT_SEED, "utf8"), umi.publicKeyBytes(escrow)]);
+    return eddsa.findPda(this.program, [Buffer.from(OFT_SEED, "utf8"), umi$1.publicKeyBytes(escrow)]);
   }
   lzReceiveTypesAccounts(oftConfig) {
-    return eddsa.findPda(this.program, [Buffer.from(lzSolanaSdkV2.LZ_RECEIVE_TYPES_SEED, "utf8"), umi.publicKeyBytes(oftConfig)]);
+    return eddsa.findPda(this.program, [Buffer.from(lzSolanaSdkV2.LZ_RECEIVE_TYPES_SEED, "utf8"), umi$1.publicKeyBytes(oftConfig)]);
   }
 };
 
@@ -1490,11 +1491,11 @@ function getOftProgramId(context, clusterFilter) {
 }
 
 // src/oft302.ts
-var ENDPOINT_PROGRAM_ID = umiWeb3jsAdapters.fromWeb3JsPublicKey(lzSolanaSdkV2.EndpointProgram.PROGRAM_ID);
-var ULN_PROGRAM_ID = umiWeb3jsAdapters.fromWeb3JsPublicKey(lzSolanaSdkV2.UlnProgram.PROGRAM_ID);
+var ENDPOINT_PROGRAM_ID = umi.EndpointProgram.ENDPOINT_PROGRAM_ID;
+var ULN_PROGRAM_ID = umi.UlnProgram.ULN_PROGRAM_ID;
 function createOFTProgramRepo(oftProgram, rpc) {
   if (rpc === void 0) {
-    rpc = umi.createNullRpc();
+    rpc = umi$1.createNullRpc();
     rpc.getCluster = () => "custom";
   }
   return umiProgramRepository.createDefaultProgramRepository({ rpc }, [
@@ -1516,7 +1517,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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID));
+  const endpoint = new umi.EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID);
   const { payer, admin, mint, escrow } = accounts;
   const [oftStore] = deriver.oftStore(escrow.publicKey);
   const [lzReceiveTypes3] = deriver.lzReceiveTypesAccounts(oftStore);
@@ -1536,13 +1537,13 @@ function initOft2(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
       oftType,
       admin,
       sharedDecimals,
-      endpointProgram: umiWeb3jsAdapters.fromWeb3JsPublicKey(endpoint.program)
+      endpointProgram: endpoint.programId
     }
   );
   const retval = txBuilder.addRemainingAccounts(
-    endpoint.getRegisterOappIxAccountMetaForCPI(umiWeb3jsAdapters.toWeb3JsPublicKey(payer.publicKey), umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore)).map((acc) => {
+    endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1554,7 +1555,6 @@ function initOft2(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
 function setOFTConfig(accounts, params, programs) {
   let actualParams;
   const { oftStore, admin } = accounts;
-  const oftStoreWeb3Js = umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore);
   const remainingAccounts = [];
   if (params.__kind === "Admin") {
     if (params.admin === void 0) {
@@ -1572,29 +1572,13 @@ function setOFTConfig(accounts, params, programs) {
       __kind: "Delegate",
       fields: [params.delegate]
     };
-    const endpointProgram = umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID);
-    const [oAppRegistry] = new lzSolanaSdkV2.EndpointPDADeriver(endpointProgram).oappRegistry(oftStoreWeb3Js);
-    const [endpointEventAuthority] = new lzSolanaSdkV2.EventPDADeriver(endpointProgram).eventAuthority();
-    const keys = lzSolanaSdkV2.EndpointProgram.instructions.createSetDelegateInstructionAccounts(
-      {
-        oapp: oftStoreWeb3Js,
-        oappRegistry: oAppRegistry,
-        eventAuthority: endpointEventAuthority,
-        program: endpointProgram
-      },
-      endpointProgram
-    );
+    const endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID;
+    const endpointSDK = new umi.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");
@@ -1614,12 +1598,12 @@ function setOFTConfig(accounts, params, programs) {
   } else if (params.__kind === "Pauser") {
     actualParams = {
       __kind: "Pauser",
-      fields: [params.pauser ? umi.some(params.pauser) : umi.none()]
+      fields: [params.pauser ? umi$1.some(params.pauser) : umi$1.none()]
     };
   } else {
     actualParams = {
       __kind: "Unpauser",
-      fields: [params.unpauser ? umi.some(params.unpauser) : umi.none()]
+      fields: [params.unpauser ? umi$1.some(params.unpauser) : umi$1.none()]
     };
   }
   const txBuilder = setOftConfig(
@@ -1633,7 +1617,7 @@ function setOFTConfig(accounts, params, programs) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1655,7 +1639,7 @@ function setPeerConfig2(accounts, param, oftProgramId) {
     }
     config = peerConfigParam("PeerAddress", [param.peer]);
   } else if (param.__kind === "FeeBps") {
-    config = { __kind: "FeeBps", fields: [umi.some(param.feeBps)] };
+    config = { __kind: "FeeBps", fields: [umi$1.some(param.feeBps)] };
   } else if (param.__kind === "EnforcedOptions") {
     config = {
       __kind: "EnforcedOptions",
@@ -1666,9 +1650,9 @@ function setPeerConfig2(accounts, param, oftProgramId) {
     config = {
       __kind: param.__kind,
       fields: [
-        param.rateLimit ? umi.some({
-          refillPerSecond: umi.some(param.rateLimit.refillPerSecond),
-          capacity: umi.some(param.rateLimit.capacity)
+        param.rateLimit ? umi$1.some({
+          refillPerSecond: umi$1.some(param.rateLimit.refillPerSecond),
+          capacity: umi$1.some(param.rateLimit.capacity)
         }) : null
       ]
     };
@@ -1689,60 +1673,34 @@ function setPeerConfig2(accounts, param, oftProgramId) {
 }
 function initSendLibrary(accounts, remoteEid, endpointProgram = ENDPOINT_PROGRAM_ID) {
   const { admin, oftStore } = accounts;
-  const endpoint = new lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.initSendLibrary(umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey), umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore), remoteEid)
-    ),
-    signers: [admin],
-    bytesCreatedOnChain: 0
-  };
+  const endpoint = new umi.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.initReceiveLibrary(umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey), umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore), remoteEid)
-    ),
-    signers: [admin],
-    bytesCreatedOnChain: 0
-  };
+  const endpoint = new umi.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.setSendLibrary(
-        umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey),
-        umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore),
-        umiWeb3jsAdapters.toWeb3JsPublicKey(sendLibraryProgram),
-        remoteEid
-      )
-    ),
-    signers: [admin],
-    bytesCreatedOnChain: 0
-  };
+  const endpoint = new umi.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.setReceiveLibrary(
-        umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey),
-        umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore),
-        umiWeb3jsAdapters.toWeb3JsPublicKey(receiveLibraryProgram),
-        remoteEid,
-        gracePeriod
-      )
-    ),
-    signers: [admin],
-    bytesCreatedOnChain: 0
-  };
+  const endpoint = new umi.EndpointProgram.Endpoint(endpointProgram);
+  return endpoint.setOAppReceiveLibrary(admin, {
+    receiver: oftStore,
+    remote: remoteEid,
+    msgLibProgram: receiveLibraryProgram,
+    gracePeriod
+  });
 }
 function initConfig(accounts, remoteEid, programs) {
   const { admin, oftStore, payer } = accounts;
@@ -1754,28 +1712,26 @@ function initConfig(accounts, remoteEid, programs) {
     msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID;
     endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID;
   }
-  const endpoint = new lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
+  const endpoint = new umi.EndpointProgram.Endpoint(endpointProgram);
   let msgLib;
-  if (msgLibProgram.toString() === lzSolanaSdkV2.SimpleMessageLibProgram.PROGRAM_ID.toBase58()) {
-    msgLib = new lzSolanaSdkV2.SimpleMessageLibProgram.SimpleMessageLib(lzSolanaSdkV2.SimpleMessageLibProgram.PROGRAM_ID);
+  if (msgLibProgram === umi.SimpleMessageLibProgram.SIMPLE_MESSAGELIB_PROGRAM_ID) {
+    msgLib = new umi.SimpleMessageLibProgram.SimpleMessageLib(umi.SimpleMessageLibProgram.SIMPLE_MESSAGELIB_PROGRAM_ID);
   } else {
-    msgLib = new lzSolanaSdkV2.UlnProgram.Uln(umiWeb3jsAdapters.toWeb3JsPublicKey(msgLibProgram));
+    msgLib = new umi.UlnProgram.Uln(msgLibProgram);
   }
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.initOAppConfig(
-        umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey),
-        msgLib,
-        umiWeb3jsAdapters.toWeb3JsPublicKey(payer.publicKey),
-        umiWeb3jsAdapters.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;
@@ -1786,20 +1742,16 @@ async function setConfig(connection, accounts, params, programs) {
     msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID;
     endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID;
   }
-  const endpoint = new lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return umiWeb3jsAdapters.fromWeb3JsInstruction(
-    await endpoint.setOappConfig(
-      connection,
-      umiWeb3jsAdapters.toWeb3JsPublicKey(signer),
-      umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore),
-      umiWeb3jsAdapters.toWeb3JsPublicKey(msgLibProgram),
-      remoteEid,
-      {
-        configType,
-        value: config
-      }
-    )
-  );
+  const endpoint = new umi.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;
@@ -1825,25 +1777,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 web3_js.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID));
-    const msgLibProgram = await getSendLibraryProgram(connection, endpoint, payer.publicKey, oftStore, dstEid);
+    const endpoint = new umi.EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID);
+    const msgLibProgram = await getSendLibraryProgram(rpc, endpoint, payer.publicKey, oftStore, dstEid);
     const packetPath = {
-      srcEid: 0,
       dstEid,
-      sender: bytes.hexlify(umi.publicKeyBytes(oftStore)),
-      receiver: bytes.hexlify(peerAddr)
+      sender: oftStore,
+      receiver: peerAddr
     };
-    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-      connection,
-      umiWeb3jsAdapters.toWeb3JsPublicKey(payer.publicKey),
-      packetPath,
+    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+      path: packetPath,
       msgLibProgram
-    );
+    });
   }
-  const [eventAuthorityPDA] = new lzSolanaSdkV2.EventPDADeriver(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.oft)).eventAuthority();
+  const [eventAuthorityPDA] = new umi.EventPDA(programs.oft).eventAuthority();
   const tokenProgram = programs.token ?? umiWeb3jsAdapters.fromWeb3JsPublicKey(TOKEN_PROGRAM_ID);
   const txBuilder = send(
     { programs: createOFTProgramRepo(programs.oft) },
@@ -1855,7 +1803,7 @@ async function send2(rpc, accounts, sendParams, programs, remainingAccounts) {
       tokenEscrow,
       tokenMint,
       tokenProgram,
-      eventAuthority: umiWeb3jsAdapters.fromWeb3JsPublicKey(eventAuthorityPDA),
+      eventAuthority: eventAuthorityPDA,
       program: programs.oft,
       // params
       dstEid,
@@ -1871,7 +1819,7 @@ async function send2(rpc, accounts, sendParams, programs, remainingAccounts) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1884,21 +1832,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 web3_js.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID));
-    const messageLib = await getSendLibraryProgram(connection, endpoint, payer, oftStore, dstEid);
-    remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
-      connection,
-      umiWeb3jsAdapters.toWeb3JsPublicKey(payer),
-      {
-        sender: bytes.hexlify(umi.publicKeyBytes(oftStore)),
-        dstEid,
-        receiver: bytes.hexlify(peerAddr)
-      },
-      messageLib
-    );
+    const endpoint = new umi.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) },
@@ -1920,7 +1861,7 @@ async function quote(rpc, accounts, quoteParams, programs, remainingAccounts, ad
     // Get remaining accounts from msgLib(simple_msgLib or uln)
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -1930,17 +1871,16 @@ async function quote(rpc, accounts, quoteParams, programs, remainingAccounts, ad
   const modifyComputeUnits = web3_js.ComputeBudgetProgram.setComputeUnitLimit({
     units: 1e6
   });
-  const buffer = await lzSolanaSdkV2.simulateTransaction(
-    connection,
+  return umi.simulateWeb3JsTransaction(
+    rpc,
     [modifyComputeUnits, web3Ix],
     web3Ix.programId,
     umiWeb3jsAdapters.toWeb3JsPublicKey(payer),
+    umi.EndpointProgram.types.getMessagingFeeSerializer(),
     "confirmed",
     void 0,
     addressLookupTable === void 0 ? void 0 : umiWeb3jsAdapters.toWeb3JsPublicKey(addressLookupTable)
   );
-  const fee = lzSolanaSdkV2.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;
@@ -1965,32 +1905,23 @@ async function quoteOft2(rpc, accounts, quoteParams, oftProgram) {
     }
   ).getInstructions()[0];
   const web3Ix = umiWeb3jsAdapters.toWeb3JsInstruction(ix);
-  const connection = new web3_js.Connection(rpc.getEndpoint());
-  const returnedValues = await lzSolanaSdkV2.simulateTransaction(
-    connection,
+  return umi.simulateWeb3JsTransaction(
+    rpc.getEndpoint(),
     [web3Ix],
     web3Ix.programId,
     umiWeb3jsAdapters.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  return {
-    instruction: umiWeb3jsAdapters.fromWeb3JsInstruction(
-      endpoint.initOAppNonce(
-        umiWeb3jsAdapters.toWeb3JsPublicKey(admin.publicKey),
-        remoteEid,
-        umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore),
-        remoteOappAddr
-      )
-    ),
-    signers: [admin],
-    bytesCreatedOnChain: 0
-  };
+  const endpoint = new umi.EndpointProgram.Endpoint(endpointProgram);
+  return endpoint.initOAppNonce(admin, {
+    localOApp: oftStore,
+    remote: remoteEid,
+    remoteOApp: remoteOappAddr
+  });
 }
 async function getEndpointConfig(rpc, oftStore, endpointId, programs) {
   let msgLibProgram, endpointProgram;
@@ -2001,38 +1932,33 @@ async function getEndpointConfig(rpc, oftStore, endpointId, programs) {
     msgLibProgram = programs.msgLib ?? ULN_PROGRAM_ID;
     endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID;
   }
-  const endpointDeriver = new lzSolanaSdkV2.EndpointPDADeriver(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram));
-  const ulnDeriver = new lzSolanaSdkV2.UlnPDADeriver(umiWeb3jsAdapters.toWeb3JsPublicKey(msgLibProgram));
-  const web3OftStore = umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore);
-  const [sendLib] = endpointDeriver.sendLibraryConfig(web3OftStore, endpointId);
+  const endpointDeriver = new umi.EndpointPDA(endpointProgram);
+  const ulnDeriver = new umi.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 web3_js.Connection(rpc.getEndpoint());
-  let sendLibraryConfig = await lzSolanaSdkV2.EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, sendLib);
-  let receiveLibraryConfig = await lzSolanaSdkV2.EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, receiveLib);
-  const defaultSendLibraryConfig = await lzSolanaSdkV2.EndpointProgram.accounts.SendLibraryConfig.fromAccountAddress(connection, defaultSendLib);
-  const defaultReceiveLibraryConfig = await lzSolanaSdkV2.EndpointProgram.accounts.ReceiveLibraryConfig.fromAccountAddress(connection, defaultReceiveLib);
-  const nil64 = "18446744073709551615";
+  let sendLibraryConfig = await umi.EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, sendLib);
+  let receiveLibraryConfig = await umi.EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, receiveLib);
+  const defaultSendLibraryConfig = await umi.EndpointProgram.accounts.fetchSendLibraryConfig({ rpc }, defaultSendLib);
+  const defaultReceiveLibraryConfig = await umi.EndpointProgram.accounts.fetchReceiveLibraryConfig({ rpc }, defaultReceiveLib);
+  const nil64 = 18446744073709551615n;
   const nil8 = 255;
-  if (sendLibraryConfig.messageLib.toBase58() === umi.defaultPublicKey().toString()) {
+  if (sendLibraryConfig.messageLib === umi$1.defaultPublicKey()) {
     sendLibraryConfig = defaultSendLibraryConfig;
   }
-  if (receiveLibraryConfig.messageLib.toBase58() === umi.defaultPublicKey().toString()) {
+  if (receiveLibraryConfig.messageLib === umi$1.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 lzSolanaSdkV2.UlnProgram.accounts.SendConfig.fromAccountAddress(connection, ulnSendConfigPDA);
-    const ulnDefaultSendConfig = await lzSolanaSdkV2.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 umi.UlnProgram.accounts.fetchSendConfig({ rpc }, ulnSendConfigPDA);
+    const ulnDefaultSendConfig = await umi.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) {
@@ -2051,20 +1977,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 lzSolanaSdkV2.UlnProgram.accounts.ReceiveConfig.fromAccountAddress(
-      connection,
-      ulnReceiveConfigPDA
-    );
-    const ulnDefaultReceiveConfig = await lzSolanaSdkV2.UlnProgram.accounts.ReceiveConfig.fromAccountAddress(
-      connection,
+    const [ulnReceiveConfigPDA] = ulnDeriver.receiveConfig(endpointId, oftStore);
+    const ulnReceiveConfig = await umi.UlnProgram.accounts.fetchReceiveConfig({ rpc }, ulnReceiveConfigPDA);
+    const ulnDefaultReceiveConfig = await umi.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) {
@@ -2094,31 +2017,26 @@ async function getPeerAddress(rpc, oftInstance, remoteEid, oftProgramId) {
   return bytes.hexlify(peerInfo.peerAddress);
 }
 async function getDelegate(rpc, oftInstance, endpointProgram = ENDPOINT_PROGRAM_ID) {
-  const [oAppRegistry] = new lzSolanaSdkV2.EndpointPDADeriver(umiWeb3jsAdapters.toWeb3JsPublicKey(endpointProgram)).oappRegistry(
-    umiWeb3jsAdapters.toWeb3JsPublicKey(oftInstance)
-  );
-  const oAppRegistryInfo = await lzSolanaSdkV2.EndpointProgram.accounts.OAppRegistry.fromAccountAddress(
-    new web3_js.Connection(rpc.getEndpoint()),
-    oAppRegistry
-  );
-  return umiWeb3jsAdapters.fromWeb3JsPublicKey(oAppRegistryInfo.delegate);
+  const [oAppRegistry] = new umi.EndpointPDA(endpointProgram).oappRegistry(oftInstance);
+  const oAppRegistryInfo = await umi.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, umiWeb3jsAdapters.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, umiWeb3jsAdapters.toWeb3JsPublicKey(payer), msgLibProgram);
-  if (msgLibVersion?.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
-    return new lzSolanaSdkV2.SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram);
-  } else if (msgLibVersion?.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
-    return new lzSolanaSdkV2.UlnProgram.Uln(msgLibProgram);
+  const msgLibVersion = await endpoint.getMessageLibVersion(rpc, payer, msgLibProgram);
+  if (msgLibVersion.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    return new umi.SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram);
+  } else if (msgLibVersion.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    return new umi.UlnProgram.Uln(msgLibProgram);
   }
   throw new Error(`Unsupported message library version: ${JSON.stringify(msgLibVersion, null, 2)}`);
 }
@@ -2196,39 +2114,39 @@ function getLzReceiveTypesAccountsAccountDataSerializer2() {
   );
 }
 function deserializeLzReceiveTypesAccounts2(rawAccount) {
-  return umi.deserializeAccount(
+  return umi$1.deserializeAccount(
     rawAccount,
     getLzReceiveTypesAccountsAccountDataSerializer2()
   );
 }
 async function fetchLzReceiveTypesAccounts2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
+  umi$1.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
   return deserializeLzReceiveTypesAccounts2(maybeAccount);
 }
 async function safeFetchLzReceiveTypesAccounts2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializeLzReceiveTypesAccounts2(maybeAccount) : null;
 }
 async function fetchAllLzReceiveTypesAccounts2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
+    umi$1.assertAccountExists(maybeAccount, "LzReceiveTypesAccounts");
     return deserializeLzReceiveTypesAccounts2(maybeAccount);
   });
 }
 async function safeFetchAllLzReceiveTypesAccounts2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map(
@@ -2237,7 +2155,7 @@ async function safeFetchAllLzReceiveTypesAccounts2(context, publicKeys, options)
 }
 function getLzReceiveTypesAccountsGpaBuilder2(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     oftStore: [8, serializers.publicKey()],
     tokenMint: [40, serializers.publicKey()]
@@ -2518,43 +2436,43 @@ function getOFTStoreAccountDataSerializer2() {
   );
 }
 function deserializeOFTStore2(rawAccount) {
-  return umi.deserializeAccount(rawAccount, getOFTStoreAccountDataSerializer2());
+  return umi$1.deserializeAccount(rawAccount, getOFTStoreAccountDataSerializer2());
 }
 async function fetchOFTStore2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "OFTStore");
+  umi$1.assertAccountExists(maybeAccount, "OFTStore");
   return deserializeOFTStore2(maybeAccount);
 }
 async function safeFetchOFTStore2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializeOFTStore2(maybeAccount) : null;
 }
 async function fetchAllOFTStore2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "OFTStore");
+    umi$1.assertAccountExists(maybeAccount, "OFTStore");
     return deserializeOFTStore2(maybeAccount);
   });
 }
 async function safeFetchAllOFTStore2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map((maybeAccount) => deserializeOFTStore2(maybeAccount));
 }
 function getOFTStoreGpaBuilder2(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     oftType: [8, getOFTTypeSerializer2()],
     ld2sdRate: [9, serializers.u64()],
@@ -2595,43 +2513,43 @@ function getPeerConfigAccountDataSerializer2() {
   );
 }
 function deserializePeerConfig2(rawAccount) {
-  return umi.deserializeAccount(rawAccount, getPeerConfigAccountDataSerializer2());
+  return umi$1.deserializeAccount(rawAccount, getPeerConfigAccountDataSerializer2());
 }
 async function fetchPeerConfig2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
-  umi.assertAccountExists(maybeAccount, "PeerConfig");
+  umi$1.assertAccountExists(maybeAccount, "PeerConfig");
   return deserializePeerConfig2(maybeAccount);
 }
 async function safeFetchPeerConfig2(context, publicKey3, options) {
   const maybeAccount = await context.rpc.getAccount(
-    umi.publicKey(publicKey3, false),
+    umi$1.publicKey(publicKey3, false),
     options
   );
   return maybeAccount.exists ? deserializePeerConfig2(maybeAccount) : null;
 }
 async function fetchAllPeerConfig2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.map((maybeAccount) => {
-    umi.assertAccountExists(maybeAccount, "PeerConfig");
+    umi$1.assertAccountExists(maybeAccount, "PeerConfig");
     return deserializePeerConfig2(maybeAccount);
   });
 }
 async function safeFetchAllPeerConfig2(context, publicKeys, options) {
   const maybeAccounts = await context.rpc.getAccounts(
-    publicKeys.map((key) => umi.publicKey(key, false)),
+    publicKeys.map((key) => umi$1.publicKey(key, false)),
     options
   );
   return maybeAccounts.filter((maybeAccount) => maybeAccount.exists).map((maybeAccount) => deserializePeerConfig2(maybeAccount));
 }
 function getPeerConfigGpaBuilder2(context) {
   const programId = context.programs.getPublicKey("oft", "");
-  return umi.gpaBuilder(context, programId).registerFields({
+  return umi$1.gpaBuilder(context, programId).registerFields({
     discriminator: [0, serializers.bytes({ size: 8 })],
     peerAddress: [8, serializers.bytes({ size: 32 })],
     enforcedOptions: [40, getEnforcedOptionsSerializer2()],
@@ -2663,7 +2581,7 @@ __export(errors_exports2, {
 });
 var codeToErrorMap2 = /* @__PURE__ */ new Map();
 var nameToErrorMap2 = /* @__PURE__ */ new Map();
-var UnauthorizedError2 = class extends umi.ProgramError {
+var UnauthorizedError2 = class extends umi$1.ProgramError {
   // 6000
   constructor(program, cause) {
     super("", program, cause);
@@ -2673,7 +2591,7 @@ var UnauthorizedError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6e3, UnauthorizedError2);
 nameToErrorMap2.set("Unauthorized", UnauthorizedError2);
-var InvalidSenderError2 = class extends umi.ProgramError {
+var InvalidSenderError2 = class extends umi$1.ProgramError {
   // 6001
   constructor(program, cause) {
     super("", program, cause);
@@ -2683,7 +2601,7 @@ var InvalidSenderError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6001, InvalidSenderError2);
 nameToErrorMap2.set("InvalidSender", InvalidSenderError2);
-var InvalidDecimalsError2 = class extends umi.ProgramError {
+var InvalidDecimalsError2 = class extends umi$1.ProgramError {
   // 6002
   constructor(program, cause) {
     super("", program, cause);
@@ -2693,7 +2611,7 @@ var InvalidDecimalsError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6002, InvalidDecimalsError2);
 nameToErrorMap2.set("InvalidDecimals", InvalidDecimalsError2);
-var SlippageExceededError2 = class extends umi.ProgramError {
+var SlippageExceededError2 = class extends umi$1.ProgramError {
   // 6003
   constructor(program, cause) {
     super("", program, cause);
@@ -2703,7 +2621,7 @@ var SlippageExceededError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6003, SlippageExceededError2);
 nameToErrorMap2.set("SlippageExceeded", SlippageExceededError2);
-var InvalidTokenDestError2 = class extends umi.ProgramError {
+var InvalidTokenDestError2 = class extends umi$1.ProgramError {
   // 6004
   constructor(program, cause) {
     super("", program, cause);
@@ -2713,7 +2631,7 @@ var InvalidTokenDestError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6004, InvalidTokenDestError2);
 nameToErrorMap2.set("InvalidTokenDest", InvalidTokenDestError2);
-var RateLimitExceededError2 = class extends umi.ProgramError {
+var RateLimitExceededError2 = class extends umi$1.ProgramError {
   // 6005
   constructor(program, cause) {
     super("", program, cause);
@@ -2723,7 +2641,7 @@ var RateLimitExceededError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6005, RateLimitExceededError2);
 nameToErrorMap2.set("RateLimitExceeded", RateLimitExceededError2);
-var InvalidFeeError2 = class extends umi.ProgramError {
+var InvalidFeeError2 = class extends umi$1.ProgramError {
   // 6006
   constructor(program, cause) {
     super("", program, cause);
@@ -2733,7 +2651,7 @@ var InvalidFeeError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6006, InvalidFeeError2);
 nameToErrorMap2.set("InvalidFee", InvalidFeeError2);
-var InvalidMintAuthorityError2 = class extends umi.ProgramError {
+var InvalidMintAuthorityError2 = class extends umi$1.ProgramError {
   // 6007
   constructor(program, cause) {
     super("", program, cause);
@@ -2743,7 +2661,7 @@ var InvalidMintAuthorityError2 = class extends umi.ProgramError {
 };
 codeToErrorMap2.set(6007, InvalidMintAuthorityError2);
 nameToErrorMap2.set("InvalidMintAuthority", InvalidMintAuthorityError2);
-var PausedError2 = class extends umi.ProgramError {
+var PausedError2 = class extends umi$1.ProgramError {
   // 6008
   constructor(program, cause) {
     super("", program, cause);
@@ -2805,10 +2723,10 @@ function expectPublicKey2(value) {
   if (!value) {
     throw new Error("Expected a PublicKey.");
   }
-  return umi.publicKey(value, false);
+  return umi$1.publicKey(value, false);
 }
 function expectPda2(value) {
-  if (!value || !Array.isArray(value) || !umi.isPda(value)) {
+  if (!value || !Array.isArray(value) || !umi$1.isPda(value)) {
     throw new Error("Expected a PDA.");
   }
   return value;
@@ -2822,12 +2740,12 @@ function getAccountMetasAndSigners2(accounts, optionalAccountStrategy, programId
       keys.push({ pubkey: programId, isSigner: false, isWritable: false });
       return;
     }
-    if (umi.isSigner(account.value)) {
+    if (umi$1.isSigner(account.value)) {
       signers.push(account.value);
     }
     keys.push({
-      pubkey: umi.publicKey(account.value, false),
-      isSigner: umi.isSigner(account.value),
+      pubkey: umi$1.publicKey(account.value, false),
+      isSigner: umi$1.isSigner(account.value),
       isWritable: account.isWritable
     });
   });
@@ -2922,7 +2840,7 @@ function initOft3(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3036,7 +2954,7 @@ function lzReceive2(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3082,7 +3000,7 @@ function lzReceiveTypes2(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3135,7 +3053,7 @@ function quoteOft3(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3188,7 +3106,7 @@ function quoteSend2(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3279,7 +3197,7 @@ function send3(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3325,7 +3243,7 @@ function setOftConfig2(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3371,7 +3289,7 @@ function setPause2(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3431,7 +3349,7 @@ function setPeerConfig3(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3504,7 +3422,7 @@ function withdrawFee3(context, input) {
     resolvedArgs
   );
   const bytesCreatedOnChain = 0;
-  return umi.transactionBuilder([
+  return umi$1.transactionBuilder([
     { instruction: { keys, programId, data }, signers, bytesCreatedOnChain }
   ]);
 }
@@ -3543,11 +3461,11 @@ function getOftProgramId2(context, clusterFilter) {
 }
 
 // src/oft202.ts
-var ENDPOINT_PROGRAM_ID2 = umiWeb3jsAdapters.fromWeb3JsPublicKey(lzSolanaSdkV2.EndpointProgram.PROGRAM_ID);
+var { ENDPOINT_PROGRAM_ID: ENDPOINT_PROGRAM_ID2 } = umi.EndpointProgram;
 var PROGRAM_NAME = "oft";
 function createOFTProgramRepo2(oftProgram, rpc) {
   if (rpc === void 0) {
-    rpc = umi.createNullRpc();
+    rpc = umi$1.createNullRpc();
     rpc.getCluster = () => "custom";
   }
   return umiProgramRepository.createDefaultProgramRepository({ rpc }, [
@@ -3569,7 +3487,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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
+  const endpoint = new umi.EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
   const { payer, admin, mint, escrow } = accounts;
   const [oftStore] = deriver.oftStore(escrow.publicKey);
   const [lzReceiveTypes3] = deriver.lzReceiveTypesAccounts(oftStore);
@@ -3589,13 +3507,13 @@ function initOft4(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
       oftType,
       admin,
       sharedDecimals,
-      endpointProgram: umiWeb3jsAdapters.fromWeb3JsPublicKey(endpoint.program)
+      endpointProgram: endpoint.programId
     }
   );
   const retval = txBuilder.addRemainingAccounts(
-    endpoint.getRegisterOappIxAccountMetaForCPI(umiWeb3jsAdapters.toWeb3JsPublicKey(payer.publicKey), umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore)).map((acc) => {
+    endpoint.getRegisterOappIxAccountMetaForCPI(payer.publicKey, oftStore).map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -3607,7 +3525,6 @@ function initOft4(accounts, oftType, sharedDecimals = OFT_DECIMALS, programs) {
 function setOFTConfig2(accounts, params, programs) {
   let actualParams;
   const { oftStore, admin } = accounts;
-  const oftStoreWeb3Js = umiWeb3jsAdapters.toWeb3JsPublicKey(oftStore);
   const remainingAccounts = [];
   if (params.__kind === "Admin") {
     if (params.admin === void 0) {
@@ -3625,18 +3542,9 @@ function setOFTConfig2(accounts, params, programs) {
       __kind: "Delegate",
       fields: [params.delegate]
     };
-    const endpointProgram = umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
-    const [oAppRegistry] = new lzSolanaSdkV2.EndpointPDADeriver(endpointProgram).oappRegistry(oftStoreWeb3Js);
-    const [endpointEventAuthority] = new lzSolanaSdkV2.EventPDADeriver(endpointProgram).eventAuthority();
-    const keys = lzSolanaSdkV2.EndpointProgram.instructions.createSetDelegateInstructionAccounts(
-      {
-        oapp: oftStoreWeb3Js,
-        oappRegistry: oAppRegistry,
-        eventAuthority: endpointEventAuthority,
-        program: endpointProgram
-      },
-      endpointProgram
-    );
+    const endpointProgram = programs.endpoint ?? ENDPOINT_PROGRAM_ID2;
+    const endpointSDK = new umi.EndpointProgram.Endpoint(endpointProgram);
+    const keys = endpointSDK.getSetDelegateIxAccountMetaForCPI(oftStore);
     for (const acc of keys) {
       acc.isSigner = false;
     }
@@ -3667,12 +3575,12 @@ function setOFTConfig2(accounts, params, programs) {
   } else if (params.__kind === "Pauser") {
     actualParams = {
       __kind: "Pauser",
-      fields: [params.pauser ? umi.some(params.pauser) : umi.none()]
+      fields: [params.pauser ? umi$1.some(params.pauser) : umi$1.none()]
     };
   } else {
     actualParams = {
       __kind: "Unpauser",
-      fields: [params.unpauser ? umi.some(params.unpauser) : umi.none()]
+      fields: [params.unpauser ? umi$1.some(params.unpauser) : umi$1.none()]
     };
   }
   const txBuilder = setOftConfig2(
@@ -3686,7 +3594,7 @@ function setOFTConfig2(accounts, params, programs) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -3708,7 +3616,7 @@ function setPeerConfig4(accounts, param, oftProgramId) {
     }
     config = peerConfigParam2("PeerAddress", [param.peer]);
   } else if (param.__kind === "FeeBps") {
-    config = { __kind: "FeeBps", fields: [umi.some(param.feeBps)] };
+    config = { __kind: "FeeBps", fields: [umi$1.some(param.feeBps)] };
   } else if (param.__kind === "EnforcedOptions") {
     config = {
       __kind: "EnforcedOptions",
@@ -3719,9 +3627,9 @@ function setPeerConfig4(accounts, param, oftProgramId) {
     config = {
       __kind: param.__kind,
       fields: [
-        param.rateLimit ? umi.some({
-          refillPerSecond: umi.some(param.rateLimit.refillPerSecond),
-          capacity: umi.some(param.rateLimit.capacity)
+        param.rateLimit ? umi$1.some({
+          refillPerSecond: umi$1.some(param.rateLimit.refillPerSecond),
+          capacity: umi$1.some(param.rateLimit.capacity)
         }) : null
       ]
     };
@@ -3768,25 +3676,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 web3_js.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
-    const msgLibProgram = await getSendLibraryProgram2(connection, endpoint, payer.publicKey, oftStore, dstEid);
+    const endpoint = new umi.EndpointProgram.Endpoint(programs.endpoint ?? ENDPOINT_PROGRAM_ID2);
+    const msgLibProgram = await getSendLibraryProgram2(rpc, endpoint, payer.publicKey, oftStore, dstEid);
     const packetPath = {
-      srcEid: 0,
       dstEid,
-      sender: bytes.hexlify(umi.publicKeyBytes(oftStore)),
-      receiver: bytes.hexlify(peerAddr)
+      sender: oftStore,
+      receiver: peerAddr
     };
-    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
-      connection,
-      umiWeb3jsAdapters.toWeb3JsPublicKey(payer.publicKey),
-      packetPath,
+    remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(rpc, payer.publicKey, {
+      path: packetPath,
       msgLibProgram
-    );
+    });
   }
-  const [eventAuthorityPDA] = new lzSolanaSdkV2.EventPDADeriver(umiWeb3jsAdapters.toWeb3JsPublicKey(oftProgramId)).eventAuthority();
+  const [eventAuthorityPDA] = new umi.EventPDA(oftProgramId).eventAuthority();
   const tokenProgram = programs.token ?? umiWeb3jsAdapters.fromWeb3JsPublicKey(TOKEN_PROGRAM_ID);
   const txBuilder = send3(
     { programs: programsRepo },
@@ -3798,7 +3702,7 @@ async function send4(rpc, accounts, sendParams, programs, remainingAccounts) {
       tokenEscrow,
       tokenMint,
       tokenProgram,
-      eventAuthority: umiWeb3jsAdapters.fromWeb3JsPublicKey(eventAuthorityPDA),
+      eventAuthority: eventAuthorityPDA,
       program: oftProgramId,
       // params
       dstEid,
@@ -3814,35 +3718,28 @@ async function send4(rpc, accounts, sendParams, programs, remainingAccounts) {
   return txBuilder.addRemainingAccounts(
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.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 web3_js.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 lzSolanaSdkV2.EndpointProgram.Endpoint(umiWeb3jsAdapters.toWeb3JsPublicKey(programs.endpoint ?? ENDPOINT_PROGRAM_ID2));
-    const messageLib = await getSendLibraryProgram2(connection, endpoint, payer, oftStore, dstEid);
-    remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
-      connection,
-      umiWeb3jsAdapters.toWeb3JsPublicKey(payer),
-      {
-        sender: bytes.hexlify(umi.publicKeyBytes(oftStore)),
-        dstEid,
-        receiver: bytes.hexlify(peerAddr)
-      },
-      messageLib
-    );
+    const endpoint = new umi.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 },
@@ -3864,7 +3761,7 @@ async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts) {
     // Get remaining accounts from msgLib(simple_msgLib or uln)
     remainingAccounts.map((acc) => {
       return {
-        pubkey: umiWeb3jsAdapters.fromWeb3JsPublicKey(acc.pubkey),
+        pubkey: acc.pubkey,
         isSigner: acc.isSigner,
         isWritable: acc.isWritable
       };
@@ -3874,15 +3771,16 @@ async function quote2(rpc, accounts, quoteParams, programs, remainingAccounts) {
   const modifyComputeUnits = web3_js.ComputeBudgetProgram.setComputeUnitLimit({
     units: 1e6
   });
-  const buffer = await lzSolanaSdkV2.simulateTransaction(
-    connection,
+  return umi.simulateWeb3JsTransaction(
+    rpc,
     [modifyComputeUnits, web3Ix],
     web3Ix.programId,
     umiWeb3jsAdapters.toWeb3JsPublicKey(payer),
-    "confirmed"
+    umi.EndpointProgram.types.getMessagingFeeSerializer(),
+    "confirmed",
+    void 0,
+    addressLookupTable === void 0 ? void 0 : umiWeb3jsAdapters.toWeb3JsPublicKey(addressLookupTable)
   );
-  const fee = lzSolanaSdkV2.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;
@@ -3908,28 +3806,26 @@ async function quoteOft4(rpc, accounts, quoteParams, oftProgram) {
     }
   ).getInstructions()[0];
   const web3Ix = umiWeb3jsAdapters.toWeb3JsInstruction(ix);
-  const connection = new web3_js.Connection(rpc.getEndpoint());
-  const returnedValues = await lzSolanaSdkV2.simulateTransaction(
-    connection,
+  return umi.simulateWeb3JsTransaction(
+    rpc.getEndpoint(),
     [web3Ix],
     web3Ix.programId,
     umiWeb3jsAdapters.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, umiWeb3jsAdapters.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, umiWeb3jsAdapters.toWeb3JsPublicKey(payer), msgLibProgram);
-  if (msgLibVersion?.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
-    return new lzSolanaSdkV2.SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram);
-  } else if (msgLibVersion?.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
-    return new lzSolanaSdkV2.UlnProgram.Uln(msgLibProgram);
+  const msgLibVersion = await endpoint.getMessageLibVersion(rpc, payer, msgLibProgram);
+  if (msgLibVersion.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    return new umi.SimpleMessageLibProgram.SimpleMessageLib(msgLibProgram);
+  } else if (msgLibVersion.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+    return new umi.UlnProgram.Uln(msgLibProgram);
   }
   throw new Error(`Unsupported message library version: ${JSON.stringify(msgLibVersion, null, 2)}`);
 }