chore(solana): factorize all relayer errors

Author: xenoliss

solana/programs/base_relayer/src/errors.rs

@@ -0,0 +1,26 @@
+use anchor_lang::prelude::*;
+
+#[error_code]
+pub enum RelayerError {
+    // Initialization (6000-6099)
+    #[msg("Only the upgrade authority can initialize the relayer")]
+    UnauthorizedInitialization = 6000,
+
+    #[msg("Incorrect relayer program")]
+    IncorrectRelayerProgram,
+
+    // Configuration (6100-6199)
+    #[msg("Unauthorized to update configuration")]
+    UnauthorizedConfigUpdate = 6100,
+
+    // Gas Validation (6200-6299)
+    #[msg("Gas limit too low")]
+    GasLimitTooLow = 6200,
+
+    #[msg("Gas limit exceeded")]
+    GasLimitExceeded,
+
+    // Payment (6300-6399)
+    #[msg("Incorrect gas fee receiver")]
+    IncorrectGasFeeReceiver = 6300,
+}

solana/programs/base_relayer/src/instructions/config/mod.rs

@@ -1,6 +1,6 @@
 use anchor_lang::prelude::*;
 
-use crate::{constants::CFG_SEED, state::Cfg};
+use crate::{constants::CFG_SEED, state::Cfg, RelayerError};
 
 /// Accounts struct for configuration setter instructions
 /// Only the guardian can update these parameters
@@ -9,7 +9,7 @@ pub struct SetConfig<'info> {
     /// The bridge account containing configuration
     #[account(
         mut,
-        has_one = guardian @ ConfigError::UnauthorizedConfigUpdate,
+        has_one = guardian @ RelayerError::UnauthorizedConfigUpdate,
         seeds = [CFG_SEED],
         bump
     )]
@@ -19,13 +19,6 @@ pub struct SetConfig<'info> {
     pub guardian: Signer<'info>,
 }
 
-/// Error codes for configuration updates
-#[error_code]
-pub enum ConfigError {
-    #[msg("Unauthorized to update configuration")]
-    UnauthorizedConfigUpdate = 6000,
-}
-
 pub mod set_eip1559_config;
 pub mod set_gas_config;
 pub mod set_guardian;

solana/programs/base_relayer/src/instructions/initialize.rs

@@ -4,7 +4,7 @@ use crate::{
     constants::{CFG_SEED, DISCRIMINATOR_LEN},
     internal::{Eip1559, Eip1559Config, GasConfig},
     program::BaseRelayer as BaseRelayerProgram,
-    Cfg,
+    Cfg, RelayerError,
 };
 
 /// Accounts for the initialize instruction that sets up the base relayer's initial state.
@@ -33,15 +33,15 @@ pub struct Initialize<'info> {
     /// Validates that the signer is indeed the upgrade authority.
     #[account(
         constraint = program_data.upgrade_authority_address == Some(upgrade_authority.key())
-            @ InitializeError::UnauthorizedInitialization
+            @ RelayerError::UnauthorizedInitialization
     )]
     pub program_data: Account<'info, ProgramData>,
 
     /// The base_relayer program itself.
     /// Validates that program_data is the correct ProgramData account for this program.
     #[account(
         constraint = program.programdata_address()? == Some(program_data.key())
-            @ InitializeError::IncorrectRelayerProgram
+            @ RelayerError::IncorrectRelayerProgram
     )]
     pub program: Program<'info, BaseRelayerProgram>,
 
@@ -74,20 +74,11 @@ pub fn initialize_handler(
     Ok(())
 }
 
-/// Error codes for initialization
-#[error_code]
-pub enum InitializeError {
-    #[msg("Only the upgrade authority can initialize the relayer")]
-    UnauthorizedInitialization = 8000,
-    #[msg("Incorrect relayer program")]
-    IncorrectRelayerProgram = 8001,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
     use anchor_lang::{
-        solana_program::{bpf_loader_upgradeable, instruction::Instruction, system_program},
+        solana_program::{instruction::Instruction, system_program},
         InstructionData,
     };
     use solana_message::Message;
@@ -217,7 +208,7 @@ mod tests {
         // Verify the error message contains "UnauthorizedInitialization"
         let error_string = format!("{:?}", result.unwrap_err());
         assert!(
-            error_string.contains("UnauthorizedInitialization") || error_string.contains("8000"), // Error code for UnauthorizedInitialization
+            error_string.contains("UnauthorizedInitialization") || error_string.contains("6000"), // Error code for UnauthorizedInitialization
             "Expected UnauthorizedInitialization error, got: {}",
             error_string
         );

solana/programs/base_relayer/src/instructions/pay_for_relay.rs

@@ -4,6 +4,7 @@ use crate::{
     constants::{CFG_SEED, DISCRIMINATOR_LEN, MTR_SEED},
     internal::check_and_pay_for_gas,
     state::{Cfg, MessageToRelay},
+    RelayerError,
 };
 
 #[derive(Accounts)]
@@ -22,7 +23,7 @@ pub struct PayForRelay<'info> {
 
     /// The account that receives payment for the gas costs of bridging SOL to Base.
     /// CHECK: This account is validated to be the same as cfg.gas_config.gas_fee_receiver
-    #[account(mut, address = cfg.gas_config.gas_fee_receiver @ PayForRelayError::IncorrectGasFeeReceiver)]
+    #[account(mut, address = cfg.gas_config.gas_fee_receiver @ RelayerError::IncorrectGasFeeReceiver)]
     pub gas_fee_receiver: AccountInfo<'info>,
 
     #[account(init, payer = payer, seeds = [MTR_SEED, mtr_salt.as_ref()], bump, space = DISCRIMINATOR_LEN + MessageToRelay::INIT_SPACE)]
@@ -57,12 +58,6 @@ pub fn pay_for_relay_handler(
     Ok(())
 }
 
-#[error_code]
-pub enum PayForRelayError {
-    #[msg("Incorrect gas fee receiver")]
-    IncorrectGasFeeReceiver,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/base_relayer/src/internal/gas_config.rs

@@ -1,6 +1,6 @@
 use anchor_lang::prelude::*;
 
-use crate::state::Cfg;
+use crate::{state::Cfg, RelayerError};
 
 #[derive(Debug, Clone, PartialEq, Eq, InitSpace, AnchorSerialize, AnchorDeserialize)]
 pub struct GasConfig {
@@ -30,11 +30,11 @@ pub fn check_and_pay_for_gas<'info>(
 fn check_gas_limit(gas_limit: u64, cfg: &Cfg) -> Result<()> {
     require!(
         gas_limit >= cfg.gas_config.min_gas_limit_per_message,
-        GasConfigError::GasLimitTooLow
+        RelayerError::GasLimitTooLow
     );
     require!(
         gas_limit <= cfg.gas_config.max_gas_limit_per_message,
-        GasConfigError::GasLimitExceeded
+        RelayerError::GasLimitExceeded
     );
 
     Ok(())
@@ -70,14 +70,6 @@ fn pay_for_gas<'info>(
     Ok(())
 }
 
-#[error_code]
-pub enum GasConfigError {
-    #[msg("Gas limit too low")]
-    GasLimitTooLow,
-    #[msg("Gas limit exceeded")]
-    GasLimitExceeded,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

solana/programs/base_relayer/src/lib.rs

@@ -3,10 +3,12 @@
 use anchor_lang::prelude::*;
 
 mod constants;
+mod errors;
 mod instructions;
 mod internal;
 mod state;
 
+pub use errors::*;
 use instructions::*;
 use internal::*;
 use state::*;

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

@@ -1,13 +1,13 @@
 use anchor_lang::{prelude::*, solana_program::keccak};
 
+use crate::BridgeError;
 use crate::{
     base_to_solana::{
         constants::INCOMING_MESSAGE_SEED, internal::mmr, state::IncomingMessage, Message,
         OutputRoot, ProveBuffer,
     },
     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)]
@@ -56,10 +56,7 @@ pub fn prove_message_buffered_handler(
     message_hash: [u8; 32],
 ) -> Result<()> {
     // Pause
-    require!(
-        !ctx.accounts.bridge.paused,
-        BridgeError::BridgePaused
-    );
+    require!(!ctx.accounts.bridge.paused, BridgeError::BridgePaused);
 
     // Verify hash
     let data = &ctx.accounts.prove_buffer.data;

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

@@ -3,11 +3,11 @@ use anchor_lang::prelude::*;
 use crate::base_to_solana::constants::{PARTNER_PROGRAM_ID, PARTNER_SIGNERS_ACCOUNT_SEED};
 use crate::base_to_solana::state::Signers;
 use crate::base_to_solana::{compute_output_root_message_hash, recover_unique_evm_addresses};
+use crate::BridgeError;
 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
@@ -60,10 +60,7 @@ pub fn register_output_root_handler(
     signatures: Vec<[u8; 65]>,
 ) -> Result<()> {
     // Check if bridge is paused
-    require!(
-        !ctx.accounts.bridge.paused,
-        BridgeError::BridgePaused
-    );
+    require!(!ctx.accounts.bridge.paused, BridgeError::BridgePaused);
 
     // Build message hash for signatures
     let message_hash =

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

@@ -33,10 +33,7 @@ pub fn relay_message_handler<'a, 'info>(
     // Check if bridge is paused
     require!(!ctx.accounts.bridge.paused, BridgeError::BridgePaused);
 
-    require!(
-        !ctx.accounts.message.executed,
-        BridgeError::AlreadyExecuted
-    );
+    require!(!ctx.accounts.message.executed, BridgeError::AlreadyExecuted);
 
     let message = ctx.accounts.message.message.clone();
     let (transfer, ixs) = match message {

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

@@ -3,8 +3,8 @@ use anchor_lang::{
     system_program::{self, Transfer},
 };
 
-use crate::{common::SOL_VAULT_SEED, ID};
 use crate::BridgeError;
+use crate::{common::SOL_VAULT_SEED, ID};
 
 /// Instruction data for finalizing a native SOL transfer from Base to Solana.
 ///