Add validation preventing caller PDA to be garbage-collected (#386)

chains/solana/contracts/programs/ccip-router/src/fee_quoter.rs

@@ -90,6 +90,12 @@ pub fn wrap_native_sol<'info>(
     amount: u64,
     signer_bump: u8,
 ) -> Result<()> {
+    require!(
+        // guarantee that if caller is a PDA it won't get garbage-collected
+        *from.owner == System::id() || from.get_lamports() > amount,
+        CcipRouterError::InsufficientLamports
+    );
+
     invoke_signed(
         &system_instruction::transfer(&from.key(), &to.key(), amount),
         &[from.to_account_info(), to.to_account_info()],

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

@@ -1601,6 +1601,8 @@ pub enum CcipRouterError {
     InvalidTokenPrice,
     #[msg("Stale gas price")]
     StaleGasPrice,
+    #[msg("Insufficient lamports")]
+    InsufficientLamports,
 }
 
 // TODO: Refactor this to use the same structure as messages: execution_report.validate(..)

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

@@ -2726,6 +2726,9 @@
           },
           {
             "name": "StaleGasPrice"
+          },
+          {
+            "name": "InsufficientLamports"
           }
         ]
       }

chains/solana/contracts/tests/ccip/ccip_router_test.go

@@ -2785,7 +2785,7 @@ func TestCCIPRouter(t *testing.T) {
 			}
 		})
 
-		t.Run("hen sending a Valid CCIP Message but the user does not have enough funds of the fee token, it fails", func(t *testing.T) {
+		t.Run("When sending a Valid CCIP Message but the user does not have enough funds of the fee token, it fails", func(t *testing.T) {
 			message := ccip_router.Solana2AnyMessage{
 				FeeToken: token2022.mint,
 				Receiver: validReceiverAddress[:],