minor solana program refactoring

Author: jackchuma

solana/programs/bridge/src/constants.rs

@@ -74,7 +74,7 @@ pub const MESSENGER_SEED: &[u8] = b"messenger_state";
 pub const NATIVE_SOL_PUBKEY: Pubkey = pubkey!("LYDZWqhCarLgXtQsmWFr4DaqRE7c21xd49fpdVUUaBr");
 
 #[constant]
-pub const ROOT_KEY: &[u8] = b"output_root";
+pub const OUTPUT_ROOT_SEED: &[u8] = b"output_root";
 
 #[constant]
 pub const MESSAGE_SEED: &[u8] = b"message";

solana/programs/bridge/src/instructions/initializer.rs

@@ -1,13 +1,9 @@
 use anchor_lang::prelude::*;
 
-use crate::{MESSENGER_SEED, VAULT_SEED};
+use crate::{Vault, MESSENGER_SEED, VAULT_SEED};
 
 use super::Messenger;
 
-#[derive(InitSpace)]
-#[account]
-pub struct Vault {}
-
 #[derive(Accounts)]
 pub struct Initialize<'info> {
     #[account(mut)]

solana/programs/bridge/src/instructions/messenger.rs

@@ -41,15 +41,13 @@ pub struct SentMessage {
 #[event]
 // Emitted whenever a message is successfully relayed on this chain.
 pub struct RelayedMessage {
-    // Hash of the message that was relayed.
-    pub msg_hash: [u8; 32],
+    pub msg_hash: [u8; 32], // Hash of the message that was relayed.
 }
 
 #[event]
 // Emitted whenever a message fails to be relayed on this chain.
 pub struct FailedRelayedMessage {
-    // Hash of the message that failed to be relayed.
-    pub msg_hash: [u8; 32],
+    pub msg_hash: [u8; 32], // Hash of the message that failed to be relayed.
 }
 
 /// @notice Sends a message to some target address on Base. Note that if the call

solana/programs/bridge/src/instructions/portal.rs

@@ -76,9 +76,9 @@ fn minimum_gas_limit(byte_count: u64) -> u64 {
 
 fn encode_packed(gas_limit: u64, is_creation: bool, data: Vec<u8>) -> Vec<u8> {
     let mut opaque_data = Vec::new();
-    opaque_data.extend_from_slice(&gas_limit.to_be_bytes()); // Equivalent to _gasLimit
-    opaque_data.push(is_creation as u8); // Equivalent to _isCreation
-    opaque_data.extend_from_slice(&data); // Equivalent to _data
+    opaque_data.extend_from_slice(&gas_limit.to_be_bytes());
+    opaque_data.push(is_creation as u8);
+    opaque_data.extend_from_slice(&data);
     return opaque_data;
 }
 

solana/programs/bridge/src/instructions/post_root.rs

@@ -1,6 +1,6 @@
 use anchor_lang::prelude::*;
 
-use crate::{OutputRoot, ROOT_KEY, TRUSTED_ORACLE};
+use crate::{OutputRoot, OUTPUT_ROOT_SEED, TRUSTED_ORACLE};
 
 #[derive(Accounts)]
 #[instruction(root: [u8; 32], block_number: u64)]
@@ -9,7 +9,7 @@ pub struct PostRoot<'info> {
         init, 
         payer = payer, 
         space = 8 + OutputRoot::INIT_SPACE, 
-        seeds = [ROOT_KEY, &block_number.to_le_bytes()], 
+        seeds = [OUTPUT_ROOT_SEED, &block_number.to_le_bytes()], 
         bump
     )]
     pub root: Account<'info, OutputRoot>,

solana/programs/bridge/src/instructions/receiver.rs

@@ -7,8 +7,6 @@ use crate::{Ix, Message, MessengerPayload, OutputRoot, DEFAULT_SENDER, MESSAGE_S
 
 use super::messenger;
 
-// TODO: Should we block vault transfers that don't go through the bridge component?
-
 #[derive(Accounts)]
 #[instruction(transaction_hash: [u8; 32])]
 pub struct ProveTransaction<'info> {
@@ -44,22 +42,6 @@ pub struct FinalizeTransaction<'info> {
     pub vault: AccountInfo<'info>,
 }
 
-pub fn finalize_transaction_handler<'a, 'info>(
-    ctx: Context<'a, '_, 'info, 'info, FinalizeTransaction<'info>>,
-    _transaction_hash: &[u8; 32],
-) -> Result<()> {
-    if ctx.accounts.message.is_executed {
-        return err!(ReceiverError::AlreadyExecuted);
-    }
-
-    ctx.accounts.message.is_executed = true;
-    handle_ixs(
-        ctx.remaining_accounts,
-        &mut ctx.accounts.message,
-        &ctx.accounts.vault,
-    )
-}
-
 pub fn prove_transaction_handler(
     ctx: Context<ProveTransaction>,
     transaction_hash: &[u8; 32],
@@ -85,6 +67,22 @@ pub fn prove_transaction_handler(
     Ok(())
 }
 
+pub fn finalize_transaction_handler<'a, 'info>(
+    ctx: Context<'a, '_, 'info, 'info, FinalizeTransaction<'info>>,
+    _transaction_hash: &[u8; 32],
+) -> Result<()> {
+    if ctx.accounts.message.is_executed {
+        return err!(ReceiverError::AlreadyExecuted);
+    }
+
+    ctx.accounts.message.is_executed = true;
+    handle_ixs(
+        ctx.remaining_accounts,
+        &mut ctx.accounts.message,
+        &ctx.accounts.vault,
+    )
+}
+
 /**
  * @dev Returns true if a `leaf` can be proved to be a part of a Merkle tree
  * defined by `root`. For this, a `proof` must be provided, containing

solana/programs/bridge/src/state/mod.rs

@@ -1,7 +1,9 @@
 pub mod deposit;
 pub mod message;
 pub mod output_root;
+pub mod vault;
 
 pub use deposit::*;
 pub use message::*;
 pub use output_root::*;
+pub use vault::*;

solana/programs/bridge/src/state/vault.rs

@@ -0,0 +1,5 @@
+use anchor_lang::prelude::*;
+
+#[derive(InitSpace)]
+#[account]
+pub struct Vault {}