@metaplex-foundation/kinobi 0.14.0 → 0.15.1

package/dist/cjs/renderers/rust/GetRustTypeManifestVisitor.js

@@ -48,7 +48,9 @@ class GetRustTypeManifestVisitor {
         this.parentName = null;
         return {
             ...manifest,
-            type: `#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]\n${manifest.type}`,
+            type: '#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]\n' +
+                '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
+                `${manifest.type}`,
         };
     }
     visitAccountData(accountData) {
@@ -92,8 +94,12 @@ class GetRustTypeManifestVisitor {
         }
         return {
             ...manifest,
-            type: `#[derive(${traits.join(', ')})]\n${manifest.type}`,
-            nestedStructs: manifest.nestedStructs.map((struct) => `#[derive(${traits.join(', ')})]\n${struct}`),
+            type: `#[derive(${traits.join(', ')})]\n` +
+                '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
+                `${manifest.type}`,
+            nestedStructs: manifest.nestedStructs.map((struct) => `#[derive(${traits.join(', ')})]\n` +
+                '#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]\n' +
+                `${struct}`),
         };
     }
     visitError() {
@@ -262,11 +268,16 @@ class GetRustTypeManifestVisitor {
         this.nestedStruct = originalNestedStruct;
         const fieldName = (0, shared_1.snakeCase)(structFieldType.name);
         const docblock = this.createDocblock(structFieldType.docs);
+        let derive = '';
+        if (fieldManifest.type === 'Pubkey') {
+            derive =
+                '#[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::DisplayFromStr>"))]\n';
+        }
         return {
             ...fieldManifest,
             type: this.inlineStruct
-                ? `${docblock}${fieldName}: ${fieldManifest.type},`
-                : `${docblock}pub ${fieldName}: ${fieldManifest.type},`,
+                ? `${docblock}${derive}${fieldName}: ${fieldManifest.type},`
+                : `${docblock}${derive}pub ${fieldName}: ${fieldManifest.type},`,
         };
     }
     visitTupleType(tupleType) {

package/dist/cjs/renderers/rust/GetRustTypeManifestVisitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetRustTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/GetRustTypeManifestVisitor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GetRustTypeManifestVisitor.js","sourceRoot":"","sources":["../../../../src/renderers/rust/GetRustTypeManifestVisitor.ts"],"names":[],"mappings":"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"}

package/dist/cjs/renderers/rust/templates/accountsMod.njk

@@ -3,11 +3,11 @@
 {% block main %}
 
 {% for account in accountsToExport | sort(false, false, 'name') %}
-pub mod {{ account.name | snakeCase }};
+  pub(crate) mod {{ account.name | snakeCase }};
 {% endfor %}
 
 {% for account in accountsToExport | sort(false, false, 'name') %}
-pub use self::{{ account.name | snakeCase }}::*;
+  pub use self::{{ account.name | snakeCase }}::*;
 {% endfor %}
 
 {% endblock %}

package/dist/cjs/renderers/rust/templates/accountsPage.njk

@@ -12,25 +12,23 @@
 {{ nestedStruct }}
 {% endfor %}
 
-{% if account.size != null or seeds.length > 0 %}
 impl {{ account.name | pascalCase }} {
   {% if account.size != null %}
     pub const LEN: usize = {{ account.size }};
   {% endif %}
 
   {% if seeds.length > 0 %}
-    pub fn find_pda(
-    {% if hasVariableSeeds %}
-        {% for seed in seeds %}
-          {% if seed.kind == 'variable' and seed.type.kind == 'publicKeyTypeNode' %}
-            {{ seed.name | snakeCase }}: &{{ seed.typeManifest.type }},
-          {% elif seed.kind === 'variable' %}
-            {{ seed.name | snakeCase }}: {{ seed.typeManifest.type }},
-          {% endif %}
-        {% endfor %}
-    {% endif %}
-    ) -> (solana_program::pubkey::Pubkey, u8) {
-      solana_program::pubkey::Pubkey::find_program_address(
+    pub fn create_pda(
+      {% if hasVariableSeeds %}
+          {% for seed in seeds %}
+            {% if seed.kind === 'variable' %}
+              {{ seed.name | snakeCase }}: {{ seed.typeManifest.type }},
+            {% endif %}
+          {% endfor %}
+      {% endif %}
+      bump: u8,
+    ) -> Result<solana_program::pubkey::Pubkey, solana_program::pubkey::PubkeyError> {
+      solana_program::pubkey::Pubkey::create_program_address(
         &[
           {% for seed in seeds %}
             {% if seed.kind === 'programId' %}
@@ -43,21 +41,24 @@ impl {{ account.name | pascalCase }} {
               {{ seed.name | snakeCase }}.to_string().as_ref(),
             {% endif %}
           {% endfor %}
+          &[bump],
         ],
         &crate::{{ program.name | snakeCase | upper }}_ID,
       )
     }
-    pub fn create_pda(
-      {% if hasVariableSeeds %}
-          {% for seed in seeds %}
-            {% if seed.kind === 'variable' %}
-              {{ seed.name | snakeCase }}: {{ seed.typeManifest.type }},
-            {% endif %}
-          {% endfor %}
-      {% endif %}
-      bump: u8,
-    ) -> Result<solana_program::pubkey::Pubkey, solana_program::pubkey::PubkeyError> {
-      solana_program::pubkey::Pubkey::create_program_address(
+
+    pub fn find_pda(
+    {% if hasVariableSeeds %}
+        {% for seed in seeds %}
+          {% if seed.kind == 'variable' and seed.type.kind == 'publicKeyTypeNode' %}
+            {{ seed.name | snakeCase }}: &{{ seed.typeManifest.type }},
+          {% elif seed.kind === 'variable' %}
+            {{ seed.name | snakeCase }}: {{ seed.typeManifest.type }},
+          {% endif %}
+        {% endfor %}
+    {% endif %}
+    ) -> (solana_program::pubkey::Pubkey, u8) {
+      solana_program::pubkey::Pubkey::find_program_address(
         &[
           {% for seed in seeds %}
             {% if seed.kind === 'programId' %}
@@ -70,19 +71,23 @@ impl {{ account.name | pascalCase }} {
               {{ seed.name | snakeCase }}.to_string().as_ref(),
             {% endif %}
           {% endfor %}
-          &[bump],
         ],
         &crate::{{ program.name | snakeCase | upper }}_ID,
       )
     }
   {% endif %}
+
+  #[inline(always)]
+  pub fn from_bytes(data: &[u8]) -> Result<Self, std::io::Error> {
+    let mut data = data;
+    Self::deserialize(&mut data)
+  }
 }
-{% endif %}
 
-impl<'a> TryFrom<&'a solana_program::account_info::AccountInfo<'a>> for {{ account.name | pascalCase }} {
+impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for {{ account.name | pascalCase }} {
   type Error = std::io::Error;
 
-  fn try_from(account_info: &'a solana_program::account_info::AccountInfo<'a>) -> Result<Self, Self::Error> {
+  fn try_from(account_info: &solana_program::account_info::AccountInfo<'a>) -> Result<Self, Self::Error> {
       let mut data: &[u8] = &(*account_info.data).borrow();
       Self::deserialize(&mut data)
   }

package/dist/cjs/renderers/rust/templates/definedTypesMod.njk

@@ -3,11 +3,11 @@
 {% block main %}
 
 {% for definedType in definedTypesToExport | sort(false, false, 'name') %}
-pub mod {{ definedType.name | snakeCase }};
+  pub(crate) mod {{ definedType.name | snakeCase }};
 {% endfor %}
 
 {% for definedType in definedTypesToExport | sort(false, false, 'name') %}
-pub use self::{{ definedType.name | snakeCase }}::*;
+  pub use self::{{ definedType.name | snakeCase }}::*;
 {% endfor %}
 
 {% endblock %}

package/dist/cjs/renderers/rust/templates/errorsMod.njk

@@ -4,7 +4,7 @@
 
 {% for program in programsToExport | sort(false, false, 'name') %}
   {% if program.errors.length > 0 %}
-    pub mod {{ program.name | snakeCase }};
+    pub(crate) mod {{ program.name | snakeCase }};
   {% endif %}
 {% endfor %}
 

package/dist/cjs/renderers/rust/templates/errorsPage.njk

@@ -8,7 +8,7 @@ use thiserror::Error;
 #[derive(Clone, Debug, Eq, Error, FromPrimitive, PartialEq)]
 pub enum {{ program.name | pascalCase }}Error {
 {% for error in errors | sort(false, false, 'code') %}
-    /// 0x{{ error.code.toString(16) | upper }} - {{ error.message }}
+    /// {{ error.code }} (0x{{ error.code.toString(16) | upper }}) - {{ error.message }}
     #[error("{{ error.message }}")]
     {{ error.name | pascalCase }},
 {% endfor %}

package/dist/cjs/renderers/rust/templates/instructionsCpiPage.njk

@@ -1,16 +1,37 @@
+/// `{{ instruction.name | snakeCase }}` CPI accounts.
+pub struct {{ instruction.name | pascalCase }}CpiAccounts<'a, 'b> {
+  {% for account in instruction.accounts %}
+    {% if account.docs.length > 0 %}
+      {{ macros.docblock(account.docs) }}
+    {% endif %}
+
+    {% if account.isSigner === 'either' %}
+      {% set type = '(&\'b solana_program::account_info::AccountInfo<\'a>, bool)' %}
+    {% else %}
+      {% set type = '&\'b solana_program::account_info::AccountInfo<\'a>' %}
+    {% endif %}
+
+    {% if account.isOptional %}
+      pub {{ account.name | snakeCase }}: Option<{{ type }}>,
+    {% else %}
+      pub {{ account.name | snakeCase }}: {{ type }},
+    {% endif %}
+  {% endfor %}
+}
+
 /// `{{ instruction.name | snakeCase }}` CPI instruction.
-pub struct {{ instruction.name | pascalCase }}Cpi<'a> {
+pub struct {{ instruction.name | pascalCase }}Cpi<'a, 'b> {
   /// The program to invoke.
-  pub __program: &'a solana_program::account_info::AccountInfo<'a>,
+  pub __program: &'b solana_program::account_info::AccountInfo<'a>,
   {% for account in instruction.accounts %}
     {% if account.docs.length > 0 %}
       {{ macros.docblock(account.docs) }}
     {% endif %}
 
     {% if account.isSigner === 'either' %}
-      {% set type = '(&\'a solana_program::account_info::AccountInfo<\'a>, bool)' %}
+      {% set type = '(&\'b solana_program::account_info::AccountInfo<\'a>, bool)' %}
     {% else %}
-      {% set type = '&\'a solana_program::account_info::AccountInfo<\'a>' %}
+      {% set type = '&\'b solana_program::account_info::AccountInfo<\'a>' %}
     {% endif %}
 
     {% if account.isOptional %}
@@ -25,14 +46,44 @@ pub struct {{ instruction.name | pascalCase }}Cpi<'a> {
   {% endif %}
 }
 
-impl<'a> {{ instruction.name | pascalCase }}Cpi<'a> {
+impl<'a, 'b> {{ instruction.name | pascalCase }}Cpi<'a, 'b> {
+  pub fn new(
+    program: &'b solana_program::account_info::AccountInfo<'a>,
+    accounts: {{ instruction.name | pascalCase }}CpiAccounts<'a, 'b>,
+    {% if hasArgs %}
+      args: {{ instruction.name | pascalCase }}InstructionArgs,
+    {% endif %}
+  ) -> Self {
+    Self {
+      __program: program,
+      {% for account in instruction.accounts %}
+        {{ account.name | snakeCase }}: accounts.{{ account.name | snakeCase }},
+      {% endfor %}
+      {% if hasArgs %}
+        __args: args,
+      {% endif %}
+    }
+  }
+  #[inline(always)]
   pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult {
-    self.invoke_signed(&[])
+    self.invoke_signed_with_remaining_accounts(&[], &[])
+  }
+  #[inline(always)]
+  pub fn invoke_with_remaining_accounts(&self, remaining_accounts: &[super::InstructionAccountInfo<'a, '_>]) -> solana_program::entrypoint::ProgramResult {
+    self.invoke_signed_with_remaining_accounts(&[], remaining_accounts)
+  }
+  #[inline(always)]
+  pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program::entrypoint::ProgramResult {
+    self.invoke_signed_with_remaining_accounts(signers_seeds, &[])
   }
   #[allow(clippy::clone_on_copy)]
   #[allow(clippy::vec_init_then_push)]
-  pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program::entrypoint::ProgramResult {
-    let mut accounts = Vec::with_capacity({{ instruction.accounts.length }});
+  pub fn invoke_signed_with_remaining_accounts(
+    &self,
+    signers_seeds: &[&[&[u8]]],
+    remaining_accounts: &[super::InstructionAccountInfo<'a, '_>]
+  ) -> solana_program::entrypoint::ProgramResult {
+    let mut accounts = Vec::with_capacity({{ instruction.accounts.length }} + remaining_accounts.len());
     {% for account in instruction.accounts %}
       {% if account.isSigner === 'either' %}
         {% if account.isOptional and instruction.optionalAccountStrategy === 'programId' %}
@@ -88,6 +139,7 @@ impl<'a> {{ instruction.name | pascalCase }}Cpi<'a> {
         {% endif %}
       {% endif %}
     {% endfor %}
+    remaining_accounts.iter().for_each(|remaining_account| accounts.push(remaining_account.to_account_meta()));
     let {{ 'mut ' if hasArgs }}data = {{ instruction.name | pascalCase }}InstructionData::new().try_to_vec().unwrap();
     {% if hasArgs %}
       let mut args = self.__args.try_to_vec().unwrap();
@@ -99,7 +151,7 @@ impl<'a> {{ instruction.name | pascalCase }}Cpi<'a> {
       accounts,
       data,
     };
-    let mut account_infos = Vec::with_capacity({{ instruction.accounts.length }} + 1);
+    let mut account_infos = Vec::with_capacity({{ instruction.accounts.length }} + 1 + remaining_accounts.len());
     account_infos.push(self.__program.clone());
     {% for account in instruction.accounts %}
       {% if account.isOptional %}
@@ -110,6 +162,7 @@ impl<'a> {{ instruction.name | pascalCase }}Cpi<'a> {
         account_infos.push(self.{{ account.name | snakeCase }}{{ '.0' if account.isSigner === 'either' }}.clone());
       {% endif %}
     {% endfor %}
+    remaining_accounts.iter().for_each(|remaining_account| account_infos.push(remaining_account.account_info().clone()));
 
     if signers_seeds.is_empty() {
       solana_program::program::invoke(&instruction, &account_infos)

package/dist/cjs/renderers/rust/templates/instructionsCpiPageBuilder.njk

@@ -1,10 +1,10 @@
 /// `{{ instruction.name | snakeCase }}` CPI instruction builder.
-pub struct {{ instruction.name | pascalCase }}CpiBuilder<'a> {
-  instruction: Box<{{ instruction.name | pascalCase }}CpiBuilderInstruction<'a>>,
+pub struct {{ instruction.name | pascalCase }}CpiBuilder<'a, 'b> {
+  instruction: Box<{{ instruction.name | pascalCase }}CpiBuilderInstruction<'a, 'b>>,
 }
 
-impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
-  pub fn new(program: &'a solana_program::account_info::AccountInfo<'a>) -> Self {
+impl<'a, 'b> {{ instruction.name | pascalCase }}CpiBuilder<'a, 'b> {
+  pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self {
     let instruction = Box::new({{ instruction.name | pascalCase }}CpiBuilderInstruction {
       __program: program,
       {% for account in instruction.accounts %}
@@ -15,6 +15,7 @@ impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
           {{ arg.name | snakeCase }}: None,
         {% endif %}
       {% endfor %}
+      __remaining_accounts: Vec::new(),
     });
     Self { instruction }
   }
@@ -22,11 +23,23 @@ impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
     {{'/// `[optional account]`\n' if account.isOptional }}
     {{- macros.docblock(account.docs) -}}
     #[inline(always)]
-    pub fn {{ account.name | snakeCase }}(&mut self, {{ account.name | snakeCase }}: &'a solana_program::account_info::AccountInfo<'a>{{ ', as_signer: bool' if account.isSigner === 'either' }}) -> &mut Self {
-      {% if account.isSigner === 'either' %}
-        self.instruction.{{ account.name | snakeCase }} = Some(({{ account.name | snakeCase }}, as_signer));
+    pub fn {{ account.name | snakeCase }}(&mut self, {{ account.name | snakeCase }}: {{ "Option<&'b solana_program::account_info::AccountInfo<'a>>" if account.isOptional else "&'b solana_program::account_info::AccountInfo<'a>" }}{{ ', as_signer: bool' if account.isSigner === 'either' }}) -> &mut Self {
+      {% if account.isOptional %}
+        {% if account.isSigner === 'either' %}
+          if let Some({{ account.name | snakeCase }}) = {{ account.name | snakeCase }} {
+            self.instruction.{{ account.name | snakeCase }} = Some(({{ account.name | snakeCase }}, as_signer));
+          } else {
+            self.instruction.{{ account.name | snakeCase }} = None;
+          }
+        {% else %}
+          self.instruction.{{ account.name | snakeCase }} = {{ account.name | snakeCase }};
+        {% endif %}
       {% else %}
-        self.instruction.{{ account.name | snakeCase }} = Some({{ account.name | snakeCase }});
+        {% if account.isSigner === 'either' %}
+          self.instruction.{{ account.name | snakeCase }} = Some(({{ account.name | snakeCase }}, as_signer));
+        {% else %}
+          self.instruction.{{ account.name | snakeCase }} = Some({{ account.name | snakeCase }});
+        {% endif %}
       {% endif %}
       self
     }
@@ -43,8 +56,23 @@ impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
       }
     {% endif %}
   {% endfor %}
+  #[inline(always)]
+  pub fn add_remaining_account(&mut self, account: super::InstructionAccountInfo<'a,'b>) -> &mut Self {
+    self.instruction.__remaining_accounts.push(account);
+    self
+  }
+  #[inline(always)]
+  pub fn add_remaining_accounts(&mut self, accounts: &[super::InstructionAccountInfo<'a, 'b>]) -> &mut Self {
+    self.instruction.__remaining_accounts.extend_from_slice(accounts);
+    self
+  }
+  #[inline(always)]
+  pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult {
+    self.invoke_signed(&[])
+  }
   #[allow(clippy::clone_on_copy)]
-  pub fn build(&self) -> {{ instruction.name | pascalCase }}Cpi<'a> {
+  #[allow(clippy::vec_init_then_push)]
+  pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program::entrypoint::ProgramResult {
     {% if hasArgs %}
       let args = {{ instruction.name | pascalCase }}InstructionArgs {
         {% for arg in instructionArgs %}
@@ -62,8 +90,7 @@ impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
         {% endfor %}
       };
     {% endif %}
-
-    {{ instruction.name | pascalCase }}Cpi {
+    let instruction = {{ instruction.name | pascalCase }}Cpi {
         __program: self.instruction.__program,
         {% for account in instruction.accounts %}          
           {{ account.name | snakeCase }}: self.instruction.{{ account.name | snakeCase }}{{ '.expect(\"' + account.name | snakeCase + ' is not set\")' if not account.isOptional }},
@@ -71,22 +98,24 @@ impl<'a> {{ instruction.name | pascalCase }}CpiBuilder<'a> {
         {% if hasArgs %}
           __args: args,
         {% endif %}
-    }
+    };
+    instruction.invoke_signed_with_remaining_accounts(signers_seeds, &self.instruction.__remaining_accounts)
   }
 }
 
-struct {{ instruction.name | pascalCase }}CpiBuilderInstruction<'a> {
-  __program: &'a solana_program::account_info::AccountInfo<'a>,
-{% for account in instruction.accounts %}
-  {% if account.isSigner === 'either' %}
-    {{ account.name | snakeCase }}: Option<(&'a solana_program::account_info::AccountInfo<'a>, bool)>,
-  {% else %}
-    {{ account.name | snakeCase }}: Option<&'a solana_program::account_info::AccountInfo<'a>>,
-  {% endif %}
-{% endfor %}
-{% for arg in instructionArgs %}
-  {% if not arg.default %}
-    {{ arg.name | snakeCase }}: {{ arg.type if arg.innerOptionType else 'Option<' + arg.type + '>' }},
-  {% endif %}
-{% endfor %}
+struct {{ instruction.name | pascalCase }}CpiBuilderInstruction<'a, 'b> {
+  __program: &'b solana_program::account_info::AccountInfo<'a>,
+  {% for account in instruction.accounts %}
+    {% if account.isSigner === 'either' %}
+      {{ account.name | snakeCase }}: Option<(&'b solana_program::account_info::AccountInfo<'a>, bool)>,
+    {% else %}
+      {{ account.name | snakeCase }}: Option<&'b solana_program::account_info::AccountInfo<'a>>,
+    {% endif %}
+  {% endfor %}
+  {% for arg in instructionArgs %}
+    {% if not arg.default %}
+      {{ arg.name | snakeCase }}: {{ arg.type if arg.innerOptionType else 'Option<' + arg.type + '>' }},
+    {% endif %}
+  {% endfor %}
+  __remaining_accounts: Vec<super::InstructionAccountInfo<'a, 'b>>,
 }

package/dist/cjs/renderers/rust/templates/instructionsMod.njk

@@ -3,11 +3,70 @@
 {% block main %}
 
 {% for instruction in instructionsToExport | sort(false, false, 'name') %}
-pub mod {{ instruction.name | snakeCase }};
+  pub(crate) mod {{ instruction.name | snakeCase }};
 {% endfor %}
 
 {% for instruction in instructionsToExport | sort(false, false, 'name') %}
-pub use self::{{ instruction.name | snakeCase }}::*;
+  pub use self::{{ instruction.name | snakeCase }}::*;
 {% endfor %}
 
+#[derive(Clone, Copy)]
+pub enum InstructionAccount {
+  Readonly(solana_program::pubkey::Pubkey),
+  ReadonlySigner(solana_program::pubkey::Pubkey),
+  Writable(solana_program::pubkey::Pubkey),
+  WritableSigner(solana_program::pubkey::Pubkey),
+}
+
+impl InstructionAccount {
+  pub fn to_account_meta(&self) -> solana_program::instruction::AccountMeta {
+    let (pubkey, writable, signer) = match self {
+      InstructionAccount::Readonly(pubkey) => (pubkey, false, false),
+      InstructionAccount::ReadonlySigner(pubkey) => (pubkey, false, true),
+      InstructionAccount::Writable(pubkey) => (pubkey, true, false),
+      InstructionAccount::WritableSigner(pubkey) => (pubkey, true, true),
+    };
+
+    if writable {
+      solana_program::instruction::AccountMeta::new(*pubkey, signer)
+    } else {
+      solana_program::instruction::AccountMeta::new_readonly(*pubkey, signer)
+    }
+  }
+}
+
+#[derive(Clone, Copy)]
+pub enum InstructionAccountInfo<'a, 'b> {
+  Readonly(&'b solana_program::account_info::AccountInfo<'a>),
+  ReadonlySigner(&'b solana_program::account_info::AccountInfo<'a>),
+  Writable(&'b solana_program::account_info::AccountInfo<'a>),
+  WritableSigner(&'b solana_program::account_info::AccountInfo<'a>),
+}
+
+impl<'a, 'b> InstructionAccountInfo<'a, 'b> {
+  pub fn to_account_meta(&self) -> solana_program::instruction::AccountMeta {
+    let (pubkey, writable, signer) = match self {
+      InstructionAccountInfo::Readonly(account_info) => (account_info.key, false, false),
+      InstructionAccountInfo::ReadonlySigner(account_info) => (account_info.key, false, true),
+      InstructionAccountInfo::Writable(account_info) => (account_info.key, true, false),
+      InstructionAccountInfo::WritableSigner(account_info) => (account_info.key, true, true),
+    };
+
+    if writable {
+      solana_program::instruction::AccountMeta::new(*pubkey, signer)
+    } else {
+      solana_program::instruction::AccountMeta::new_readonly(*pubkey, signer)
+    }
+  }
+  pub fn account_info(&self) -> &'b solana_program::account_info::AccountInfo<'a> {
+    match self {
+      InstructionAccountInfo::Readonly(account_info)
+        | InstructionAccountInfo::ReadonlySigner(account_info)
+        | InstructionAccountInfo::Writable(account_info)
+        | InstructionAccountInfo::WritableSigner(account_info)
+      => account_info,
+    }
+  }
+}
+
 {% endblock %}

package/dist/cjs/renderers/rust/templates/instructionsPage.njk

@@ -7,29 +7,32 @@
 
 /// Accounts.
 pub struct {{ instruction.name | pascalCase }} {
-{% for account in instruction.accounts %}
-  {% if account.docs.length > 0 %}
-    {{ macros.docblock(account.docs) }}
-  {% endif %}
+  {% for account in instruction.accounts %}
+    {% if account.docs.length > 0 %}
+      {{ macros.docblock(account.docs) }}
+    {% endif %}
 
-  {% if account.isSigner === 'either' %}
-    {% set type = '(solana_program::pubkey::Pubkey, bool)' %}
-  {% else %}
-    {% set type = 'solana_program::pubkey::Pubkey' %}
-  {% endif %}
+    {% if account.isSigner === 'either' %}
+      {% set type = '(solana_program::pubkey::Pubkey, bool)' %}
+    {% else %}
+      {% set type = 'solana_program::pubkey::Pubkey' %}
+    {% endif %}
 
-  {% if account.isOptional %}
-    pub {{ account.name | snakeCase }}: Option<{{ type }}>,
-  {% else %}
-    pub {{ account.name | snakeCase }}: {{ type }},
-  {% endif %}
-{% endfor %}
+    {% if account.isOptional %}
+      pub {{ account.name | snakeCase }}: Option<{{ type }}>,
+    {% else %}
+      pub {{ account.name | snakeCase }}: {{ type }},
+    {% endif %}
+  {% endfor %}
 }
 
 impl {{ instruction.name | pascalCase }} {
-  #[allow(clippy::vec_init_then_push)]
   pub fn instruction(&self{{ ', args: ' + instruction.name | pascalCase + 'InstructionArgs' if hasArgs }}) -> solana_program::instruction::Instruction {
-    let mut accounts = Vec::with_capacity({{ instruction.accounts.length }});
+    self.instruction_with_remaining_accounts({{ 'args, ' if hasArgs }}&[])
+  }
+  #[allow(clippy::vec_init_then_push)]
+  pub fn instruction_with_remaining_accounts(&self{{ ', args: ' + instruction.name | pascalCase + 'InstructionArgs' if hasArgs }}, remaining_accounts: &[super::InstructionAccount]) -> solana_program::instruction::Instruction {
+    let mut accounts = Vec::with_capacity({{ instruction.accounts.length }} + remaining_accounts.len());
     {% for account in instruction.accounts %}
       {% if account.isSigner === 'either' %}
         {% if account.isOptional %}
@@ -89,6 +92,7 @@ impl {{ instruction.name | pascalCase }} {
         {% endif %}
       {% endif %}
     {% endfor %}
+    remaining_accounts.iter().for_each(|remaining_account| accounts.push(remaining_account.to_account_meta()));
     let {{ 'mut ' if hasArgs }}data = {{ instruction.name | pascalCase }}InstructionData::new().try_to_vec().unwrap();
     {% if hasArgs %}
       let mut args = args.try_to_vec().unwrap();
@@ -125,7 +129,8 @@ impl {{ instruction.name | pascalCase }}InstructionData {
 }
 
 {% if hasArgs %}
-#[derive(BorshSerialize, BorshDeserialize, Debug)]
+#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct {{ instruction.name | pascalCase }}InstructionArgs {
   {% for arg in instructionArgs %}
     {% if not arg.default %}
@@ -137,6 +142,7 @@ pub struct {{ instruction.name | pascalCase }}InstructionArgs {
 
 {% for nestedStruct in typeManifest.nestedStructs %}
 #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 {{ nestedStruct }}
 {% endfor %}