program: Fix build, bump everything to v3 (#58)

* program: Fix build, bump everything to v3

#### Problem

After merging #32, dependabot went wild and started merging everything,
because we didn't have status checks in place in our branch protection.
This has left the program build broken.

#### Summary of changes

Finish bumping everything to v3! There's a slight regression on CUs, but
nothing too ridiculous.

* Update CLI version, regenerate clients

Author: joncinque

Cargo.lock

@@ -1,5 +1,5 @@
 RUST_TOOLCHAIN_NIGHTLY = nightly-2025-02-16
-SOLANA_CLI_VERSION = 2.3.4
+SOLANA_CLI_VERSION = 3.0.0
 
 nightly = +${RUST_TOOLCHAIN_NIGHTLY}
 
@@ -33,6 +33,7 @@ spellcheck:
 clippy-%:
 	cargo $(nightly) clippy --manifest-path $(call make-path,$*)/Cargo.toml \
 	  --all-targets \
+	  --all-features \
 		-- \
 		--deny=warnings \
 		--deny=clippy::default_trait_access \

Makefile

@@ -34,12 +34,12 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@solana/web3.js": "2.0.0-preview.4"
+    "@solana/kit": "3.0.0"
   },
   "devDependencies": {
     "@ava/typescript": "^6.0.0",
     "@solana/eslint-config-solana": "^3.0.3",
-    "@solana/web3.js": "2.0.0-preview.4",
+    "@solana/kit": "3.0.0",
     "@solana/webcrypto-ed25519-polyfill": "3.0.3",
     "@types/node": "^24",
     "@typescript-eslint/eslint-plugin": "^7.16.1",

clients/js/package.json

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */

clients/js/pnpm-lock.yaml

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */
@@ -11,7 +11,7 @@ import {
   type Address,
   type SOLANA_ERROR__INSTRUCTION_ERROR__CUSTOM,
   type SolanaError,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { SOLANA_FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
 
 /** FeatureAlreadyActivated: Feature already activated */

clients/js/src/generated/errors/index.ts

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */

clients/js/src/generated/errors/solanaFeatureGate.ts

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */

clients/js/src/generated/index.ts

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */
@@ -13,20 +13,21 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
+  type AccountMeta,
+  type AccountSignerMeta,
   type Address,
-  type Codec,
-  type Decoder,
-  type Encoder,
-  type IAccountMeta,
-  type IAccountSignerMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type ReadonlyAccount,
+  type ReadonlyUint8Array,
   type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/web3.js';
+} from '@solana/kit';
 import { SOLANA_FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
@@ -38,19 +39,19 @@ export function getRevokePendingActivationDiscriminatorBytes() {
 
 export type RevokePendingActivationInstruction<
   TProgram extends string = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
-  TAccountFeature extends string | IAccountMeta<string> = string,
-  TAccountIncinerator extends string | IAccountMeta<string> = string,
+  TAccountFeature extends string | AccountMeta<string> = string,
+  TAccountIncinerator extends string | AccountMeta<string> = string,
   TAccountSystemProgram extends
     | string
-    | IAccountMeta<string> = '11111111111111111111111111111111',
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+    | AccountMeta<string> = '11111111111111111111111111111111',
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountFeature extends string
         ? WritableSignerAccount<TAccountFeature> &
-            IAccountSignerMeta<TAccountFeature>
+            AccountSignerMeta<TAccountFeature>
         : TAccountFeature,
       TAccountIncinerator extends string
         ? WritableAccount<TAccountIncinerator>
@@ -66,7 +67,7 @@ export type RevokePendingActivationInstructionData = { discriminator: number };
 
 export type RevokePendingActivationInstructionDataArgs = {};
 
-export function getRevokePendingActivationInstructionDataEncoder(): Encoder<RevokePendingActivationInstructionDataArgs> {
+export function getRevokePendingActivationInstructionDataEncoder(): FixedSizeEncoder<RevokePendingActivationInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([['discriminator', getU8Encoder()]]),
     (value) => ({
@@ -76,11 +77,11 @@ export function getRevokePendingActivationInstructionDataEncoder(): Encoder<Revo
   );
 }
 
-export function getRevokePendingActivationInstructionDataDecoder(): Decoder<RevokePendingActivationInstructionData> {
+export function getRevokePendingActivationInstructionDataDecoder(): FixedSizeDecoder<RevokePendingActivationInstructionData> {
   return getStructDecoder([['discriminator', getU8Decoder()]]);
 }
 
-export function getRevokePendingActivationInstructionDataCodec(): Codec<
+export function getRevokePendingActivationInstructionDataCodec(): FixedSizeCodec<
   RevokePendingActivationInstructionDataArgs,
   RevokePendingActivationInstructionData
 > {
@@ -143,27 +144,25 @@ export function getRevokePendingActivationInstruction<
   }
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
-  const instruction = {
+  return Object.freeze({
     accounts: [
       getAccountMeta(accounts.feature),
       getAccountMeta(accounts.incinerator),
       getAccountMeta(accounts.systemProgram),
     ],
-    programAddress,
     data: getRevokePendingActivationInstructionDataEncoder().encode({}),
+    programAddress,
   } as RevokePendingActivationInstruction<
     TProgramAddress,
     TAccountFeature,
     TAccountIncinerator,
     TAccountSystemProgram
-  >;
-
-  return instruction;
+  >);
 }
 
 export type ParsedRevokePendingActivationInstruction<
   TProgram extends string = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -179,19 +178,19 @@ export type ParsedRevokePendingActivationInstruction<
 
 export function parseRevokePendingActivationInstruction<
   TProgram extends string,
-  TAccountMetas extends readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[],
 >(
-  instruction: IInstruction<TProgram> &
-    IInstructionWithAccounts<TAccountMetas> &
-    IInstructionWithData<Uint8Array>
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedRevokePendingActivationInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 3) {
     // TODO: Coded error.
     throw new Error('Not enough accounts');
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };

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

@@ -1,7 +1,7 @@
 /**
- * This code was AUTOGENERATED using the codama library.
+ * This code was AUTOGENERATED using the Codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun codama to update it.
+ * to add features, then rerun Codama to update it.
  *
  * @see https://github.com/codama-idl/codama
  */