@layerzerolabs/lz-solana-sdk-v2 3.0.135 → 3.0.136

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lz-solana-sdk-v2",
-  "version": "3.0.135",
+  "version": "3.0.136",
   "license": "BUSL-1.1",
   "exports": {
     ".": {
@@ -39,12 +39,12 @@
     "test-uln": "TEST_SCOPES=uln anchor test --skip-build"
   },
   "dependencies": {
-    "@layerzerolabs/lz-corekit-solana": "^3.0.135",
-    "@layerzerolabs/lz-definitions": "^3.0.135",
-    "@layerzerolabs/lz-foundation": "^3.0.135",
-    "@layerzerolabs/lz-serdes": "^3.0.135",
-    "@layerzerolabs/lz-utilities": "^3.0.135",
-    "@layerzerolabs/lz-v2-utilities": "^3.0.135",
+    "@layerzerolabs/lz-corekit-solana": "^3.0.136",
+    "@layerzerolabs/lz-definitions": "^3.0.136",
+    "@layerzerolabs/lz-foundation": "^3.0.136",
+    "@layerzerolabs/lz-serdes": "^3.0.136",
+    "@layerzerolabs/lz-utilities": "^3.0.136",
+    "@layerzerolabs/lz-v2-utilities": "^3.0.136",
     "@metaplex-foundation/beet": "^0.7.1",
     "@metaplex-foundation/beet-solana": "^0.4.0",
     "@metaplex-foundation/mpl-toolbox": "^0.9.2",
@@ -67,8 +67,8 @@
     "@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.135",
-    "@layerzerolabs/typescript-config-next": "^3.0.135",
+    "@layerzerolabs/tsup-config-next": "^3.0.136",
+    "@layerzerolabs/typescript-config-next": "^3.0.136",
     "@metaplex-foundation/umi-bundle-defaults": "^0.9.2",
     "@types/bn.js": "^5.1.5",
     "@types/chai": "^4.3.11",

package/src/solita/utility.ts

@@ -1,5 +1,6 @@
 import * as beet from '@metaplex-foundation/beet'
 import {
+    AddressLookupTableAccount,
     AddressLookupTableProgram,
     Blockhash,
     CloseLookupTableParams,
@@ -365,7 +366,7 @@ export function closeLookupTable(
  * @param {PublicKey} payer - The payer public key.
  * @param {TransactionInstruction[]} instructions - The transaction instructions.
  * @param {Blockhash} [recentBlockHash] - The recent block hash.
- * @param {PublicKey} [tableAddr] - The address lookup table public key.
+ * @param {PublicKey} [_tableAddrs] - The array of address lookup table public keys.
  * @returns {Promise<VersionedTransaction>} A promise that resolves to the versioned transaction.
  */
 export async function txWithAddressLookupTable(
@@ -373,10 +374,10 @@ export async function txWithAddressLookupTable(
     payer: PublicKey,
     instructions: TransactionInstruction[],
     recentBlockHash?: Blockhash,
-    tableAddr?: PublicKey
+    _tableAddrs?: PublicKey | PublicKey[]
 ): Promise<VersionedTransaction> {
     recentBlockHash = recentBlockHash ?? (await connection.getLatestBlockhash()).blockhash
-    if (!tableAddr) {
+    if (!_tableAddrs) {
         return new VersionedTransaction(
             new TransactionMessage({
                 instructions,
@@ -385,13 +386,23 @@ export async function txWithAddressLookupTable(
             }).compileToV0Message()
         )
     }
-    const { value: lookupTableAccount } = await connection.getAddressLookupTable(tableAddr)
+    const tableAddrs = Array.isArray(_tableAddrs) ? _tableAddrs : [_tableAddrs]
+    const lookupTableAccountsResult = await connection.getMultipleAccountsInfo(tableAddrs)
+    const lookupTableAccounts = lookupTableAccountsResult
+        .map((result, index) => {
+            if (result === null) return null
+            return new AddressLookupTableAccount({
+                key: tableAddrs[index],
+                state: AddressLookupTableAccount.deserialize(result.data),
+            })
+        })
+        .filter((account): account is AddressLookupTableAccount => account !== null)
     return new VersionedTransaction(
         new TransactionMessage({
             instructions,
             payerKey: payer,
             recentBlockhash: recentBlockHash,
-        }).compileToV0Message(lookupTableAccount ? [lookupTableAccount] : undefined)
+        }).compileToV0Message(lookupTableAccounts.length > 0 ? lookupTableAccounts : undefined)
     )
 }
 
@@ -519,7 +530,7 @@ export async function buildMessageV0(
  * @param {TransactionInstruction[]} instructions - The transaction instructions.
  * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig='confirmed'] - The commitment level or account info configuration.
  * @param {Blockhash} [blockhash] - The blockhash.
- * @param {PublicKey} [lookupTableAddress] - The lookup table address.
+ * @param {PublicKey} [lookupTableAddresses] - The array of lookup table addresses.
  * @returns {Promise<VersionedTransaction>} A promise that resolves to the versioned transaction.
  */
 export async function buildVersionedTransaction(
@@ -528,10 +539,10 @@ export async function buildVersionedTransaction(
     instructions: TransactionInstruction[],
     commitmentOrConfig: Commitment | GetAccountInfoConfig = 'confirmed',
     blockhash?: Blockhash,
-    lookupTableAddress?: PublicKey
+    lookupTableAddresses?: PublicKey | PublicKey[]
 ): Promise<VersionedTransaction> {
-    if (lookupTableAddress) {
-        return txWithAddressLookupTable(connection, payerKey, instructions, blockhash, lookupTableAddress)
+    if (lookupTableAddresses) {
+        return txWithAddressLookupTable(connection, payerKey, instructions, blockhash, lookupTableAddresses)
     }
     return new VersionedTransaction(
         await buildMessageV0(connection, payerKey, instructions, commitmentOrConfig, blockhash)
@@ -557,7 +568,7 @@ export function instructionDiscriminator(method: string): Buffer {
  * @param {PublicKey} payer - The payer public key.
  * @param {Commitment} [commitment='confirmed'] - The commitment level.
  * @param {Blockhash} [blockhash] - The blockhash.
- * @param {PublicKey} [lookupTableAddress] - The lookup table address.
+ * @param {PublicKey} [lookupTableAddresses] - The array of lookup table addresses.
  * @returns {Promise<Buffer>} A promise that resolves to the simulation result.
  * @throws {Error} If the simulation fails.
  */
@@ -568,7 +579,7 @@ export async function simulateTransaction(
     payer: PublicKey,
     commitment: Commitment = 'confirmed',
     blockhash?: Blockhash,
-    lookupTableAddress?: PublicKey
+    lookupTableAddresses?: PublicKey | PublicKey[]
 ): Promise<Buffer> {
     const tx = await buildVersionedTransaction(
         connection,
@@ -576,7 +587,7 @@ export async function simulateTransaction(
         instructions,
         commitment,
         blockhash,
-        lookupTableAddress
+        lookupTableAddresses
     )
     const simulateResp = await connection.simulateTransaction(tx, { sigVerify: false, commitment })
     const returnPrefix = `Program return: ${programId.toBase58()} `

package/src/utility.ts

@@ -360,7 +360,7 @@ export function closeLookupTable(
  * @param {PublicKey} payer - The payer public key.
  * @param {TransactionInstruction[]} instructions - The transaction instructions.
  * @param {Blockhash} [recentBlockHash] - The recent block hash.
- * @param {PublicKey} [tableAddr] - The address lookup table public key.
+ * @param {PublicKey} [_tableAddrs] - The array of address lookup table public keys.
  * @returns {Promise<VersionedTransaction>} A promise that resolves to the versioned transaction.
  */
 export async function txWithAddressLookupTable(
@@ -368,10 +368,10 @@ export async function txWithAddressLookupTable(
     payer: web3.PublicKey,
     instructions: web3.TransactionInstruction[],
     recentBlockHash?: web3.Blockhash,
-    tableAddr?: web3.PublicKey
+    _tableAddrs?: web3.PublicKey | web3.PublicKey[]
 ): Promise<web3.VersionedTransaction> {
     recentBlockHash = recentBlockHash ?? (await connection.getLatestBlockhash()).blockhash
-    if (!tableAddr) {
+    if (!_tableAddrs) {
         return new web3.VersionedTransaction(
             new web3.TransactionMessage({
                 instructions,
@@ -380,13 +380,23 @@ export async function txWithAddressLookupTable(
             }).compileToV0Message()
         )
     }
-    const { value: lookupTableAccount } = await connection.getAddressLookupTable(tableAddr)
+    const tableAddrs = Array.isArray(_tableAddrs) ? _tableAddrs : [_tableAddrs]
+    const lookupTableAccountsResult = await connection.getMultipleAccountsInfo(tableAddrs)
+    const lookupTableAccounts = lookupTableAccountsResult
+        .map((result, index) => {
+            if (result === null) return null
+            return new web3.AddressLookupTableAccount({
+                key: tableAddrs[index],
+                state: web3.AddressLookupTableAccount.deserialize(result.data),
+            })
+        })
+        .filter((account): account is web3.AddressLookupTableAccount => account !== null)
     return new web3.VersionedTransaction(
         new web3.TransactionMessage({
             instructions,
             payerKey: payer,
             recentBlockhash: recentBlockHash,
-        }).compileToV0Message(lookupTableAccount ? [lookupTableAccount] : undefined)
+        }).compileToV0Message(lookupTableAccounts.length > 0 ? lookupTableAccounts : undefined)
     )
 }
 
@@ -514,7 +524,7 @@ export async function buildMessageV0(
  * @param {TransactionInstruction[]} instructions - The transaction instructions.
  * @param {Commitment | GetAccountInfoConfig} [commitmentOrConfig='confirmed'] - The commitment level or account info configuration.
  * @param {Blockhash} [blockhash] - The blockhash.
- * @param {PublicKey} [lookupTableAddress] - The lookup table address.
+ * @param {PublicKey} [lookupTableAddresses] - The array of lookup table addresses.
  * @returns {Promise<VersionedTransaction>} A promise that resolves to the versioned transaction.
  */
 export async function buildVersionedTransaction(
@@ -523,10 +533,10 @@ export async function buildVersionedTransaction(
     instructions: web3.TransactionInstruction[],
     commitmentOrConfig: web3.Commitment | web3.GetAccountInfoConfig = 'confirmed',
     blockhash?: web3.Blockhash,
-    lookupTableAddress?: web3.PublicKey
+    lookupTableAddresses?: web3.PublicKey | web3.PublicKey[]
 ): Promise<web3.VersionedTransaction> {
-    if (lookupTableAddress) {
-        return txWithAddressLookupTable(connection, payerKey, instructions, blockhash, lookupTableAddress)
+    if (lookupTableAddresses) {
+        return txWithAddressLookupTable(connection, payerKey, instructions, blockhash, lookupTableAddresses)
     }
     return new web3.VersionedTransaction(
         await buildMessageV0(connection, payerKey, instructions, commitmentOrConfig, blockhash)
@@ -553,7 +563,7 @@ export function instructionDiscriminator(method: string): Buffer {
  * @param {Serializer<From, To>} serializer - The serializer.
  * @param {web3.Commitment} [commitment='confirmed'] - The commitment level.
  * @param {web3.Blockhash} [blockhash] - The blockhash.
- * @param {web3.PublicKey | PublicKey} [_lookupTableAddress] - The lookup table address.
+ * @param {web3.PublicKey | PublicKey} [_lookupTableAddresses] - The array of lookup table addresses.
  * @returns {Promise<Buffer>} A promise that resolves to the simulation result.
  * @throws {Error} If the simulation fails.
  */
@@ -565,7 +575,7 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
     serializer: Serializer<From, To>,
     commitment: web3.Commitment = 'confirmed',
     blockhash?: web3.Blockhash,
-    _lookupTableAddress?: web3.PublicKey | PublicKey
+    _lookupTableAddresses?: web3.PublicKey | PublicKey | web3.PublicKey[] | PublicKey[]
 ): Promise<To> {
     let connection: web3.Connection
     if (typeof _connection === 'string') {
@@ -600,14 +610,13 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
         payer = toWeb3JsPublicKey(_payer)
     }
 
-    let lookupTableAddress: web3.PublicKey | undefined
-    if (_lookupTableAddress) {
-        if (_lookupTableAddress instanceof web3.PublicKey) {
-            lookupTableAddress = _lookupTableAddress
-        } else {
-            lookupTableAddress = toWeb3JsPublicKey(_lookupTableAddress)
-        }
-    }
+    const lookupTableAddresses =
+        _lookupTableAddresses &&
+        (Array.isArray(_lookupTableAddresses)
+            ? _lookupTableAddresses.map((addr) => (addr instanceof web3.PublicKey ? addr : toWeb3JsPublicKey(addr)))
+            : _lookupTableAddresses instanceof web3.PublicKey
+              ? _lookupTableAddresses
+              : toWeb3JsPublicKey(_lookupTableAddresses))
 
     const tx = await buildVersionedTransaction(
         connection,
@@ -615,7 +624,7 @@ export async function simulateWeb3JsTransaction<From, To extends From = From>(
         instructions,
         commitment,
         blockhash,
-        lookupTableAddress
+        lookupTableAddresses
     )
     const simulateResp = await connection.simulateTransaction(tx, { sigVerify: false, commitment })
     const returnPrefix = `Program return: ${programId.toBase58()} `