Bump Codama to 1.2.8 and use @solana/kit

clients/js/package.json

@@ -45,12 +45,12 @@
   "homepage": "https://github.com/solana-program/program-metadata#readme",
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "^2.0.0"
+    "@solana/kit": "^2.1.0"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@solana-program/compute-budget": "^0.6.1",
-    "@solana-program/system": "^0.6.2",
+    "@solana-program/compute-budget": "^0.7.0",
+    "@solana-program/system": "^0.7.0",
     "chalk": "^4.1.0",
     "commander": "^13.0.0",
     "pako": "^2.1.0",
@@ -59,7 +59,7 @@
   "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": "^22",
     "@types/pako": "^2.0.3",
     "@typescript-eslint/eslint-plugin": "^7.16.1",

clients/js/src/cli.ts

@@ -21,7 +21,7 @@ import {
   RpcSubscriptions,
   SolanaRpcApi,
   SolanaRpcSubscriptionsApi,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import chalk from 'chalk';
 import { Command, Option } from 'commander';
 import { parse as parseYaml } from 'yaml';

clients/js/src/createMetadata.ts

@@ -4,7 +4,7 @@ import {
   GetMinimumBalanceForRentExemptionApi,
   Lamports,
   Rpc,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   getAllocateInstruction,
   getInitializeInstruction,

clients/js/src/downloadMetadata.ts

@@ -1,5 +1,5 @@
 import { parse as parseToml } from '@iarna/toml';
-import { Address, GetAccountInfoApi, Rpc } from '@solana/web3.js';
+import { Address, GetAccountInfoApi, Rpc } from '@solana/kit';
 import { parse as parseYaml } from 'yaml';
 import { fetchMetadataFromSeeds, Format, SeedArgs } from './generated';
 import { unpackAndFetchData } from './packData';

clients/js/src/generated/accounts/buffer.ts

@@ -39,7 +39,7 @@ import {
   type Option,
   type OptionOrNullable,
   type ReadonlyUint8Array,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { MetadataSeeds, findMetadataPda } from '../pdas';
 import {
   AccountDiscriminator,

clients/js/src/generated/accounts/metadata.ts

@@ -41,7 +41,7 @@ import {
   type Option,
   type OptionOrNullable,
   type ReadonlyUint8Array,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { MetadataSeeds, findMetadataPda } from '../pdas';
 import {
   AccountDiscriminator,

clients/js/src/generated/instructions/allocate.ts

@@ -31,7 +31,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 import {

clients/js/src/generated/instructions/close.ts

@@ -26,7 +26,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/instructions/extend.ts

@@ -28,7 +28,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/instructions/initialize.ts

@@ -34,7 +34,7 @@ import {
   type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { findCanonicalPda, findNonCanonicalPda } from '../pdas';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import {

clients/js/src/generated/instructions/setAuthority.ts

@@ -32,7 +32,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/instructions/setData.ts

@@ -34,7 +34,7 @@ import {
   type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 import {

clients/js/src/generated/instructions/setImmutable.ts

@@ -26,7 +26,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/instructions/trim.ts

@@ -26,7 +26,7 @@ import {
   type ReadonlySignerAccount,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/instructions/write.ts

@@ -30,7 +30,7 @@ import {
   type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { PROGRAM_METADATA_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 

clients/js/src/generated/pdas/canonical.ts

@@ -11,7 +11,7 @@ import {
   getProgramDerivedAddress,
   type Address,
   type ProgramDerivedAddress,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { getSeedEncoder, type SeedArgs } from '../types';
 
 export type CanonicalSeeds = {

clients/js/src/generated/pdas/metadata.ts

@@ -13,7 +13,7 @@ import {
   type Address,
   type OptionOrNullable,
   type ProgramDerivedAddress,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { getSeedEncoder, type SeedArgs } from '../types';
 
 export type MetadataSeeds = {

clients/js/src/generated/pdas/nonCanonical.ts

@@ -11,7 +11,7 @@ import {
   getProgramDerivedAddress,
   type Address,
   type ProgramDerivedAddress,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { getSeedEncoder, type SeedArgs } from '../types';
 
 export type NonCanonicalSeeds = {

clients/js/src/generated/programs/programMetadata.ts

@@ -11,7 +11,7 @@ import {
   getU8Encoder,
   type Address,
   type ReadonlyUint8Array,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   type ParsedAllocateInstruction,
   type ParsedCloseInstruction,

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)
   );
 }

clients/js/src/generated/types/accountDiscriminator.ts

@@ -13,7 +13,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export enum AccountDiscriminator {
   Empty,

clients/js/src/generated/types/compression.ts

@@ -13,7 +13,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export enum Compression {
   None,

clients/js/src/generated/types/dataSource.ts

@@ -13,7 +13,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export enum DataSource {
   Direct,

clients/js/src/generated/types/encoding.ts

@@ -13,7 +13,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export enum Encoding {
   None,

clients/js/src/generated/types/externalData.ts

@@ -22,7 +22,7 @@ import {
   type Encoder,
   type Option,
   type OptionOrNullable,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export type ExternalData = {
   address: Address;

clients/js/src/generated/types/format.ts

@@ -13,7 +13,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export enum Format {
   None,

clients/js/src/generated/types/seed.ts

@@ -15,7 +15,7 @@ import {
   type Codec,
   type Decoder,
   type Encoder,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export type Seed = string;
 

clients/js/src/instructionPlans/defaultInstructionPlanExecutor.ts

@@ -24,7 +24,7 @@ import {
   TransactionMessageWithBlockhashLifetime,
   TransactionMessageWithDurableNonceLifetime,
   TransactionWithBlockhashLifetime,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   getTransactionMessageFromPlan,
   MessageInstructionPlan,

clients/js/src/instructionPlans/instructionPlan.ts

@@ -2,7 +2,7 @@ import {
   appendTransactionMessageInstructions,
   BaseTransactionMessage,
   IInstruction,
-} from '@solana/web3.js';
+} from '@solana/kit';
 
 export type InstructionPlan =
   | SequentialInstructionPlan

clients/js/src/internals.ts

@@ -21,7 +21,7 @@ import {
   Transaction,
   TransactionMessageWithBlockhashLifetime,
   TransactionSigner,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   ExtendInstruction,
   findMetadataPda,

clients/js/src/packData.ts

@@ -15,7 +15,7 @@ import {
   ReadonlyUint8Array,
   Rpc,
   unwrapOption,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { deflate, gzip, inflate, ungzip } from 'pako';
 import {
   Compression,

clients/js/src/updateMetadata.ts

@@ -8,7 +8,7 @@ import {
   Lamports,
   Rpc,
   TransactionSigner,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   fetchMetadata,
   getAllocateInstruction,

clients/js/src/utils.ts

@@ -26,7 +26,7 @@ import {
   Transaction,
   TransactionSigner,
   unwrapOption,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   CompressionArgs,
   DataSourceArgs,

clients/js/test/_setup.ts

@@ -34,7 +34,7 @@ import {
   TransactionMessageWithBlockhashLifetime,
   TransactionSigner,
   unwrapOption,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import {
   Compression,
   DataSource,

clients/js/test/allocate.test.ts

@@ -6,7 +6,7 @@ import {
   none,
   pipe,
   some,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import test from 'ava';
 import {
   AccountDiscriminator,

clients/js/test/close.test.ts

@@ -5,7 +5,7 @@ import {
   generateKeyPairSigner,
   getUtf8Encoder,
   pipe,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import test from 'ava';
 import {
   fetchMaybeMetadata,

clients/js/test/createMetadata.test.ts

@@ -1,4 +1,4 @@
-import { address, getUtf8Encoder, none, some } from '@solana/web3.js';
+import { address, getUtf8Encoder, none, some } from '@solana/kit';
 import test from 'ava';
 import {
   AccountDiscriminator,

clients/js/test/downloadMetadata.test.ts

@@ -1,4 +1,4 @@
-import { address } from '@solana/web3.js';
+import { address } from '@solana/kit';
 import test from 'ava';
 import {
   downloadAndParseMetadata,

clients/js/test/extend.test.ts

@@ -7,7 +7,7 @@ import {
   generateKeyPairSigner,
   getUtf8Encoder,
   pipe,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import test from 'ava';
 import {
   ACCOUNT_HEADER_LENGTH,

clients/js/test/initialize.test.ts

@@ -7,7 +7,7 @@ import {
   none,
   pipe,
   some,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import test from 'ava';
 import {
   AccountDiscriminator,

clients/js/test/loader-v3/deploy.ts

@@ -21,7 +21,7 @@ import {
   type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { getAccountMetaFactory, type ResolvedAccount } from './shared';
 import { LOADER_V3_PROGRAM_ADDRESS } from '../../src';