add codama macros

Author: samkim-crypto

Cargo.lock

@@ -12,6 +12,7 @@ no-entrypoint = []
 
 [dependencies]
 bytemuck = { version = "1.23.1", features = ["derive"] }
+codama = "0.6.3"
 num-derive = "0.4"
 num-traits = "0.2"
 solana-account-info = "3.0.0"

program/Cargo.toml

@@ -1,9 +1,12 @@
 //! Error types
 
-use {num_derive::FromPrimitive, solana_program_error::ProgramError, thiserror::Error};
+use {
+    codama::CodamaErrors, num_derive::FromPrimitive, solana_program_error::ProgramError,
+    thiserror::Error,
+};
 
 /// Errors that may be returned by the program.
-#[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
+#[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq, CodamaErrors)]
 pub enum RecordError {
     /// Incorrect authority provided on update or delete
     #[error("Incorrect authority provided on update or delete")]

program/src/error.rs

@@ -2,21 +2,24 @@
 
 use {
     crate::id,
+    codama::{codama, CodamaInstructions},
     solana_instruction::{AccountMeta, Instruction},
     solana_program_error::ProgramError,
     solana_pubkey::Pubkey,
     std::mem::size_of,
 };
 
 /// Instructions supported by the program
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, CodamaInstructions)]
 pub enum RecordInstruction<'a> {
     /// Create a new record
     ///
     /// Accounts expected by this instruction:
     ///
     /// 0. `[writable]` Record account, must be uninitialized
     /// 1. `[]` Record authority
+    #[codama(account(name = "record_account", writable))]
+    #[codama(account(name = "authority"))]
     Initialize,
 
     /// Write to the provided record account
@@ -25,10 +28,14 @@ pub enum RecordInstruction<'a> {
     ///
     /// 0. `[writable]` Record account, must be previously initialized
     /// 1. `[signer]` Current record authority
+    #[codama(account(name = "record_account", writable))]
+    #[codama(account(name = "authority", signer))]
     Write {
         /// Offset to start writing record, expressed as `u64`.
         offset: u64,
         /// Data to replace the existing record data
+        #[codama(type = bytes)]
+        #[codama(size_prefix = number(u32))]
         data: &'a [u8],
     },
 
@@ -39,6 +46,9 @@ pub enum RecordInstruction<'a> {
     /// 0. `[writable]` Record account, must be previously initialized
     /// 1. `[signer]` Current record authority
     /// 2. `[]` New record authority
+    #[codama(account(name = "record_account", writable))]
+    #[codama(account(name = "authority", signer))]
+    #[codama(account(name = "new_authority"))]
     SetAuthority,
 
     /// Close the provided record account, draining lamports to recipient
@@ -49,6 +59,9 @@ pub enum RecordInstruction<'a> {
     /// 0. `[writable]` Record account, must be previously initialized
     /// 1. `[signer]` Record authority
     /// 2. `[]` Receiver of account lamports
+    #[codama(account(name = "record_account", writable))]
+    #[codama(account(name = "authority", signer))]
+    #[codama(account(name = "receiver", writable))]
     CloseAccount,
 
     /// Reallocate additional space in a record account
@@ -60,6 +73,8 @@ pub enum RecordInstruction<'a> {
     ///
     /// 0. `[writable]` The record account to reallocate
     /// 1. `[signer]` The account's owner
+    #[codama(account(name = "record_account", writable))]
+    #[codama(account(name = "authority", signer))]
     Reallocate {
         /// The length of the data to hold in the record account excluding meta
         /// data

program/src/instruction.rs

@@ -1,15 +1,18 @@
 //! Program state
 use {
     bytemuck::{Pod, Zeroable},
+    codama::{codama, CodamaAccount},
     solana_program_pack::IsInitialized,
     solana_pubkey::Pubkey,
 };
 
 /// Header type for recorded account data
 #[repr(C)]
-#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)]
+#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable, CodamaAccount)]
+#[codama(discriminator(field = "version"))]
 pub struct RecordData {
     /// Struct version, allows for upgrades to the program
+    #[codama(default_value = 1)]
     pub version: u8,
 
     /// The account allowed to update the data