@layerzerolabs/lz-solana-sdk-v2 2.3.21 → 2.3.22

package/dist/index.cjs

@@ -1,13 +1,13 @@
 'use strict';
 
 var web35 = require('@solana/web3.js');
-var BN6 = require('bn.js');
+var BN2 = require('bn.js');
 var beet201 = require('@metaplex-foundation/beet');
 var beetSolana97 = require('@metaplex-foundation/beet-solana');
 var splToken = require('@solana/spl-token');
 var bytes = require('@ethersproject/bytes');
 var keccak256 = require('@ethersproject/keccak256');
-var invariant2 = require('tiny-invariant');
+var invariant3 = require('tiny-invariant');
 var address = require('@ethersproject/address');
 require('@ethersproject/abi');
 var bignumber = require('@ethersproject/bignumber');
@@ -39,11 +39,11 @@ function _interopNamespace(e) {
 }
 
 var web35__namespace = /*#__PURE__*/_interopNamespace(web35);
-var BN6__default = /*#__PURE__*/_interopDefault(BN6);
+var BN2__default = /*#__PURE__*/_interopDefault(BN2);
 var beet201__namespace = /*#__PURE__*/_interopNamespace(beet201);
 var beetSolana97__namespace = /*#__PURE__*/_interopNamespace(beetSolana97);
 var splToken__namespace = /*#__PURE__*/_interopNamespace(splToken);
-var invariant2__default = /*#__PURE__*/_interopDefault(invariant2);
+var invariant3__default = /*#__PURE__*/_interopDefault(invariant3);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var base58__default = /*#__PURE__*/_interopDefault(base58);
 
@@ -115,7 +115,7 @@ var MaxExecutorOptionTypeLength = 10;
 function oappIDPDA(program, seed = COUNT_SEED, id) {
   if (id != void 0) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(seed, "utf8"), new BN6__default.default(id).toArrayLike(Buffer, "be", 1)],
+      [Buffer.from(seed, "utf8"), new BN2__default.default(id).toArrayLike(Buffer, "be", 1)],
       program
     );
   } else {
@@ -159,121 +159,22 @@ var BaseOApp = class {
   }
 };
 
-// src/generated/oft/index.ts
-var oft_exports = {};
-__export(oft_exports, {
+// src/generated/oft/accounts/index.ts
+var accounts_exports = {};
+__export(accounts_exports, {
   EnforcedOptions: () => EnforcedOptions,
-  InvalidDecimalsError: () => InvalidDecimalsError,
-  InvalidEndpointProgramError: () => InvalidEndpointProgramError,
-  InvalidOptionsError: () => InvalidOptionsError,
-  InvalidSenderError: () => InvalidSenderError,
-  InvalidTokenDestError: () => InvalidTokenDestError,
-  InvalidTokenEscrowError: () => InvalidTokenEscrowError,
-  InvalidTokenMintError: () => InvalidTokenMintError,
   LzReceiveTypesAccounts: () => LzReceiveTypesAccounts,
   OftConfig: () => OftConfig,
-  PROGRAM_ADDRESS: () => PROGRAM_ADDRESS,
-  PROGRAM_ID: () => PROGRAM_ID,
   Peer: () => Peer,
-  RateLimitExceededError: () => RateLimitExceededError,
-  SlippageExceededError: () => SlippageExceededError,
-  UnauthorizedError: () => UnauthorizedError,
   accountProviders: () => accountProviders,
-  createInitAdapterOftInstruction: () => createInitAdapterOftInstruction,
-  createInitAdapterOftInstructionAccounts: () => createInitAdapterOftInstructionAccounts,
-  createInitOftInstruction: () => createInitOftInstruction,
-  createInitOftInstructionAccounts: () => createInitOftInstructionAccounts,
-  createLzReceiveInstruction: () => createLzReceiveInstruction,
-  createLzReceiveInstructionAccounts: () => createLzReceiveInstructionAccounts,
-  createLzReceiveTypesInstruction: () => createLzReceiveTypesInstruction,
-  createLzReceiveTypesInstructionAccounts: () => createLzReceiveTypesInstructionAccounts,
-  createMintToInstruction: () => createMintToInstruction,
-  createMintToInstructionAccounts: () => createMintToInstructionAccounts,
-  createQuoteInstruction: () => createQuoteInstruction,
-  createQuoteInstructionAccounts: () => createQuoteInstructionAccounts,
-  createQuoteOftInstruction: () => createQuoteOftInstruction,
-  createQuoteOftInstructionAccounts: () => createQuoteOftInstructionAccounts,
-  createSendInstruction: () => createSendInstruction,
-  createSendInstructionAccounts: () => createSendInstructionAccounts,
-  createSetDelegateInstruction: () => createSetDelegateInstruction,
-  createSetDelegateInstructionAccounts: () => createSetDelegateInstructionAccounts,
-  createSetEnforcedOptionsInstruction: () => createSetEnforcedOptionsInstruction,
-  createSetEnforcedOptionsInstructionAccounts: () => createSetEnforcedOptionsInstructionAccounts,
-  createSetMintAuthorityInstruction: () => createSetMintAuthorityInstruction,
-  createSetMintAuthorityInstructionAccounts: () => createSetMintAuthorityInstructionAccounts,
-  createSetPeerInstruction: () => createSetPeerInstruction,
-  createSetPeerInstructionAccounts: () => createSetPeerInstructionAccounts,
-  createSetRateLimitInstruction: () => createSetRateLimitInstruction,
-  createSetRateLimitInstructionAccounts: () => createSetRateLimitInstructionAccounts,
-  createTransferAdminInstruction: () => createTransferAdminInstruction,
-  createTransferAdminInstructionAccounts: () => createTransferAdminInstructionAccounts,
-  createVersionInstruction: () => createVersionInstruction,
-  createVersionInstructionAccounts: () => createVersionInstructionAccounts,
   enforcedOptionsBeet: () => enforcedOptionsBeet,
   enforcedOptionsDiscriminator: () => enforcedOptionsDiscriminator,
-  errorFromCode: () => errorFromCode,
-  errorFromName: () => errorFromName,
-  initAdapterOftInstructionDiscriminator: () => initAdapterOftInstructionDiscriminator,
-  initAdapterOftParamsBeet: () => initAdapterOftParamsBeet,
-  initAdapterOftStruct: () => initAdapterOftStruct,
-  initOftInstructionDiscriminator: () => initOftInstructionDiscriminator,
-  initOftParamsBeet: () => initOftParamsBeet,
-  initOftStruct: () => initOftStruct,
-  isOftConfigExtAdapter: () => isOftConfigExtAdapter,
-  isOftConfigExtNative: () => isOftConfigExtNative,
-  lzAccountBeet: () => lzAccountBeet,
-  lzReceiveInstructionDiscriminator: () => lzReceiveInstructionDiscriminator,
-  lzReceiveParamsBeet: () => lzReceiveParamsBeet,
-  lzReceiveStruct: () => lzReceiveStruct,
   lzReceiveTypesAccountsBeet: () => lzReceiveTypesAccountsBeet,
   lzReceiveTypesAccountsDiscriminator: () => lzReceiveTypesAccountsDiscriminator,
-  lzReceiveTypesInstructionDiscriminator: () => lzReceiveTypesInstructionDiscriminator,
-  lzReceiveTypesStruct: () => lzReceiveTypesStruct,
-  messagingFeeBeet: () => messagingFeeBeet,
-  messagingReceiptBeet: () => messagingReceiptBeet,
-  mintToInstructionDiscriminator: () => mintToInstructionDiscriminator,
-  mintToParamsBeet: () => mintToParamsBeet,
-  mintToStruct: () => mintToStruct,
-  oFTFeeDetailBeet: () => oFTFeeDetailBeet,
-  oFTLimitsBeet: () => oFTLimitsBeet,
-  oFTReceiptBeet: () => oFTReceiptBeet,
   oftConfigBeet: () => oftConfigBeet,
   oftConfigDiscriminator: () => oftConfigDiscriminator,
-  oftConfigExtBeet: () => oftConfigExtBeet,
   peerBeet: () => peerBeet,
-  peerDiscriminator: () => peerDiscriminator,
-  quoteInstructionDiscriminator: () => quoteInstructionDiscriminator,
-  quoteOftInstructionDiscriminator: () => quoteOftInstructionDiscriminator,
-  quoteOftParamsBeet: () => quoteOftParamsBeet,
-  quoteOftResultBeet: () => quoteOftResultBeet,
-  quoteOftStruct: () => quoteOftStruct,
-  quoteParamsBeet: () => quoteParamsBeet,
-  quoteStruct: () => quoteStruct,
-  rateLimiterBeet: () => rateLimiterBeet,
-  sendInstructionDiscriminator: () => sendInstructionDiscriminator,
-  sendParamsBeet: () => sendParamsBeet,
-  sendStruct: () => sendStruct,
-  setDelegateInstructionDiscriminator: () => setDelegateInstructionDiscriminator,
-  setDelegateParamsBeet: () => setDelegateParamsBeet,
-  setDelegateStruct: () => setDelegateStruct,
-  setEnforcedOptionsInstructionDiscriminator: () => setEnforcedOptionsInstructionDiscriminator,
-  setEnforcedOptionsParamsBeet: () => setEnforcedOptionsParamsBeet,
-  setEnforcedOptionsStruct: () => setEnforcedOptionsStruct,
-  setMintAuthorityInstructionDiscriminator: () => setMintAuthorityInstructionDiscriminator,
-  setMintAuthorityParamsBeet: () => setMintAuthorityParamsBeet,
-  setMintAuthorityStruct: () => setMintAuthorityStruct,
-  setPeerInstructionDiscriminator: () => setPeerInstructionDiscriminator,
-  setPeerParamsBeet: () => setPeerParamsBeet,
-  setPeerStruct: () => setPeerStruct,
-  setRateLimitInstructionDiscriminator: () => setRateLimitInstructionDiscriminator,
-  setRateLimitParamsBeet: () => setRateLimitParamsBeet,
-  setRateLimitStruct: () => setRateLimitStruct,
-  transferAdminInstructionDiscriminator: () => transferAdminInstructionDiscriminator,
-  transferAdminParamsBeet: () => transferAdminParamsBeet,
-  transferAdminStruct: () => transferAdminStruct,
-  versionBeet: () => versionBeet,
-  versionInstructionDiscriminator: () => versionInstructionDiscriminator,
-  versionStruct: () => versionStruct
+  peerDiscriminator: () => peerDiscriminator
 });
 var enforcedOptionsDiscriminator = [114, 221, 43, 174, 5, 37, 8, 20];
 var EnforcedOptions = class _EnforcedOptions {
@@ -954,14 +855,71 @@ createErrorFromNameLookup.set(
   "RateLimitExceeded",
   () => new RateLimitExceededError()
 );
-function errorFromCode(code) {
-  const createError = createErrorFromCodeLookup.get(code);
-  return createError != null ? createError() : null;
-}
-function errorFromName(name) {
-  const createError = createErrorFromNameLookup.get(name);
-  return createError != null ? createError() : null;
-}
+
+// src/generated/oft/instructions/index.ts
+var instructions_exports = {};
+__export(instructions_exports, {
+  createInitAdapterOftInstruction: () => createInitAdapterOftInstruction,
+  createInitAdapterOftInstructionAccounts: () => createInitAdapterOftInstructionAccounts,
+  createInitOftInstruction: () => createInitOftInstruction,
+  createInitOftInstructionAccounts: () => createInitOftInstructionAccounts,
+  createLzReceiveInstruction: () => createLzReceiveInstruction,
+  createLzReceiveInstructionAccounts: () => createLzReceiveInstructionAccounts,
+  createLzReceiveTypesInstruction: () => createLzReceiveTypesInstruction,
+  createLzReceiveTypesInstructionAccounts: () => createLzReceiveTypesInstructionAccounts,
+  createMintToInstruction: () => createMintToInstruction,
+  createMintToInstructionAccounts: () => createMintToInstructionAccounts,
+  createQuoteInstruction: () => createQuoteInstruction,
+  createQuoteInstructionAccounts: () => createQuoteInstructionAccounts,
+  createQuoteOftInstruction: () => createQuoteOftInstruction,
+  createQuoteOftInstructionAccounts: () => createQuoteOftInstructionAccounts,
+  createSendInstruction: () => createSendInstruction,
+  createSendInstructionAccounts: () => createSendInstructionAccounts,
+  createSetDelegateInstruction: () => createSetDelegateInstruction,
+  createSetDelegateInstructionAccounts: () => createSetDelegateInstructionAccounts,
+  createSetEnforcedOptionsInstruction: () => createSetEnforcedOptionsInstruction,
+  createSetEnforcedOptionsInstructionAccounts: () => createSetEnforcedOptionsInstructionAccounts,
+  createSetMintAuthorityInstruction: () => createSetMintAuthorityInstruction,
+  createSetMintAuthorityInstructionAccounts: () => createSetMintAuthorityInstructionAccounts,
+  createSetPeerInstruction: () => createSetPeerInstruction,
+  createSetPeerInstructionAccounts: () => createSetPeerInstructionAccounts,
+  createSetRateLimitInstruction: () => createSetRateLimitInstruction,
+  createSetRateLimitInstructionAccounts: () => createSetRateLimitInstructionAccounts,
+  createTransferAdminInstruction: () => createTransferAdminInstruction,
+  createTransferAdminInstructionAccounts: () => createTransferAdminInstructionAccounts,
+  createVersionInstruction: () => createVersionInstruction,
+  createVersionInstructionAccounts: () => createVersionInstructionAccounts,
+  initAdapterOftInstructionDiscriminator: () => initAdapterOftInstructionDiscriminator,
+  initAdapterOftStruct: () => initAdapterOftStruct,
+  initOftInstructionDiscriminator: () => initOftInstructionDiscriminator,
+  initOftStruct: () => initOftStruct,
+  lzReceiveInstructionDiscriminator: () => lzReceiveInstructionDiscriminator,
+  lzReceiveStruct: () => lzReceiveStruct,
+  lzReceiveTypesInstructionDiscriminator: () => lzReceiveTypesInstructionDiscriminator,
+  lzReceiveTypesStruct: () => lzReceiveTypesStruct,
+  mintToInstructionDiscriminator: () => mintToInstructionDiscriminator,
+  mintToStruct: () => mintToStruct,
+  quoteInstructionDiscriminator: () => quoteInstructionDiscriminator,
+  quoteOftInstructionDiscriminator: () => quoteOftInstructionDiscriminator,
+  quoteOftStruct: () => quoteOftStruct,
+  quoteStruct: () => quoteStruct,
+  sendInstructionDiscriminator: () => sendInstructionDiscriminator,
+  sendStruct: () => sendStruct,
+  setDelegateInstructionDiscriminator: () => setDelegateInstructionDiscriminator,
+  setDelegateStruct: () => setDelegateStruct,
+  setEnforcedOptionsInstructionDiscriminator: () => setEnforcedOptionsInstructionDiscriminator,
+  setEnforcedOptionsStruct: () => setEnforcedOptionsStruct,
+  setMintAuthorityInstructionDiscriminator: () => setMintAuthorityInstructionDiscriminator,
+  setMintAuthorityStruct: () => setMintAuthorityStruct,
+  setPeerInstructionDiscriminator: () => setPeerInstructionDiscriminator,
+  setPeerStruct: () => setPeerStruct,
+  setRateLimitInstructionDiscriminator: () => setRateLimitInstructionDiscriminator,
+  setRateLimitStruct: () => setRateLimitStruct,
+  transferAdminInstructionDiscriminator: () => transferAdminInstructionDiscriminator,
+  transferAdminStruct: () => transferAdminStruct,
+  versionInstructionDiscriminator: () => versionInstructionDiscriminator,
+  versionStruct: () => versionStruct
+});
 var initAdapterOftParamsBeet = new beet201__namespace.FixableBeetArgsStruct(
   [
     ["admin", beetSolana97__namespace.publicKey],
@@ -2418,6 +2376,36 @@ function createVersionInstructionAccounts(programId = new web35__namespace.Publi
   const keys = [];
   return keys;
 }
+
+// src/generated/oft/types/index.ts
+var types_exports = {};
+__export(types_exports, {
+  initAdapterOftParamsBeet: () => initAdapterOftParamsBeet,
+  initOftParamsBeet: () => initOftParamsBeet,
+  isOftConfigExtAdapter: () => isOftConfigExtAdapter,
+  isOftConfigExtNative: () => isOftConfigExtNative,
+  lzAccountBeet: () => lzAccountBeet,
+  lzReceiveParamsBeet: () => lzReceiveParamsBeet,
+  messagingFeeBeet: () => messagingFeeBeet,
+  messagingReceiptBeet: () => messagingReceiptBeet,
+  mintToParamsBeet: () => mintToParamsBeet,
+  oFTFeeDetailBeet: () => oFTFeeDetailBeet,
+  oFTLimitsBeet: () => oFTLimitsBeet,
+  oFTReceiptBeet: () => oFTReceiptBeet,
+  oftConfigExtBeet: () => oftConfigExtBeet,
+  quoteOftParamsBeet: () => quoteOftParamsBeet,
+  quoteOftResultBeet: () => quoteOftResultBeet,
+  quoteParamsBeet: () => quoteParamsBeet,
+  rateLimiterBeet: () => rateLimiterBeet,
+  sendParamsBeet: () => sendParamsBeet,
+  setDelegateParamsBeet: () => setDelegateParamsBeet,
+  setEnforcedOptionsParamsBeet: () => setEnforcedOptionsParamsBeet,
+  setMintAuthorityParamsBeet: () => setMintAuthorityParamsBeet,
+  setPeerParamsBeet: () => setPeerParamsBeet,
+  setRateLimitParamsBeet: () => setRateLimitParamsBeet,
+  transferAdminParamsBeet: () => transferAdminParamsBeet,
+  versionBeet: () => versionBeet
+});
 var lzAccountBeet = new beet201__namespace.BeetArgsStruct(
   [
     ["pubkey", beetSolana97__namespace.publicKey],
@@ -2523,7 +2511,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(SEND_LIBRARY_CONFIG_SEED, "utf8"),
         // U32 to Uint8Array([0,0,0,0])
-        new BN6__default.default(dstEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN2__default.default(dstEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -2534,7 +2522,7 @@ var EndpointPDADeriver = class {
         Buffer.from(SEND_LIBRARY_CONFIG_SEED, "utf8"),
         sender.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new BN6__default.default(dstEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN2__default.default(dstEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -2553,7 +2541,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED, "utf8"),
         // U32 to Uint8Array([0,0,0,0])
-        new BN6__default.default(srcEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN2__default.default(srcEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -2564,7 +2552,7 @@ var EndpointPDADeriver = class {
         Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED, "utf8"),
         receiver.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new BN6__default.default(srcEndpointId).toArrayLike(Buffer, "be", 4)
+        new BN2__default.default(srcEndpointId).toArrayLike(Buffer, "be", 4)
       ],
       this.program
     );
@@ -2592,7 +2580,7 @@ var EndpointPDADeriver = class {
         Buffer.from(NONCE_SEED, "utf8"),
         localOapp.toBytes(),
         // U32 to Uint8Array([0,0,0,0])
-        new BN6__default.default(remoteChainId).toArrayLike(Buffer, "be", 4),
+        new BN2__default.default(remoteChainId).toArrayLike(Buffer, "be", 4),
         remoteOapp
       ],
       this.program
@@ -2603,7 +2591,7 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(PENDING_NONCE_SEED, "utf8"),
         localOapp.toBytes(),
-        new BN6__default.default(remoteChainId).toArrayLike(Buffer, "be", 4),
+        new BN2__default.default(remoteChainId).toArrayLike(Buffer, "be", 4),
         remoteOapp
       ],
       this.program
@@ -2628,9 +2616,9 @@ var EndpointPDADeriver = class {
       [
         Buffer.from(PAYLOAD_HASH_SEED, "utf8"),
         receiver.toBytes(),
-        new BN6__default.default(srcEid).toArrayLike(Buffer, "be", 4),
+        new BN2__default.default(srcEid).toArrayLike(Buffer, "be", 4),
         sender,
-        new BN6__default.default(nonce).toArrayLike(Buffer, "be", 8)
+        new BN2__default.default(nonce).toArrayLike(Buffer, "be", 8)
       ],
       this.program
     );
@@ -2642,7 +2630,7 @@ var EndpointPDADeriver = class {
         from.toBytes(),
         to.toBytes(),
         guid,
-        new BN6__default.default(index).toArrayLike(Buffer, "be", 2),
+        new BN2__default.default(index).toArrayLike(Buffer, "be", 2),
         messageHash
       ],
       this.program
@@ -2658,13 +2646,13 @@ var MessageLibPDADeriver = class {
   }
   sendConfig(eid, oapp) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
+      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
       this.program
     );
   }
   receiveConfig(eid, oapp) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
+      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4), oapp.toBuffer()],
       this.program
     );
   }
@@ -2675,25 +2663,25 @@ var UlnPDADeriver = class extends MessageLibPDADeriver {
   }
   config(eid) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(ULN_CONFIG_SEED, "utf8"), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(ULN_CONFIG_SEED, "utf8"), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   defaultSendConfig(eid) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(SEND_CONFIG_SEED, "utf8"), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   defaultReceiveConfig(eid) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(RECEIVE_CONFIG_SEED, "utf8"), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   options(eit) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(OPTIONS_SEED, "utf8"), new BN6__default.default(eit).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(OPTIONS_SEED, "utf8"), new BN2__default.default(eit).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -2713,7 +2701,7 @@ var OAppBasePDADeriver = class {
   }
   remote(dstChainId) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(REMOTE_SEED), new BN6__default.default(dstChainId).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(REMOTE_SEED), new BN2__default.default(dstChainId).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -2734,7 +2722,7 @@ var OmniCounterPDADeriver = class extends OAppBasePDADeriver {
   }
   remote(dstChainId) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(REMOTE_SEED), this.count()[0].toBytes(), new BN6__default.default(dstChainId).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(REMOTE_SEED), this.count()[0].toBytes(), new BN2__default.default(dstChainId).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
@@ -2798,19 +2786,25 @@ var OftPDADeriver = class {
   }
   enforcedOptions(oftConfig, eid) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(ENFORCED_OPTIONS_SEED, "utf8"), oftConfig.toBytes(), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(ENFORCED_OPTIONS_SEED, "utf8"), oftConfig.toBytes(), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   peer(oftConfig, eid) {
     return web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(PEER_SEED, "utf8"), oftConfig.toBytes(), new BN6__default.default(eid).toArrayLike(Buffer, "be", 4)],
+      [Buffer.from(PEER_SEED, "utf8"), oftConfig.toBytes(), new BN2__default.default(eid).toArrayLike(Buffer, "be", 4)],
       this.program
     );
   }
   oftConfig(mintOrEscrow) {
     return web35.PublicKey.findProgramAddressSync([Buffer.from(OFT_SEED, "utf8"), mintOrEscrow.toBuffer()], this.program);
   }
+  lzReceiveTypesAccounts(oftConfig) {
+    return web35.PublicKey.findProgramAddressSync(
+      [Buffer.from(LZ_RECEIVE_TYPES_SEED, "utf-8"), oftConfig.toBuffer()],
+      this.program
+    );
+  }
 };
 
 // src/endpoint.ts
@@ -2820,11 +2814,11 @@ __export(endpoint_exports, {
   Endpoint: () => Endpoint,
   EventEmitDiscriminator: () => EventEmitDiscriminator,
   PROGRAM_ID: () => PROGRAM_ID2,
-  accounts: () => accounts_exports,
+  accounts: () => accounts_exports2,
   errors: () => errors_exports,
   events: () => events_exports,
-  instructions: () => instructions_exports,
-  types: () => types_exports
+  instructions: () => instructions_exports2,
+  types: () => types_exports2
 });
 function hexZeroPadTo32(addr) {
   return bytes.hexZeroPad(addr, 32);
@@ -2958,10 +2952,27 @@ var PacketV1Codec = class _PacketV1Codec {
     };
   }
 };
+var PacketSerializer = class {
+  static serialize(packet) {
+    return PacketV1Codec.encode(packet);
+  }
+  static serializeBytes(packet) {
+    return PacketV1Codec.encodeBytes(packet);
+  }
+  static deserialize(bytesLike) {
+    let codec;
+    if (bytesLike instanceof Uint8Array) {
+      codec = PacketV1Codec.fromBytes(bytesLike);
+    } else {
+      codec = PacketV1Codec.from(bytesLike);
+    }
+    return codec.toPacket();
+  }
+};
 
 // src/generated/endpoint/accounts/index.ts
-var accounts_exports = {};
-__export(accounts_exports, {
+var accounts_exports2 = {};
+__export(accounts_exports2, {
   ComposeMessageState: () => ComposeMessageState,
   EndpointSettings: () => EndpointSettings,
   MessageLibInfo: () => MessageLibInfo,
@@ -4119,8 +4130,8 @@ __export(errors_exports, {
   SameValueError: () => SameValueError,
   UnauthorizedError: () => UnauthorizedError2,
   WritableAccountNotAllowedError: () => WritableAccountNotAllowedError,
-  errorFromCode: () => errorFromCode2,
-  errorFromName: () => errorFromName2
+  errorFromCode: () => errorFromCode,
+  errorFromName: () => errorFromName
 });
 var createErrorFromCodeLookup2 = /* @__PURE__ */ new Map();
 var createErrorFromNameLookup2 = /* @__PURE__ */ new Map();
@@ -4376,18 +4387,18 @@ createErrorFromNameLookup2.set(
   "WritableAccountNotAllowed",
   () => new WritableAccountNotAllowedError()
 );
-function errorFromCode2(code) {
+function errorFromCode(code) {
   const createError = createErrorFromCodeLookup2.get(code);
   return createError != null ? createError() : null;
 }
-function errorFromName2(name) {
+function errorFromName(name) {
   const createError = createErrorFromNameLookup2.get(name);
   return createError != null ? createError() : null;
 }
 
 // src/generated/endpoint/instructions/index.ts
-var instructions_exports = {};
-__export(instructions_exports, {
+var instructions_exports2 = {};
+__export(instructions_exports2, {
   burnInstructionDiscriminator: () => burnInstructionDiscriminator,
   burnStruct: () => burnStruct,
   clearComposeInstructionDiscriminator: () => clearComposeInstructionDiscriminator,
@@ -8061,8 +8072,8 @@ function createWithdrawRentInstructionAccounts(accounts, programId = new web35__
 }
 
 // src/generated/endpoint/types/index.ts
-var types_exports = {};
-__export(types_exports, {
+var types_exports2 = {};
+__export(types_exports2, {
   MessageLibType: () => MessageLibType,
   burnParamsBeet: () => burnParamsBeet,
   clearComposeParamsBeet: () => clearComposeParamsBeet,
@@ -8525,12 +8536,16 @@ var Endpoint = class {
   }
   async initOAppNonce(connection, delegate, dstEid, oappIDPDA2, remoteOappAddr) {
     const [nonce] = this.endpointDeriver.nonce(oappIDPDA2, dstEid, remoteOappAddr);
-    const [pendingNonce] = this.endpointDeriver.pendingNonce(oappIDPDA2, dstEid, remoteOappAddr);
-    const [oappRegistry] = this.endpointDeriver.oappRegistry(oappIDPDA2);
     const info = await connection.getAccountInfo(nonce);
     if (info) {
       return null;
     }
+    return this.initOAppNonceWithoutChecks(delegate, dstEid, oappIDPDA2, remoteOappAddr);
+  }
+  initOAppNonceWithoutChecks(delegate, dstEid, oappIDPDA2, remoteOappAddr) {
+    const [nonce] = this.endpointDeriver.nonce(oappIDPDA2, dstEid, remoteOappAddr);
+    const [pendingNonce] = this.endpointDeriver.pendingNonce(oappIDPDA2, dstEid, remoteOappAddr);
+    const [oappRegistry] = this.endpointDeriver.oappRegistry(oappIDPDA2);
     return createInitNonceInstruction(
       {
         nonce,
@@ -8549,12 +8564,16 @@ var Endpoint = class {
     );
   }
   async initSendLibrary(connection, delegate, sender, dstEid, commitmentOrConfig) {
-    const [oappRegistry] = this.endpointDeriver.oappRegistry(sender);
     const [sendLibraryConfig] = this.endpointDeriver.sendLibraryConfig(sender, dstEid);
     const info = await connection.getAccountInfo(sendLibraryConfig, commitmentOrConfig);
     if (info) {
       return null;
     }
+    return this.initSendLibraryWithoutChecks(delegate, sender, dstEid);
+  }
+  initSendLibraryWithoutChecks(delegate, sender, dstEid) {
+    const [oappRegistry] = this.endpointDeriver.oappRegistry(sender);
+    const [sendLibraryConfig] = this.endpointDeriver.sendLibraryConfig(sender, dstEid);
     return createInitSendLibraryInstruction(
       {
         delegate,
@@ -8570,7 +8589,7 @@ var Endpoint = class {
       this.program
     );
   }
-  async setSendLibrary(_connection, oappAdmin, oappIDPDA2, newSendLibProgram, dstEid) {
+  async setSendLibrary(oappAdmin, oappIDPDA2, newSendLibProgram, dstEid) {
     const [newSendLib] = new MessageLibPDADeriver(newSendLibProgram).messageLib();
     const [sendLibraryConfig] = this.endpointDeriver.sendLibraryConfig(oappIDPDA2, dstEid);
     const [sendLibraryInfo] = this.endpointDeriver.messageLibraryInfo(newSendLib);
@@ -8596,12 +8615,16 @@ var Endpoint = class {
     return Promise.resolve(ix);
   }
   async initReceiveLibrary(connection, delegate, receiver, srcEid, commitmentOrConfig) {
-    const [oappRegistry] = this.endpointDeriver.oappRegistry(receiver);
     const [receiveLibraryConfig] = this.endpointDeriver.receiveLibraryConfig(receiver, srcEid);
     const info = await connection.getAccountInfo(receiveLibraryConfig, commitmentOrConfig);
     if (info) {
       return null;
     }
+    return this.initReceiveLibraryWithoutChecks(delegate, receiver, srcEid);
+  }
+  initReceiveLibraryWithoutChecks(delegate, receiver, srcEid) {
+    const [oappRegistry] = this.endpointDeriver.oappRegistry(receiver);
+    const [receiveLibraryConfig] = this.endpointDeriver.receiveLibraryConfig(receiver, srcEid);
     return createInitReceiveLibraryInstruction(
       {
         delegate,
@@ -8617,7 +8640,7 @@ var Endpoint = class {
       this.program
     );
   }
-  async setReceiveLibrary(_connection, oappAdmin, oappIDPDA2, newReceiveLibProgram, srcEid, gracePeriod) {
+  async setReceiveLibrary(oappAdmin, oappIDPDA2, newReceiveLibProgram, srcEid, gracePeriod) {
     const [newReceiveLib] = new MessageLibPDADeriver(newReceiveLibProgram).messageLib();
     const [receiveLibraryConfig] = this.endpointDeriver.receiveLibraryConfig(oappIDPDA2, srcEid);
     const [receiveLibraryInfo] = this.endpointDeriver.messageLibraryInfo(newReceiveLib);
@@ -8671,7 +8694,7 @@ var Endpoint = class {
         params: {
           eid,
           configType: config.configType,
-          config: uln_exports.Uln.constructSetConfigData(config.configType, config.value),
+          config: msgLibProgram.toBase58() === simple_message_lib_exports.PROGRAM_ID.toBase58() ? new Uint8Array(10) : uln_exports.Uln.constructSetConfigData(config.configType, config.value),
           oapp: oappID
         }
       },
@@ -8798,7 +8821,7 @@ var Endpoint = class {
           receiver,
           srcEid,
           sender: Array.from(sender.toBytes()),
-          nonce: new BN6__default.default(nonce)
+          nonce: new BN2__default.default(nonce)
         }
       },
       this.program
@@ -8823,7 +8846,7 @@ var Endpoint = class {
           srcEid,
           sender: Array.from(sender.toBytes()),
           receiver,
-          nonce: new BN6__default.default(nonce)
+          nonce: new BN2__default.default(nonce)
         }
       },
       this.program
@@ -9067,15 +9090,39 @@ var Endpoint = class {
   //         } as AccountMeta,
   //     ].concat(ix.keys)
   // }
+  getRegisterOappIxAccountMetaForCPI(payer, oapp) {
+    const [oappRegistry] = this.endpointDeriver.oappRegistry(oapp);
+    const eventAuthority = this.eventAuthorityPDA;
+    const keys = createRegisterOappInstructionAccounts(
+      {
+        payer,
+        oapp,
+        oappRegistry,
+        eventAuthority,
+        program: this.program
+      },
+      this.program
+    );
+    keys.forEach((key) => {
+      key.isSigner = false;
+    });
+    return [
+      {
+        pubkey: this.program,
+        isSigner: false,
+        isWritable: false
+      }
+    ].concat(keys);
+  }
   getSkipIxAccountMetaForCPI(receiver, sender, srcEid, nonce) {
     const [noncePDA] = this.endpointDeriver.nonce(receiver, srcEid, sender);
     const [pendingNonce] = this.endpointDeriver.pendingNonce(receiver, srcEid, sender);
     const [payloadHash] = this.endpointDeriver.payloadHash(receiver, srcEid, sender, nonce);
-    const ix = createSkipInstruction(
+    const [oappRegistry] = this.endpointDeriver.oappRegistry(receiver);
+    const keys = createSkipInstructionAccounts(
       {
         signer: receiver,
-        oappRegistry: receiver,
-        // FIXME: oappRegistry is wrong
+        oappRegistry,
         nonce: noncePDA,
         pendingInboundNonce: pendingNonce,
         payloadHash,
@@ -9083,16 +9130,9 @@ var Endpoint = class {
         program: this.program,
         eventAuthority: this.eventAuthorityPDA
       },
-      {
-        params: {
-          srcEid,
-          sender: Array.from(sender),
-          receiver,
-          nonce
-        }
-      }
+      this.program
     );
-    ix.keys.forEach((key) => {
+    keys.forEach((key) => {
       key.isSigner = false;
     });
     return [
@@ -9101,7 +9141,7 @@ var Endpoint = class {
         isSigner: false,
         isWritable: false
       }
-    ].concat(ix.keys);
+    ].concat(keys);
   }
   async isDefaultSendLibrary(connection, messageLibProgram, dstEid, commitmentOrConfig) {
     const [msgLib] = new MessageLibPDADeriver(messageLibProgram).messageLib();
@@ -9242,7 +9282,7 @@ var Endpoint = class {
         if (timeout2) {
           const slot = await connection.getSlot();
           const timestamp = await connection.getBlockTime(slot);
-          invariant2__default.default(timestamp, "timestamp should not be null");
+          invariant3__default.default(timestamp, "timestamp should not be null");
           const isValid = parseInt(timeout2.expiry.toString()) > timestamp;
           return {
             programId: defaultInfo.messageLib,
@@ -9260,12 +9300,12 @@ var Endpoint = class {
       };
     }
     const messageLibInfo = await connection.getAccountInfo(info.messageLib, commitmentOrConfig);
-    invariant2__default.default(messageLibInfo, "messageLibInfo should not be null");
+    invariant3__default.default(messageLibInfo, "messageLibInfo should not be null");
     const { timeout } = info;
     if (timeout) {
       const slot = await connection.getSlot();
       const timestamp = await connection.getBlockTime(slot);
-      invariant2__default.default(timestamp, "timestamp should not be null");
+      invariant3__default.default(timestamp, "timestamp should not be null");
       const isValid = parseInt(timeout.expiry.toString()) > timestamp;
       return {
         programId: messageLibInfo.owner,
@@ -9350,15 +9390,15 @@ var simple_message_lib_exports = {};
 __export(simple_message_lib_exports, {
   PROGRAM_ID: () => PROGRAM_ID3,
   SimpleMessageLib: () => SimpleMessageLib,
-  accounts: () => accounts_exports2,
+  accounts: () => accounts_exports3,
   errors: () => errors_exports2,
-  instructions: () => instructions_exports2,
-  types: () => types_exports2
+  instructions: () => instructions_exports3,
+  types: () => types_exports3
 });
 
 // src/generated/simple_messagelib/accounts/index.ts
-var accounts_exports2 = {};
-__export(accounts_exports2, {
+var accounts_exports3 = {};
+__export(accounts_exports3, {
   MessageLib: () => MessageLib,
   ReceiveConfigStore: () => ReceiveConfigStore,
   SendConfigStore: () => SendConfigStore,
@@ -9776,8 +9816,8 @@ __export(errors_exports2, {
   OnlyRevertError: () => OnlyRevertError,
   OnlyWhitelistedCallerError: () => OnlyWhitelistedCallerError,
   SendReentrancyError: () => SendReentrancyError,
-  errorFromCode: () => errorFromCode3,
-  errorFromName: () => errorFromName3
+  errorFromCode: () => errorFromCode2,
+  errorFromName: () => errorFromName2
 });
 var createErrorFromCodeLookup3 = /* @__PURE__ */ new Map();
 var createErrorFromNameLookup3 = /* @__PURE__ */ new Map();
@@ -9892,18 +9932,18 @@ var OnlyRevertError = class _OnlyRevertError extends Error {
 };
 createErrorFromCodeLookup3.set(6007, () => new OnlyRevertError());
 createErrorFromNameLookup3.set("OnlyRevert", () => new OnlyRevertError());
-function errorFromCode3(code) {
+function errorFromCode2(code) {
   const createError = createErrorFromCodeLookup3.get(code);
   return createError != null ? createError() : null;
 }
-function errorFromName3(name) {
+function errorFromName2(name) {
   const createError = createErrorFromNameLookup3.get(name);
   return createError != null ? createError() : null;
 }
 
 // src/generated/simple_messagelib/instructions/index.ts
-var instructions_exports2 = {};
-__export(instructions_exports2, {
+var instructions_exports3 = {};
+__export(instructions_exports3, {
   createInitConfigInstruction: () => createInitConfigInstruction2,
   createInitConfigInstructionAccounts: () => createInitConfigInstructionAccounts2,
   createInitDefaultConfigInstruction: () => createInitDefaultConfigInstruction,
@@ -11228,8 +11268,8 @@ function createWithdrawFeesInstructionAccounts(accounts, programId = new web35__
 }
 
 // src/generated/simple_messagelib/types/index.ts
-var types_exports2 = {};
-__export(types_exports2, {
+var types_exports3 = {};
+__export(types_exports3, {
   initConfigParamsBeet: () => initConfigParamsBeet2,
   initDefaultConfigParamsBeet: () => initDefaultConfigParamsBeet,
   initMessageLibParamsBeet: () => initMessageLibParamsBeet,
@@ -11349,36 +11389,21 @@ var SimpleMessageLib = class {
    */
   async getSendIXAccountMetaForCPI(_connection, payer, _path) {
     const [msgLib] = this.deriver.messageLib();
-    const ix = createSendInstruction3(
+    const cpiAccounts = createSendInstructionAccounts3(
       {
         endpoint: web35.PublicKey.default,
         // useless
         messageLib: msgLib,
         payer
       },
-      /// Fake value. params is useless.
-      {
-        params: {
-          packet: {
-            nonce: 0,
-            srcEid: 0,
-            sender: web35.PublicKey.default,
-            dstEid: 0,
-            receiver: Array.from(web35.PublicKey.default.toBytes()),
-            message: Uint8Array.from(Buffer.from("test")),
-            guid: Array.from(web35.PublicKey.default.toBytes())
-          },
-          options: Uint8Array.from(Buffer.from("test")),
-          nativeFee: 0
-        }
-      }
+      this.program
     );
-    ix.keys.forEach((key) => {
+    cpiAccounts.forEach((key) => {
       if (!payer.equals(key.pubkey)) {
         key.isSigner = false;
       }
     });
-    return Promise.resolve(ix.keys.slice(1));
+    return Promise.resolve(cpiAccounts.slice(1));
   }
   async getQuoteIXAccountMetaForCPI(_connection, _payer, _path, _commitment) {
     const [msgLib] = this.deriver.messageLib();
@@ -11414,7 +11439,7 @@ var SimpleMessageLib = class {
     const [sendConfig] = this.deriver.sendConfig(eid, oappID);
     const [receiveConfig] = this.deriver.receiveConfig(eid, oappID);
     const [messageLib] = this.deriver.messageLib();
-    const ix = createInitConfigInstruction2(
+    const keys = createInitConfigInstructionAccounts2(
       {
         endpoint: web35.PublicKey.default,
         // useless
@@ -11423,23 +11448,30 @@ var SimpleMessageLib = class {
         sendConfig,
         receiveConfig
       },
-      // Fake params, just to get the ix.keys
-      {
-        params: {
-          eid,
-          oapp: oappID
-        }
-      }
+      this.program
     );
-    ix.keys.forEach((key) => {
+    keys.forEach((key) => {
       if (!payer.equals(key.pubkey)) {
         key.isSigner = false;
       }
     });
-    return Promise.resolve(ix.keys.slice(1));
+    return Promise.resolve(keys.slice(1));
   }
-  async getSetConfigIXAccountMetaForCPI(_endpointProgram, _oappID, _eid) {
-    return Promise.reject(new Error("Method not implemented."));
+  async getSetConfigIXAccountMetaForCPI(endpointProgram, oappID, eid) {
+    const [sendConfig] = this.deriver.sendConfig(eid, oappID);
+    const [receiveConfig] = this.deriver.receiveConfig(eid, oappID);
+    const [msgLib] = this.deriver.messageLib();
+    const accounts = createSetConfigInstructionAccounts2(
+      {
+        endpoint: web35.PublicKey.default,
+        // useless
+        sendConfig,
+        receiveConfig,
+        messageLib: msgLib
+      },
+      this.program
+    );
+    return Promise.resolve(accounts.slice(1));
   }
 };
 
@@ -11487,7 +11519,7 @@ __export(uln_exports, {
   VerifyingError: () => VerifyingError,
   ZeroMessageSizeError: () => ZeroMessageSizeError,
   accountProviders: () => accountProviders6,
-  accounts: () => accounts_exports5,
+  accounts: () => accounts_exports6,
   commitVerificationInstructionDiscriminator: () => commitVerificationInstructionDiscriminator,
   commitVerificationParamsBeet: () => commitVerificationParamsBeet,
   commitVerificationStruct: () => commitVerificationStruct,
@@ -11524,8 +11556,8 @@ __export(uln_exports, {
   createVersionInstructionAccounts: () => createVersionInstructionAccounts3,
   createWithdrawRentInstruction: () => createWithdrawRentInstruction2,
   createWithdrawRentInstructionAccounts: () => createWithdrawRentInstructionAccounts2,
-  errorFromCode: () => errorFromCode6,
-  errorFromName: () => errorFromName6,
+  errorFromCode: () => errorFromCode5,
+  errorFromName: () => errorFromName5,
   errors: () => errors_exports4,
   events: () => events_exports4,
   executorConfigBeet: () => executorConfigBeet2,
@@ -11541,7 +11573,7 @@ __export(uln_exports, {
   initVerifyInstructionDiscriminator: () => initVerifyInstructionDiscriminator2,
   initVerifyParamsBeet: () => initVerifyParamsBeet2,
   initVerifyStruct: () => initVerifyStruct2,
-  instructions: () => instructions_exports5,
+  instructions: () => instructions_exports6,
   isConfigExecutor: () => isConfigExecutor,
   isConfigReceiveUln: () => isConfigReceiveUln,
   isConfigSendUln: () => isConfigSendUln,
@@ -11575,7 +11607,7 @@ __export(uln_exports, {
   transferAdminStruct: () => transferAdminStruct4,
   treasuryBeet: () => treasuryBeet,
   treasuryFeeBeet: () => treasuryFeeBeet,
-  types: () => types_exports5,
+  types: () => types_exports6,
   ulnConfigBeet: () => ulnConfigBeet2,
   ulnSettingsBeet: () => ulnSettingsBeet,
   ulnSettingsDiscriminator: () => ulnSettingsDiscriminator,
@@ -11597,11 +11629,11 @@ __export(dvn_exports2, {
   DVN: () => DVN,
   PROGRAM_ID: () => PROGRAM_ID4,
   SolanaSignerExt: () => SolanaSignerExt,
-  accounts: () => accounts_exports3,
+  accounts: () => accounts_exports4,
   errors: () => errors_exports3,
   events: () => events_exports2,
-  instructions: () => instructions_exports3,
-  types: () => types_exports3
+  instructions: () => instructions_exports4,
+  types: () => types_exports4
 });
 
 // src/generated/dvn/index.ts
@@ -11653,8 +11685,8 @@ __export(dvn_exports, {
   dstConfigBeet: () => dstConfigBeet,
   dvnConfigBeet: () => dvnConfigBeet,
   dvnConfigDiscriminator: () => dvnConfigDiscriminator,
-  errorFromCode: () => errorFromCode4,
-  errorFromName: () => errorFromName4,
+  errorFromCode: () => errorFromCode3,
+  errorFromName: () => errorFromName3,
   executeHashBeet: () => executeHashBeet,
   executeHashDiscriminator: () => executeHashDiscriminator,
   executeTransactionDigestBeet: () => executeTransactionDigestBeet,
@@ -11698,8 +11730,8 @@ __export(dvn_exports, {
 });
 
 // src/generated/dvn/accounts/index.ts
-var accounts_exports3 = {};
-__export(accounts_exports3, {
+var accounts_exports4 = {};
+__export(accounts_exports4, {
   DvnConfig: () => DvnConfig,
   ExecuteHash: () => ExecuteHash,
   ReceiveConfig: () => ReceiveConfig,
@@ -12149,8 +12181,8 @@ __export(errors_exports3, {
   TooManyOptionTypesError: () => TooManyOptionTypesError,
   UnexpiredExecuteHashError: () => UnexpiredExecuteHashError,
   UniqueOwnersError: () => UniqueOwnersError,
-  errorFromCode: () => errorFromCode4,
-  errorFromName: () => errorFromName4
+  errorFromCode: () => errorFromCode3,
+  errorFromName: () => errorFromName3
 });
 var createErrorFromCodeLookup4 = /* @__PURE__ */ new Map();
 var createErrorFromNameLookup4 = /* @__PURE__ */ new Map();
@@ -12382,18 +12414,18 @@ createErrorFromNameLookup4.set(
   "EidNotSupported",
   () => new EidNotSupportedError()
 );
-function errorFromCode4(code) {
+function errorFromCode3(code) {
   const createError = createErrorFromCodeLookup4.get(code);
   return createError != null ? createError() : null;
 }
-function errorFromName4(name) {
+function errorFromName3(name) {
   const createError = createErrorFromNameLookup4.get(name);
   return createError != null ? createError() : null;
 }
 
 // src/generated/dvn/instructions/index.ts
-var instructions_exports3 = {};
-__export(instructions_exports3, {
+var instructions_exports4 = {};
+__export(instructions_exports4, {
   closeExecuteInstructionDiscriminator: () => closeExecuteInstructionDiscriminator,
   closeExecuteStruct: () => closeExecuteStruct,
   createCloseExecuteInstruction: () => createCloseExecuteInstruction,
@@ -13148,8 +13180,8 @@ function createWithdrawFeeInstructionAccounts(accounts, programId = new web35__n
 }
 
 // src/generated/dvn/types/index.ts
-var types_exports3 = {};
-__export(types_exports3, {
+var types_exports4 = {};
+__export(types_exports4, {
   VerificationState: () => VerificationState,
   aclBeet: () => aclBeet,
   adminConfigBeet: () => adminConfigBeet,
@@ -13649,7 +13681,7 @@ __export(executor_exports, {
   ZeroLzComposeGasProvidedError: () => ZeroLzComposeGasProvidedError,
   ZeroLzReceiveGasProvidedError: () => ZeroLzReceiveGasProvidedError,
   accountProviders: () => accountProviders5,
-  accounts: () => accounts_exports4,
+  accounts: () => accounts_exports5,
   aclBeet: () => aclBeet2,
   adminSetConfigInstructionDiscriminator: () => adminSetConfigInstructionDiscriminator,
   adminSetConfigParamsBeet: () => adminSetConfigParamsBeet,
@@ -13674,8 +13706,8 @@ __export(executor_exports, {
   createQuoteExecutorInstruction: () => createQuoteExecutorInstruction,
   createQuoteExecutorInstructionAccounts: () => createQuoteExecutorInstructionAccounts,
   dstConfigBeet: () => dstConfigBeet2,
-  errorFromCode: () => errorFromCode5,
-  errorFromName: () => errorFromName5,
+  errorFromCode: () => errorFromCode4,
+  errorFromName: () => errorFromName4,
   events: () => events_exports3,
   executableInstructionDiscriminator: () => executableInstructionDiscriminator,
   executableParamsBeet: () => executableParamsBeet,
@@ -13689,7 +13721,7 @@ __export(executor_exports, {
   initExecutorInstructionDiscriminator: () => initExecutorInstructionDiscriminator,
   initExecutorParamsBeet: () => initExecutorParamsBeet,
   initExecutorStruct: () => initExecutorStruct,
-  instructions: () => instructions_exports4,
+  instructions: () => instructions_exports5,
   isAdminSetConfigParamsDefaultMultiplierBps: () => isAdminSetConfigParamsDefaultMultiplierBps,
   isAdminSetConfigParamsDstConfigs: () => isAdminSetConfigParamsDstConfigs,
   isAdminSetConfigParamsPriceFeed: () => isAdminSetConfigParamsPriceFeed,
@@ -13715,12 +13747,12 @@ __export(executor_exports, {
   quoteExecutorInstructionDiscriminator: () => quoteExecutorInstructionDiscriminator,
   quoteExecutorParamsBeet: () => quoteExecutorParamsBeet,
   quoteExecutorStruct: () => quoteExecutorStruct,
-  types: () => types_exports4
+  types: () => types_exports5
 });
 
 // src/generated/executor/accounts/index.ts
-var accounts_exports4 = {};
-__export(accounts_exports4, {
+var accounts_exports5 = {};
+__export(accounts_exports5, {
   ExecutorConfig: () => ExecutorConfig,
   Nonce: () => Nonce2,
   accountProviders: () => accountProviders5,
@@ -14059,8 +14091,8 @@ var nativeDropAppliedEventBeet = new beet201__namespace.FixableBeetArgsStruct(
 );
 
 // src/generated/executor/instructions/index.ts
-var instructions_exports4 = {};
-__export(instructions_exports4, {
+var instructions_exports5 = {};
+__export(instructions_exports5, {
   adminSetConfigInstructionDiscriminator: () => adminSetConfigInstructionDiscriminator,
   adminSetConfigStruct: () => adminSetConfigStruct,
   composeInstructionDiscriminator: () => composeInstructionDiscriminator,
@@ -14946,8 +14978,8 @@ function createQuoteExecutorInstructionAccounts(accounts, programId = new web35_
 }
 
 // src/generated/executor/types/index.ts
-var types_exports4 = {};
-__export(types_exports4, {
+var types_exports5 = {};
+__export(types_exports5, {
   ExecutionState: () => ExecutionState,
   aclBeet: () => aclBeet2,
   adminSetConfigParamsBeet: () => adminSetConfigParamsBeet,
@@ -15345,7 +15377,7 @@ async function isAccountInitialized(connection, account, commitmentOrConfig) {
 async function buildMessageV0(connection, payerKey, instructions, commitmentOrConfig = "confirmed", blockhash) {
   return new web35.TransactionMessage({
     payerKey,
-    recentBlockhash: blockhash ?? (await connection.getLatestBlockhash()).blockhash,
+    recentBlockhash: blockhash ?? (await connection.getLatestBlockhash(commitmentOrConfig)).blockhash,
     instructions
   }).compileToV0Message();
 }
@@ -15772,11 +15804,11 @@ createErrorFromNameLookup5.set(
   "ExecutorIsAdmin",
   () => new ExecutorIsAdminError()
 );
-function errorFromCode5(code) {
+function errorFromCode4(code) {
   const createError = createErrorFromCodeLookup5.get(code);
   return createError != null ? createError() : null;
 }
-function errorFromName5(name) {
+function errorFromName4(name) {
   const createError = createErrorFromNameLookup5.get(name);
   return createError != null ? createError() : null;
 }
@@ -16021,7 +16053,7 @@ var Executor = class {
       }
     ].concat(ixAccounts);
   }
-  async execute(connection, executor, endpointProgram, packet, extraData, value = new BN6__default.default(0), computeUnits = 2e5, commitmentOrConfig) {
+  async execute(connection, executor, endpointProgram, packet, extraData, value = new BN2__default.default(0), computeUnits = 2e5, commitmentOrConfig) {
     const [config] = this.deriver.config();
     const endpointEventDeriver = new EventPDADeriver(endpointProgram);
     const executorEventDeriver = new EventPDADeriver(this.program);
@@ -16080,7 +16112,7 @@ var Executor = class {
       this.program
     );
   }
-  async compose(connection, executor, endpointProgram, event, extraData, value = new BN6__default.default(0), computeUnits = 4e5, commitmentOrConfig) {
+  async compose(connection, executor, endpointProgram, event, extraData, value = new BN2__default.default(0), computeUnits = 4e5, commitmentOrConfig) {
     const [config] = this.deriver.config();
     const endpointEventDeriver = new EventPDADeriver(endpointProgram);
     const executorEventDeriver = new EventPDADeriver(this.program);
@@ -16139,8 +16171,8 @@ var Executor = class {
 };
 
 // src/generated/uln/accounts/index.ts
-var accounts_exports5 = {};
-__export(accounts_exports5, {
+var accounts_exports6 = {};
+__export(accounts_exports6, {
   Confirmations: () => Confirmations,
   ReceiveConfig: () => ReceiveConfig2,
   SendConfig: () => SendConfig,
@@ -16666,8 +16698,8 @@ __export(errors_exports4, {
   UnsortedError: () => UnsortedError,
   VerifyingError: () => VerifyingError,
   ZeroMessageSizeError: () => ZeroMessageSizeError,
-  errorFromCode: () => errorFromCode6,
-  errorFromName: () => errorFromName6
+  errorFromCode: () => errorFromCode5,
+  errorFromName: () => errorFromName5
 });
 var createErrorFromCodeLookup6 = /* @__PURE__ */ new Map();
 var createErrorFromNameLookup6 = /* @__PURE__ */ new Map();
@@ -17136,18 +17168,18 @@ var InvalidPayerError = class _InvalidPayerError extends Error {
 };
 createErrorFromCodeLookup6.set(6032, () => new InvalidPayerError());
 createErrorFromNameLookup6.set("InvalidPayer", () => new InvalidPayerError());
-function errorFromCode6(code) {
+function errorFromCode5(code) {
   const createError = createErrorFromCodeLookup6.get(code);
   return createError != null ? createError() : null;
 }
-function errorFromName6(name) {
+function errorFromName5(name) {
   const createError = createErrorFromNameLookup6.get(name);
   return createError != null ? createError() : null;
 }
 
 // src/generated/uln/instructions/index.ts
-var instructions_exports5 = {};
-__export(instructions_exports5, {
+var instructions_exports6 = {};
+__export(instructions_exports6, {
   commitVerificationInstructionDiscriminator: () => commitVerificationInstructionDiscriminator,
   commitVerificationStruct: () => commitVerificationStruct,
   createCommitVerificationInstruction: () => createCommitVerificationInstruction,
@@ -18802,8 +18834,8 @@ function createWithdrawRentInstructionAccounts2(accounts, programId = new web35_
 }
 
 // src/generated/uln/types/index.ts
-var types_exports5 = {};
-__export(types_exports5, {
+var types_exports6 = {};
+__export(types_exports6, {
   commitVerificationParamsBeet: () => commitVerificationParamsBeet,
   configBeet: () => configBeet,
   executorConfigBeet: () => executorConfigBeet2,
@@ -19150,7 +19182,7 @@ var Uln = class {
         params: {
           packetHeader: Array.from(Uint8Array.from(Buffer.from(packet.header().slice(2), "hex"))),
           payloadHash: Array.from(payloadHashBytes),
-          confirmations: typeof confirmations === "string" ? new BN6__default.default(confirmations) : confirmations
+          confirmations: typeof confirmations === "string" ? new BN2__default.default(confirmations) : confirmations
         }
       },
       this.program
@@ -19353,14 +19385,14 @@ var pricefeed_exports = {};
 __export(pricefeed_exports, {
   PROGRAM_ID: () => PROGRAM_ID7,
   PriceFeed: () => PriceFeed2,
-  accounts: () => accounts_exports6,
-  instructions: () => instructions_exports6,
-  types: () => types_exports6
+  accounts: () => accounts_exports7,
+  instructions: () => instructions_exports7,
+  types: () => types_exports7
 });
 
 // src/generated/pricefeed/accounts/index.ts
-var accounts_exports6 = {};
-__export(accounts_exports6, {
+var accounts_exports7 = {};
+__export(accounts_exports7, {
   PriceFeed: () => PriceFeed,
   accountProviders: () => accountProviders7,
   priceFeedBeet: () => priceFeedBeet,
@@ -19560,8 +19592,8 @@ var priceFeedBeet = new beet201__namespace.FixableBeetStruct(
 var accountProviders7 = { PriceFeed };
 
 // src/generated/pricefeed/instructions/index.ts
-var instructions_exports6 = {};
-__export(instructions_exports6, {
+var instructions_exports7 = {};
+__export(instructions_exports7, {
   createGetFeeInstruction: () => createGetFeeInstruction,
   createGetFeeInstructionAccounts: () => createGetFeeInstructionAccounts,
   createInitPriceFeedInstruction: () => createInitPriceFeedInstruction,
@@ -20046,8 +20078,8 @@ function createTransferAdminInstructionAccounts5(accounts, programId = new web35
 }
 
 // src/generated/pricefeed/types/index.ts
-var types_exports6 = {};
-__export(types_exports6, {
+var types_exports7 = {};
+__export(types_exports7, {
   getFeeParamsBeet: () => getFeeParamsBeet,
   initPriceFeedParamsBeet: () => initPriceFeedParamsBeet,
   isModelTypeArbitrum: () => isModelTypeArbitrum,
@@ -20221,11 +20253,9 @@ var PriceFeed2 = class {
   }
 };
 
-// src/OftTools.ts
-var OftTools_exports = {};
-__export(OftTools_exports, {
-  ConfigType: () => ConfigType,
-  OFT_SEED: () => OFT_SEED2,
+// src/oft-tools.ts
+var oft_tools_exports = {};
+__export(oft_tools_exports, {
   SOLANA_EID: () => SOLANA_EID,
   createInitAdapterOftIx: () => createInitAdapterOftIx,
   createInitConfigIx: () => createInitConfigIx,
@@ -20248,211 +20278,443 @@ __export(OftTools_exports, {
   getEndpointConfig: () => getEndpointConfig,
   getEnforcedOptions: () => getEnforcedOptions,
   getPeerAddress: () => getPeerAddress,
-  isAccountInitialized: () => isAccountInitialized2,
   quoteOft: () => quoteOft,
   quoteWithUln: () => quoteWithUln,
   sendWithUln: () => sendWithUln
 });
-var SOLANA_EID = 1;
-var OFT_SEED2 = "Oft";
-var NONCE_SEED2 = "Nonce";
-var PENDING_NONCE_SEED2 = "PendingNonce";
-var ENDPOINT_SEED2 = "Endpoint";
-var SEND_CONFIG_SEED2 = "SendConfig";
-var RECEIVE_CONFIG_SEED2 = "ReceiveConfig";
-var OAPP_SEED2 = "OApp";
-var EVENT_SEED2 = "__event_authority";
-var LZ_RECEIVE_TYPES_SEED2 = "LzReceiveTypes";
-var PEER_SEED2 = "Peer";
-var ENFORCED_OPTIONS_SEED2 = "EnforcedOptions";
-var SEND_LIBRARY_CONFIG_SEED2 = "SendLibraryConfig";
-var RECEIVE_LIBRARY_CONFIG_SEED2 = "ReceiveLibraryConfig";
-var MESSAGE_LIB_SEED2 = "MessageLib";
-var ULN_SEED2 = MESSAGE_LIB_SEED2;
-var ConfigType = /* @__PURE__ */ ((ConfigType2) => {
-  ConfigType2[ConfigType2["Executor"] = 1] = "Executor";
-  ConfigType2[ConfigType2["SendUln"] = 2] = "SendUln";
-  ConfigType2[ConfigType2["ReceiveUln"] = 3] = "ReceiveUln";
-  return ConfigType2;
-})(ConfigType || {});
-async function isAccountInitialized2(connection, account, commitmentOrConfig = "confirmed") {
-  return connection.getAccountInfo(account, commitmentOrConfig).then((res) => {
-    return res !== null;
-  });
-}
-async function createNonceTx(connection, nonceAccount, nonceAuthority, instructions, commitmentOrConfig = "confirmed") {
-  const nonceAccountInfo = await connection.getNonce(nonceAccount, commitmentOrConfig);
-  if (nonceAccountInfo === null) {
-    throw new Error("Invalid nonce account");
+
+// src/oft.ts
+var oft_exports = {};
+__export(oft_exports, {
+  OFT_DECIMALS: () => OFT_DECIMALS,
+  OFT_DEFAULT_PROGRAM_ID: () => PROGRAM_ID,
+  Oft: () => Oft,
+  accounts: () => accounts_exports,
+  instructions: () => instructions_exports,
+  types: () => types_exports
+});
+var OFT_DECIMALS = 6;
+var Oft = class {
+  constructor(program, endpointProgram, _tokenProgram, mintKp, escrowKp) {
+    this.program = program;
+    this.endpointProgram = endpointProgram;
+    this.deriver = new OftPDADeriver(this.program);
+    this.endpoint = new endpoint_exports.Endpoint(endpointProgram);
+    const [eventAuthorityPDA] = new EventPDADeriver(this.program).eventAuthority();
+    this.eventAuthorityPDA = eventAuthorityPDA;
+    this.mintKp = mintKp;
+    this.escrowKp = escrowKp;
+    this.isAdapter = escrowKp !== void 0;
+    this.tokenProgram = _tokenProgram;
   }
-  const { nonce } = nonceAccountInfo;
-  const nonceAdvanceIx = web35.SystemProgram.nonceAdvance({
-    noncePubkey: nonceAccount,
-    authorizedPubkey: nonceAuthority
-  });
-  return new web35.Transaction({
-    recentBlockhash: nonce,
-    nonceInfo: {
-      nonce,
-      nonceInstruction: nonceAdvanceIx
-    }
-  }).add(...instructions);
-}
-async function createInitAdapterOftIx(payer, admin, mint, lzDelegate, escrow, sharedDecimals = 6, tokenProgram = splToken.TOKEN_PROGRAM_ID) {
-  const [oftConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OFT_SEED2, "utf-8"), escrow.toBuffer()],
-    PROGRAM_ID
-  );
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [endpointEventAuthority] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(EVENT_SEED2, "utf-8")],
-    PROGRAM_ID2
-  );
-  const [lzReceiveTypes] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(LZ_RECEIVE_TYPES_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID
-  );
-  const registerOappIx = createRegisterOappInstruction(
-    {
-      payer,
-      oapp: oftConfig,
-      oappRegistry: oAppRegistry,
-      eventAuthority: endpointEventAuthority,
-      program: PROGRAM_ID
-    },
-    {
-      params: {
-        delegate: lzDelegate
-      }
+  getOftConfig() {
+    if (this.isAdapter) {
+      return this.deriver.oftConfig(this.escrowKp)[0];
     }
-  );
-  for (const acc of registerOappIx.keys) {
-    acc.isSigner = false;
+    return this.deriver.oftConfig(this.mintKp)[0];
   }
-  return createInitAdapterOftInstruction(
-    {
-      payer,
-      oftConfig,
-      tokenMint: mint,
-      tokenEscrow: escrow,
-      lzReceiveTypesAccounts: lzReceiveTypes,
-      tokenProgram,
-      anchorRemainingAccounts: [
-        {
-          pubkey: PROGRAM_ID2,
-          isSigner: false,
-          isWritable: false
-        }
-      ].concat(
-        ...registerOappIx.keys,
-        {
-          pubkey: endpointEventAuthority,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: PROGRAM_ID2,
-          isSigner: false,
-          isWritable: false
+  async getVersion() {
+    return Promise.resolve([createVersionInstruction(this.program)]);
+  }
+  async setDelegate(admin, delegate) {
+    const endpointEventAuthority = this.endpoint.eventAuthorityPDA;
+    const oftConfig = this.getOftConfig();
+    const [oAppRegistry] = this.endpoint.endpointDeriver.oappRegistry(oftConfig);
+    const endpointSetDelegateKeys = endpoint_exports.instructions.createSetDelegateInstructionAccounts(
+      {
+        oapp: oftConfig,
+        oappRegistry: oAppRegistry,
+        eventAuthority: endpointEventAuthority,
+        program: this.endpointProgram
+      },
+      this.endpointProgram
+    );
+    for (const acc of endpointSetDelegateKeys) {
+      acc.isSigner = false;
+    }
+    const ix = createSetDelegateInstruction(
+      {
+        admin,
+        oftConfig: this.getOftConfig(),
+        anchorRemainingAccounts: [
+          {
+            pubkey: this.endpointProgram,
+            isSigner: false,
+            isWritable: false
+          },
+          ...endpointSetDelegateKeys
+        ]
+      },
+      {
+        params: {
+          delegate
         }
+      },
+      this.program
+    );
+    return Promise.resolve(ix);
+  }
+  async initOft(connection, payer, admin) {
+    const oftConfig = this.getOftConfig();
+    const endpointEventAuthority = this.endpoint.eventAuthorityPDA;
+    const [oAppRegistry] = this.endpoint.endpointDeriver.oappRegistry(oftConfig);
+    const [lzReceiveTypes] = web35.PublicKey.findProgramAddressSync(
+      [Buffer.from(LZ_RECEIVE_TYPES_SEED, "utf-8"), oftConfig.toBuffer()],
+      this.program
+    );
+    const registerOappIxKeys = endpoint_exports.instructions.createRegisterOappInstructionAccounts(
+      {
+        payer: admin,
+        oapp: oftConfig,
+        oappRegistry: oAppRegistry,
+        eventAuthority: endpointEventAuthority,
+        program: this.program
+      },
+      this.program
+    );
+    for (const acc of registerOappIxKeys) {
+      acc.isSigner = false;
+    }
+    const ret = [
+      web35.SystemProgram.createAccount({
+        fromPubkey: admin,
+        newAccountPubkey: this.mintKp,
+        space: splToken.getMintLen([]),
+        lamports: await connection.getMinimumBalanceForRentExemption(splToken.getMintLen([])),
+        programId: this.tokenProgram
+      }),
+      splToken.createInitializeMintInstruction(
+        this.mintKp,
+        OFT_DECIMALS,
+        this.isAdapter ? admin : oftConfig,
+        null,
+        this.tokenProgram
       )
-    },
-    {
-      params: {
-        admin,
-        sharedDecimals,
-        endpointProgram: PROGRAM_ID2
+    ];
+    if (this.isAdapter) {
+      return ret.concat(
+        createInitAdapterOftInstruction(
+          {
+            payer,
+            oftConfig,
+            tokenMint: this.mintKp,
+            tokenEscrow: this.escrowKp,
+            lzReceiveTypesAccounts: lzReceiveTypes,
+            tokenProgram: this.tokenProgram,
+            anchorRemainingAccounts: [
+              {
+                pubkey: this.endpointProgram,
+                isSigner: false,
+                isWritable: false
+              }
+            ].concat(
+              ...registerOappIxKeys,
+              {
+                pubkey: endpointEventAuthority,
+                isSigner: false,
+                isWritable: false
+              },
+              {
+                pubkey: this.endpointProgram,
+                isSigner: false,
+                isWritable: false
+              }
+            )
+          },
+          {
+            params: {
+              admin,
+              sharedDecimals: OFT_DECIMALS,
+              endpointProgram: this.endpointProgram
+            }
+          }
+        )
+      );
+    } else {
+      return ret.concat(
+        createInitOftInstruction(
+          {
+            payer,
+            oftConfig,
+            tokenMint: this.mintKp,
+            lzReceiveTypesAccounts: lzReceiveTypes,
+            tokenProgram: this.tokenProgram,
+            anchorRemainingAccounts: [
+              {
+                pubkey: this.endpointProgram,
+                isSigner: false,
+                isWritable: false
+              }
+            ].concat(
+              ...registerOappIxKeys,
+              {
+                pubkey: endpointEventAuthority,
+                isSigner: false,
+                isWritable: false
+              },
+              {
+                pubkey: this.endpointProgram,
+                isSigner: false,
+                isWritable: false
+              }
+            )
+          },
+          {
+            params: {
+              admin,
+              sharedDecimals: OFT_DECIMALS,
+              endpointProgram: this.endpointProgram,
+              mintAuthority: admin
+            }
+          },
+          this.program
+        )
+      );
+    }
+  }
+  getAddressB32() {
+    const [oftConfig] = this.deriver.oftConfig(this.isAdapter ? this.escrowKp : this.mintKp);
+    const ret = new Uint8Array(32);
+    ret.fill(0).set(oftConfig.toBytes());
+    return ret;
+  }
+  async mint_to(signer, to, amount) {
+    const ix = createMintToInstruction(
+      {
+        minter: signer,
+        oftConfig: this.getOftConfig(),
+        tokenDest: to,
+        tokenMint: this.mintKp,
+        tokenProgram: this.tokenProgram
+      },
+      {
+        params: {
+          amount: new BN2__default.default(amount.toString())
+        }
       }
+    );
+    return Promise.resolve(ix);
+  }
+  async setPeer(_peer, admin, dstEid) {
+    const [oftConfig] = this.deriver.oftConfig(this.isAdapter ? this.escrowKp : this.mintKp);
+    const [peer] = this.deriver.peer(oftConfig, dstEid);
+    const ix = createSetPeerInstruction(
+      {
+        admin,
+        peer,
+        oftConfig
+      },
+      {
+        params: {
+          dstEid,
+          peer: new Array(32 - _peer.length).fill(0).concat(_peer)
+        }
+      },
+      this.program
+    );
+    return Promise.resolve(ix);
+  }
+  async setEnforcedOptions(admin, send, sendAndCall, dstEid) {
+    const oftConfig = this.getOftConfig();
+    const [enforcedOptions] = this.deriver.enforcedOptions(oftConfig, dstEid);
+    const ix = createSetEnforcedOptionsInstruction(
+      {
+        admin,
+        enforcedOptions,
+        oftConfig
+      },
+      {
+        params: {
+          dstEid,
+          send,
+          sendAndCall
+        }
+      },
+      this.program
+    );
+    return Promise.resolve(ix);
+  }
+  async send(connection, payer, tokenSource, to, dstEid, amountLd, minAmountLd, fee, options = new Uint8Array(), composeMsg = null, commitmentOrConfig = "confirmed") {
+    const oftConfig = this.getOftConfig();
+    const [peer] = this.deriver.peer(oftConfig, dstEid);
+    const [enforcedOptions] = this.deriver.enforcedOptions(oftConfig, dstEid);
+    const peerinfo = await connection.getAccountInfo(peer);
+    const peerAddress = peerinfo.data.subarray(8, 32 + 8);
+    const msgLibProgram = await this.getSendLibraryProgram(connection, payer, dstEid);
+    const [endpointSettings] = this.endpoint.endpointDeriver.setting();
+    const receiverInfo = await Peer.fromAccountAddress(connection, peer, commitmentOrConfig);
+    const packetPath = {
+      srcEid: 0,
+      dstEid,
+      sender: bytes.hexlify(oftConfig.toBytes()),
+      receiver: bytes.hexlify(receiverInfo.address)
+    };
+    invariant3__default.default(await isAccountInitialized(connection, endpointSettings), "endpointSettings account not initialized");
+    invariant3__default.default(await isAccountInitialized(connection, peer), "peer account not initialized");
+    invariant3__default.default(await isAccountInitialized(connection, enforcedOptions), "enforcedOptions account not initialized");
+    invariant3__default.default(await isAccountInitialized(connection, payer), "payer account not initialized");
+    invariant3__default.default(
+      await isAccountInitialized(
+        connection,
+        this.endpoint.endpointDeriver.nonce(oftConfig, dstEid, peerAddress)[0]
+      ),
+      "nonce account not initialized"
+    );
+    return createSendInstruction(
+      {
+        signer: payer,
+        peer,
+        enforcedOptions,
+        oftConfig,
+        tokenSource,
+        tokenEscrow: this.escrowKp,
+        tokenMint: this.mintKp,
+        tokenProgram: this.tokenProgram,
+        eventAuthority: this.eventAuthorityPDA,
+        program: this.program,
+        // Get remaining accounts from msgLib(simple_msgLib or uln)
+        anchorRemainingAccounts: await this.endpoint.getSendIXAccountMetaForCPI(
+          connection,
+          payer,
+          packetPath,
+          msgLibProgram,
+          commitmentOrConfig
+        )
+      },
+      {
+        params: {
+          dstEid,
+          to,
+          amountLd: new BN2__default.default(amountLd.toString()),
+          minAmountLd: new BN2__default.default(minAmountLd.toString()),
+          options,
+          composeMsg,
+          nativeFee: fee.nativeFee,
+          lzTokenFee: fee.lzTokenFee
+        }
+      },
+      this.program
+    );
+  }
+  async setRateLimit(signer, dstEid, capacity, refillPerSecond, enabled) {
+    const [peerPda] = this.deriver.peer(this.getOftConfig(), dstEid);
+    const ix = createSetRateLimitInstruction(
+      {
+        admin: signer,
+        peer: peerPda,
+        oftConfig: this.getOftConfig()
+      },
+      {
+        params: {
+          dstEid,
+          capacity: new BN2__default.default(capacity.toString()),
+          refillPerSecond: new BN2__default.default(refillPerSecond.toString()),
+          enabled
+        }
+      },
+      this.program
+    );
+    return Promise.resolve(ix);
+  }
+  async lzReceive(connection, payer, packet) {
+    const deserializedPacket = PacketSerializer.deserialize(packet);
+    return lzReceive(connection, payer, deserializedPacket);
+  }
+  async getSendLibraryProgram(connection, payer, dstEid) {
+    const oftConfig = this.getOftConfig();
+    const sendLibInfo = await this.endpoint.getSendLibrary(connection, oftConfig, dstEid);
+    if (!sendLibInfo?.programId) {
+      throw new Error("Send library not initialized or blocked message library");
     }
-  );
-}
-async function createInitNativeOftIx(payer, admin, mint, oftMintAuthority, lzDelegate, sharedDecimals = 6, tokenProgram = splToken.TOKEN_PROGRAM_ID) {
-  const [oftConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OFT_SEED2, "utf-8"), mint.toBuffer()],
-    PROGRAM_ID
-  );
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [endpointEventAuthority] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(EVENT_SEED2, "utf-8")],
-    PROGRAM_ID2
-  );
-  const [lzReceiveTypes] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(LZ_RECEIVE_TYPES_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID
-  );
-  const registerOappIx = createRegisterOappInstruction(
+    const { programId: msgLibProgram } = sendLibInfo;
+    const msgLibVersion = await this.endpoint.getMessageLibVersion(connection, payer, msgLibProgram);
+    if (msgLibVersion?.major.toString() === "0" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+      return new simple_message_lib_exports.SimpleMessageLib(msgLibProgram);
+    } else if (msgLibVersion?.major.toString() === "3" && msgLibVersion.minor == 0 && msgLibVersion.endpointVersion == 2) {
+      return new uln_exports.Uln(msgLibProgram);
+    }
+    throw new Error(`Unsupported message library version: ${JSON.stringify(msgLibVersion, null, 2)}`);
+  }
+};
+
+// src/oft-tools.ts
+var SOLANA_EID = 1;
+async function createInitAdapterOftIx(payer, admin, mint, escrow, sharedDecimals = 6, tokenProgram = splToken.TOKEN_PROGRAM_ID, oftProgramId = PROGRAM_ID, endpointProgram = PROGRAM_ID2) {
+  const deriver = new OftPDADeriver(oftProgramId);
+  const endpoint = new Endpoint(endpointProgram);
+  const [oftConfig] = deriver.oftConfig(escrow);
+  const [lzReceiveTypes] = deriver.lzReceiveTypesAccounts(oftConfig);
+  return instructions_exports.createInitAdapterOftInstruction(
     {
       payer,
-      oapp: oftConfig,
-      oappRegistry: oAppRegistry,
-      eventAuthority: endpointEventAuthority,
-      program: PROGRAM_ID
+      oftConfig,
+      tokenMint: mint,
+      tokenEscrow: escrow,
+      lzReceiveTypesAccounts: lzReceiveTypes,
+      tokenProgram,
+      anchorRemainingAccounts: endpoint.getRegisterOappIxAccountMetaForCPI(payer, oftConfig)
     },
     {
       params: {
-        delegate: lzDelegate
+        admin,
+        sharedDecimals,
+        endpointProgram
       }
     }
   );
-  for (const acc of registerOappIx.keys) {
-    acc.isSigner = false;
+}
+async function createNonceTx(connection, nonceAccount, nonceAuthority, instructions, commitmentOrConfig = "confirmed") {
+  const nonceAccountInfo = await connection.getNonce(nonceAccount, commitmentOrConfig);
+  if (nonceAccountInfo === null) {
+    throw new Error("Invalid nonce account");
   }
-  return createInitOftInstruction(
+  const { nonce } = nonceAccountInfo;
+  const nonceAdvanceIx = web35.SystemProgram.nonceAdvance({
+    noncePubkey: nonceAccount,
+    authorizedPubkey: nonceAuthority
+  });
+  return new web35.Transaction({
+    recentBlockhash: nonce,
+    nonceInfo: {
+      nonce,
+      nonceInstruction: nonceAdvanceIx
+    }
+  }).add(...instructions);
+}
+async function createInitNativeOftIx(payer, admin, mint, oftMintAuthority, sharedDecimals = 6, tokenProgram = splToken.TOKEN_PROGRAM_ID, oftProgramId = PROGRAM_ID, endpointProgram = PROGRAM_ID2) {
+  const deriver = new OftPDADeriver(oftProgramId);
+  const endpoint = new Endpoint(endpointProgram);
+  const [oftConfig] = deriver.oftConfig(mint);
+  const [lzReceiveTypes] = deriver.lzReceiveTypesAccounts(oftConfig);
+  return instructions_exports.createInitOftInstruction(
     {
       payer,
       oftConfig,
       tokenMint: mint,
       lzReceiveTypesAccounts: lzReceiveTypes,
       tokenProgram,
-      anchorRemainingAccounts: [
-        {
-          pubkey: PROGRAM_ID2,
-          isSigner: false,
-          isWritable: false
-        }
-      ].concat(
-        ...registerOappIx.keys,
-        {
-          pubkey: endpointEventAuthority,
-          isSigner: false,
-          isWritable: false
-        },
-        {
-          pubkey: PROGRAM_ID2,
-          isSigner: false,
-          isWritable: false
-        }
-      )
+      anchorRemainingAccounts: endpoint.getRegisterOappIxAccountMetaForCPI(payer, oftConfig)
     },
     {
       params: {
         admin,
         sharedDecimals,
-        endpointProgram: PROGRAM_ID2,
-        mintAuthority: oftMintAuthority
+        mintAuthority: oftMintAuthority,
+        endpointProgram
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function createSetPeerIx(admin, oftConfig, dstEid, peer) {
+async function createSetPeerIx(admin, oftConfig, dstEid, peer, oftProgramId = PROGRAM_ID) {
   if (peer.length !== 32) {
     throw new Error("Peer must be 32 bytes (left-padded with zeroes)");
   }
   if (dstEid % 3e4 == 0) {
     throw new Error("Invalid dstEid");
   }
-  const [peerPda] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftConfig.toBuffer(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  return createSetPeerInstruction(
+  const [peerPda] = new OftPDADeriver(oftProgramId).peer(oftConfig, dstEid);
+  return instructions_exports.createSetPeerInstruction(
     {
       admin,
       peer: peerPda,
@@ -20464,45 +20726,36 @@ async function createSetPeerIx(admin, oftConfig, dstEid, peer) {
         peer
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function createSetDelegateIx(admin, oftConfig, delegate) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [endpointEventAuthority] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(EVENT_SEED2, "utf-8")],
-    PROGRAM_ID2
-  );
-  const endpointSetDelegateIx = createSetDelegateInstruction2(
+async function createSetDelegateIx(admin, oftConfig, delegate, oftProgramId = PROGRAM_ID, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  const [oAppRegistry] = endpoint.endpointDeriver.oappRegistry(oftConfig);
+  const endpointEventAuthority = endpoint.eventAuthorityPDA;
+  const keys = instructions_exports2.createSetDelegateInstructionAccounts(
     {
       oapp: oftConfig,
       oappRegistry: oAppRegistry,
       eventAuthority: endpointEventAuthority,
-      program: PROGRAM_ID2
+      program: endpointProgram
     },
-    {
-      params: {
-        delegate
-      }
-    }
+    endpointProgram
   );
-  for (const acc of endpointSetDelegateIx.keys) {
+  for (const acc of keys) {
     acc.isSigner = false;
   }
-  return createSetDelegateInstruction(
+  return instructions_exports.createSetDelegateInstruction(
     {
       admin,
       oftConfig,
       anchorRemainingAccounts: [
         {
-          pubkey: PROGRAM_ID2,
+          pubkey: endpointProgram,
           isSigner: false,
           isWritable: false
         },
-        ...endpointSetDelegateIx.keys
+        ...keys
       ]
     },
     {
@@ -20510,151 +20763,34 @@ async function createSetDelegateIx(admin, oftConfig, delegate) {
         delegate
       }
     },
-    PROGRAM_ID
-  );
-}
-async function createInitSendLibraryIx(signer, oftConfig, dstEid) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [sendLibraryConfig] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(SEND_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftConfig.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  return createInitSendLibraryInstruction(
-    {
-      delegate: signer,
-      oappRegistry: oAppRegistry,
-      sendLibraryConfig
-    },
-    {
-      params: {
-        sender: oftConfig,
-        eid: dstEid
-      }
-    },
-    PROGRAM_ID2
-  );
-}
-async function createInitReceiveLibraryIx(signer, oftConfig, remoteEid) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [receiveLibraryConfig] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftConfig.toBuffer(),
-      new BN6__default.default(remoteEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  return createInitReceiveLibraryInstruction(
-    {
-      delegate: signer,
-      oappRegistry: oAppRegistry,
-      receiveLibraryConfig
-    },
-    {
-      params: {
-        receiver: oftConfig,
-        eid: remoteEid
-      }
-    },
-    PROGRAM_ID2
+    oftProgramId
   );
 }
-async function createSetSendLibraryIx(signer, oftConfig, sendLibraryProgram, dstEid) {
-  const [newSendLib] = web35.PublicKey.findProgramAddressSync([Buffer.from(MESSAGE_LIB_SEED2, "utf8")], sendLibraryProgram);
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [sendLibraryConfig] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(SEND_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftConfig.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  const [sendLibraryInfo] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(MESSAGE_LIB_SEED2, "utf-8"), newSendLib.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [eventAuthority] = web35.PublicKey.findProgramAddressSync([Buffer.from(EVENT_SEED2, "utf-8")], PROGRAM_ID2);
-  return createSetSendLibraryInstruction(
-    {
-      signer,
-      oappRegistry: oAppRegistry,
-      sendLibraryConfig,
-      messageLibInfo: sendLibraryInfo,
-      eventAuthority,
-      program: PROGRAM_ID2
-    },
-    {
-      params: {
-        sender: oftConfig,
-        eid: dstEid,
-        newLib: newSendLib
-      }
-    },
-    PROGRAM_ID2
+async function createInitSendLibraryIx(signer, oftConfig, dstEid, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.initSendLibraryWithoutChecks(signer, oftConfig, dstEid);
+}
+async function createInitReceiveLibraryIx(signer, oftConfig, remoteEid, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.initReceiveLibraryWithoutChecks(signer, oftConfig, remoteEid);
+}
+async function createSetSendLibraryIx(signer, oftConfig, sendLibraryProgram, dstEid, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.setSendLibrary(signer, oftConfig, sendLibraryProgram, dstEid);
+}
+async function createSetReceiveLibraryIx(signer, oftConfig, receiveLibraryProgram, dstEid, gracePeriod, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.setReceiveLibrary(
+    signer,
+    oftConfig,
+    receiveLibraryProgram,
+    dstEid,
+    parseInt(gracePeriod.toString())
   );
 }
-async function createSetReceiveLibraryIx(signer, oftConfig, receiveLibraryProgram, dstEid, gracePeriod) {
-  const [newReceiveLib] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(MESSAGE_LIB_SEED2, "utf8")],
-    receiveLibraryProgram
-  );
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [receiveLibraryConfig] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftConfig.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  const [receiveLibraryInfo] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(MESSAGE_LIB_SEED2, "utf-8"), newReceiveLib.toBuffer()],
-    PROGRAM_ID2
-  );
-  const [eventAuthority] = web35.PublicKey.findProgramAddressSync([Buffer.from(EVENT_SEED2, "utf-8")], PROGRAM_ID2);
-  return createSetReceiveLibraryInstruction(
-    {
-      signer,
-      oappRegistry: oAppRegistry,
-      receiveLibraryConfig,
-      messageLibInfo: receiveLibraryInfo,
-      eventAuthority,
-      program: PROGRAM_ID2
-    },
-    {
-      params: {
-        receiver: oftConfig,
-        eid: dstEid,
-        newLib: newReceiveLib,
-        gracePeriod: new BN6__default.default(gracePeriod.toString())
-      }
-    },
-    PROGRAM_ID2
-  );
-}
-async function createMintToIx(signer, tokenMint, tokenDest, amount, tokenProgram = splToken.TOKEN_PROGRAM_ID) {
-  const [oftConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OFT_SEED2, "utf-8"), tokenMint.toBytes()],
-    PROGRAM_ID
-  );
-  return createMintToInstruction(
+async function createMintToIx(signer, tokenMint, tokenDest, amount, tokenProgram = splToken.TOKEN_PROGRAM_ID, oftProgramId = PROGRAM_ID) {
+  const [oftConfig] = new OftPDADeriver(oftProgramId).oftConfig(tokenMint);
+  return instructions_exports.createMintToInstruction(
     {
       minter: signer,
       oftConfig,
@@ -20664,18 +20800,15 @@ async function createMintToIx(signer, tokenMint, tokenDest, amount, tokenProgram
     },
     {
       params: {
-        amount: new BN6__default.default(amount.toString())
+        amount: new BN2__default.default(amount.toString())
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function createSetRateLimitIx(signer, oftConfig, dstEid, capacity, refillPerSecond, enabled) {
-  const [peer] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftConfig.toBytes(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  return createSetRateLimitInstruction(
+async function createSetRateLimitIx(signer, oftConfig, dstEid, capacity, refillPerSecond, enabled, oftProgramId = PROGRAM_ID) {
+  const [peer] = new OftPDADeriver(oftProgramId).peer(oftConfig, dstEid);
+  return instructions_exports.createSetRateLimitInstruction(
     {
       admin: signer,
       peer,
@@ -20684,160 +20817,31 @@ async function createSetRateLimitIx(signer, oftConfig, dstEid, capacity, refillP
     {
       params: {
         dstEid,
-        capacity: new BN6__default.default(capacity.toString()),
-        refillPerSecond: new BN6__default.default(refillPerSecond.toString()),
+        capacity: new BN2__default.default(capacity.toString()),
+        refillPerSecond: new BN2__default.default(refillPerSecond.toString()),
         enabled
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function createInitConfigIx(signer, oftConfig, messageLibProgram, dstEid) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBytes()],
-    PROGRAM_ID2
-  );
-  const [messageLib] = web35.PublicKey.findProgramAddressSync([Buffer.from(MESSAGE_LIB_SEED2, "utf-8")], messageLibProgram);
-  const [messageLibInfo] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(MESSAGE_LIB_SEED2, "utf-8"), messageLib.toBytes()],
-    PROGRAM_ID2
-  );
-  const [endpointSettings] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(ENDPOINT_SEED2, "utf-8")],
-    PROGRAM_ID2
-  );
-  const [sendConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(SEND_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4), oftConfig.toBytes()],
-    messageLibProgram
-  );
-  const [receiveConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(RECEIVE_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4), oftConfig.toBytes()],
-    messageLibProgram
-  );
-  const initConfigMessageLibIx = createInitConfigInstruction3(
-    {
-      endpoint: endpointSettings,
-      payer: signer,
-      uln: messageLib,
-      sendConfig,
-      receiveConfig
-    },
-    {
-      params: {
-        oapp: oftConfig,
-        eid: dstEid
-      }
-    }
-  );
-  for (const acc of initConfigMessageLibIx.keys) {
-    if (!signer.equals(acc.pubkey)) {
-      acc.isSigner = false;
-    }
+async function createInitConfigIx(signer, oftConfig, dstEid, msgLibProgram = PROGRAM_ID6, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  let msgLib;
+  if (msgLibProgram.toBase58() === simple_message_lib_exports.PROGRAM_ID.toBase58()) {
+    msgLib = new simple_message_lib_exports.SimpleMessageLib(msgLibProgram);
+  } else {
+    msgLib = new Uln(msgLibProgram);
   }
-  return createInitConfigInstruction(
-    {
-      delegate: signer,
-      oappRegistry: oAppRegistry,
-      messageLibInfo,
-      messageLib,
-      messageLibProgram,
-      anchorRemainingAccounts: initConfigMessageLibIx.keys.slice(1)
-    },
-    {
-      params: {
-        oapp: oftConfig,
-        eid: dstEid
-      }
-    }
-  );
+  return endpoint.initOappConfig(signer, msgLib, signer, oftConfig, dstEid);
 }
-async function createSetConfigIx(signer, oftConfig, dstEid, configType, config, messageLibProgram = PROGRAM_ID6) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftConfig.toBytes()],
-    PROGRAM_ID2
-  );
-  const [messageLib] = web35.PublicKey.findProgramAddressSync([Buffer.from(MESSAGE_LIB_SEED2, "utf-8")], messageLibProgram);
-  const [messageLibInfo] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(MESSAGE_LIB_SEED2, "utf-8"), messageLib.toBytes()],
-    PROGRAM_ID2
-  );
-  const [endpointSettings] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(ENDPOINT_SEED2, "utf-8")],
-    PROGRAM_ID2
-  );
-  const [defaultSendConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(SEND_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    messageLibProgram
-  );
-  const [sendConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(SEND_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4), oftConfig.toBytes()],
-    messageLibProgram
-  );
-  const [defaultReceiveConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(RECEIVE_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    messageLibProgram
-  );
-  const [receiveConfig] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(RECEIVE_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4), oftConfig.toBytes()],
-    messageLibProgram
-  );
-  const [messageLibEventAuthority] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(EVENT_SEED2, "utf-8")],
-    messageLibProgram
-  );
-  const [ulnSettings] = web35.PublicKey.findProgramAddressSync([Buffer.from(ULN_SEED2, "utf-8")], messageLibProgram);
-  const messageLibSetConfigIx = createSetConfigInstruction4(
-    {
-      endpoint: endpointSettings,
-      uln: ulnSettings,
-      sendConfig,
-      receiveConfig,
-      defaultSendConfig,
-      defaultReceiveConfig,
-      eventAuthority: messageLibEventAuthority,
-      program: messageLibProgram
-    },
-    {
-      params: {
-        oapp: oftConfig,
-        eid: dstEid,
-        configType,
-        config
-      }
-    },
-    messageLibProgram
-  );
-  for (const acc of messageLibSetConfigIx.keys) {
-    if (!signer.equals(acc.pubkey)) {
-      acc.isSigner = false;
-    }
-  }
-  return createSetConfigInstruction(
-    {
-      signer,
-      oappRegistry: oAppRegistry,
-      messageLibInfo,
-      messageLib,
-      messageLibProgram,
-      anchorRemainingAccounts: messageLibSetConfigIx.keys.slice(1)
-    },
-    {
-      params: {
-        oapp: oftConfig,
-        eid: dstEid,
-        configType,
-        config
-      }
-    },
-    PROGRAM_ID2
-  );
+async function createSetConfigIx(connection, signer, oftConfig, dstEid, configType, config, msgLibProgram = PROGRAM_ID6, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.setOappConfig(connection, signer, oftConfig, msgLibProgram, dstEid, { configType, value: config });
 }
-async function createSetEnforcedOptionsIx(admin, oftConfig, dstEid, sendOptions, sendAndCallOptions) {
-  const [enforcedOptions] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(ENFORCED_OPTIONS_SEED2, "utf-8"), oftConfig.toBytes(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  return createSetEnforcedOptionsInstruction(
+async function createSetEnforcedOptionsIx(admin, oftConfig, dstEid, sendOptions, sendAndCallOptions, oftProgramId = PROGRAM_ID) {
+  const [enforcedOptions] = new OftPDADeriver(oftProgramId).enforcedOptions(oftConfig, dstEid);
+  return instructions_exports.createSetEnforcedOptionsInstruction(
     {
       admin,
       enforcedOptions,
@@ -20850,11 +20854,11 @@ async function createSetEnforcedOptionsIx(admin, oftConfig, dstEid, sendOptions,
         sendAndCall: sendAndCallOptions
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function createTransferAdminIx(signer, oftConfig, newAdmin) {
-  return createTransferAdminInstruction(
+async function createTransferAdminIx(signer, oftConfig, newAdmin, oftProgramId = PROGRAM_ID) {
+  return instructions_exports.createTransferAdminInstruction(
     {
       admin: signer,
       oftConfig
@@ -20864,115 +20868,36 @@ async function createTransferAdminIx(signer, oftConfig, newAdmin) {
         admin: newAdmin
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function sendWithUln(connection, payer, tokenMint, tokenSource, dstEid, amountLd, minAmountLd, options, to, nativeFee, tokenEscrow = void 0, lzTokenFee = 0n, tokenProgram = splToken.TOKEN_PROGRAM_ID, composeMsg = null) {
-  const [oftInstance] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OFT_SEED2, "utf-8"), tokenEscrow ? tokenEscrow.toBuffer() : tokenMint.toBuffer()],
-    PROGRAM_ID
-  );
-  const [peer] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftInstance.toBuffer(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  const [oftEventAuthority] = web35.PublicKey.findProgramAddressSync([Buffer.from(EVENT_SEED2, "utf-8")], PROGRAM_ID);
-  const peerInfo = await Peer.fromAccountAddress(connection, peer);
-  const peerAddress = peerInfo.address;
-  const [enforcedOptions] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(ENFORCED_OPTIONS_SEED2, "utf-8"),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID
-  );
-  const messageLib = new Uln(PROGRAM_ID6);
-  const endpoint = new Endpoint(PROGRAM_ID2);
-  const remainingAccounts = await endpoint.getSendIXAccountMetaForCPI(
+async function sendWithUln(connection, payer, tokenMint, tokenSource, dstEid, amountLd, minAmountLd, options, to, nativeFee, tokenEscrow = void 0, lzTokenFee = 0n, tokenProgram = splToken.TOKEN_PROGRAM_ID, composeMsg = null, oftProgramId = PROGRAM_ID, endpointProgram = PROGRAM_ID2) {
+  const oft = new Oft(oftProgramId, endpointProgram, tokenProgram, tokenMint, tokenEscrow);
+  return oft.send(
     connection,
     payer,
+    tokenSource,
+    to,
+    dstEid,
+    amountLd,
+    minAmountLd,
     {
-      srcEid: SOLANA_EID,
-      sender: bytes.hexlify(oftInstance.toBytes()),
-      dstEid,
-      receiver: bytes.hexlify(peerAddress)
-    },
-    messageLib
-  );
-  return createSendInstruction(
-    {
-      signer: payer,
-      peer,
-      enforcedOptions,
-      oftConfig: oftInstance,
-      tokenSource,
-      tokenEscrow,
-      tokenMint,
-      tokenProgram,
-      eventAuthority: oftEventAuthority,
-      program: PROGRAM_ID,
-      anchorRemainingAccounts: remainingAccounts
+      nativeFee: new BN2__default.default(nativeFee.toString()),
+      lzTokenFee: new BN2__default.default(lzTokenFee.toString())
     },
-    {
-      params: {
-        dstEid,
-        to,
-        amountLd: new BN6__default.default(amountLd.toString()),
-        minAmountLd: new BN6__default.default(minAmountLd.toString()),
-        options,
-        composeMsg,
-        nativeFee: new BN6__default.default(nativeFee.toString()),
-        lzTokenFee: new BN6__default.default(lzTokenFee.toString())
-      }
-    }
+    options,
+    composeMsg
   );
 }
-async function createInitNonceIx(delegate, dstEid, oftInstance, remoteOappAddr) {
-  const [nonce] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(NONCE_SEED2), oftInstance.toBuffer(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4), remoteOappAddr],
-    PROGRAM_ID2
-  );
-  const [pendingNonce] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(PENDING_NONCE_SEED2),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4),
-      remoteOappAddr
-    ],
-    PROGRAM_ID2
-  );
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftInstance.toBuffer()],
-    PROGRAM_ID2
-  );
-  return createInitNonceInstruction(
-    {
-      nonce,
-      pendingInboundNonce: pendingNonce,
-      oappRegistry: oAppRegistry,
-      delegate
-    },
-    {
-      params: {
-        localOapp: oftInstance,
-        remoteOapp: Array.from(remoteOappAddr),
-        remoteEid: dstEid
-      }
-    },
-    PROGRAM_ID2
-  );
+async function createInitNonceIx(delegate, dstEid, oftInstance, remoteOappAddr, endpointProgram = PROGRAM_ID2) {
+  const endpoint = new Endpoint(endpointProgram);
+  return endpoint.initOAppNonceWithoutChecks(delegate, dstEid, oftInstance, remoteOappAddr);
 }
-async function quoteOft(connection, payer, tokenMint, dstEid, amountLd, minAmountLd, options, to, tokenEscrow = void 0, payInLzToken = false, composeMsg = null) {
-  const [oftInstance] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OFT_SEED2, "utf-8"), tokenMint.toBuffer()],
-    PROGRAM_ID
-  );
-  const [peer] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftInstance.toBuffer(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  const ix = createQuoteOftInstruction(
+async function quoteOft(connection, payer, tokenMint, dstEid, amountLd, minAmountLd, options, to, tokenEscrow = void 0, payInLzToken = false, composeMsg = null, tokenProgram = splToken.TOKEN_PROGRAM_ID, oftProgramId = PROGRAM_ID, endpointProgram = PROGRAM_ID2) {
+  const oft = new Oft(oftProgramId, endpointProgram, tokenProgram, tokenMint, tokenEscrow);
+  const oftInstance = oft.getOftConfig();
+  const [peer] = oft.deriver.peer(oftInstance, dstEid);
+  const ix = instructions_exports.createQuoteOftInstruction(
     {
       oftConfig: oftInstance,
       peer,
@@ -20982,8 +20907,8 @@ async function quoteOft(connection, payer, tokenMint, dstEid, amountLd, minAmoun
       params: {
         dstEid,
         to,
-        amountLd: new BN6__default.default(amountLd.toString()),
-        minAmountLd: new BN6__default.default(minAmountLd.toString()),
+        amountLd: new BN2__default.default(amountLd.toString()),
+        minAmountLd: new BN2__default.default(minAmountLd.toString()),
         options,
         payInLzToken,
         composeMsg
@@ -20991,45 +20916,18 @@ async function quoteOft(connection, payer, tokenMint, dstEid, amountLd, minAmoun
     }
   );
   const returnedValues = await simulateTransaction(connection, [ix], ix.programId, payer, "confirmed");
-  const oftLimits = oFTLimitsBeet.read(returnedValues, 0);
-  const [oftFeeDetail] = oFTFeeDetailBeet.deserialize(returnedValues, 20);
-  const oftReceipt = oFTReceiptBeet.read(returnedValues, returnedValues.length - oFTLimitsBeet.byteSize);
-  return {
-    oftLimits: {
-      minAmountLd: oftLimits.minAmountLd.toString(),
-      maxAmountLd: oftLimits.maxAmountLd.toString()
-    },
-    oftFeeDetail: {
-      feeAmountLd: oftFeeDetail.feeAmountLd.toString(),
-      description: oftFeeDetail.description
-    },
-    oftReceipt: {
-      amountSentLd: oftReceipt.amountSentLd.toString(),
-      amountReceivedLd: oftReceipt.amountReceivedLd.toString()
-    }
-  };
-}
-async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minAmountLd, options, to, tokenEscrow = void 0, payInLzToken = false, composeMsg = null) {
-  const [oftInstance] = tokenEscrow === void 0 ? web35.PublicKey.findProgramAddressSync([Buffer.from(OFT_SEED2, "utf-8"), tokenMint.toBuffer()], PROGRAM_ID) : web35.PublicKey.findProgramAddressSync([Buffer.from(OFT_SEED2, "utf-8"), tokenEscrow.toBuffer()], PROGRAM_ID);
-  const [peer] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftInstance.toBytes(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  const peerinfo = await connection.getAccountInfo(peer);
-  if (peerinfo === null) {
-    throw new Error("Peer not found");
-  }
-  const peerAddress = peerinfo.data.subarray(8, 32 + 8);
-  const [enforcedOptions] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(ENFORCED_OPTIONS_SEED2, "utf-8"),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID
-  );
-  const messageLib = new Uln(PROGRAM_ID6);
-  const endpoint = new Endpoint(PROGRAM_ID2);
+  const [result] = types_exports.quoteOftResultBeet.deserialize(returnedValues, 0);
+  return result;
+}
+async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minAmountLd, options, to, tokenEscrow = void 0, payInLzToken = false, composeMsg = null, tokenProgram = splToken.TOKEN_PROGRAM_ID, oftProgramId = PROGRAM_ID, msgLibProgram = PROGRAM_ID6, endpointProgram = PROGRAM_ID2) {
+  const oft = new Oft(oftProgramId, endpointProgram, tokenProgram, tokenMint, tokenEscrow);
+  const oftInstance = oft.getOftConfig();
+  const [enforcedOptions] = oft.deriver.enforcedOptions(oftInstance, dstEid);
+  const [peer] = oft.deriver.peer(oftInstance, dstEid);
+  const peerInfo = await accounts_exports.Peer.fromAccountAddress(connection, peer);
+  const peerAddress = peerInfo.address;
+  const messageLib = new Uln(msgLibProgram);
+  const endpoint = new Endpoint(endpointProgram);
   const remainingAccounts = await endpoint.getQuoteIXAccountMetaForCPI(
     connection,
     payer,
@@ -21041,7 +20939,7 @@ async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minA
     },
     messageLib
   );
-  const ix = createQuoteInstruction(
+  const ix = instructions_exports.createQuoteInstruction(
     {
       oftConfig: oftInstance,
       peer,
@@ -21053,8 +20951,8 @@ async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minA
       params: {
         dstEid,
         to,
-        amountLd: new BN6__default.default(amountLd.toString()),
-        minAmountLd: new BN6__default.default(minAmountLd.toString()),
+        amountLd: new BN2__default.default(amountLd.toString()),
+        minAmountLd: new BN2__default.default(minAmountLd.toString()),
         options,
         payInLzToken,
         composeMsg
@@ -21065,11 +20963,11 @@ async function quoteWithUln(connection, payer, tokenMint, dstEid, amountLd, minA
     units: 1e6
   });
   const buffer = await simulateTransaction(connection, [modifyComputeUnits, ix], ix.programId, payer, "confirmed");
-  const fee = types_exports.messagingFeeBeet.read(buffer, 0);
+  const fee = types_exports2.messagingFeeBeet.read(buffer, 0);
   return { nativeFee: BigInt(fee.nativeFee.toString()), lzTokenFee: BigInt(fee.lzTokenFee.toString()) };
 }
-async function createSetMintAuthorityIx(signer, oftInstance, newAuthority) {
-  return createSetMintAuthorityInstruction(
+async function createSetMintAuthorityIx(signer, oftInstance, newAuthority, oftProgramId = PROGRAM_ID) {
+  return instructions_exports.createSetMintAuthorityInstruction(
     {
       signer,
       oftConfig: oftInstance
@@ -21079,40 +20977,22 @@ async function createSetMintAuthorityIx(signer, oftInstance, newAuthority) {
         mintAuthority: newAuthority
       }
     },
-    PROGRAM_ID
+    oftProgramId
   );
 }
-async function getEndpointConfig(connection, oftInstance, dstEid) {
-  const [sendLib] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(SEND_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  const [defaultSendLib] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(SEND_LIBRARY_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID2
-  );
-  const [receiveLib] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED2, "utf-8"),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID2
-  );
-  const [defaultReceiveLib] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(RECEIVE_LIBRARY_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID2
-  );
-  const [ulnSettings] = web35.PublicKey.findProgramAddressSync([Buffer.from(ULN_SEED2, "utf-8")], PROGRAM_ID6);
-  let sendLibraryConfig = await accounts_exports.SendLibraryConfig.fromAccountAddress(connection, sendLib);
-  let receiveLibraryConfig = await accounts_exports.ReceiveLibraryConfig.fromAccountAddress(connection, receiveLib);
-  const defaultSendLibraryConfig = await accounts_exports.SendLibraryConfig.fromAccountAddress(connection, defaultSendLib);
-  const defaultReceiveLibraryConfig = await accounts_exports.ReceiveLibraryConfig.fromAccountAddress(connection, defaultReceiveLib);
-  const nil64 = new BN6__default.default("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "hex");
+async function getEndpointConfig(connection, oftInstance, dstEid, msgLibProgram = PROGRAM_ID6, endpointProgram = PROGRAM_ID2) {
+  const endpointDeriver = new EndpointPDADeriver(endpointProgram);
+  const ulnDeriver = new UlnPDADeriver(msgLibProgram);
+  const [sendLib] = endpointDeriver.sendLibraryConfig(oftInstance, dstEid);
+  const [defaultSendLib] = endpointDeriver.defaultSendLibraryConfig(dstEid);
+  const [receiveLib] = endpointDeriver.receiveLibraryConfig(oftInstance, dstEid);
+  const [defaultReceiveLib] = endpointDeriver.defaultReceiveLibraryConfig(dstEid);
+  const [msgLib] = ulnDeriver.messageLib();
+  let sendLibraryConfig = await accounts_exports2.SendLibraryConfig.fromAccountAddress(connection, sendLib);
+  let receiveLibraryConfig = await accounts_exports2.ReceiveLibraryConfig.fromAccountAddress(connection, receiveLib);
+  const defaultSendLibraryConfig = await accounts_exports2.SendLibraryConfig.fromAccountAddress(connection, defaultSendLib);
+  const defaultReceiveLibraryConfig = await accounts_exports2.ReceiveLibraryConfig.fromAccountAddress(connection, defaultReceiveLib);
+  const nil64 = new BN2__default.default("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "hex");
   const nil8 = 255;
   if (sendLibraryConfig.messageLib.equals(web35.PublicKey.default)) {
     sendLibraryConfig = defaultSendLibraryConfig;
@@ -21120,25 +21000,15 @@ async function getEndpointConfig(connection, oftInstance, dstEid) {
   if (receiveLibraryConfig.messageLib.equals(web35.PublicKey.default)) {
     receiveLibraryConfig = defaultReceiveLibraryConfig;
   }
-  if (sendLibraryConfig.messageLib.equals(ulnSettings)) {
-    const [ulnDefaultSendConfigPDA] = web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-      PROGRAM_ID6
-    );
-    const [ulnSendConfigPDA] = web35.PublicKey.findProgramAddressSync(
-      [
-        Buffer.from(SEND_CONFIG_SEED2, "utf-8"),
-        new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4),
-        oftInstance.toBuffer()
-      ],
-      PROGRAM_ID6
-    );
-    const ulnSendConfig = await accounts_exports5.SendConfig.fromAccountAddress(connection, ulnSendConfigPDA);
-    const ulnDefaultSendConfig = await accounts_exports5.SendConfig.fromAccountAddress(
+  if (sendLibraryConfig.messageLib.equals(msgLib)) {
+    const [ulnDefaultSendConfigPDA] = ulnDeriver.defaultSendConfig(dstEid);
+    const [ulnSendConfigPDA] = ulnDeriver.sendConfig(dstEid, oftInstance);
+    const ulnSendConfig = await accounts_exports6.SendConfig.fromAccountAddress(connection, ulnSendConfigPDA);
+    const ulnDefaultSendConfig = await accounts_exports6.SendConfig.fromAccountAddress(
       connection,
       ulnDefaultSendConfigPDA
     );
-    if (nil64.eq(new BN6__default.default(ulnSendConfig.uln.confirmations.toString()))) {
+    if (nil64.eq(new BN2__default.default(ulnSendConfig.uln.confirmations.toString()))) {
       ulnSendConfig.uln.confirmations = 0;
     } else if (ulnSendConfig.uln.confirmations == 0) {
       ulnSendConfig.uln.confirmations = ulnDefaultSendConfig.uln.confirmations;
@@ -21159,25 +21029,15 @@ async function getEndpointConfig(connection, oftInstance, dstEid) {
     }
     sendLibraryConfig.ulnSendConfig = ulnSendConfig;
   }
-  if (receiveLibraryConfig.messageLib.equals(ulnSettings)) {
-    const [ulnDefaultReceiveConfigPDA] = web35.PublicKey.findProgramAddressSync(
-      [Buffer.from(SEND_CONFIG_SEED2, "utf-8"), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-      PROGRAM_ID6
-    );
-    const [ulnReceiveConfigPDA] = web35.PublicKey.findProgramAddressSync(
-      [
-        Buffer.from(SEND_CONFIG_SEED2, "utf-8"),
-        new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4),
-        oftInstance.toBuffer()
-      ],
-      PROGRAM_ID6
-    );
-    const ulnReceiveConfig = await accounts_exports5.ReceiveConfig.fromAccountAddress(connection, ulnReceiveConfigPDA);
-    const ulnDefaultReceiveConfig = await accounts_exports5.ReceiveConfig.fromAccountAddress(
+  if (receiveLibraryConfig.messageLib.equals(msgLib)) {
+    const [ulnDefaultReceiveConfigPDA] = ulnDeriver.defaultReceiveConfig(dstEid);
+    const [ulnReceiveConfigPDA] = ulnDeriver.receiveConfig(dstEid, oftInstance);
+    const ulnReceiveConfig = await accounts_exports6.ReceiveConfig.fromAccountAddress(connection, ulnReceiveConfigPDA);
+    const ulnDefaultReceiveConfig = await accounts_exports6.ReceiveConfig.fromAccountAddress(
       connection,
       ulnDefaultReceiveConfigPDA
     );
-    if (nil64.eq(new BN6__default.default(ulnReceiveConfig.uln.confirmations.toString()))) {
+    if (nil64.eq(new BN2__default.default(ulnReceiveConfig.uln.confirmations.toString()))) {
       ulnReceiveConfig.uln.confirmations = 0;
     } else if (ulnReceiveConfig.uln.confirmations == 0) {
       ulnReceiveConfig.uln.confirmations = ulnDefaultReceiveConfig.uln.confirmations;
@@ -21203,33 +21063,19 @@ async function getEndpointConfig(connection, oftInstance, dstEid) {
     receiveLibraryConfig
   };
 }
-async function getPeerAddress(connection, oftInstance, dstEid) {
-  const [peer] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(PEER_SEED2, "utf-8"), oftInstance.toBytes(), new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)],
-    PROGRAM_ID
-  );
-  const peerinfo = await connection.getAccountInfo(peer);
-  return bytes.hexlify(peerinfo.data.subarray(8, 32 + 8));
+async function getPeerAddress(connection, oftInstance, dstEid, oftProgramId = PROGRAM_ID) {
+  const [peer] = new OftPDADeriver(oftProgramId).peer(oftInstance, dstEid);
+  const peerInfo = await accounts_exports.Peer.fromAccountAddress(connection, peer);
+  return bytes.hexlify(peerInfo.address);
 }
-async function getDelegate(connection, oftInstance) {
-  const [oAppRegistry] = web35.PublicKey.findProgramAddressSync(
-    [Buffer.from(OAPP_SEED2, "utf-8"), oftInstance.toBuffer()],
-    PROGRAM_ID2
-  );
-  const oAppRegistryInfo = await connection.getAccountInfo(oAppRegistry);
-  return new web35.PublicKey(oAppRegistryInfo.data.subarray(8, 40));
-}
-async function getEnforcedOptions(connection, oftInstance, dstEid) {
-  const [enforcedOptions] = web35.PublicKey.findProgramAddressSync(
-    [
-      Buffer.from(ENFORCED_OPTIONS_SEED2, "utf-8"),
-      oftInstance.toBuffer(),
-      new BN6__default.default(dstEid).toArrayLike(Buffer, "be", 4)
-    ],
-    PROGRAM_ID
-  );
-  const enforcedOptionsInfo = await connection.getAccountInfo(enforcedOptions);
-  return enforcedOptionsBeet.deserialize(enforcedOptionsInfo.data);
+async function getDelegate(connection, oftInstance, endpointProgram = PROGRAM_ID2) {
+  const [oAppRegistry] = new EndpointPDADeriver(endpointProgram).oappRegistry(oftInstance);
+  const oAppRegistryInfo = await accounts_exports2.OAppRegistry.fromAccountAddress(connection, oAppRegistry);
+  return oAppRegistryInfo.delegate;
+}
+async function getEnforcedOptions(connection, oftInstance, dstEid, oftProgramId = PROGRAM_ID) {
+  const [enforcedOptions] = new OftPDADeriver(oftProgramId).enforcedOptions(oftInstance, dstEid);
+  return accounts_exports.EnforcedOptions.fromAccountAddress(connection, enforcedOptions);
 }
 var idlTypes = [
   "MessageLibQuoteParams",
@@ -22859,11 +22705,11 @@ var types = [
 var IdlTypes = {
   endpoint: types
 };
-var SetConfigType2 = /* @__PURE__ */ ((SetConfigType3) => {
-  SetConfigType3[SetConfigType3["EXECUTOR"] = 1] = "EXECUTOR";
-  SetConfigType3[SetConfigType3["SEND_ULN"] = 2] = "SEND_ULN";
-  SetConfigType3[SetConfigType3["RECEIVE_ULN"] = 3] = "RECEIVE_ULN";
-  return SetConfigType3;
+var SetConfigType2 = /* @__PURE__ */ ((SetConfigType4) => {
+  SetConfigType4[SetConfigType4["EXECUTOR"] = 1] = "EXECUTOR";
+  SetConfigType4[SetConfigType4["SEND_ULN"] = 2] = "SEND_ULN";
+  SetConfigType4[SetConfigType4["RECEIVE_ULN"] = 3] = "RECEIVE_ULN";
+  return SetConfigType4;
 })(SetConfigType2 || {});
 
 exports.AddressType = AddressType;
@@ -22904,9 +22750,9 @@ exports.OAPP_SEED = OAPP_SEED;
 exports.OAppBasePDADeriver = OAppBasePDADeriver;
 exports.OFT_SEED = OFT_SEED;
 exports.OPTIONS_SEED = OPTIONS_SEED;
-exports.Oft = oft_exports;
 exports.OftPDADeriver = OftPDADeriver;
-exports.OftTools = OftTools_exports;
+exports.OftProgram = oft_exports;
+exports.OftTools = oft_tools_exports;
 exports.OmniCounterPDADeriver = OmniCounterPDADeriver;
 exports.PAYLOAD_HASH_SEED = PAYLOAD_HASH_SEED;
 exports.PEER_SEED = PEER_SEED;