Update Codama to 1.2.4 and use Codama CLI (#34)

lorisleiva · web-flow · commit c755dfa55ab2 · 2025-02-04T11:09:36.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml
@@ -8,6 +8,7 @@ readme = "README.md"
 license-file = "../../LICENSE"
 
 [features]
+fetch = ["dep:solana-client", "dep:solana-sdk"]
 test-sbf = []
 serde = ["dep:serde", "dep:serde_with", "kaigan/serde"]
 
@@ -18,5 +19,7 @@ num-derive = "^0.3"
 num-traits = "^0.2"
 serde = { version = "^1.0", features = ["derive"], optional = true }
 serde_with = { version = "^3.0", optional = true }
+solana-client = { version = "^2.1", optional = true }
+solana-sdk = { version = "^2.1", optional = true }
 solana-program = "^2.1"
 thiserror = "^1.0"
diff --git a/clients/rust/src/generated/accounts/nonce.rs b/clients/rust/src/generated/accounts/nonce.rs
@@ -49,3 +49,73 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for Nonce {
         Self::deserialize(&mut data)
     }
 }
+
+#[cfg(feature = "fetch")]
+pub fn fetch_nonce(
+    rpc: &solana_client::rpc_client::RpcClient,
+    address: &Pubkey,
+) -> Result<crate::shared::DecodedAccount<Nonce>, std::io::Error> {
+    let accounts = fetch_all_nonce(rpc, &[*address])?;
+    Ok(accounts[0].clone())
+}
+
+#[cfg(feature = "fetch")]
+pub fn fetch_all_nonce(
+    rpc: &solana_client::rpc_client::RpcClient,
+    addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::DecodedAccount<Nonce>>, 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<Nonce>> = 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 = Nonce::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_nonce(
+    rpc: &solana_client::rpc_client::RpcClient,
+    address: &Pubkey,
+) -> Result<crate::shared::MaybeAccount<Nonce>, std::io::Error> {
+    let accounts = fetch_all_maybe_nonce(rpc, &[*address])?;
+    Ok(accounts[0].clone())
+}
+
+#[cfg(feature = "fetch")]
+pub fn fetch_all_maybe_nonce(
+    rpc: &solana_client::rpc_client::RpcClient,
+    addresses: &[Pubkey],
+) -> Result<Vec<crate::shared::MaybeAccount<Nonce>>, 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<Nonce>> = Vec::new();
+    for i in 0..addresses.len() {
+        let address = addresses[i];
+        if let Some(account) = accounts[i].as_ref() {
+            let data = Nonce::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/errors/system.rs b/clients/rust/src/generated/errors/system.rs
@@ -44,3 +44,9 @@ impl solana_program::program_error::PrintProgramError for SystemError {
         solana_program::msg!(&self.to_string());
     }
 }
+
+impl<T> solana_program::decode_error::DecodeError<T> for SystemError {
+    fn type_of() -> &'static str {
+        "SystemError"
+    }
+}
diff --git a/clients/rust/src/generated/instructions/advance_nonce_account.rs b/clients/rust/src/generated/instructions/advance_nonce_account.rs
@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;
 use borsh::BorshSerialize;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct AdvanceNonceAccount {
     pub nonce_account: solana_program::pubkey::Pubkey,
 
@@ -52,7 +53,8 @@ impl AdvanceNonceAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AdvanceNonceAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/allocate.rs b/clients/rust/src/generated/instructions/allocate.rs
@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;
 use borsh::BorshSerialize;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct Allocate {
     pub new_account: solana_program::pubkey::Pubkey,
 }
@@ -44,7 +45,8 @@ impl Allocate {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AllocateInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/allocate_with_seed.rs b/clients/rust/src/generated/instructions/allocate_with_seed.rs
@@ -11,6 +11,7 @@ use kaigan::types::U64PrefixString;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct AllocateWithSeed {
     pub new_account: solana_program::pubkey::Pubkey,
 
@@ -52,7 +53,8 @@ impl AllocateWithSeed {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AllocateWithSeedInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/assign.rs b/clients/rust/src/generated/instructions/assign.rs
@@ -10,6 +10,7 @@ use borsh::BorshSerialize;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct Assign {
     pub account: solana_program::pubkey::Pubkey,
 }
@@ -45,7 +46,8 @@ impl Assign {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AssignInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/assign_with_seed.rs b/clients/rust/src/generated/instructions/assign_with_seed.rs
@@ -11,6 +11,7 @@ use kaigan::types::U64PrefixString;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct AssignWithSeed {
     pub account: solana_program::pubkey::Pubkey,
 
@@ -52,7 +53,8 @@ impl AssignWithSeed {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AssignWithSeedInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/authorize_nonce_account.rs b/clients/rust/src/generated/instructions/authorize_nonce_account.rs
@@ -10,6 +10,7 @@ use borsh::BorshSerialize;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct AuthorizeNonceAccount {
     pub nonce_account: solana_program::pubkey::Pubkey,
 
@@ -53,7 +54,8 @@ impl AuthorizeNonceAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct AuthorizeNonceAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/create_account.rs b/clients/rust/src/generated/instructions/create_account.rs
@@ -10,6 +10,7 @@ use borsh::BorshSerialize;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct CreateAccount {
     pub payer: solana_program::pubkey::Pubkey,
 
@@ -50,7 +51,8 @@ impl CreateAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct CreateAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/create_account_with_seed.rs b/clients/rust/src/generated/instructions/create_account_with_seed.rs
@@ -11,6 +11,7 @@ use kaigan::types::U64PrefixString;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct CreateAccountWithSeed {
     pub payer: solana_program::pubkey::Pubkey,
 
@@ -59,7 +60,8 @@ impl CreateAccountWithSeed {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct CreateAccountWithSeedInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/initialize_nonce_account.rs b/clients/rust/src/generated/instructions/initialize_nonce_account.rs
@@ -10,6 +10,7 @@ use borsh::BorshSerialize;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct InitializeNonceAccount {
     pub nonce_account: solana_program::pubkey::Pubkey,
 
@@ -59,7 +60,8 @@ impl InitializeNonceAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct InitializeNonceAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/transfer_sol.rs b/clients/rust/src/generated/instructions/transfer_sol.rs
@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;
 use borsh::BorshSerialize;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct TransferSol {
     pub source: solana_program::pubkey::Pubkey,
 
@@ -50,7 +51,8 @@ impl TransferSol {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct TransferSolInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/transfer_sol_with_seed.rs b/clients/rust/src/generated/instructions/transfer_sol_with_seed.rs
@@ -11,6 +11,7 @@ use kaigan::types::U64PrefixString;
 use solana_program::pubkey::Pubkey;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct TransferSolWithSeed {
     pub source: solana_program::pubkey::Pubkey,
 
@@ -60,7 +61,8 @@ impl TransferSolWithSeed {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct TransferSolWithSeedInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/upgrade_nonce_account.rs b/clients/rust/src/generated/instructions/upgrade_nonce_account.rs
@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;
 use borsh::BorshSerialize;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct UpgradeNonceAccount {
     pub nonce_account: solana_program::pubkey::Pubkey,
 }
@@ -40,7 +41,8 @@ impl UpgradeNonceAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct UpgradeNonceAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/instructions/withdraw_nonce_account.rs b/clients/rust/src/generated/instructions/withdraw_nonce_account.rs
@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;
 use borsh::BorshSerialize;
 
 /// Accounts.
+#[derive(Debug)]
 pub struct WithdrawNonceAccount {
     pub nonce_account: solana_program::pubkey::Pubkey,
 
@@ -70,7 +71,8 @@ impl WithdrawNonceAccount {
     }
 }
 
-#[derive(BorshDeserialize, BorshSerialize)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct WithdrawNonceAccountInstructionData {
     discriminator: u32,
 }
diff --git a/clients/rust/src/generated/mod.rs b/clients/rust/src/generated/mod.rs
@@ -9,6 +9,7 @@ pub mod accounts;
 pub mod errors;
 pub mod instructions;
 pub mod programs;
+pub mod shared;
 pub mod types;
 
 pub(crate) use programs::*;
diff --git a/clients/rust/src/generated/shared.rs b/clients/rust/src/generated/shared.rs
@@ -0,0 +1,21 @@
+//! 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.
+//!
+//! <https://github.com/codama-idl/codama>
+//!
+
+#[cfg(feature = "fetch")]
+#[derive(Debug, Clone)]
+pub struct DecodedAccount<T> {
+    pub address: solana_program::pubkey::Pubkey,
+    pub account: solana_sdk::account::Account,
+    pub data: T,
+}
+
+#[cfg(feature = "fetch")]
+#[derive(Debug, Clone)]
+pub enum MaybeAccount<T> {
+    Exists(DecodedAccount<T>),
+    NotFound(solana_program::pubkey::Pubkey),
+}
diff --git a/codama.mjs b/codama.mjs
@@ -0,0 +1,28 @@
+import path from 'node:path';
+
+const { default: prettierOptions } = await import(
+  path.resolve('clients', 'js', '.prettierrc.json'),
+  { with: { type: 'json' } }
+);
+
+export default {
+  idl: 'program/idl.json',
+  before: [],
+  scripts: {
+    js: {
+      from: '@codama/renderers-js',
+      args: ['clients/js/src/generated', { prettierOptions }],
+    },
+    rust: {
+      from: '@codama/renderers-rust',
+      args: [
+        'clients/rust/src/generated',
+        {
+          anchorTraits: false,
+          crateFolder: 'clients/rust',
+          formatCode: true,
+        },
+      ],
+    },
+  },
+};
diff --git a/package.json b/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/scripts/helpers/generate-clients.mts b/scripts/helpers/generate-clients.mts

Original file line number	Diff line number	Diff line change
`@@ -44,3 +44,9 @@ impl solana_program::program_error::PrintProgramError for SystemError {`
`44`	`44`	`solana_program::msg!(&self.to_string());`
`45`	`45`	`}`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+impl<T> solana_program::decode_error::DecodeError<T> for SystemError {`
	`49`	`+ fn type_of() -> &'static str {`
	`50`	`+ "SystemError"`
	`51`	`+ }`
	`52`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ use borsh::BorshDeserialize;`
`9`	`9`	`use borsh::BorshSerialize;`
`10`	`10`
`11`	`11`	`/// Accounts.`
	`12`	`+#[derive(Debug)]`
`12`	`13`	`pub struct AdvanceNonceAccount {`
`13`	`14`	`pub nonce_account: solana_program::pubkey::Pubkey,`
`14`	`15`
`@@ -52,7 +53,8 @@ impl AdvanceNonceAccount {`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`
`55`		`-#[derive(BorshDeserialize, BorshSerialize)]`
	`56`	`+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]`
	`57`	`+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
`56`	`58`	`pub struct AdvanceNonceAccountInstructionData {`
`57`	`59`	`discriminator: u32,`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ use kaigan::types::U64PrefixString;`
`11`	`11`	`use solana_program::pubkey::Pubkey;`
`12`	`12`
`13`	`13`	`/// Accounts.`
	`14`	`+#[derive(Debug)]`
`14`	`15`	`pub struct AllocateWithSeed {`
`15`	`16`	`pub new_account: solana_program::pubkey::Pubkey,`
`16`	`17`
`@@ -52,7 +53,8 @@ impl AllocateWithSeed {`
`52`	`53`	`}`
`53`	`54`	`}`
`54`	`55`
`55`		`-#[derive(BorshDeserialize, BorshSerialize)]`
	`56`	`+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]`
	`57`	`+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
`56`	`58`	`pub struct AllocateWithSeedInstructionData {`
`57`	`59`	`discriminator: u32,`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ use borsh::BorshSerialize;`
`10`	`10`	`use solana_program::pubkey::Pubkey;`
`11`	`11`
`12`	`12`	`/// Accounts.`
	`13`	`+#[derive(Debug)]`
`13`	`14`	`pub struct Assign {`
`14`	`15`	`pub account: solana_program::pubkey::Pubkey,`
`15`	`16`	`}`
`@@ -45,7 +46,8 @@ impl Assign {`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
`48`		`-#[derive(BorshDeserialize, BorshSerialize)]`
	`49`	`+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]`
	`50`	`+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]`
`49`	`51`	`pub struct AssignInstructionData {`
`50`	`52`	`discriminator: u32,`
`51`	`53`	`}`