Merge branch 'main' into tt/testBuild

Author: tt-cll

.gitignore

@@ -8,7 +8,7 @@
 
 # Test binary, built with `go test -c`
 *.test
-carpenter
+/cmd/carpenter/carpenter
 
 # Test & linter reports
 *report.xml

chains/solana/contracts/Cargo.lock

@@ -22,3 +22,4 @@ solana-program = "1.17.25" # pin solana to 1.17
 spl-math = { version = "0.2.0", features = [ "no-entrypoint" ] }
 base-token-pool = { version = "0.1.0-dev", path = "../base-token-pool/", features = ["no-entrypoint"] }
 rmn_remote = {path = "../rmn-remote", features = ["cpi"]}
+ccip_common = {path = "../ccip-common"}

chains/solana/contracts/programs/burnmint-token-pool/Cargo.toml

@@ -4,6 +4,7 @@ use anchor_spl::{
     token_interface::{Mint, TokenAccount},
 };
 use base_token_pool::common::*;
+use ccip_common::seed;
 
 use crate::{ChainConfig, State};
 
@@ -99,7 +100,6 @@ pub struct TokenOfframp<'info> {
     // Token pool accounts ------------------
     // consistent set + token pool program
     #[account(
-        mut,
         seeds = [POOL_STATE_SEED, mint.key().as_ref()],
         bump,
     )]
@@ -136,15 +136,15 @@ pub struct TokenOfframp<'info> {
 
     /// CHECK: This account is just used in the CPI to the RMN Remote program
     #[account(
-        seeds = [rmn_remote::context::seed::CURSES],
+        seeds = [seed::CURSES],
         bump,
         seeds::program = state.config.rmn_remote,
     )]
     pub rmn_remote_curses: UncheckedAccount<'info>,
 
     /// CHECK: This account is just used in the CPI to the RMN Remote program
     #[account(
-        seeds = [rmn_remote::context::seed::CONFIG],
+        seeds = [seed::CONFIG],
         bump,
         seeds::program = state.config.rmn_remote,
     )]
@@ -165,7 +165,6 @@ pub struct TokenOnramp<'info> {
     // Token pool accounts ------------------
     // consistent set + token pool program
     #[account(
-        mut,
         seeds = [POOL_STATE_SEED, mint.key().as_ref()],
         bump,
     )]
@@ -195,15 +194,15 @@ pub struct TokenOnramp<'info> {
 
     /// CHECK: This account is just used in the CPI to the RMN Remote program
     #[account(
-        seeds = [rmn_remote::context::seed::CURSES],
+        seeds = [seed::CURSES],
         bump,
         seeds::program = state.config.rmn_remote,
     )]
     pub rmn_remote_curses: UncheckedAccount<'info>,
 
     /// CHECK: This account is just used in the CPI to the RMN Remote program
     #[account(
-        seeds = [rmn_remote::context::seed::CONFIG],
+        seeds = [seed::CONFIG],
         bump,
         seeds::program = state.config.rmn_remote,
     )]
@@ -254,7 +253,6 @@ pub struct SetChainRateLimit<'info> {
     pub chain_config: Account<'info, ChainConfig>,
     #[account(mut, constraint = authority.key() == state.config.owner || authority.key() == state.config.rate_limit_admin)]
     pub authority: Signer<'info>,
-    pub system_program: Program<'info, System>,
 }
 
 #[derive(Accounts)]
@@ -320,5 +318,4 @@ pub struct DeleteChainConfig<'info> {
     pub chain_config: Account<'info, ChainConfig>,
     #[account(mut, address = state.config.owner)]
     pub authority: Signer<'info>,
-    pub system_program: Program<'info, System>,
 }

chains/solana/contracts/programs/burnmint-token-pool/src/context.rs

@@ -0,0 +1,22 @@
+[package]
+name = "ccip_common"
+version = "0.1.0-dev"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "ccip_common"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+# ccip-common is not to be deployed, so using the no-entrypoint feature
+# prevents global allocator conflicts with its dependees.
+default = ["no-entrypoint"]
+
+[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"

chains/solana/contracts/programs/ccip-common/Cargo.toml

@@ -0,0 +1,108 @@
+use anchor_lang::prelude::*;
+use anchor_spl::associated_token::get_associated_token_address_with_program_id;
+use anchor_spl::token_interface::{Mint, TokenAccount, TokenInterface};
+use solana_program::address_lookup_table;
+
+use crate::seed;
+use crate::CommonCcipError;
+
+#[derive(Accounts)]
+#[instruction(token_receiver: Pubkey, chain_selector: u64, router: Pubkey, fee_quoter: Pubkey)]
+pub struct TokenAccountsValidationContext<'info> {
+    #[account(
+        constraint = user_token_account.key() == get_associated_token_address_with_program_id(
+            &token_receiver.key(),
+            &mint.key(),
+            &token_program.key()
+        ) @ CommonCcipError::InvalidInputsTokenAccounts,
+    )]
+    pub user_token_account: InterfaceAccount<'info, TokenAccount>,
+
+    /// CHECK: Per chain token billing config PDA
+    // billing: configured via CCIP fee quoter
+    // chain config: configured via pool
+    #[account(
+        seeds = [
+            seed::PER_CHAIN_PER_TOKEN_CONFIG,
+            chain_selector.to_le_bytes().as_ref(),
+            mint.key().as_ref(),
+        ],
+        seeds::program = fee_quoter.key(),
+        owner = fee_quoter.key() @ CommonCcipError::InvalidInputsTokenAccounts,
+        bump
+    )]
+    pub token_billing_config: UncheckedAccount<'info>,
+
+    /// CHECK: Pool chain config PDA
+    #[account(
+        seeds = [
+            seed::TOKEN_POOL_CONFIG,
+            chain_selector.to_le_bytes().as_ref(),
+            mint.key().as_ref(),
+        ],
+        seeds::program = pool_program.key(),
+        owner = pool_program.key() @ CommonCcipError::InvalidInputsPoolAccounts,
+        bump
+    )]
+    pub pool_chain_config: UncheckedAccount<'info>,
+
+    /// CHECK: Lookup table
+    #[account(owner = address_lookup_table::program::id() @ CommonCcipError::InvalidInputsLookupTableAccounts)]
+    pub lookup_table: UncheckedAccount<'info>,
+
+    /// CHECK: Token admin registry PDA
+    #[account(
+        seeds = [seed::TOKEN_ADMIN_REGISTRY, mint.key().as_ref()],
+        seeds::program = router.key(),
+        bump,
+        owner = router.key() @ CommonCcipError::InvalidInputsTokenAdminRegistryAccounts,
+    )]
+    pub token_admin_registry: UncheckedAccount<'info>,
+
+    /// CHECK: Pool program
+    #[account(executable)]
+    pub pool_program: UncheckedAccount<'info>,
+
+    /// CHECK: Pool config PDA
+    #[account(
+        seeds = [seed::CCIP_TOKENPOOL_CONFIG, mint.key().as_ref()],
+        seeds::program = pool_program.key(),
+        bump,
+        owner = pool_program.key() @ CommonCcipError::InvalidInputsPoolAccounts
+    )]
+    pub pool_config: UncheckedAccount<'info>,
+
+    #[account(
+        address = get_associated_token_address_with_program_id(
+            &pool_signer.key(),
+            &mint.key(),
+            &token_program.key()
+        ) @ CommonCcipError::InvalidInputsTokenAccounts
+    )]
+    pub pool_token_account: InterfaceAccount<'info, TokenAccount>,
+
+    /// CHECK: Pool signer PDA
+    #[account(
+        seeds = [seed::CCIP_TOKENPOOL_SIGNER, mint.key().as_ref()],
+        seeds::program = pool_program.key(),
+        bump
+    )]
+    pub pool_signer: UncheckedAccount<'info>,
+
+    pub token_program: Interface<'info, TokenInterface>,
+
+    #[account(owner = token_program.key() @ CommonCcipError::InvalidInputsTokenAccounts)]
+    pub mint: InterfaceAccount<'info, Mint>,
+
+    /// CHECK: Fee token config PDA
+    #[account(
+        seeds = [
+            seed::FEE_BILLING_TOKEN_CONFIG,
+            mint.key().as_ref()
+        ],
+        seeds::program = fee_quoter.key(),
+        owner = fee_quoter.key() @ CommonCcipError::InvalidInputsTokenAccounts,
+        bump
+    )]
+    pub fee_token_config: UncheckedAccount<'info>,
+}

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

@@ -0,0 +1,50 @@
+//! Contains common logic used across ccip programs. Common logic is versioned independently:
+//! v1 of the common logic may not necessarily be used by v1 of each particular program.
+use anchor_lang::prelude::*;
+
+pub mod context;
+pub mod seed;
+pub mod v1;
+
+#[error_code]
+pub enum CommonCcipError {
+    #[msg("The given sequence interval is invalid")]
+    // offset error code so that they don't clash with other programs
+    // (Anchor's base custom error code 6000 + offset 4000 = start at 10000)
+    InvalidSequenceInterval = 4000,
+    #[msg("Invalid pool accounts")]
+    InvalidInputsPoolAccounts,
+    #[msg("Invalid token accounts")]
+    InvalidInputsTokenAccounts,
+    #[msg("Invalid Token Admin Registry account")]
+    InvalidInputsTokenAdminRegistryAccounts,
+    #[msg("Invalid LookupTable account")]
+    InvalidInputsLookupTableAccounts,
+    #[msg("Invalid LookupTable account writable access")]
+    InvalidInputsLookupTableAccountWritable,
+}
+
+// Duplicates the router ID to declare router accounts that must be visible from the common crate,
+// avoiding a circular dependency. This means this crate may only declare accounts that belong
+// to the router, and no other program.
+declare_id!("Ccip842gzYHhvdDkSyi2YVCoAWPbYJoApMFzSxQroE9C");
+// null contract required for IDL + gobinding generation
+#[program]
+pub mod ccip_common {}
+
+pub mod router_accounts {
+    use super::*;
+
+    #[account]
+    #[derive(InitSpace)]
+    pub struct TokenAdminRegistry {
+        pub version: u8,
+        pub administrator: Pubkey,
+        pub pending_administrator: Pubkey,
+        pub lookup_table: Pubkey,
+        // binary representation of indexes that are writable in token pool lookup table
+        // lookup table can store 256 addresses
+        pub writable_indexes: [u128; 2],
+        pub mint: Pubkey,
+    }
+}

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

@@ -0,0 +1,27 @@
+// Fixed seeds - different contexts must use different PDA seeds
+pub const CONFIG: &[u8] = b"config";
+pub const ALLOWED_PRICE_UPDATER: &[u8] = b"allowed_price_updater";
+pub const DEST_CHAIN: &[u8] = b"dest_chain";
+pub const FEE_BILLING_TOKEN_CONFIG: &[u8] = b"fee_billing_token_config";
+pub const PER_CHAIN_PER_TOKEN_CONFIG: &[u8] = b"per_chain_per_token_config";
+pub const SOURCE_CHAIN: &[u8] = b"source_chain_state";
+pub const COMMIT_REPORT: &[u8] = b"commit_report";
+pub const REFERENCE_ADDRESSES: &[u8] = b"reference_addresses";
+pub const STATE: &[u8] = b"state";
+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";
+
+// arbitrary messaging signer
+pub const EXTERNAL_EXECUTION_CONFIG: &[u8] = b"external_execution_config";
+// token pool interaction signer
+pub const EXTERNAL_TOKEN_POOL: &[u8] = b"external_token_pools_signer";
+// signer for billing fee token transfer
+pub const FEE_BILLING_SIGNER: &[u8] = b"fee_billing_signer";
+
+// token specific
+pub const TOKEN_ADMIN_REGISTRY: &[u8] = b"token_admin_registry";
+pub const CCIP_TOKENPOOL_CONFIG: &[u8] = b"ccip_tokenpool_config";
+pub const CCIP_TOKENPOOL_SIGNER: &[u8] = b"ccip_tokenpool_signer";
+pub const TOKEN_POOL_CONFIG: &[u8] = b"ccip_tokenpool_chainconfig";