Merge branch 'main' into tt/testBuild

Author: tt-cll

.github/workflows/solana-verified-build.yml

@@ -15,6 +15,9 @@ jobs:
   build:
     runs-on: ubuntu-latest-8cores-32GB
     steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - name: Get Long and Short SHAs
       id: get_sha
       run: |

chainconfig/chainconfig.go

@@ -27,6 +27,10 @@ type ChainConfig struct {
 	// OptimisticConfirmations is the number of confirmations of a chain event before
 	// it is considered optimistically confirmed (i.e not necessarily finalized).
 	OptimisticConfirmations uint32 `json:"optimisticConfirmations"`
+
+	// ChainFeeDeviationDisabled is a flag to disable deviation-based reporting. If true, we will only report
+	// prices based on the heartbeat.
+	ChainFeeDeviationDisabled bool `json:"chainFeeDeviationDisabled"`
 }
 
 func (cc ChainConfig) Validate() error {

chains/solana/Makefile

@@ -13,7 +13,7 @@ anchor_version:
 
 .PHONY: clippy
 clippy:
-	cargo clippy --manifest-path ./contracts/programs/ccip-router/Cargo.toml
+	cd ./contracts && cargo clippy -- -D warnings
 
 .PHONY: gomods
 gomods: ## Install gomods

chains/solana/contracts/programs/access-controller/src/lib.rs

@@ -52,6 +52,10 @@ pub mod access_controller {
         proposed_owner: Pubkey,
     ) -> Result<()> {
         let state = &mut *ctx.accounts.state.load_mut()?;
+        require!(
+            proposed_owner != Pubkey::default() && proposed_owner != state.owner,
+            ErrorCode::InvalidInput
+        );
         state.proposed_owner = proposed_owner;
         Ok(())
     }

chains/solana/contracts/programs/ccip-router/src/instructions/v1/pools.rs

@@ -17,6 +17,11 @@ pub fn calculate_token_pool_account_indices(
     start_indices: &[u8],
     remaining_accounts_count: usize,
 ) -> Result<(usize, usize)> {
+    require!(
+        i < start_indices.len(),
+        CcipRouterError::InvalidInputsTokenIndices
+    );
+
     // account set = [start...end)
     let start: usize = start_indices[i] as usize;
     let end: usize = if i == start_indices.len() - 1 {
@@ -355,6 +360,10 @@ pub mod token_admin_registry_writable {
 
     #[cfg(test)]
     mod tests {
+        use crate::{
+            instructions::v1::pools::calculate_token_pool_account_indices, CcipRouterError,
+        };
+
         use super::*;
         use solana_program::pubkey::Pubkey;
 
@@ -422,5 +431,30 @@ pub mod token_admin_registry_writable {
             assert!(is(state, 128 + 56));
             assert!(is(state, 128 + 100));
         }
+
+        #[test]
+        fn token_pool_indices_underflow_overflow() {
+            let empty_start_indices: [u8; 0] = [];
+            let full_start_indices = [1u8, 2, 3];
+            let arbitrary_account_count = 5;
+
+            assert_eq!(
+                calculate_token_pool_account_indices(
+                    0,
+                    &empty_start_indices,
+                    arbitrary_account_count
+                ),
+                Err(CcipRouterError::InvalidInputsTokenIndices.into())
+            );
+
+            assert_eq!(
+                calculate_token_pool_account_indices(
+                    full_start_indices.len(),
+                    &full_start_indices,
+                    arbitrary_account_count
+                ),
+                Err(CcipRouterError::InvalidInputsTokenIndices.into())
+            );
+        }
     }
 }

chains/solana/contracts/programs/example-ccip-receiver/src/lib.rs

@@ -325,6 +325,10 @@ impl BaseState {
     }
 
     pub fn transfer_ownership(&mut self, owner: Pubkey, proposed_owner: Pubkey) -> Result<()> {
+        require!(
+            proposed_owner != self.owner && proposed_owner != Pubkey::default(),
+            CcipReceiverError::InvalidProposedOwner
+        );
         require_eq!(self.owner, owner, CcipReceiverError::OnlyOwner);
         self.proposed_owner = proposed_owner;
         Ok(())
@@ -386,6 +390,8 @@ pub enum CcipReceiverError {
     OnlyProposedOwner,
     #[msg("Caller is not allowed")]
     InvalidCaller,
+    #[msg("Proposed owner is invalid")]
+    InvalidProposedOwner,
 }
 
 #[event]

chains/solana/contracts/programs/example-ccip-sender/src/state.rs

@@ -22,6 +22,10 @@ impl BaseState {
     }
 
     pub fn transfer_ownership(&mut self, owner: Pubkey, proposed_owner: Pubkey) -> Result<()> {
+        require!(
+            proposed_owner != self.owner && proposed_owner != Pubkey::default(),
+            CcipSenderError::InvalidProposedOwner
+        );
         require_eq!(self.owner, owner, CcipSenderError::OnlyOwner);
         self.proposed_owner = proposed_owner;
         Ok(())
@@ -106,6 +110,8 @@ pub enum CcipSenderError {
     OnlyOwner,
     #[msg("Address is not proposed_owner")]
     OnlyProposedOwner,
+    #[msg("Proposed owner is invalid")]
+    InvalidProposedOwner,
 }
 
 #[cfg(test)]

chains/solana/contracts/programs/mcm/src/lib.rs

@@ -97,7 +97,10 @@ pub mod mcm {
         proposed_owner: Pubkey,
     ) -> Result<()> {
         let config = &mut ctx.accounts.config;
-        require!(proposed_owner != config.owner, McmError::InvalidInputs);
+        require!(
+            proposed_owner != config.owner && proposed_owner != Pubkey::default(),
+            McmError::InvalidInputs
+        );
         config.proposed_owner = proposed_owner;
         Ok(())
     }

chains/solana/contracts/programs/timelock/src/lib.rs

@@ -468,7 +468,10 @@ pub mod timelock {
         proposed_owner: Pubkey,
     ) -> Result<()> {
         let mut config = ctx.accounts.config.load_mut()?;
-        require!(proposed_owner != config.owner, TimelockError::InvalidInput);
+        require!(
+            proposed_owner != config.owner && proposed_owner != Pubkey::default(),
+            TimelockError::InvalidInput
+        );
         config.proposed_owner = proposed_owner;
         Ok(())
     }

chains/solana/contracts/target/idl/example_ccip_receiver.json

@@ -403,6 +403,11 @@
       "code": 6005,
       "name": "InvalidCaller",
       "msg": "Caller is not allowed"
+    },
+    {
+      "code": 6006,
+      "name": "InvalidProposedOwner",
+      "msg": "Proposed owner is invalid"
     }
   ]
 }