Rename feature gate program to drop the solana prefix

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

@@ -12,38 +12,30 @@ import {
   type SOLANA_ERROR__INSTRUCTION_ERROR__CUSTOM,
   type SolanaError,
 } from '@solana/kit';
-import { SOLANA_FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
+import { FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
 
 /** FeatureAlreadyActivated: Feature already activated */
-export const SOLANA_FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED = 0x0; // 0
+export const FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED = 0x0; // 0
 
-export type SolanaFeatureGateError =
-  typeof SOLANA_FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED;
+export type FeatureGateError =
+  typeof FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED;
 
-let solanaFeatureGateErrorMessages:
-  | Record<SolanaFeatureGateError, string>
-  | undefined;
+let featureGateErrorMessages: Record<FeatureGateError, string> | undefined;
 if (process.env['NODE_ENV'] !== 'production') {
-  solanaFeatureGateErrorMessages = {
-    [SOLANA_FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED]: `Feature already activated`,
+  featureGateErrorMessages = {
+    [FEATURE_GATE_ERROR__FEATURE_ALREADY_ACTIVATED]: `Feature already activated`,
   };
 }
 
-export function getSolanaFeatureGateErrorMessage(
-  code: SolanaFeatureGateError
-): string {
+export function getFeatureGateErrorMessage(code: FeatureGateError): string {
   if (process.env['NODE_ENV'] !== 'production') {
-    return (
-      solanaFeatureGateErrorMessages as Record<SolanaFeatureGateError, string>
-    )[code];
+    return (featureGateErrorMessages as Record<FeatureGateError, string>)[code];
   }
 
   return 'Error message not available in production bundles.';
 }
 
-export function isSolanaFeatureGateError<
-  TProgramErrorCode extends SolanaFeatureGateError,
->(
+export function isFeatureGateError<TProgramErrorCode extends FeatureGateError>(
   error: unknown,
   transactionMessage: {
     instructions: Record<number, { programAddress: Address }>;
@@ -54,7 +46,7 @@ export function isSolanaFeatureGateError<
   return isProgramError<TProgramErrorCode>(
     error,
     transactionMessage,
-    SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+    FEATURE_GATE_PROGRAM_ADDRESS,
     code
   );
 }

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

@@ -6,4 +6,4 @@
  * @see https://github.com/codama-idl/codama
  */
 
-export * from './solanaFeatureGate';
+export * from './featureGate';

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

@@ -34,7 +34,7 @@ import {
   getAccountMetaFactory,
   type ResolvedInstructionAccount,
 } from '@solana/kit/program-client-core';
-import { SOLANA_FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
+import { FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
 
 export const REVOKE_PENDING_ACTIVATION_DISCRIMINATOR = 0;
 
@@ -43,7 +43,7 @@ export function getRevokePendingActivationDiscriminatorBytes(): ReadonlyUint8Arr
 }
 
 export type RevokePendingActivationInstruction<
-  TProgram extends string = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+  TProgram extends string = typeof FEATURE_GATE_PROGRAM_ADDRESS,
   TAccountFeature extends string | AccountMeta<string> = string,
   TAccountIncinerator extends string | AccountMeta<string> = string,
   TAccountSystemProgram extends string | AccountMeta<string> =
@@ -112,7 +112,7 @@ export function getRevokePendingActivationInstruction<
   TAccountFeature extends string,
   TAccountIncinerator extends string,
   TAccountSystemProgram extends string,
-  TProgramAddress extends Address = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+  TProgramAddress extends Address = typeof FEATURE_GATE_PROGRAM_ADDRESS,
 >(
   input: RevokePendingActivationInput<
     TAccountFeature,
@@ -127,8 +127,7 @@ export function getRevokePendingActivationInstruction<
   TAccountSystemProgram
 > {
   // Program address.
-  const programAddress =
-    config?.programAddress ?? SOLANA_FEATURE_GATE_PROGRAM_ADDRESS;
+  const programAddress = config?.programAddress ?? FEATURE_GATE_PROGRAM_ADDRESS;
 
   // Original accounts.
   const originalAccounts = {
@@ -165,7 +164,7 @@ export function getRevokePendingActivationInstruction<
 }
 
 export type ParsedRevokePendingActivationInstruction<
-  TProgram extends string = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+  TProgram extends string = typeof FEATURE_GATE_PROGRAM_ADDRESS,
   TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;

clients/js/src/generated/programs/solanaFeatureGate.ts → clients/js/src/generated/programs/featureGate.ts

@@ -32,41 +32,41 @@ import {
   type RevokePendingActivationInput,
 } from '../instructions';
 
-export const SOLANA_FEATURE_GATE_PROGRAM_ADDRESS =
+export const FEATURE_GATE_PROGRAM_ADDRESS =
   'Feature111111111111111111111111111111111111' as Address<'Feature111111111111111111111111111111111111'>;
 
-export enum SolanaFeatureGateInstruction {
+export enum FeatureGateInstruction {
   RevokePendingActivation,
 }
 
-export function identifySolanaFeatureGateInstruction(
+export function identifyFeatureGateInstruction(
   instruction: { data: ReadonlyUint8Array } | ReadonlyUint8Array
-): SolanaFeatureGateInstruction {
+): FeatureGateInstruction {
   const data = 'data' in instruction ? instruction.data : instruction;
   if (containsBytes(data, getU8Encoder().encode(0), 0)) {
-    return SolanaFeatureGateInstruction.RevokePendingActivation;
+    return FeatureGateInstruction.RevokePendingActivation;
   }
   throw new SolanaError(
     SOLANA_ERROR__PROGRAM_CLIENTS__FAILED_TO_IDENTIFY_INSTRUCTION,
-    { instructionData: data, programName: 'solanaFeatureGate' }
+    { instructionData: data, programName: 'featureGate' }
   );
 }
 
-export type ParsedSolanaFeatureGateInstruction<
+export type ParsedFeatureGateInstruction<
   TProgram extends string = 'Feature111111111111111111111111111111111111',
 > = {
-  instructionType: SolanaFeatureGateInstruction.RevokePendingActivation;
+  instructionType: FeatureGateInstruction.RevokePendingActivation;
 } & ParsedRevokePendingActivationInstruction<TProgram>;
 
-export function parseSolanaFeatureGateInstruction<TProgram extends string>(
+export function parseFeatureGateInstruction<TProgram extends string>(
   instruction: Instruction<TProgram> & InstructionWithData<ReadonlyUint8Array>
-): ParsedSolanaFeatureGateInstruction<TProgram> {
-  const instructionType = identifySolanaFeatureGateInstruction(instruction);
+): ParsedFeatureGateInstruction<TProgram> {
+  const instructionType = identifyFeatureGateInstruction(instruction);
   switch (instructionType) {
-    case SolanaFeatureGateInstruction.RevokePendingActivation: {
+    case FeatureGateInstruction.RevokePendingActivation: {
       assertIsInstructionWithAccounts(instruction);
       return {
-        instructionType: SolanaFeatureGateInstruction.RevokePendingActivation,
+        instructionType: FeatureGateInstruction.RevokePendingActivation,
         ...parseRevokePendingActivationInstruction(instruction),
       };
     }
@@ -75,34 +75,30 @@ export function parseSolanaFeatureGateInstruction<TProgram extends string>(
         SOLANA_ERROR__PROGRAM_CLIENTS__UNRECOGNIZED_INSTRUCTION_TYPE,
         {
           instructionType: instructionType as string,
-          programName: 'solanaFeatureGate',
+          programName: 'featureGate',
         }
       );
   }
 }
 
-export type SolanaFeatureGatePlugin = {
-  instructions: SolanaFeatureGatePluginInstructions;
-};
+export type FeatureGatePlugin = { instructions: FeatureGatePluginInstructions };
 
-export type SolanaFeatureGatePluginInstructions = {
+export type FeatureGatePluginInstructions = {
   revokePendingActivation: (
     input: RevokePendingActivationInput
   ) => ReturnType<typeof getRevokePendingActivationInstruction> &
     SelfPlanAndSendFunctions;
 };
 
-export type SolanaFeatureGatePluginRequirements =
-  ClientWithTransactionPlanning & ClientWithTransactionSending;
+export type FeatureGatePluginRequirements = ClientWithTransactionPlanning &
+  ClientWithTransactionSending;
 
-export function solanaFeatureGateProgram() {
-  return <T extends SolanaFeatureGatePluginRequirements>(
+export function featureGateProgram() {
+  return <T extends FeatureGatePluginRequirements>(
     client: T
-  ): Omit<T, 'solanaFeatureGate'> & {
-    solanaFeatureGate: SolanaFeatureGatePlugin;
-  } => {
+  ): Omit<T, 'featureGate'> & { featureGate: FeatureGatePlugin } => {
     return extendClient(client, {
-      solanaFeatureGate: <SolanaFeatureGatePlugin>{
+      featureGate: <FeatureGatePlugin>{
         instructions: {
           revokePendingActivation: (input) =>
             addSelfPlanAndSendFunctions(

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

@@ -6,4 +6,4 @@
  * @see https://github.com/codama-idl/codama
  */
 
-export * from './solanaFeatureGate';
+export * from './featureGate';

clients/js/test/_setup.ts

@@ -4,12 +4,9 @@ import { createClient, lamports } from '@solana/kit';
 import { litesvm } from '@solana/kit-plugin-litesvm';
 import { airdropSigner, generatedSigner } from '@solana/kit-plugin-signer';
 
-import {
-  SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
-  solanaFeatureGateProgram,
-} from '../src';
+import { FEATURE_GATE_PROGRAM_ADDRESS, featureGateProgram } from '../src';
 
-const SOLANA_FEATURE_GATE_BINARY_PATH = path.resolve(
+const FEATURE_GATE_BINARY_PATH = path.resolve(
   __dirname,
   '..',
   '..',
@@ -29,10 +26,10 @@ export const createTestClient = () => {
       // compiled `.so` file. This must run after the `litesvm()` plugin so
       // that `client.svm` is available.
       client.svm.addProgramFromFile(
-        SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
-        SOLANA_FEATURE_GATE_BINARY_PATH
+        FEATURE_GATE_PROGRAM_ADDRESS,
+        FEATURE_GATE_BINARY_PATH
       );
       return client;
     })
-    .use(solanaFeatureGateProgram());
+    .use(featureGateProgram());
 };

clients/js/test/example.test.ts

@@ -7,7 +7,7 @@ it('sets up a LiteSVM client with the feature-gate program', async () => {
   const client = await createTestClient();
 
   // Then the client exposes the feature-gate program plugin.
-  expect(client.solanaFeatureGate).toBeDefined();
+  expect(client.featureGate).toBeDefined();
 
   // And the payer was funded via LiteSVM.
   const { value: balance } = await client.rpc

clients/rust/src/generated/errors/solana_feature_gate.rs → clients/rust/src/generated/errors/feature_gate.rs

@@ -7,14 +7,14 @@
 use {num_derive::FromPrimitive, thiserror::Error};
 
 #[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
-pub enum SolanaFeatureGateError {
+pub enum FeatureGateError {
     /// 0 - Feature already activated
     #[error("Feature already activated")]
     FeatureAlreadyActivated = 0x0,
 }
 
-impl From<SolanaFeatureGateError> for solana_program_error::ProgramError {
-    fn from(e: SolanaFeatureGateError) -> Self {
+impl From<FeatureGateError> for solana_program_error::ProgramError {
+    fn from(e: FeatureGateError) -> Self {
         solana_program_error::ProgramError::Custom(e as u32)
     }
 }

clients/rust/src/generated/errors/mod.rs

@@ -4,6 +4,6 @@
 //!
 //! <https://github.com/codama-idl/codama>
 
-pub(crate) mod solana_feature_gate;
+pub(crate) mod feature_gate;
 
-pub use self::solana_feature_gate::SolanaFeatureGateError;
+pub use self::feature_gate::FeatureGateError;

clients/rust/src/generated/instructions/revoke_pending_activation.rs

@@ -45,7 +45,7 @@ impl RevokePendingActivation {
             .unwrap();
 
         solana_instruction::Instruction {
-            program_id: crate::SOLANA_FEATURE_GATE_ID,
+            program_id: crate::FEATURE_GATE_ID,
             accounts,
             data,
         }
@@ -223,7 +223,7 @@ impl<'a, 'b> RevokePendingActivationCpi<'a, 'b> {
             .unwrap();
 
         let instruction = solana_instruction::Instruction {
-            program_id: crate::SOLANA_FEATURE_GATE_ID,
+            program_id: crate::FEATURE_GATE_ID,
             accounts,
             data,
         };

clients/rust/src/generated/programs.rs

@@ -6,5 +6,5 @@
 
 use solana_address::{address, Address};
 
-/// `solana_feature_gate` program ID.
-pub const SOLANA_FEATURE_GATE_ID: Address = address!("Feature111111111111111111111111111111111111");
+/// `feature_gate` program ID.
+pub const FEATURE_GATE_ID: Address = address!("Feature111111111111111111111111111111111111");

clients/rust/src/lib.rs

@@ -1,4 +1,4 @@
 #[allow(deprecated)] // needed until Codama stops implementing deprecated traits
 mod generated;
 
-pub use generated::{programs::SOLANA_FEATURE_GATE_ID as ID, *};
+pub use generated::{programs::FEATURE_GATE_ID as ID, *};

codama.mjs

@@ -10,7 +10,7 @@ export default {
   before: [
     {
       from: 'codama#updateProgramsVisitor',
-      args: [{ solanaFeatureGateProgram: { name: 'solanaFeatureGate' } }],
+      args: [{ solanaFeatureGateProgram: { name: 'featureGate' } }],
     },
   ],
   scripts: {