Bump Codama to 1.2.8 and use @solana/kit (#56)

lorisleiva · web-flow · commit a62d09fbf42a · 2025-03-03T16:38:06.000Z
diff --git a/clients/js/package.json b/clients/js/package.json
@@ -42,12 +42,12 @@
   },
   "homepage": "https://github.com/solana-program/address-lookup-table#readme",
   "peerDependencies": {
-    "@solana/web3.js": "^2.0.0"
+    "@solana/kit": "^2.1.0"
   },
   "devDependencies": {
     "@ava/typescript": "^4.1.0",
     "@solana/eslint-config-solana": "^3.0.3",
-    "@solana/web3.js": "^2.0.0",
+    "@solana/kit": "^2.1.0",
     "@types/node": "^20",
     "@typescript-eslint/eslint-plugin": "^7.16.1",
     "@typescript-eslint/parser": "^7.16.1",
diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml
diff --git a/clients/js/src/generated/accounts/addressLookupTable.ts b/clients/js/src/generated/accounts/addressLookupTable.ts
@@ -42,7 +42,7 @@ import {
   type MaybeEncodedAccount,
   type Option,
   type OptionOrNullable,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { AddressLookupTableSeeds, findAddressLookupTablePda } from '../pdas';
 
 export const ADDRESS_LOOKUP_TABLE_DISCRIMINATOR = 1;
diff --git a/clients/js/src/generated/instructions/closeLookupTable.ts b/clients/js/src/generated/instructions/closeLookupTable.ts
@@ -25,7 +25,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
diff --git a/clients/js/src/generated/instructions/createLookupTable.ts b/clients/js/src/generated/instructions/createLookupTable.ts
@@ -33,7 +33,7 @@ import {
   type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { findAddressLookupTablePda } from '../pdas';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS } from '../programs';
 import {
diff --git a/clients/js/src/generated/instructions/deactivateLookupTable.ts b/clients/js/src/generated/instructions/deactivateLookupTable.ts
@@ -25,7 +25,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
diff --git a/clients/js/src/generated/instructions/extendLookupTable.ts b/clients/js/src/generated/instructions/extendLookupTable.ts
@@ -33,7 +33,7 @@ import {
   type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { resolveExtendLookupTableBytes } from '../../hooked';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS } from '../programs';
 import {
diff --git a/clients/js/src/generated/instructions/freezeLookupTable.ts b/clients/js/src/generated/instructions/freezeLookupTable.ts
@@ -25,7 +25,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { ADDRESS_LOOKUP_TABLE_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
diff --git a/clients/js/src/generated/pdas/addressLookupTable.ts b/clients/js/src/generated/pdas/addressLookupTable.ts
@@ -12,7 +12,7 @@ import {
   getU64Encoder,
   type Address,
   type ProgramDerivedAddress,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export type AddressLookupTableSeeds = {
   /** The address of the LUT's authority */
diff --git a/clients/js/src/generated/programs/addressLookupTable.ts b/clients/js/src/generated/programs/addressLookupTable.ts
@@ -11,7 +11,7 @@ import {
   getU32Encoder,
   type Address,
   type ReadonlyUint8Array,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   type ParsedCloseLookupTableInstruction,
   type ParsedCreateLookupTableInstruction,
diff --git a/clients/js/src/generated/shared/index.ts b/clients/js/src/generated/shared/index.ts
@@ -9,14 +9,14 @@
 import {
   AccountRole,
   isProgramDerivedAddress,
-  isTransactionSigner as web3JsIsTransactionSigner,
+  isTransactionSigner as kitIsTransactionSigner,
   type Address,
   type IAccountMeta,
   type IAccountSignerMeta,
   type ProgramDerivedAddress,
   type TransactionSigner,
   upgradeRoleToSigner,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 /**
  * Asserts that the given value is not null or undefined.
@@ -159,6 +159,6 @@ export function isTransactionSigner<TAddress extends string = string>(
     !!value &&
     typeof value === 'object' &&
     'address' in value &&
-    web3JsIsTransactionSigner(value)
+    kitIsTransactionSigner(value)
   );
 }
diff --git a/clients/js/src/hooked/resolvers.ts b/clients/js/src/hooked/resolvers.ts
@@ -1,4 +1,4 @@
-import type { Address } from '@solana/web3.js';
+import type { Address } from '@solana/kit';
 
 export const resolveExtendLookupTableBytes = (scope: {
   args: { addresses: Array<Address> };
diff --git a/clients/js/test/_setup.ts b/clients/js/test/_setup.ts
@@ -20,7 +20,7 @@ import {
   setTransactionMessageFeePayerSigner,
   setTransactionMessageLifetimeUsingBlockhash,
   signTransactionMessageWithSigners,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 type Client = {
   rpc: Rpc<SolanaRpcApi>;
diff --git a/clients/js/test/createLookupTable.test.ts b/clients/js/test/createLookupTable.test.ts
@@ -4,7 +4,7 @@ import {
   pipe,
   Account,
   some,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import test from 'ava';
 import {
   AddressLookupTable,
diff --git a/clients/rust/src/generated/accounts/address_lookup_table.rs b/clients/rust/src/generated/accounts/address_lookup_table.rs
@@ -62,3 +62,73 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for AddressLook
         Self::deserialize(&mut data)
     }
 }
+
+#[cfg(feature = "fetch")]
+pub fn fetch_address_lookup_table(
+    rpc: &solana_client::rpc_client::RpcClient,
+    address: &Pubkey,
+) -> Result<crate::shared::DecodedAccount<AddressLookupTable>, std::io::Error> {
+    let accounts = fetch_all_address_lookup_table(rpc, &[*address])?;
+    Ok(accounts[0].clone())
+}
+
+#[cfg(feature = "fetch")]
+pub fn fetch_all_address_lookup_table(
+    rpc: &solana_client::rpc_client::RpcClient,
+    addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::DecodedAccount<AddressLookupTable>>, std::io::Error> {
+    let accounts = rpc
+        .get_multiple_accounts(&addresses)
+        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+    let mut decoded_accounts: Vec<crate::shared::DecodedAccount<AddressLookupTable>> = Vec::new();
+    for i in 0..addresses.len() {
+        let address = addresses[i];
+        let account = accounts[i].as_ref().ok_or(std::io::Error::new(
+            std::io::ErrorKind::Other,
+            format!("Account not found: {}", address),
+        ))?;
+        let data = AddressLookupTable::from_bytes(&account.data)?;
+        decoded_accounts.push(crate::shared::DecodedAccount {
+            address,
+            account: account.clone(),
+            data,
+        });
+    }
+    Ok(decoded_accounts)
+}
+
+#[cfg(feature = "fetch")]
+pub fn fetch_maybe_address_lookup_table(
+    rpc: &solana_client::rpc_client::RpcClient,
+    address: &Pubkey,
+) -> Result<crate::shared::MaybeAccount<AddressLookupTable>, std::io::Error> {
+    let accounts = fetch_all_maybe_address_lookup_table(rpc, &[*address])?;
+    Ok(accounts[0].clone())
+}
+
+#[cfg(feature = "fetch")]
+pub fn fetch_all_maybe_address_lookup_table(
+    rpc: &solana_client::rpc_client::RpcClient,
+    addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::MaybeAccount<AddressLookupTable>>, std::io::Error> {
+    let accounts = rpc
+        .get_multiple_accounts(&addresses)
+        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?;
+    let mut decoded_accounts: Vec<crate::shared::MaybeAccount<AddressLookupTable>> = Vec::new();
+    for i in 0..addresses.len() {
+        let address = addresses[i];
+        if let Some(account) = accounts[i].as_ref() {
+            let data = AddressLookupTable::from_bytes(&account.data)?;
+            decoded_accounts.push(crate::shared::MaybeAccount::Exists(
+                crate::shared::DecodedAccount {
+                    address,
+                    account: account.clone(),
+                    data,
+                },
+            ));
+        } else {
+            decoded_accounts.push(crate::shared::MaybeAccount::NotFound(address));
+        }
+    }
+    Ok(decoded_accounts)
+}
diff --git a/clients/rust/src/generated/instructions/close_lookup_table.rs b/clients/rust/src/generated/instructions/close_lookup_table.rs
@@ -7,6 +7,7 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 
 /// Accounts.
+#[derive(Debug)]
 pub struct CloseLookupTable {
     pub address: solana_program::pubkey::Pubkey,
 
@@ -38,7 +39,7 @@ impl CloseLookupTable {
             false,
         ));
         accounts.extend_from_slice(remaining_accounts);
-        let data = CloseLookupTableInstructionData::new().try_to_vec().unwrap();
+        let data = borsh::to_vec(&CloseLookupTableInstructionData::new()).unwrap();
 
         solana_program::instruction::Instruction {
             program_id: crate::ADDRESS_LOOKUP_TABLE_ID,
@@ -48,7 +49,8 @@ impl CloseLookupTable {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct CloseLookupTableInstructionData {
     discriminator: u32,
 }
@@ -215,7 +217,7 @@ impl<'a, 'b> CloseLookupTableCpi<'a, 'b> {
                 is_writable: remaining_account.2,
             })
         });
-        let data = CloseLookupTableInstructionData::new().try_to_vec().unwrap();
+        let data = borsh::to_vec(&CloseLookupTableInstructionData::new()).unwrap();
 
         let instruction = solana_program::instruction::Instruction {
             program_id: crate::ADDRESS_LOOKUP_TABLE_ID,
diff --git a/clients/rust/src/generated/instructions/create_lookup_table.rs b/clients/rust/src/generated/instructions/create_lookup_table.rs
@@ -7,6 +7,7 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 
 /// Accounts.
+#[derive(Debug)]
 pub struct CreateLookupTable {
     pub address: solana_program::pubkey::Pubkey,
 
@@ -47,10 +48,8 @@ impl CreateLookupTable {
             false,
         ));
         accounts.extend_from_slice(remaining_accounts);
-        let mut data = CreateLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
-        let mut args = args.try_to_vec().unwrap();
+        let mut data = borsh::to_vec(&CreateLookupTableInstructionData::new()).unwrap();
+        let mut args = borsh::to_vec(&args).unwrap();
         data.append(&mut args);
 
         solana_program::instruction::Instruction {
@@ -61,7 +60,8 @@ impl CreateLookupTable {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct CreateLookupTableInstructionData {
     discriminator: u32,
 }
@@ -276,10 +276,8 @@ impl<'a, 'b> CreateLookupTableCpi<'a, 'b> {
                 is_writable: remaining_account.2,
             })
         });
-        let mut data = CreateLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
-        let mut args = self.__args.try_to_vec().unwrap();
+        let mut data = borsh::to_vec(&CreateLookupTableInstructionData::new()).unwrap();
+        let mut args = borsh::to_vec(&self.__args).unwrap();
         data.append(&mut args);
 
         let instruction = solana_program::instruction::Instruction {
diff --git a/clients/rust/src/generated/instructions/deactivate_lookup_table.rs b/clients/rust/src/generated/instructions/deactivate_lookup_table.rs
@@ -7,6 +7,7 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 
 /// Accounts.
+#[derive(Debug)]
 pub struct DeactivateLookupTable {
     pub address: solana_program::pubkey::Pubkey,
 
@@ -32,9 +33,7 @@ impl DeactivateLookupTable {
             true,
         ));
         accounts.extend_from_slice(remaining_accounts);
-        let data = DeactivateLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
+        let data = borsh::to_vec(&DeactivateLookupTableInstructionData::new()).unwrap();
 
         solana_program::instruction::Instruction {
             program_id: crate::ADDRESS_LOOKUP_TABLE_ID,
@@ -44,7 +43,8 @@ impl DeactivateLookupTable {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct DeactivateLookupTableInstructionData {
     discriminator: u32,
 }
@@ -194,9 +194,7 @@ impl<'a, 'b> DeactivateLookupTableCpi<'a, 'b> {
                 is_writable: remaining_account.2,
             })
         });
-        let data = DeactivateLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
+        let data = borsh::to_vec(&DeactivateLookupTableInstructionData::new()).unwrap();
 
         let instruction = solana_program::instruction::Instruction {
             program_id: crate::ADDRESS_LOOKUP_TABLE_ID,
diff --git a/clients/rust/src/generated/instructions/extend_lookup_table.rs b/clients/rust/src/generated/instructions/extend_lookup_table.rs
@@ -11,6 +11,7 @@ use {
 };
 
 /// Accounts.
+#[derive(Debug)]
 pub struct ExtendLookupTable {
     pub address: solana_program::pubkey::Pubkey,
 
@@ -51,10 +52,8 @@ impl ExtendLookupTable {
             false,
         ));
         accounts.extend_from_slice(remaining_accounts);
-        let mut data = ExtendLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
-        let mut args = args.try_to_vec().unwrap();
+        let mut data = borsh::to_vec(&ExtendLookupTableInstructionData::new()).unwrap();
+        let mut args = borsh::to_vec(&args).unwrap();
         data.append(&mut args);
 
         solana_program::instruction::Instruction {
@@ -65,7 +64,8 @@ impl ExtendLookupTable {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct ExtendLookupTableInstructionData {
     discriminator: u32,
 }
@@ -272,10 +272,8 @@ impl<'a, 'b> ExtendLookupTableCpi<'a, 'b> {
                 is_writable: remaining_account.2,
             })
         });
-        let mut data = ExtendLookupTableInstructionData::new()
-            .try_to_vec()
-            .unwrap();
-        let mut args = self.__args.try_to_vec().unwrap();
+        let mut data = borsh::to_vec(&ExtendLookupTableInstructionData::new()).unwrap();
+        let mut args = borsh::to_vec(&self.__args).unwrap();
         data.append(&mut args);
 
         let instruction = solana_program::instruction::Instruction {
diff --git a/clients/rust/src/generated/instructions/freeze_lookup_table.rs b/clients/rust/src/generated/instructions/freeze_lookup_table.rs
diff --git a/clients/rust/src/generated/mod.rs b/clients/rust/src/generated/mod.rs
diff --git a/clients/rust/src/generated/shared.rs b/clients/rust/src/generated/shared.rs
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
