@layerzerolabs/lz-solana-sdk-v2 3.0.66 → 3.0.68-ton.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-solana-sdk-v2",
-  "version": "3.0.66",
+  "version": "3.0.68-ton.0",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -35,15 +35,16 @@
     "sync-target-idl": "mkdir -p target/idl && rsync -avc --delete ../solana/target/idl/ target/idl/",
     "test": "anchor test --skip-build",
     "test-endpoint": "TEST_SCOPES=endpoint anchor test --skip-build",
+    "test-extend": "yarn run ts-mocha -b -p ./tsconfig.json -t 10000000 tests/extend_account.test.ts",
     "test-uln": "TEST_SCOPES=uln anchor test --skip-build"
   },
   "dependencies": {
-    "@layerzerolabs/lz-corekit-solana": "^3.0.66",
-    "@layerzerolabs/lz-definitions": "^3.0.66",
-    "@layerzerolabs/lz-foundation": "^3.0.66",
-    "@layerzerolabs/lz-serdes": "^3.0.66",
-    "@layerzerolabs/lz-utilities": "^3.0.66",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.66",
+    "@layerzerolabs/lz-corekit-solana": "^3.0.68-ton.0",
+    "@layerzerolabs/lz-definitions": "^3.0.68-ton.0",
+    "@layerzerolabs/lz-foundation": "^3.0.68-ton.0",
+    "@layerzerolabs/lz-serdes": "^3.0.68-ton.0",
+    "@layerzerolabs/lz-utilities": "^3.0.68-ton.0",
+    "@layerzerolabs/lz-v2-utilities": "^3.0.68-ton.0",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/umi": "^0.9.2",
@@ -65,14 +66,15 @@
     "@kinobi-so/renderers": "^0.21.3",
     "@kinobi-so/renderers-js-umi": "^0.21.6",
     "@layerzerolabs/layerzero-v2-solana": "^0.0.0",
-    "@layerzerolabs/tsup-config-next": "^3.0.66",
-    "@layerzerolabs/typescript-config-next": "^3.0.66",
+    "@layerzerolabs/tsup-config-next": "^3.0.68-ton.0",
+    "@layerzerolabs/typescript-config-next": "^3.0.68-ton.0",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@types/bn.js": "^5.1.5",
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.0",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.10.5",
+    "axios": "^1.6.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "kinobi": "^0.21.4",
@@ -81,7 +83,8 @@
     "ts-mocha": "^10.0.0",
     "ts-node": "^10.9.1",
     "tsup": "^8.3.5",
-    "typescript": "~5.2.2"
+    "typescript": "~5.2.2",
+    "zx": "^8.1.3"
   },
   "publishConfig": {
     "access": "public"

package/src/generated/kinobi/dvn/instructions/extendDvnConfig.ts

@@ -0,0 +1,124 @@
+/**
+ * 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,
+  Pda,
+  PublicKey,
+  Signer,
+  TransactionBuilder,
+  transactionBuilder,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  bytes,
+  mapSerializer,
+  struct,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  ResolvedAccount,
+  ResolvedAccountsWithIndices,
+  getAccountMetasAndSigners,
+} from '../shared';
+
+// Accounts.
+export type ExtendDvnConfigInstructionAccounts = {
+  admin: Signer;
+  config: PublicKey | Pda;
+  systemProgram?: PublicKey | Pda;
+};
+
+// Data.
+export type ExtendDvnConfigInstructionData = { discriminator: Uint8Array };
+
+export type ExtendDvnConfigInstructionDataArgs = {};
+
+export function getExtendDvnConfigInstructionDataSerializer(): Serializer<
+  ExtendDvnConfigInstructionDataArgs,
+  ExtendDvnConfigInstructionData
+> {
+  return mapSerializer<
+    ExtendDvnConfigInstructionDataArgs,
+    any,
+    ExtendDvnConfigInstructionData
+  >(
+    struct<ExtendDvnConfigInstructionData>(
+      [['discriminator', bytes({ size: 8 })]],
+      { description: 'ExtendDvnConfigInstructionData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: new Uint8Array([183, 248, 24, 49, 110, 229, 169, 66]),
+    })
+  ) as Serializer<
+    ExtendDvnConfigInstructionDataArgs,
+    ExtendDvnConfigInstructionData
+  >;
+}
+
+// Instruction.
+export function extendDvnConfig(
+  context: Pick<Context, 'programs'>,
+  input: ExtendDvnConfigInstructionAccounts
+): TransactionBuilder {
+  // Program ID.
+  const programId = context.programs.getPublicKey(
+    'dvn',
+    'HtEYV4xB4wvsj5fgTkcfuChYpvGYzgzwvNhgDZQNh7wW'
+  );
+
+  // Accounts.
+  const resolvedAccounts = {
+    admin: {
+      index: 0,
+      isWritable: true as boolean,
+      value: input.admin ?? null,
+    },
+    config: {
+      index: 1,
+      isWritable: true as boolean,
+      value: input.config ?? null,
+    },
+    systemProgram: {
+      index: 2,
+      isWritable: false as boolean,
+      value: input.systemProgram ?? null,
+    },
+  } satisfies ResolvedAccountsWithIndices;
+
+  // Default values.
+  if (!resolvedAccounts.systemProgram.value) {
+    resolvedAccounts.systemProgram.value = context.programs.getPublicKey(
+      'splSystem',
+      '11111111111111111111111111111111'
+    );
+    resolvedAccounts.systemProgram.isWritable = false;
+  }
+
+  // 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 = getExtendDvnConfigInstructionDataSerializer().serialize({});
+
+  // Bytes Created On Chain.
+  const bytesCreatedOnChain = 0;
+
+  return transactionBuilder([
+    { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },
+  ]);
+}

package/src/generated/kinobi/dvn/instructions/index.ts

@@ -7,6 +7,7 @@
  */
 
 export * from './closeExecute';
+export * from './extendDvnConfig';
 export * from './initDvn';
 export * from './invoke';
 export * from './quoteDvn';

package/src/generated/kinobi/executor/instructions/extendExecutorConfig.ts

@@ -0,0 +1,124 @@
+/**
+ * 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,
+  Pda,
+  PublicKey,
+  Signer,
+  TransactionBuilder,
+  transactionBuilder,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  bytes,
+  mapSerializer,
+  struct,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  ResolvedAccount,
+  ResolvedAccountsWithIndices,
+  getAccountMetasAndSigners,
+} from '../shared';
+
+// Accounts.
+export type ExtendExecutorConfigInstructionAccounts = {
+  admin: Signer;
+  config: PublicKey | Pda;
+  systemProgram?: PublicKey | Pda;
+};
+
+// Data.
+export type ExtendExecutorConfigInstructionData = { discriminator: Uint8Array };
+
+export type ExtendExecutorConfigInstructionDataArgs = {};
+
+export function getExtendExecutorConfigInstructionDataSerializer(): Serializer<
+  ExtendExecutorConfigInstructionDataArgs,
+  ExtendExecutorConfigInstructionData
+> {
+  return mapSerializer<
+    ExtendExecutorConfigInstructionDataArgs,
+    any,
+    ExtendExecutorConfigInstructionData
+  >(
+    struct<ExtendExecutorConfigInstructionData>(
+      [['discriminator', bytes({ size: 8 })]],
+      { description: 'ExtendExecutorConfigInstructionData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: new Uint8Array([238, 223, 196, 220, 61, 71, 72, 85]),
+    })
+  ) as Serializer<
+    ExtendExecutorConfigInstructionDataArgs,
+    ExtendExecutorConfigInstructionData
+  >;
+}
+
+// Instruction.
+export function extendExecutorConfig(
+  context: Pick<Context, 'programs'>,
+  input: ExtendExecutorConfigInstructionAccounts
+): TransactionBuilder {
+  // Program ID.
+  const programId = context.programs.getPublicKey(
+    'executor',
+    '6doghB248px58JSSwG4qejQ46kFMW4AMj7vzJnWZHNZn'
+  );
+
+  // Accounts.
+  const resolvedAccounts = {
+    admin: {
+      index: 0,
+      isWritable: true as boolean,
+      value: input.admin ?? null,
+    },
+    config: {
+      index: 1,
+      isWritable: true as boolean,
+      value: input.config ?? null,
+    },
+    systemProgram: {
+      index: 2,
+      isWritable: false as boolean,
+      value: input.systemProgram ?? null,
+    },
+  } satisfies ResolvedAccountsWithIndices;
+
+  // Default values.
+  if (!resolvedAccounts.systemProgram.value) {
+    resolvedAccounts.systemProgram.value = context.programs.getPublicKey(
+      'splSystem',
+      '11111111111111111111111111111111'
+    );
+    resolvedAccounts.systemProgram.isWritable = false;
+  }
+
+  // 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 = getExtendExecutorConfigInstructionDataSerializer().serialize({});
+
+  // Bytes Created On Chain.
+  const bytesCreatedOnChain = 0;
+
+  return transactionBuilder([
+    { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },
+  ]);
+}

package/src/generated/kinobi/executor/instructions/index.ts

@@ -10,6 +10,7 @@ export * from './adminSetConfig';
 export * from './compose';
 export * from './executable';
 export * from './execute';
+export * from './extendExecutorConfig';
 export * from './initExecutor';
 export * from './nativeDrop';
 export * from './ownerSetConfig';

package/src/generated/kinobi/pricefeed/instructions/extendPriceFeed.ts

@@ -0,0 +1,124 @@
+/**
+ * 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,
+  Pda,
+  PublicKey,
+  Signer,
+  TransactionBuilder,
+  transactionBuilder,
+} from '@metaplex-foundation/umi';
+import {
+  Serializer,
+  bytes,
+  mapSerializer,
+  struct,
+} from '@metaplex-foundation/umi/serializers';
+import {
+  ResolvedAccount,
+  ResolvedAccountsWithIndices,
+  getAccountMetasAndSigners,
+} from '../shared';
+
+// Accounts.
+export type ExtendPriceFeedInstructionAccounts = {
+  admin: Signer;
+  priceFeed: PublicKey | Pda;
+  systemProgram?: PublicKey | Pda;
+};
+
+// Data.
+export type ExtendPriceFeedInstructionData = { discriminator: Uint8Array };
+
+export type ExtendPriceFeedInstructionDataArgs = {};
+
+export function getExtendPriceFeedInstructionDataSerializer(): Serializer<
+  ExtendPriceFeedInstructionDataArgs,
+  ExtendPriceFeedInstructionData
+> {
+  return mapSerializer<
+    ExtendPriceFeedInstructionDataArgs,
+    any,
+    ExtendPriceFeedInstructionData
+  >(
+    struct<ExtendPriceFeedInstructionData>(
+      [['discriminator', bytes({ size: 8 })]],
+      { description: 'ExtendPriceFeedInstructionData' }
+    ),
+    (value) => ({
+      ...value,
+      discriminator: new Uint8Array([16, 95, 1, 5, 220, 54, 15, 80]),
+    })
+  ) as Serializer<
+    ExtendPriceFeedInstructionDataArgs,
+    ExtendPriceFeedInstructionData
+  >;
+}
+
+// Instruction.
+export function extendPriceFeed(
+  context: Pick<Context, 'programs'>,
+  input: ExtendPriceFeedInstructionAccounts
+): TransactionBuilder {
+  // Program ID.
+  const programId = context.programs.getPublicKey(
+    'pricefeed',
+    '8ahPGPjEbpgGaZx2NV1iG5Shj7TDwvsjkEDcGWjt94TP'
+  );
+
+  // Accounts.
+  const resolvedAccounts = {
+    admin: {
+      index: 0,
+      isWritable: true as boolean,
+      value: input.admin ?? null,
+    },
+    priceFeed: {
+      index: 1,
+      isWritable: true as boolean,
+      value: input.priceFeed ?? null,
+    },
+    systemProgram: {
+      index: 2,
+      isWritable: false as boolean,
+      value: input.systemProgram ?? null,
+    },
+  } satisfies ResolvedAccountsWithIndices;
+
+  // Default values.
+  if (!resolvedAccounts.systemProgram.value) {
+    resolvedAccounts.systemProgram.value = context.programs.getPublicKey(
+      'splSystem',
+      '11111111111111111111111111111111'
+    );
+    resolvedAccounts.systemProgram.isWritable = false;
+  }
+
+  // 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 = getExtendPriceFeedInstructionDataSerializer().serialize({});
+
+  // Bytes Created On Chain.
+  const bytesCreatedOnChain = 0;
+
+  return transactionBuilder([
+    { instruction: { keys, programId, data }, signers, bytesCreatedOnChain },
+  ]);
+}

package/src/generated/kinobi/pricefeed/instructions/index.ts

@@ -6,6 +6,7 @@
  * @see https://github.com/kinobi-so/kinobi
  */
 
+export * from './extendPriceFeed';
 export * from './getFee';
 export * from './initPriceFeed';
 export * from './setPrice';

package/src/next_nonce.ts

@@ -16,7 +16,7 @@ import { arrayify } from '@layerzerolabs/lz-utilities'
 import { Packet, addressToBytes32 } from '@layerzerolabs/lz-v2-utilities'
 
 import { EDDSA } from './pda'
-import { instructionDiscriminator, simulateWeb3JsTransaction } from './utility'
+import { instructionDiscriminator, simulateWeb3JsTransaction, toWeb3Connection } from './utility'
 
 // Data.
 export interface NextNonceInstructionData {
@@ -61,14 +61,7 @@ export async function nextNonce(
 ): Promise<bigint> {
     const { sender: sender_, srcEid, receiver: receiver_ } = packet
     const receiver = new web3.PublicKey(addressToBytes32(receiver_))
-    let connection: web3.Connection
-    if (rpc instanceof web3.Connection) {
-        connection = rpc
-    } else if ('connection' in rpc && rpc.connection instanceof web3.Connection) {
-        ;({ connection } = rpc)
-    } else {
-        throw new Error('Invalid connection')
-    }
+    const connection = toWeb3Connection(rpc)
     const receiverInfo = await connection.getAccountInfo(receiver)
     if (receiverInfo === null) {
         throw new Error(`Receiver account not found: ${receiver.toBase58()}`)

package/src/utility.ts

@@ -222,7 +222,7 @@ export async function extractWorkerFeePaidEventByTxHash(
  * @returns {Promise<E[] | null>} A promise that resolves to an array of events or null if not found.
  */
 export async function extractEventFromTransactionSignature<From, To extends From = From>(
-    connection: web3.Connection | RpcInterface,
+    rpc: web3.Connection | RpcInterface,
     _program: PublicKey | web3.PublicKey,
     signature: web3.TransactionSignature | web3.ParsedTransactionWithMeta | null,
     serializer: Serializer<From, To>,
@@ -237,13 +237,8 @@ export async function extractEventFromTransactionSignature<From, To extends From
     }
     let tx: web3.ParsedTransactionWithMeta | null
     if (typeof signature === 'string') {
-        if (connection instanceof web3.Connection) {
-            tx = await connection.getParsedTransaction(signature, commitment)
-        } else if ('connection' in connection && connection.connection instanceof web3.Connection) {
-            tx = await connection.connection.getParsedTransaction(signature, commitment)
-        } else {
-            throw new Error('Invalid connection')
-        }
+        const connection = toWeb3Connection(rpc)
+        tx = await connection.getParsedTransaction(signature, commitment)
     } else {
         tx = signature
     }
@@ -575,12 +570,8 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
     let connection: web3.Connection
     if (typeof _connection === 'string') {
         connection = new web3.Connection(_connection, commitment)
-    } else if (_connection instanceof web3.Connection) {
-        connection = _connection
-    } else if ('connection' in _connection && _connection.connection instanceof web3.Connection) {
-        ;({ connection } = _connection)
     } else {
-        throw new Error('Invalid connection')
+        connection = toWeb3Connection(_connection)
     }
 
     let instructions: web3.TransactionInstruction[]
@@ -636,3 +627,13 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
         return serializer.deserialize(resp, 0)[0]
     }
 }
+
+export function toWeb3Connection(rpc: RpcInterface | web3.Connection): web3.Connection {
+    if (rpc instanceof web3.Connection) {
+        return rpc
+    } else if ('connection' in rpc && rpc.connection instanceof web3.Connection) {
+        return rpc.connection
+    } else {
+        throw new Error('Invalid connection')
+    }
+}