use new codama renderers (#24)

solana-program · Jan 15, 2025 · 5058b10 · 5058b10
1 parent 62c6136
commit 5058b10
Show file tree

Hide file tree

Showing 17 changed files with 301 additions and 186 deletions.
diff --git a/clients/js/src/generated/errors/index.ts b/clients/js/src/generated/errors/index.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 export * from './solanaFeatureGate';
diff --git a/clients/js/src/generated/errors/solanaFeatureGate.ts b/clients/js/src/generated/errors/solanaFeatureGate.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 import {

diff --git a/clients/js/src/generated/index.ts b/clients/js/src/generated/index.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 export * from './errors';

diff --git a/clients/js/src/generated/instructions/index.ts b/clients/js/src/generated/instructions/index.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 export * from './revokePendingActivation';
diff --git a/clients/js/src/generated/instructions/revokePendingActivation.ts b/clients/js/src/generated/instructions/revokePendingActivation.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 import {
@@ -30,6 +30,12 @@ import {
 import { SOLANA_FEATURE_GATE_PROGRAM_ADDRESS } from '../programs';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared';
 
+export const REVOKE_PENDING_ACTIVATION_DISCRIMINATOR = 0;
+
+export function getRevokePendingActivationDiscriminatorBytes() {
+  return getU8Encoder().encode(REVOKE_PENDING_ACTIVATION_DISCRIMINATOR);
+}
+
 export type RevokePendingActivationInstruction<
   TProgram extends string = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
   TAccountFeature extends string | IAccountMeta<string> = string,
@@ -63,7 +69,10 @@ export type RevokePendingActivationInstructionDataArgs = {};
 export function getRevokePendingActivationInstructionDataEncoder(): Encoder<RevokePendingActivationInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([['discriminator', getU8Encoder()]]),
-    (value) => ({ ...value, discriminator: 0 })
+    (value) => ({
+      ...value,
+      discriminator: REVOKE_PENDING_ACTIVATION_DISCRIMINATOR,
+    })
   );
 }
 
@@ -98,20 +107,23 @@ export function getRevokePendingActivationInstruction<
   TAccountFeature extends string,
   TAccountIncinerator extends string,
   TAccountSystemProgram extends string,
+  TProgramAddress extends Address = typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
 >(
   input: RevokePendingActivationInput<
     TAccountFeature,
     TAccountIncinerator,
     TAccountSystemProgram
-  >
+  >,
+  config?: { programAddress?: TProgramAddress }
 ): RevokePendingActivationInstruction<
-  typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+  TProgramAddress,
   TAccountFeature,
   TAccountIncinerator,
   TAccountSystemProgram
 > {
   // Program address.
-  const programAddress = SOLANA_FEATURE_GATE_PROGRAM_ADDRESS;
+  const programAddress =
+    config?.programAddress ?? SOLANA_FEATURE_GATE_PROGRAM_ADDRESS;
 
   // Original accounts.
   const originalAccounts = {
@@ -140,7 +152,7 @@ export function getRevokePendingActivationInstruction<
     programAddress,
     data: getRevokePendingActivationInstructionDataEncoder().encode({}),
   } as RevokePendingActivationInstruction<
-    typeof SOLANA_FEATURE_GATE_PROGRAM_ADDRESS,
+    TProgramAddress,
     TAccountFeature,
     TAccountIncinerator,
     TAccountSystemProgram

diff --git a/clients/js/src/generated/programs/index.ts b/clients/js/src/generated/programs/index.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 export * from './solanaFeatureGate';
diff --git a/clients/js/src/generated/programs/solanaFeatureGate.ts b/clients/js/src/generated/programs/solanaFeatureGate.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 import {

diff --git a/clients/js/src/generated/shared/index.ts b/clients/js/src/generated/shared/index.ts
@@ -1,9 +1,9 @@
 /**
- * This code was AUTOGENERATED using the kinobi library.
+ * This code was AUTOGENERATED using the codama library.
  * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
+ * to add features, then rerun codama to update it.
  *
- * @see https://github.com/kinobi-so/kinobi
+ * @see https://github.com/codama-idl/codama
  */
 
 import {

diff --git a/clients/rust/src/generated/errors/mod.rs b/clients/rust/src/generated/errors/mod.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 pub(crate) mod solana_feature_gate;
 

diff --git a/clients/rust/src/generated/errors/solana_feature_gate.rs b/clients/rust/src/generated/errors/solana_feature_gate.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 use {num_derive::FromPrimitive, thiserror::Error};
 
@@ -18,3 +18,9 @@ impl solana_program::program_error::PrintProgramError for SolanaFeatureGateError
         solana_program::msg!(&self.to_string());
     }
 }
+
+impl<T> solana_program::decode_error::DecodeError<T> for SolanaFeatureGateError {
+    fn type_of() -> &'static str {
+        "SolanaFeatureGateError"
+    }
+}
diff --git a/clients/rust/src/generated/instructions/mod.rs b/clients/rust/src/generated/instructions/mod.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 pub(crate) mod r#revoke_pending_activation;
 

diff --git a/clients/rust/src/generated/instructions/revoke_pending_activation.rs b/clients/rust/src/generated/instructions/revoke_pending_activation.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 use borsh::{BorshDeserialize, BorshSerialize};
 
@@ -51,7 +51,8 @@ impl RevokePendingActivation {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct RevokePendingActivationInstructionData {
     discriminator: u8,
 }
@@ -107,7 +108,7 @@ impl RevokePendingActivationBuilder {
         self.system_program = Some(system_program);
         self
     }
-    /// Add an aditional account to the instruction.
+    /// Add an additional account to the instruction.
     #[inline(always)]
     pub fn add_remaining_account(
         &mut self,
@@ -235,7 +236,7 @@ impl<'a, 'b> RevokePendingActivationCpi<'a, 'b> {
             accounts,
             data,
         };
-        let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len());
+        let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len());
         account_infos.push(self.__program.clone());
         account_infos.push(self.feature.clone());
         account_infos.push(self.incinerator.clone());

diff --git a/clients/rust/src/generated/mod.rs b/clients/rust/src/generated/mod.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 pub mod errors;
 pub mod instructions;

diff --git a/clients/rust/src/generated/programs.rs b/clients/rust/src/generated/programs.rs
@@ -1,8 +1,8 @@
-//! This code was AUTOGENERATED using the kinobi library.
+//! This code was AUTOGENERATED using the codama library.
 //! Please DO NOT EDIT THIS FILE, instead use visitors
-//! to add features, then rerun kinobi to update it.
+//! to add features, then rerun codama to update it.
 //!
-//! <https://github.com/kinobi-so/kinobi>
+//! <https://github.com/codama-idl/codama>
 
 use solana_program::{pubkey, pubkey::Pubkey};
 

diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
   },
   "devDependencies": {
     "@iarna/toml": "^2.2.5",
-    "@kinobi-so/nodes-from-anchor": "^0.20.9",
-    "@kinobi-so/renderers-js": "^0.21.2",
-    "@kinobi-so/renderers-rust": "^0.21.0",
+    "@codama/nodes-from-anchor": "^1.1.0",
+    "@codama/renderers-js": "^1.1.1",
+    "@codama/renderers-rust": "^1.0.6",
     "@metaplex-foundation/shank-js": "^0.1.7",
-    "kinobi": "^0.21.0",
+    "codama": "^1.2.0",
     "typescript": "^5.5.2",
     "zx": "^7.2.3"
   },