chore(solana): factorize all bridge errors

Author: xenoliss

solana/programs/bridge/src/base_to_solana/instructions/buffered/append_to_prove_buffer_data.rs

@@ -1,6 +1,7 @@
 use anchor_lang::prelude::*;
 
 use crate::base_to_solana::ProveBuffer;
+use crate::BridgeError;
 
 /// Append chunk of serialized `Message` data to the `ProveBuffer`.
 #[derive(Accounts)]
@@ -11,7 +12,7 @@ pub struct AppendToProveBufferData<'info> {
     /// Prove buffer account to append data to
     #[account(
         mut,
-        has_one = owner @ AppendToProveBufferError::Unauthorized,
+        has_one = owner @ BridgeError::BufferUnauthorizedAppend,
     )]
     pub prove_buffer: Account<'info, ProveBuffer>,
 }
@@ -25,12 +26,6 @@ pub fn append_to_prove_buffer_data_handler(
     Ok(())
 }
 
-#[error_code]
-pub enum AppendToProveBufferError {
-    #[msg("Only the owner can modify this prove buffer")]
-    Unauthorized,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/bridge/src/base_to_solana/instructions/buffered/append_to_prove_buffer_proof.rs

@@ -1,6 +1,7 @@
 use anchor_lang::prelude::*;
 
 use crate::base_to_solana::ProveBuffer;
+use crate::BridgeError;
 
 /// Append chunk of MMR proof nodes to the `ProveBuffer`.
 #[derive(Accounts)]
@@ -11,7 +12,7 @@ pub struct AppendToProveBufferProof<'info> {
     /// Prove buffer account to append proof nodes to
     #[account(
         mut,
-        has_one = owner @ AppendToProveBufferProofError::Unauthorized,
+        has_one = owner @ BridgeError::BufferUnauthorizedAppend,
     )]
     pub prove_buffer: Account<'info, ProveBuffer>,
 }
@@ -25,12 +26,6 @@ pub fn append_to_prove_buffer_proof_handler(
     Ok(())
 }
 
-#[error_code]
-pub enum AppendToProveBufferProofError {
-    #[msg("Only the owner can modify this prove buffer")]
-    Unauthorized,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/bridge/src/base_to_solana/instructions/buffered/close_prove_buffer.rs

@@ -1,6 +1,7 @@
 use anchor_lang::prelude::*;
 
 use crate::base_to_solana::ProveBuffer;
+use crate::BridgeError;
 
 /// Accounts struct for closing a prove buffer account.
 #[derive(Accounts)]
@@ -13,7 +14,7 @@ pub struct CloseProveBuffer<'info> {
     #[account(
         mut,
         close = owner,
-        has_one = owner @ CloseProveBufferError::Unauthorized,
+        has_one = owner @ BridgeError::BufferUnauthorizedClose,
     )]
     pub prove_buffer: Account<'info, ProveBuffer>,
 }
@@ -23,12 +24,6 @@ pub fn close_prove_buffer_handler(_ctx: Context<CloseProveBuffer>) -> Result<()>
     Ok(())
 }
 
-#[error_code]
-pub enum CloseProveBufferError {
-    #[msg("Only the owner can close this prove buffer")]
-    Unauthorized,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/bridge/src/base_to_solana/instructions/buffered/prove_message_buffered.rs

@@ -7,6 +7,7 @@ use crate::{
     },
     common::{bridge::Bridge, BRIDGE_SEED, DISCRIMINATOR_LEN},
 };
+use crate::BridgeError;
 
 /// Buffered variant of `prove_message` that reads data/proof from a `ProveBuffer` and closes it.
 #[derive(Accounts)]
@@ -41,7 +42,7 @@ pub struct ProveMessageBuffered<'info> {
     #[account(
         mut,
         close = owner,
-        has_one = owner @ ProveMessageBufferedError::Unauthorized,
+        has_one = owner @ BridgeError::BufferUnauthorizedClose,
     )]
     pub prove_buffer: Account<'info, ProveBuffer>,
 
@@ -57,15 +58,15 @@ pub fn prove_message_buffered_handler(
     // Pause
     require!(
         !ctx.accounts.bridge.paused,
-        ProveMessageBufferedError::BridgePaused
+        BridgeError::BridgePaused
     );
 
     // Verify hash
     let data = &ctx.accounts.prove_buffer.data;
     let computed_hash = hash_message(&nonce.to_be_bytes(), &sender, data);
     require!(
         message_hash == computed_hash,
-        ProveMessageBufferedError::InvalidMessageHash
+        BridgeError::InvalidMessageHash
     );
 
     // Verify proof
@@ -96,16 +97,6 @@ fn hash_message(nonce: &[u8], sender: &[u8; 20], data: &[u8]) -> [u8; 32] {
     keccak::hash(&data_to_hash).0
 }
 
-#[error_code]
-pub enum ProveMessageBufferedError {
-    #[msg("Invalid message hash")]
-    InvalidMessageHash,
-    #[msg("Only the owner can close this prove buffer")]
-    Unauthorized,
-    #[msg("Bridge is currently paused")]
-    BridgePaused,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/bridge/src/base_to_solana/instructions/prove_message.rs

@@ -1,6 +1,7 @@
 use anchor_lang::{prelude::*, solana_program::keccak};
 
 use crate::common::{bridge::Bridge, BRIDGE_SEED};
+use crate::BridgeError;
 use crate::{
     base_to_solana::{
         constants::INCOMING_MESSAGE_SEED,
@@ -60,13 +61,13 @@ pub fn prove_message_handler(
     message_hash: [u8; 32],
 ) -> Result<()> {
     // Check if bridge is paused
-    require!(!ctx.accounts.bridge.paused, ProveMessageError::BridgePaused);
+    require!(!ctx.accounts.bridge.paused, BridgeError::BridgePaused);
 
     // Verify that the provided message hash matches the computed hash
     let computed_hash = hash_message(&nonce.to_be_bytes(), &sender, &data);
     require!(
         message_hash == computed_hash,
-        ProveMessageError::InvalidMessageHash
+        BridgeError::InvalidMessageHash
     );
 
     // Verify the MMR proof to ensure the message was included on the source chain
@@ -100,11 +101,3 @@ fn hash_message(nonce: &[u8], sender: &[u8; 20], data: &[u8]) -> [u8; 32] {
 
     keccak::hash(&data_to_hash).0
 }
-
-#[error_code]
-pub enum ProveMessageError {
-    #[msg("Invalid message hash")]
-    InvalidMessageHash,
-    #[msg("Bridge is currently paused")]
-    BridgePaused,
-}

solana/programs/bridge/src/base_to_solana/instructions/register_output_root.rs

@@ -7,6 +7,7 @@ use crate::{
     base_to_solana::{constants::OUTPUT_ROOT_SEED, state::OutputRoot},
     common::{bridge::Bridge, BRIDGE_SEED, DISCRIMINATOR_LEN},
 };
+use crate::BridgeError;
 
 /// Accounts struct for the `register_output_root` instruction that stores Base MMR roots
 /// on Solana for cross-chain message verification. This instruction allows a trusted oracle to
@@ -61,7 +62,7 @@ pub fn register_output_root_handler(
     // Check if bridge is paused
     require!(
         !ctx.accounts.bridge.paused,
-        RegisterOutputRootError::BridgePaused
+        BridgeError::BridgePaused
     );
 
     // Build message hash for signatures
@@ -80,7 +81,7 @@ pub fn register_output_root_handler(
 
     require!(
         base_approved_count as u8 >= ctx.accounts.bridge.base_oracle_config.threshold,
-        RegisterOutputRootError::InsufficientBaseSignatures
+        BridgeError::InsufficientBaseSignatures
     );
 
     if ctx.accounts.bridge.partner_oracle_config.required_threshold > 0 {
@@ -100,7 +101,7 @@ pub fn register_output_root_handler(
         let partner_approved_count = partner_config.count_approvals(&unique_signers);
         require!(
             partner_approved_count as u8 >= partner_oracle_config.required_threshold,
-            RegisterOutputRootError::InsufficientPartnerSignatures
+            BridgeError::InsufficientPartnerSignatures
         );
     }
 
@@ -113,7 +114,7 @@ pub fn register_output_root_handler(
                     .protocol_config
                     .block_interval_requirement
                 == 0,
-        RegisterOutputRootError::IncorrectBlockNumber
+        BridgeError::IncorrectBlockNumber
     );
 
     ctx.accounts.root.root = output_root;
@@ -123,18 +124,6 @@ pub fn register_output_root_handler(
     Ok(())
 }
 
-#[error_code]
-pub enum RegisterOutputRootError {
-    #[msg("IncorrectBlockNumber")]
-    IncorrectBlockNumber,
-    #[msg("BridgePaused")]
-    BridgePaused,
-    #[msg("Insufficient base oracle signatures to meet threshold")]
-    InsufficientBaseSignatures,
-    #[msg("Insufficient partner oracle signatures to meet threshold")]
-    InsufficientPartnerSignatures,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/bridge/src/base_to_solana/instructions/relay_message.rs

@@ -7,6 +7,7 @@ use crate::base_to_solana::{
     constants::BRIDGE_CPI_AUTHORITY_SEED, state::IncomingMessage, Message, Transfer,
 };
 use crate::common::{bridge::Bridge, BRIDGE_SEED};
+use crate::BridgeError;
 
 /// Accounts struct for the relay message instruction that executes cross-chain messages from Base to Solana.
 /// This instruction processes incoming messages that contain either pure instruction calls or token transfers
@@ -30,11 +31,11 @@ pub fn relay_message_handler<'a, 'info>(
     ctx: Context<'a, '_, 'info, 'info, RelayMessage<'info>>,
 ) -> Result<()> {
     // Check if bridge is paused
-    require!(!ctx.accounts.bridge.paused, RelayMessageError::BridgePaused);
+    require!(!ctx.accounts.bridge.paused, BridgeError::BridgePaused);
 
     require!(
         !ctx.accounts.message.executed,
-        RelayMessageError::AlreadyExecuted
+        BridgeError::AlreadyExecuted
     );
 
     let message = ctx.accounts.message.message.clone();
@@ -81,11 +82,3 @@ pub fn relay_message_handler<'a, 'info>(
 
     Ok(())
 }
-
-#[error_code]
-pub enum RelayMessageError {
-    #[msg("Message already executed")]
-    AlreadyExecuted,
-    #[msg("Bridge is currently paused")]
-    BridgePaused,
-}

solana/programs/bridge/src/base_to_solana/instructions/token/finalize_sol_transfer.rs

@@ -4,6 +4,7 @@ use anchor_lang::{
 };
 
 use crate::{common::SOL_VAULT_SEED, ID};
+use crate::BridgeError;
 
 /// Instruction data for finalizing a native SOL transfer from Base to Solana.
 ///
@@ -35,7 +36,7 @@ impl FinalizeBridgeSol {
         let system_program_info = Program::<System>::try_from(next_account_info(&mut iter)?)?;
 
         // Verify the recipient matches the instruction data
-        require_keys_eq!(to_info.key(), self.to, FinalizeBridgeSolError::IncorrectTo);
+        require_keys_eq!(to_info.key(), self.to, BridgeError::IncorrectTo);
 
         // Verify the SOL vault PDA is correct
         let sol_vault_seeds = &[SOL_VAULT_SEED, self.remote_token.as_ref()];
@@ -44,7 +45,7 @@ impl FinalizeBridgeSol {
         require_keys_eq!(
             sol_vault_info.key(),
             sol_vault_pda,
-            FinalizeBridgeSolError::IncorrectSolVault
+            BridgeError::IncorrectSolVault
         );
 
         // Transfer SOL from the SOL vault to the recipient
@@ -64,11 +65,3 @@ impl FinalizeBridgeSol {
         system_program::transfer(cpi_ctx, self.amount)
     }
 }
-
-#[error_code]
-pub enum FinalizeBridgeSolError {
-    #[msg("Incorrect to")]
-    IncorrectTo,
-    #[msg("Incorrect sol vault")]
-    IncorrectSolVault,
-}

solana/programs/bridge/src/base_to_solana/instructions/token/finalize_spl_transfer.rs

@@ -2,6 +2,7 @@ use anchor_lang::prelude::*;
 use anchor_spl::token_interface::{self, Mint, TokenAccount, TokenInterface, TransferChecked};
 
 use crate::{common::TOKEN_VAULT_SEED, ID};
+use crate::BridgeError;
 
 /// Instruction data for finalizing a bridged SPL token transfer from Base to Solana.
 ///
@@ -44,14 +45,14 @@ impl FinalizeBridgeSpl {
         require_keys_eq!(
             mint.key(),
             self.local_token,
-            FinalizeBridgeSplError::MintDoesNotMatchLocalToken
+            BridgeError::MintDoesNotMatchLocalToken
         );
 
         // Check that the token account is correct given the to address
         require_keys_eq!(
             to_token_account.key(),
             self.to,
-            FinalizeBridgeSplError::TokenAccountDoesNotMatchTo
+            BridgeError::TokenAccountDoesNotMatchTo
         );
 
         // Check that the token vault is the expected PDA
@@ -67,7 +68,7 @@ impl FinalizeBridgeSpl {
         require_keys_eq!(
             token_vault.key(),
             token_vault_pda,
-            FinalizeBridgeSplError::IncorrectTokenVault
+            BridgeError::IncorrectTokenVault
         );
 
         let seeds: &[&[&[u8]]] = &[&[
@@ -93,13 +94,3 @@ impl FinalizeBridgeSpl {
         Ok(())
     }
 }
-
-#[error_code]
-pub enum FinalizeBridgeSplError {
-    #[msg("Mint does not match local token")]
-    MintDoesNotMatchLocalToken,
-    #[msg("Token account does not match to address")]
-    TokenAccountDoesNotMatchTo,
-    #[msg("Incorrect token vault")]
-    IncorrectTokenVault,
-}

solana/programs/bridge/src/base_to_solana/instructions/token/finalize_wrapped_token_transfer.rs

@@ -8,6 +8,7 @@ use crate::{
     common::{PartialTokenMetadata, WRAPPED_TOKEN_SEED},
     ID,
 };
+use crate::BridgeError;
 
 /// Instruction data for finalizing a wrapped token transfer from Base to Solana.
 ///
@@ -51,14 +52,14 @@ impl FinalizeBridgeWrappedToken {
         require_keys_eq!(
             mint.key(),
             self.local_token,
-            FinalizeBridgeWrappedTokenError::MintDoesNotMatchLocalToken
+            BridgeError::MintDoesNotMatchLocalToken
         );
 
         // Check that the to is correct given the to address
         require_keys_eq!(
             to_token_account.key(),
             self.to,
-            FinalizeBridgeWrappedTokenError::TokenAccountDoesNotMatchTo,
+            BridgeError::TokenAccountDoesNotMatchTo,
         );
 
         // Get the partial token metadata
@@ -96,11 +97,3 @@ impl FinalizeBridgeWrappedToken {
         Ok(())
     }
 }
-
-#[error_code]
-pub enum FinalizeBridgeWrappedTokenError {
-    #[msg("Token account does not match to address")]
-    TokenAccountDoesNotMatchTo,
-    #[msg("Mint does not match local token")]
-    MintDoesNotMatchLocalToken,
-}