feat: add CommitFinalizeFromBuffer

Author: snawaz

src/args/commit_state.rs

@@ -41,6 +41,18 @@ pub struct CommitStateFromBufferArgs {
     pub allow_undelegation: bool,
 }
 
+#[derive(Default, Debug, BorshSerialize, BorshDeserialize)]
+pub struct CommitFinalizeFromBufferArgs {
+    /// "Nonce" of an account. Updates are submitted historically and nonce incremented by 1
+    /// Deprecated: The ephemeral slot at which the account data is committed
+    pub nonce: u64,
+    /// The lamports that the account holds in the ephemeral validator
+    pub lamports: u64,
+    /// Whether the account can be undelegated after the commit completes
+    pub allow_undelegation: u8, // 0 (false) or 1 (true)
+    pub data_is_diff: u8, // 0 (false) or 1 (true)
+}
+
 #[derive(Default, Debug, BorshSerialize)]
 pub struct CommitDiffArgs {
     /// The account diff

src/discriminator.rs

@@ -41,6 +41,8 @@ pub enum DlpDiscriminator {
     CommitDiffFromBuffer = 17,
     /// See [crate::processor::process_commit_finalize] for docs.
     CommitFinalize = 18,
+    /// See [crate::processor::process_commit_finalize_from_buffer] for docs.
+    CommitFinalizeFromBuffer = 19,
 }
 
 impl DlpDiscriminator {

src/instruction_builder/commit_finalize_from_buffer.rs

@@ -0,0 +1,66 @@
+use borsh::to_vec;
+use solana_program::instruction::Instruction;
+use solana_program::system_program;
+use solana_program::{instruction::AccountMeta, pubkey::Pubkey};
+
+use crate::args::CommitFinalizeFromBufferArgs;
+use crate::discriminator::DlpDiscriminator;
+use crate::pda::{
+    delegation_metadata_pda_from_delegated_account, delegation_record_pda_from_delegated_account,
+    program_config_from_program_id, validator_fees_vault_pda_from_validator,
+};
+use crate::{total_size_budget, AccountSizeClass, DLP_PROGRAM_DATA_SIZE_CLASS};
+
+/// Builds a commit state from buffer instruction.
+/// See [crate::processor::process_commit_diff_from_buffer] for docs.
+pub fn commit_finalize_from_buffer(
+    validator: Pubkey,
+    delegated_account: Pubkey,
+    delegated_account_owner: Pubkey,
+    data_buffer: Pubkey,
+    commit_args: CommitFinalizeFromBufferArgs,
+) -> Instruction {
+    let commit_args = to_vec(&commit_args).unwrap();
+    let delegation_record_pda = delegation_record_pda_from_delegated_account(&delegated_account);
+    let validator_fees_vault_pda = validator_fees_vault_pda_from_validator(&validator);
+    let delegation_metadata_pda =
+        delegation_metadata_pda_from_delegated_account(&delegated_account);
+    let program_config_pda = program_config_from_program_id(&delegated_account_owner);
+    Instruction {
+        program_id: crate::id(),
+        accounts: vec![
+            AccountMeta::new_readonly(validator, true),
+            AccountMeta::new_readonly(delegated_account, false),
+            AccountMeta::new_readonly(delegation_record_pda, false),
+            AccountMeta::new(delegation_metadata_pda, false),
+            AccountMeta::new_readonly(data_buffer, false),
+            AccountMeta::new_readonly(validator_fees_vault_pda, false),
+            AccountMeta::new_readonly(program_config_pda, false),
+            AccountMeta::new_readonly(system_program::id(), false),
+        ],
+        data: [
+            DlpDiscriminator::CommitFinalizeFromBuffer.to_vec(),
+            commit_args,
+        ]
+        .concat(),
+    }
+}
+
+///
+/// Returns accounts-data-size budget for commit_diff_from_buffer instruction.
+///
+/// This value can be used with ComputeBudgetInstruction::SetLoadedAccountsDataSizeLimit
+///
+pub fn commit_finalize_from_buffer_size_budget(delegated_account: AccountSizeClass) -> u32 {
+    total_size_budget(&[
+        DLP_PROGRAM_DATA_SIZE_CLASS,
+        AccountSizeClass::Tiny, // validator
+        delegated_account,      // delegated_account
+        AccountSizeClass::Tiny, // delegation_record_pda
+        AccountSizeClass::Tiny, // delegation_metadata_pda
+        delegated_account,      // data_buffer
+        AccountSizeClass::Tiny, // validator_fees_vault_pda
+        AccountSizeClass::Tiny, // program_config_pda
+        AccountSizeClass::Tiny, // system_program
+    ])
+}

src/instruction_builder/mod.rs

@@ -4,6 +4,7 @@ mod close_validator_fees_vault;
 mod commit_diff;
 mod commit_diff_from_buffer;
 mod commit_finalize;
+mod commit_finalize_from_buffer;
 mod commit_state;
 mod commit_state_from_buffer;
 mod delegate;
@@ -23,6 +24,7 @@ pub use close_validator_fees_vault::*;
 pub use commit_diff::*;
 pub use commit_diff_from_buffer::*;
 pub use commit_finalize::*;
+pub use commit_finalize_from_buffer::*;
 pub use commit_state::*;
 pub use commit_state_from_buffer::*;
 pub use delegate::*;

src/lib.rs

@@ -116,6 +116,9 @@ pub fn fast_process_instruction(
         DlpDiscriminator::CommitFinalize => Some(processor::fast::process_commit_finalize(
             program_id, accounts, data,
         )),
+        DlpDiscriminator::CommitFinalizeFromBuffer => Some(
+            processor::fast::process_commit_finalize_from_buffer(program_id, accounts, data),
+        ),
         DlpDiscriminator::Finalize => Some(processor::fast::process_finalize(
             program_id, accounts, data,
         )),

src/processor/fast/commit_finalize_from_buffer.rs

@@ -0,0 +1,86 @@
+use borsh::BorshDeserialize;
+use pinocchio::{
+    account_info::AccountInfo, program_error::ProgramError, pubkey::Pubkey, ProgramResult,
+};
+use pinocchio_log::log;
+
+use crate::args::CommitFinalizeFromBufferArgs;
+use crate::processor::fast::{
+    commit_finalize_internal::{process_commit_finalize_internal, CommitFinalizeInternalArgs},
+    NewState,
+};
+use crate::{require_n_accounts, DiffSet};
+
+/// Commit a new state of a delegated PDA
+///
+/// Accounts:
+///
+/// 0: `[signer]`   the validator requesting the commit
+/// 1: `[]`         the delegated account
+/// 2: `[writable]` the PDA storing the new state
+/// 3: `[writable]` the PDA storing the commit record
+/// 4: `[]`         the delegation record
+/// 5: `[writable]` the delegation metadata
+/// 6: `[]`         the validator fees vault
+/// 7: `[]`         the program config account
+///
+/// Requirements:
+///
+/// - delegation record is initialized
+/// - delegation metadata is initialized
+/// - validator fees vault is initialized
+/// - program config is initialized
+/// - commit state is uninitialized
+/// - commit record is uninitialized
+/// - delegated account holds at least the lamports indicated in the delegation record
+/// - account was not committed at a later slot
+///
+/// Steps:
+/// 1. Check that the pda is delegated
+/// 2. Init a new PDA to store the new state
+/// 3. Copy the new state to the new PDA
+/// 4. Init a new PDA to store the record of the new state commitment
+pub fn process_commit_finalize_from_buffer(
+    _program_id: &Pubkey,
+    accounts: &[AccountInfo],
+    data: &[u8],
+) -> ProgramResult {
+    let [
+        validator, // force multi-line
+        delegated_account,
+        delegation_record_account,
+        delegation_metadata_account,
+        data_account, // full bytes or diff 
+        validator_fees_vault,
+        program_config_account,
+        _system_program,
+    ] = require_n_accounts!(accounts, 8);
+
+    let args = CommitFinalizeFromBufferArgs::try_from_slice(data)
+        .map_err(|_| ProgramError::BorshIoError)?;
+
+    let data = data_account.try_borrow_data()?;
+    let commit_args = CommitFinalizeInternalArgs {
+        new_state: match args.data_is_diff {
+            0 => NewState::FullBytes(&data),
+            1 => {
+                let diffset = DiffSet::try_new(data.as_ref())?;
+                if diffset.segments_count() == 0 {
+                    log!("WARN: noop; empty diff sent");
+                }
+                NewState::Diff(diffset)
+            }
+            _ => return Err(ProgramError::InvalidInstructionData),
+        },
+        commit_record_nonce: args.nonce,
+        allow_undelegation: args.allow_undelegation == 1,
+        validator,
+        delegated_account,
+        delegation_record_account,
+        delegation_metadata_account,
+        validator_fees_vault,
+        program_config_account,
+    };
+
+    process_commit_finalize_internal(commit_args)
+}

src/processor/fast/mod.rs

@@ -1,6 +1,7 @@
 mod commit_diff;
 mod commit_diff_from_buffer;
 mod commit_finalize;
+mod commit_finalize_from_buffer;
 mod commit_finalize_internal;
 mod commit_state;
 mod commit_state_from_buffer;
@@ -12,6 +13,7 @@ mod utils;
 pub use commit_diff::*;
 pub use commit_diff_from_buffer::*;
 pub use commit_finalize::*;
+pub use commit_finalize_from_buffer::*;
 pub use commit_state::*;
 pub use commit_state_from_buffer::*;
 pub use delegate::*;