@layerzerolabs/oft-v2-solana-sdk 3.0.46 → 3.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/oft-v2-solana-sdk",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -22,20 +22,21 @@
   "scripts": {
     "_test": "anchor test --skip-build",
     "api-gen": "$npm_execpath gen-idl && $npm_execpath ts-node scripts/generate.ts",
-    "build": "$npm_execpath clean-prebuild && $npm_execpath sync-target && $npm_execpath build-ts",
+    "build": "$npm_execpath clean-prebuild && $npm_execpath sync-target && $npm_execpath api-gen && $npm_execpath build-ts",
     "build-ts": "$npm_execpath tsc --noEmit && $npm_execpath tsup",
     "clean": "$npm_execpath clean-prebuild",
     "clean-prebuild": "rimraf .turbo target dist",
     "gen-idl": "$npm_execpath sync-target-idl && rsync -avc --delete target/idl/ ./idl/",
-    "sync-target": "$npm_execpath sync-target-deploy && $npm_execpath sync-target-idl",
+    "sync-oft202": "cp ../contracts/target/idl/oft.json target/idl/oft202.json && cp ../contracts/target/deploy/oft.so target/deploy/oft202.so",
+    "sync-target": "$npm_execpath sync-target-deploy && $npm_execpath sync-target-idl && $npm_execpath sync-oft202",
     "sync-target-deploy": "mkdir -p target/deploy && rsync -avc --delete ../../../../../packages/layerzero-v2/solana/target/deploy/ target/deploy/",
     "sync-target-idl": "mkdir -p target/idl && rsync -avc --delete ../../../../../packages/layerzero-v2/solana/target/idl/oft.json target/idl/"
   },
   "dependencies": {
     "@ethersproject/bytes": "^5.7.0",
-    "@layerzerolabs/lz-foundation": "^3.0.46",
-    "@layerzerolabs/lz-solana-sdk-v2": "^3.0.46",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.46",
+    "@layerzerolabs/lz-foundation": "^3.0.48",
+    "@layerzerolabs/lz-solana-sdk-v2": "^3.0.48",
+    "@layerzerolabs/lz-v2-utilities": "^3.0.48",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/umi": "^0.9.2",
@@ -52,9 +53,10 @@
     "@kinobi-so/nodes-from-anchor": "^0.21.2",
     "@kinobi-so/renderers": "^0.21.3",
     "@kinobi-so/renderers-js-umi": "^0.21.6",
-    "@layerzerolabs/tsup-config-next": "^3.0.46",
-    "@layerzerolabs/typescript-config-next": "^3.0.46",
-    "@metaplex-foundation/mpl-toolbox": "^0.9.4",
+    "@layerzerolabs/oft-v2-solana": "^0.0.0",
+    "@layerzerolabs/tsup-config-next": "^3.0.48",
+    "@layerzerolabs/typescript-config-next": "^3.0.48",
+    "@metaplex-foundation/mpl-toolbox": "^0.9.2",
     "@metaplex-foundation/solita": "^0.20.1",
     "@metaplex-foundation/umi": "^0.9.2",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",

package/src/consts.ts

@@ -0,0 +1,5 @@
+export const OFT_DECIMALS = 6
+
+export const OFT_SEED = 'OFT'
+
+export const PEER_SEED = 'Peer'

package/src/generated/{accounts → oft202/accounts}/lzReceiveTypesAccounts.ts

@@ -15,7 +15,6 @@ import {
   RpcGetAccountOptions,
   RpcGetAccountsOptions,
   assertAccountExists,
-  defaultPublicKey,
   deserializeAccount,
   gpaBuilder,
   publicKey as toPublicKey,
@@ -143,7 +142,7 @@ export async function safeFetchAllLzReceiveTypesAccounts(
 export function getLzReceiveTypesAccountsGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
   return gpaBuilder(context, programId)
     .registerFields<{
       discriminator: Uint8Array;

package/src/generated/{accounts → oft202/accounts}/oFTStore.ts

@@ -17,7 +17,6 @@ import {
   RpcGetAccountOptions,
   RpcGetAccountsOptions,
   assertAccountExists,
-  defaultPublicKey,
   deserializeAccount,
   gpaBuilder,
   publicKey as toPublicKey,
@@ -160,7 +159,7 @@ export async function safeFetchAllOFTStore(
 export function getOFTStoreGpaBuilder(
   context: Pick<Context, 'rpc' | 'programs'>
 ) {
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
   return gpaBuilder(context, programId)
     .registerFields<{
       discriminator: Uint8Array;

package/src/generated/oft202/accounts/peerConfig.ts

@@ -0,0 +1,178 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/kinobi-so/kinobi
+ */
+
+import {
+  Account,
+  Context,
+  Option,
+  OptionOrNullable,
+  Pda,
+  PublicKey,
+  RpcAccount,
+  RpcGetAccountOptions,
+  RpcGetAccountsOptions,
+  assertAccountExists,
+  deserializeAccount,
+  gpaBuilder,
+  publicKey as toPublicKey,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  bool,
+  bytes,
+  mapSerializer,
+  option,
+  struct,
+  u16,
+  u8,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  EnforcedOptions,
+  EnforcedOptionsArgs,
+  RateLimiter,
+  RateLimiterArgs,
+  getEnforcedOptionsSerializer,
+  getRateLimiterSerializer,
+} from '../types';
+
+export type PeerConfig = Account<PeerConfigAccountData>;
+
+export type PeerConfigAccountData = {
+  discriminator: Uint8Array;
+  peerAddress: Uint8Array;
+  enforcedOptions: EnforcedOptions;
+  outboundRateLimiter: Option<RateLimiter>;
+  inboundRateLimiter: Option<RateLimiter>;
+  feeBps: Option<number>;
+  bump: number;
+  isEndpointV1: boolean;
+};
+
+export type PeerConfigAccountDataArgs = {
+  peerAddress: Uint8Array;
+  enforcedOptions: EnforcedOptionsArgs;
+  outboundRateLimiter: OptionOrNullable<RateLimiterArgs>;
+  inboundRateLimiter: OptionOrNullable<RateLimiterArgs>;
+  feeBps: OptionOrNullable<number>;
+  bump: number;
+  isEndpointV1: boolean;
+};
+
+export function getPeerConfigAccountDataSerializer(): Serializer<
+  PeerConfigAccountDataArgs,
+  PeerConfigAccountData
+> {
+  return mapSerializer<PeerConfigAccountDataArgs, any, PeerConfigAccountData>(
+    struct<PeerConfigAccountData>(
+      [
+        ['discriminator', bytes({ size: 8 })],
+        ['peerAddress', bytes({ size: 32 })],
+        ['enforcedOptions', getEnforcedOptionsSerializer()],
+        ['outboundRateLimiter', option(getRateLimiterSerializer())],
+        ['inboundRateLimiter', option(getRateLimiterSerializer())],
+        ['feeBps', option(u16())],
+        ['bump', u8()],
+        ['isEndpointV1', bool()],
+      ],
+      { description: 'PeerConfigAccountData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: new Uint8Array([181, 157, 86, 198, 33, 193, 94, 203]),
+    })
+  ) as Serializer<PeerConfigAccountDataArgs, PeerConfigAccountData>;
+}
+
+export function deserializePeerConfig(rawAccount: RpcAccount): PeerConfig {
+  return deserializeAccount(rawAccount, getPeerConfigAccountDataSerializer());
+}
+
+export async function fetchPeerConfig(
+  context: Pick<Context, 'rpc'>,
+  publicKey: PublicKey | Pda,
+  options?: RpcGetAccountOptions
+): Promise<PeerConfig> {
+  const maybeAccount = await context.rpc.getAccount(
+    toPublicKey(publicKey, false),
+    options
+  );
+  assertAccountExists(maybeAccount, 'PeerConfig');
+  return deserializePeerConfig(maybeAccount);
+}
+
+export async function safeFetchPeerConfig(
+  context: Pick<Context, 'rpc'>,
+  publicKey: PublicKey | Pda,
+  options?: RpcGetAccountOptions
+): Promise<PeerConfig | null> {
+  const maybeAccount = await context.rpc.getAccount(
+    toPublicKey(publicKey, false),
+    options
+  );
+  return maybeAccount.exists ? deserializePeerConfig(maybeAccount) : null;
+}
+
+export async function fetchAllPeerConfig(
+  context: Pick<Context, 'rpc'>,
+  publicKeys: Array<PublicKey | Pda>,
+  options?: RpcGetAccountsOptions
+): Promise<PeerConfig[]> {
+  const maybeAccounts = await context.rpc.getAccounts(
+    publicKeys.map((key) => toPublicKey(key, false)),
+    options
+  );
+  return maybeAccounts.map((maybeAccount) => {
+    assertAccountExists(maybeAccount, 'PeerConfig');
+    return deserializePeerConfig(maybeAccount);
+  });
+}
+
+export async function safeFetchAllPeerConfig(
+  context: Pick<Context, 'rpc'>,
+  publicKeys: Array<PublicKey | Pda>,
+  options?: RpcGetAccountsOptions
+): Promise<PeerConfig[]> {
+  const maybeAccounts = await context.rpc.getAccounts(
+    publicKeys.map((key) => toPublicKey(key, false)),
+    options
+  );
+  return maybeAccounts
+    .filter((maybeAccount) => maybeAccount.exists)
+    .map((maybeAccount) => deserializePeerConfig(maybeAccount as RpcAccount));
+}
+
+export function getPeerConfigGpaBuilder(
+  context: Pick<Context, 'rpc' | 'programs'>
+) {
+  const programId = context.programs.getPublicKey('oft', '');
+  return gpaBuilder(context, programId)
+    .registerFields<{
+      discriminator: Uint8Array;
+      peerAddress: Uint8Array;
+      enforcedOptions: EnforcedOptionsArgs;
+      outboundRateLimiter: OptionOrNullable<RateLimiterArgs>;
+      inboundRateLimiter: OptionOrNullable<RateLimiterArgs>;
+      feeBps: OptionOrNullable<number>;
+      bump: number;
+      isEndpointV1: boolean;
+    }>({
+      discriminator: [0, bytes({ size: 8 })],
+      peerAddress: [8, bytes({ size: 32 })],
+      enforcedOptions: [40, getEnforcedOptionsSerializer()],
+      outboundRateLimiter: [null, option(getRateLimiterSerializer())],
+      inboundRateLimiter: [null, option(getRateLimiterSerializer())],
+      feeBps: [null, option(u16())],
+      bump: [null, u8()],
+      isEndpointV1: [null, bool()],
+    })
+    .deserializeUsing<PeerConfig>((account) => deserializePeerConfig(account))
+    .whereField(
+      'discriminator',
+      new Uint8Array([181, 157, 86, 198, 33, 193, 94, 203])
+    );
+}

package/src/generated/oft202/instructions/index.ts

@@ -0,0 +1,18 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/kinobi-so/kinobi
+ */
+
+export * from './initOft';
+export * from './lzReceive';
+export * from './lzReceiveTypes';
+export * from './quoteOft';
+export * from './quoteSend';
+export * from './send';
+export * from './setOftConfig';
+export * from './setPause';
+export * from './setPeerConfig';
+export * from './withdrawFee';

package/src/generated/{instructions → oft202/instructions}/initOft.ts

@@ -14,7 +14,6 @@ import {
   PublicKey,
   Signer,
   TransactionBuilder,
-  defaultPublicKey,
   transactionBuilder,
 } from '@metaplex-foundation/umi';
 import {
@@ -91,7 +90,7 @@ export function initOft(
   input: InitOftInstructionAccounts & InitOftInstructionArgs
 ): TransactionBuilder {
   // Program ID.
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
 
   // Accounts.
   const resolvedAccounts = {

package/src/generated/{instructions → oft202/instructions}/lzReceive.ts

@@ -12,7 +12,6 @@ import {
   PublicKey,
   Signer,
   TransactionBuilder,
-  defaultPublicKey,
   transactionBuilder,
 } from '@metaplex-foundation/umi';
 import {
@@ -89,7 +88,7 @@ export function lzReceive(
   input: LzReceiveInstructionAccounts & LzReceiveInstructionArgs
 ): TransactionBuilder {
   // Program ID.
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
 
   // Accounts.
   const resolvedAccounts = {

package/src/generated/{instructions → oft202/instructions}/lzReceiveTypes.ts

@@ -11,7 +11,6 @@ import {
   Pda,
   PublicKey,
   TransactionBuilder,
-  defaultPublicKey,
   transactionBuilder,
 } from '@metaplex-foundation/umi';
 import {
@@ -80,7 +79,7 @@ export function lzReceiveTypes(
   input: LzReceiveTypesInstructionAccounts & LzReceiveTypesInstructionArgs
 ): TransactionBuilder {
   // Program ID.
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
 
   // Accounts.
   const resolvedAccounts = {

package/src/generated/{instructions → oft202/instructions}/quoteOft.ts

@@ -13,7 +13,6 @@ import {
   Pda,
   PublicKey,
   TransactionBuilder,
-  defaultPublicKey,
   transactionBuilder,
 } from '@metaplex-foundation/umi';
 import {
@@ -99,7 +98,7 @@ export function quoteOft(
   input: QuoteOftInstructionAccounts & QuoteOftInstructionArgs
 ): TransactionBuilder {
   // Program ID.
-  const programId = context.programs.getPublicKey('oft', defaultPublicKey(), 'custom')
+  const programId = context.programs.getPublicKey('oft', '');
 
   // Accounts.
   const resolvedAccounts = {

package/src/generated/oft202/instructions/quoteSend.ts

@@ -0,0 +1,149 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/kinobi-so/kinobi
+ */
+
+import {
+  Context,
+  Option,
+  OptionOrNullable,
+  Pda,
+  PublicKey,
+  TransactionBuilder,
+  transactionBuilder,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  bool,
+  bytes,
+  mapSerializer,
+  option,
+  struct,
+  u32,
+  u64,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  ResolvedAccount,
+  ResolvedAccountsWithIndices,
+  getAccountMetasAndSigners,
+} from '../shared';
+import {
+  ComposeParams,
+  ComposeParamsArgs,
+  getComposeParamsSerializer,
+} from '../types';
+
+// Accounts.
+export type QuoteSendInstructionAccounts = {
+  oftStore: PublicKey | Pda;
+  peer: PublicKey | Pda;
+  tokenMint: PublicKey | Pda;
+};
+
+// Data.
+export type QuoteSendInstructionData = {
+  discriminator: Uint8Array;
+  dstEid: number;
+  to: Uint8Array;
+  amountLd: bigint;
+  minAmountLd: bigint;
+  options: Uint8Array;
+  payInLzToken: boolean;
+  composeParams: Option<ComposeParams>;
+};
+
+export type QuoteSendInstructionDataArgs = {
+  dstEid: number;
+  to: Uint8Array;
+  amountLd: number | bigint;
+  minAmountLd: number | bigint;
+  options: Uint8Array;
+  payInLzToken: boolean;
+  composeParams: OptionOrNullable<ComposeParamsArgs>;
+};
+
+export function getQuoteSendInstructionDataSerializer(): Serializer<
+  QuoteSendInstructionDataArgs,
+  QuoteSendInstructionData
+> {
+  return mapSerializer<
+    QuoteSendInstructionDataArgs,
+    any,
+    QuoteSendInstructionData
+  >(
+    struct<QuoteSendInstructionData>(
+      [
+        ['discriminator', bytes({ size: 8 })],
+        ['dstEid', u32()],
+        ['to', bytes({ size: 32 })],
+        ['amountLd', u64()],
+        ['minAmountLd', u64()],
+        ['options', bytes({ size: u32() })],
+        ['payInLzToken', bool()],
+        ['composeParams', option(getComposeParamsSerializer())],
+      ],
+      { description: 'QuoteSendInstructionData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: new Uint8Array([207, 0, 49, 214, 160, 211, 76, 211]),
+    })
+  ) as Serializer<QuoteSendInstructionDataArgs, QuoteSendInstructionData>;
+}
+
+// Args.
+export type QuoteSendInstructionArgs = QuoteSendInstructionDataArgs;
+
+// Instruction.
+export function quoteSend(
+  context: Pick<Context, 'programs'>,
+  input: QuoteSendInstructionAccounts & QuoteSendInstructionArgs
+): TransactionBuilder {
+  // Program ID.
+  const programId = context.programs.getPublicKey('oft', '');
+
+  // Accounts.
+  const resolvedAccounts = {
+    oftStore: {
+      index: 0,
+      isWritable: false as boolean,
+      value: input.oftStore ?? null,
+    },
+    peer: { index: 1, isWritable: false as boolean, value: input.peer ?? null },
+    tokenMint: {
+      index: 2,
+      isWritable: false as boolean,
+      value: input.tokenMint ?? null,
+    },
+  } satisfies ResolvedAccountsWithIndices;
+
+  // Arguments.
+  const resolvedArgs: QuoteSendInstructionArgs = { ...input };
+
+  // Accounts in order.
+  const orderedAccounts: ResolvedAccount[] = Object.values(
+    resolvedAccounts
+  ).sort((a, b) => a.index - b.index);
+
+  // Keys and Signers.
+  const [keys, signers] = getAccountMetasAndSigners(
+    orderedAccounts,
+    'programId',
+    programId
+  );
+
+  // Data.
+  const data = getQuoteSendInstructionDataSerializer().serialize(
+    resolvedArgs as QuoteSendInstructionDataArgs
+  );
+
+  // Bytes Created On Chain.
+  const bytesCreatedOnChain = 0;
+
+  return transactionBuilder([
+    { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },
+  ]);
+}