refactor: delegate utils

Signed-off-by: Pablo Maldonado <[email protected]>

Author: md0x

programs/svm-spoke/src/instructions/deposit.rs

@@ -12,8 +12,7 @@ use crate::{
     event::FundsDeposited,
     state::{Route, State},
     utils::{
-        derive_deposit_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from, DepositNowSeedData,
-        DepositSeedData,
+        derive_seed_hash, get_current_time, get_unsafe_deposit_id, transfer_from, DepositNowSeedData, DepositSeedData,
     },
 };
 
@@ -39,7 +38,7 @@ pub struct Deposit<'info> {
     )]
     pub state: Account<'info, State>,
 
-    /// CHECK: PDA derived with seeds ["delegate", deposit_seed_hash]; used as a CPI signer.
+    /// CHECK: PDA derived with seeds ["delegate", seed_hash]; used as a CPI signer.
     pub delegate: UncheckedAccount<'info>,
 
     #[account(
@@ -170,7 +169,7 @@ pub fn deposit(
     exclusivity_parameter: u32,
     message: Vec<u8>,
 ) -> Result<()> {
-    let seed_hash = derive_deposit_seed_hash(
+    let seed_hash = derive_seed_hash(
         &(DepositSeedData {
             depositor,
             recipient,
@@ -223,7 +222,7 @@ pub fn deposit_now(
 ) -> Result<()> {
     let state = &mut ctx.accounts.state;
     let current_time = get_current_time(state)?;
-    let seed_hash = derive_deposit_seed_hash(
+    let seed_hash = derive_seed_hash(
         &(DepositNowSeedData {
             depositor,
             recipient,
@@ -277,7 +276,7 @@ pub fn unsafe_deposit(
 ) -> Result<()> {
     // Calculate the unsafe deposit ID as a [u8; 32]
     let deposit_id = get_unsafe_deposit_id(ctx.accounts.signer.key(), depositor, deposit_nonce);
-    let seed_hash = derive_deposit_seed_hash(
+    let seed_hash = derive_seed_hash(
         &(DepositSeedData {
             depositor,
             recipient,

programs/svm-spoke/src/instructions/fill.rs

@@ -11,7 +11,7 @@ use crate::{
     error::{CommonError, SvmError},
     event::{FillType, FilledRelay, RelayExecutionEventInfo},
     state::{FillRelayParams, FillStatus, FillStatusAccount, State},
-    utils::{derive_fill_seed_hash, get_current_time, hash_non_empty_message, invoke_handler, transfer_from},
+    utils::{derive_seed_hash, get_current_time, hash_non_empty_message, invoke_handler, transfer_from, FillSeedData},
 };
 
 #[event_cpi]
@@ -32,7 +32,7 @@ pub struct FillRelay<'info> {
     )]
     pub state: Account<'info, State>,
 
-    /// CHECK: PDA derived with seeds ["delegate", fill_seed_hash]; used as a CPI signer.
+    /// CHECK: PDA derived with seeds ["delegate", seed_hash]; used as a CPI signer.
     pub delegate: UncheckedAccount<'info>,
 
     #[account(
@@ -119,7 +119,7 @@ pub fn fill_relay<'info>(
     };
 
     // Verify delegate PDA
-    let seed_hash = derive_fill_seed_hash(relay_hash, repayment_chain_id, repayment_address);
+    let seed_hash = derive_seed_hash(&(FillSeedData { relay_hash, repayment_chain_id, repayment_address }));
     let (pda, bump) = Pubkey::find_program_address(&[b"delegate", &seed_hash], &ctx.program_id);
     if ctx.accounts.delegate.key() != pda {
         return err!(SvmError::InvalidDelegatePda);

programs/svm-spoke/src/utils/delegate_utils.rs

@@ -0,0 +1,45 @@
+use anchor_lang::{prelude::*, solana_program::keccak};
+
+pub fn derive_seed_hash<T: AnchorSerialize>(seed: &T) -> [u8; 32] {
+    let mut buf = Vec::with_capacity(128);
+    seed.serialize(&mut buf).unwrap();
+    keccak::hash(&buf).to_bytes()
+}
+
+#[derive(AnchorSerialize)]
+pub struct DepositSeedData {
+    pub depositor: Pubkey,
+    pub recipient: Pubkey,
+    pub input_token: Pubkey,
+    pub output_token: Pubkey,
+    pub input_amount: u64,
+    pub output_amount: u64,
+    pub destination_chain_id: u64,
+    pub exclusive_relayer: Pubkey,
+    pub quote_timestamp: u32,
+    pub fill_deadline: u32,
+    pub exclusivity_parameter: u32,
+    pub message: Vec<u8>,
+}
+
+#[derive(AnchorSerialize)]
+pub struct DepositNowSeedData {
+    pub depositor: Pubkey,
+    pub recipient: Pubkey,
+    pub input_token: Pubkey,
+    pub output_token: Pubkey,
+    pub input_amount: u64,
+    pub output_amount: u64,
+    pub destination_chain_id: u64,
+    pub exclusive_relayer: Pubkey,
+    pub fill_deadline_offset: u32,
+    pub exclusivity_period: u32,
+    pub message: Vec<u8>,
+}
+
+#[derive(AnchorSerialize)]
+pub struct FillSeedData {
+    pub relay_hash: [u8; 32],
+    pub repayment_chain_id: u64,
+    pub repayment_address: Pubkey,
+}

programs/svm-spoke/src/utils/deposit_utils.rs

@@ -9,40 +9,3 @@ pub fn get_unsafe_deposit_id(msg_sender: Pubkey, depositor: Pubkey, deposit_nonc
 
     keccak::hash(&data).to_bytes()
 }
-
-#[derive(AnchorSerialize)]
-pub struct DepositSeedData {
-    pub depositor: Pubkey,
-    pub recipient: Pubkey,
-    pub input_token: Pubkey,
-    pub output_token: Pubkey,
-    pub input_amount: u64,
-    pub output_amount: u64,
-    pub destination_chain_id: u64,
-    pub exclusive_relayer: Pubkey,
-    pub quote_timestamp: u32,
-    pub fill_deadline: u32,
-    pub exclusivity_parameter: u32,
-    pub message: Vec<u8>,
-}
-
-#[derive(AnchorSerialize)]
-pub struct DepositNowSeedData {
-    pub depositor: Pubkey,
-    pub recipient: Pubkey,
-    pub input_token: Pubkey,
-    pub output_token: Pubkey,
-    pub input_amount: u64,
-    pub output_amount: u64,
-    pub destination_chain_id: u64,
-    pub exclusive_relayer: Pubkey,
-    pub fill_deadline_offset: u32,
-    pub exclusivity_period: u32,
-    pub message: Vec<u8>,
-}
-
-pub fn derive_deposit_seed_hash<T: AnchorSerialize>(seed: &T) -> [u8; 32] {
-    let mut buf = Vec::with_capacity(128);
-    seed.serialize(&mut buf).unwrap();
-    keccak::hash(&buf).to_bytes()
-}

programs/svm-spoke/src/utils/fill_utils.rs

@@ -1,16 +1,16 @@
 pub mod bitmap_utils;
 pub mod cctp_utils;
+pub mod delegate_utils;
 pub mod deposit_utils;
-pub mod fill_utils;
 pub mod merkle_proof_utils;
 pub mod message_utils;
 pub mod testable_utils;
 pub mod transfer_utils;
 
 pub use bitmap_utils::*;
 pub use cctp_utils::*;
+pub use delegate_utils::*;
 pub use deposit_utils::*;
-pub use fill_utils::*;
 pub use merkle_proof_utils::*;
 pub use message_utils::*;
 pub use testable_utils::*;