Add execution report buffer

Integration tests

Integration tests

Author: PabloMansanet

chains/solana/contracts/Anchor.toml

@@ -22,6 +22,7 @@ test_ccip_receiver = "EvhgrPhTDt4LcSPS2kfJgH6T6XWZ6wT3X9ncDGLT1vui"
 test_token_pool = "JuCcZ4smxAYv9QHJ36jshA7pA3FuQ3vQeWLUeAtZduJ"
 timelock = "DoajfR5tK24xVw51fWcawUZWhAXD8yrBJVacc13neVQA"
 ping_pong_demo = "PPbZmYFf5SPAM9Jhm9mNmYoCwT7icPYVKAfJoMCQovU"
+execution_buffer = "buffGjr75PtEtV6D3pbKhaq59CR2qp4mwZDYGspggxZ"
 
 [registry]
 url = "https://anchor.projectserum.com"

chains/solana/contracts/Cargo.lock

@@ -12,6 +12,7 @@ pub const CURSES: &[u8] = b"curses";
 pub const DEST_CHAIN_STATE: &[u8] = b"dest_chain_state";
 pub const NONCE: &[u8] = b"nonce";
 pub const ALLOWED_OFFRAMP: &[u8] = b"allowed_offramp";
+pub const EXECUTION_BUFFER: &[u8] = b"execution_buffer";
 
 // arbitrary messaging signer
 pub const EXTERNAL_EXECUTION_CONFIG: &[u8] = b"external_execution_config";

chains/solana/contracts/programs/ccip-common/src/seed.rs

@@ -0,0 +1,25 @@
+[package]
+name = "execution_buffer"
+version = "0.1.0-dev"
+description = "Created with Anchor"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "execution_buffer"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+
+[dependencies]
+solana-program = "1.17.25" # pin solana to 1.17
+anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
+anchor-spl = "0.29.0"
+bytemuck = "1.7"
+ethnum = "1.5"
+ccip_common = {path = "../ccip-common"}
+ccip_offramp = {path = "../ccip-offramp", features = ["cpi"]}

chains/solana/contracts/programs/execution-buffer/Cargo.toml

@@ -0,0 +1,113 @@
+use crate::state::BufferedReport;
+use anchor_lang::prelude::*;
+use ccip_common::seed;
+
+pub const ANCHOR_DISCRIMINATOR: usize = 8; // size in bytes
+
+#[derive(Accounts)]
+#[instruction(buffer_id: u64, data: Vec<u8>)]
+pub struct AppendExecutionReportData<'info> {
+    #[account(
+        mut,
+        seeds = [seed::EXECUTION_BUFFER, authority.key().as_ref(), &buffer_id.to_le_bytes()],
+        bump,
+        realloc = ANCHOR_DISCRIMINATOR + BufferedReport::INIT_SPACE + buffered_report.raw_report_data.len() + data.len(),
+        realloc::payer = authority,
+        realloc::zero = false
+    )]
+    pub buffered_report: Account<'info, BufferedReport>,
+
+    #[account(mut)]
+    pub authority: Signer<'info>,
+    pub system_program: Program<'info, System>,
+}
+
+#[derive(Accounts)]
+#[instruction(buffer_id: u64)]
+pub struct InitializeExecutionReportBuffer<'info> {
+    #[account(
+        init,
+        seeds = [seed::EXECUTION_BUFFER, authority.key().as_ref(), &buffer_id.to_le_bytes()],
+        bump,
+        space = ANCHOR_DISCRIMINATOR + BufferedReport::INIT_SPACE,
+        payer = authority,
+    )]
+    pub buffered_report: Account<'info, BufferedReport>,
+
+    #[account(mut)]
+    pub authority: Signer<'info>,
+    pub system_program: Program<'info, System>,
+}
+
+#[derive(Accounts)]
+#[instruction(buffer_id: u64)]
+pub struct CloseBuffer<'info> {
+    #[account(
+        mut,
+        seeds = [seed::EXECUTION_BUFFER, authority.key().as_ref(), &buffer_id.to_le_bytes()],
+        bump,
+        close = authority,
+    )]
+    pub buffered_report: Account<'info, BufferedReport>,
+
+    #[account(mut)]
+    pub authority: Signer<'info>,
+}
+
+#[derive(Accounts)]
+#[instruction(buffer_id: u64, _token_indices: Vec<u8>)]
+pub struct ExecuteContext<'info> {
+    #[account(
+        mut,
+        seeds = [seed::EXECUTION_BUFFER, authority.key().as_ref(), &buffer_id.to_le_bytes()],
+        bump,
+        close = authority,
+    )]
+    pub buffered_report: Account<'info, BufferedReport>,
+    // ------------------------
+    // Accounts for offramp CPI: All validations are done by the offramp
+    /// CHECK: validated during CPI
+    pub config: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub reference_addresses: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub source_chain: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    #[account(mut)]
+    pub commit_report: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub offramp: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub allowed_offramp: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub rmn_remote: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub rmn_remote_curses: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub rmn_remote_config: UncheckedAccount<'info>,
+    /// CHECK: validated during CPI
+    pub sysvar_instructions: UncheckedAccount<'info>,
+
+    #[account(mut)]
+    pub authority: Signer<'info>,
+    pub system_program: Program<'info, System>,
+    // remaining accounts
+    // [receiver_program, external_execution_signer, receiver_account, ...user specified accounts from message data for arbitrary messaging]
+    // +
+    // [
+    // ccip_offramp_pools_signer - derivable PDA [seed::EXTERNAL_TOKEN_POOL, pool_program], seeds::program=offramp (not in lookup table)
+    // user/sender token account (must be associated token account - derivable PDA [wallet_addr, token_program, mint])
+    // per chain per token config (ccip: billing, ccip admin controlled - derivable PDA [chain_selector, mint])
+    // pool chain config (pool: custom configs that may include rate limits & remote chain configs, pool admin controlled - derivable [chain_selector, mint])
+    // token pool lookup table
+    // token registry PDA
+    // pool program
+    // pool config
+    // pool token account (must be associated token account - derivable PDA [wallet_addr, token_program, mint])
+    // pool signer
+    // token program
+    // token mint
+    // ccip_router_pools_signer - derivable PDA [seed::EXTERNAL_TOKEN_POOL, pool_program], seeds::program=router (present in lookup table)
+    // ...additional accounts for pool config
+    // ] x N tokens
+}

chains/solana/contracts/programs/execution-buffer/src/context.rs

@@ -0,0 +1,68 @@
+use anchor_lang::prelude::*;
+
+mod context;
+use crate::context::*;
+
+mod state;
+
+declare_id!("buffGjr75PtEtV6D3pbKhaq59CR2qp4mwZDYGspggxZ");
+
+#[program]
+pub mod execution_buffer {
+    use super::*;
+
+    pub fn manually_execute_buffered<'info>(
+        ctx: Context<'_, '_, 'info, 'info, ExecuteContext<'info>>,
+        _buffer_id: u64,
+        token_indexes: Vec<u8>,
+    ) -> Result<()> {
+        let cpi_accounts = ccip_offramp::cpi::accounts::ExecuteReportContext {
+            config: ctx.accounts.config.to_account_info(),
+            reference_addresses: ctx.accounts.reference_addresses.to_account_info(),
+            source_chain: ctx.accounts.source_chain.to_account_info(),
+            commit_report: ctx.accounts.commit_report.to_account_info(),
+            offramp: ctx.accounts.offramp.to_account_info(),
+            allowed_offramp: ctx.accounts.allowed_offramp.to_account_info(),
+            authority: ctx.accounts.authority.to_account_info(),
+            system_program: ctx.accounts.system_program.to_account_info(),
+            sysvar_instructions: ctx.accounts.sysvar_instructions.to_account_info(),
+            rmn_remote: ctx.accounts.rmn_remote.to_account_info(),
+            rmn_remote_curses: ctx.accounts.rmn_remote_curses.to_account_info(),
+            rmn_remote_config: ctx.accounts.rmn_remote_config.to_account_info(),
+        };
+        let cpi_remaining_accounts = ctx.remaining_accounts.to_vec();
+        let cpi_context = CpiContext::new(ctx.accounts.offramp.to_account_info(), cpi_accounts)
+            .with_remaining_accounts(cpi_remaining_accounts);
+        ccip_offramp::cpi::manually_execute(
+            cpi_context,
+            ctx.accounts.buffered_report.raw_report_data.clone(),
+            token_indexes,
+        )
+    }
+
+    pub fn append_execution_report_data<'info>(
+        ctx: Context<'_, '_, 'info, 'info, AppendExecutionReportData>,
+        _buffer_id: u64,
+        data: Vec<u8>,
+    ) -> Result<()> {
+        ctx.accounts
+            .buffered_report
+            .raw_report_data
+            .extend_from_slice(&data);
+        Ok(())
+    }
+
+    pub fn initialize_execution_report_buffer<'info>(
+        _ctx: Context<'_, '_, 'info, 'info, InitializeExecutionReportBuffer>,
+        _buffer_id: u64,
+    ) -> Result<()> {
+        Ok(())
+    }
+
+    pub fn close_buffer<'info>(
+        _ctx: Context<'_, '_, 'info, 'info, CloseBuffer>,
+        _buffer_id: u64,
+    ) -> Result<()> {
+        Ok(())
+    }
+}

chains/solana/contracts/programs/execution-buffer/src/lib.rs

@@ -0,0 +1,8 @@
+use anchor_lang::prelude::*;
+
+#[account]
+#[derive(Debug, InitSpace)]
+pub struct BufferedReport {
+    #[max_len(0)]
+    pub raw_report_data: Vec<u8>,
+}