drop onramp

Author: bukata-sa

chains/solana/contracts/Anchor.toml

@@ -9,7 +9,6 @@ skip-lint = false
 firedrill_compound = "Dri11NnBPbx85w8a47ZXBZa3Hi7E2xvHAA9Xpyk7UivQ"
 firedrill_entrypoint = "Dri11c6TXJXELaZUgQtyw3doxbn7bGXQ6z5LRZ8bMPbc"
 firedrill_offramp = "Dri11kiWR5f1oTn5NLm3wmfaDq3cYauR92wrsTxNaudt"
-firedrill_onramp = "Dri11Hs4x2gXThgDwvjYoZ7xEPgfKNa5Ys2MWUqay3Tt"
 firedrill_token = "Dri11r4S1hY8iMpxNh6UoYZ9hsGgmGUUyZ3zxUb2rpc2"
 failing_receiver = "Dri11EwVRViqqkjs7SWV3d3ejcanBGMNrcGhD6HVn756"
 

chains/solana/contracts/Cargo.lock

@@ -1,6 +1,6 @@
 use anchor_lang::prelude::*;
 
-declare_id!("F6vRTFegLwFDD8aZ6nQ1q18wfif34WkJ6uBjKdMcpvz5");
+declare_id!("Dri11e51CFemqdySVVhmJbRzKeyVBJjch49RF2zH6Nt6");
 
 #[program]
 pub mod failing_receiver {

chains/solana/contracts/programs/failing_receiver/src/lib.rs

@@ -19,4 +19,5 @@ default = []
 solana-program = "1.17.25" # pin solana to 1.17
 anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
 anchor-spl = "0.29.0"
+ethnum = "1.5"
 shared = { path = "../../crate/shared" }

chains/solana/contracts/programs/firedrill_compound/Cargo.toml

@@ -1,8 +1,14 @@
 use anchor_lang::prelude::*;
 use shared::seed;
 
-declare_id!("F1G3cHLWhRtFQTnc7JaLNiEc5mFnkgDXo3Fobr8NcAiA");
+pub mod messages;
+use crate::messages::*;
 
+use ethnum::U256;
+
+declare_id!("Dri11ePx1XJ5Eu3DRDFjgCf4ZqB98qzNrHzEwqx2jpqk");
+
+// FiredrillCompound is Router, OnRamp, RMNRemote, FeeQuoter and TokenAdminRegistry
 #[program]
 pub mod firedrill_compound {
     use super::*;
@@ -14,6 +20,39 @@ pub mod firedrill_compound {
         Ok(())
     }
 
+    pub fn emit_ccip_message_sent(
+        ctx: Context<EmitMessage>,
+        sender: Pubkey,
+        index: u64,
+    ) -> Result<()> {
+        let compound = &ctx.accounts.compound;
+        let message = SVM2AnyRampMessage {
+            header: RampMessageHeader {
+                message_id: [0u8; 32],
+                source_chain_selector: compound.chain_selector,
+                dest_chain_selector: compound.chain_selector,
+                sequence_number: index,
+                nonce: 1,
+            },
+            sender,
+            data: vec![],
+            receiver: sender.to_bytes().to_vec(),
+            extra_args: vec![],
+            fee_token: compound.token,
+            token_amounts: vec![],
+            fee_token_amount: U256::from(0u64).into(),
+            fee_value_juels: U256::from(0u64).into(),
+        };
+
+        emit!(CCIPMessageSent {
+            dest_chain_selector: compound.chain_selector,
+            sequence_number: index,
+            message,
+        });
+
+        Ok(())
+    }
+
     pub fn emit_usd_per_token_updated(ctx: Context<EmitUsdPerToken>) -> Result<()> {
         let compound = &ctx.accounts.compound;
 
@@ -33,22 +72,30 @@ pub mod firedrill_compound {
     }
 }
 
- #[account]
- pub struct FiredrillCompound {
-     pub owner: Pubkey,
-     pub token: Pubkey,
- }
+#[account]
+pub struct FiredrillCompound {
+    pub owner: Pubkey,
+    pub chain_selector: u64,
+    pub token: Pubkey,
+}
 
- #[derive(Accounts)]
- pub struct Initialize<'info> {
-     #[account(init, seeds = [seed::COMPOUND], bump, payer = authority, space = 8 + 32 + 32)]
-     pub compound: Account<'info, FiredrillCompound>,
+#[derive(Accounts)]
+pub struct Initialize<'info> {
+    #[account(init, seeds = [seed::COMPOUND], bump, payer = authority, space = 8 + 32 + 32)]
+    pub compound: Account<'info, FiredrillCompound>,
 
-     #[account(mut)]
-     pub authority: Signer<'info>,
+    #[account(mut)]
+    pub authority: Signer<'info>,
 
-     pub system_program: Program<'info, System>,
- }
+    pub system_program: Program<'info, System>,
+}
+
+#[derive(Accounts)]
+pub struct EmitMessage<'info> {
+    #[account(mut, has_one = owner)]
+    pub compound: Account<'info, FiredrillCompound>,
+    pub owner: Signer<'info>,
+}
 
 #[derive(Accounts)]
 pub struct EmitUsdPerToken<'info> {
@@ -57,6 +104,13 @@ pub struct EmitUsdPerToken<'info> {
     pub owner: Signer<'info>,
 }
 
+#[event]
+pub struct CCIPMessageSent {
+    pub dest_chain_selector: u64,
+    pub sequence_number: u64,
+    pub message: SVM2AnyRampMessage,
+}
+
 #[event]
 pub struct UsdPerTokenUpdated {
     pub token: Pubkey,

chains/solana/contracts/programs/firedrill_compound/src/lib.rs

@@ -21,7 +21,4 @@ solana-program = "1.17.25" # pin solana to 1.17
 anchor-lang = { version = "0.29.0", features = ["init-if-needed"] }
 anchor-spl = "0.29.0"
 shared = { path = "../../crate/shared" }
-firedrill_onramp = { path = "../firedrill_onramp", features = ["cpi"] }
-firedrill_offramp = { path = "../firedrill_offramp", features = ["cpi"] }
-firedrill_compound = { path = "../firedrill_compound", features = ["cpi"] }
 

…rograms/firedrill_onramp/src/messages.rs …grams/firedrill_compound/src/messages.rschains/solana/contracts/programs/firedrill_onramp/src/messages.rs renamed to chains/solana/contracts/programs/firedrill_compound/src/messages.rs chains/solana/contracts/programs/firedrill_onramp/src/messages.rs renamed to chains/solana/contracts/programs/firedrill_compound/src/messages.rs

@@ -1,13 +1,7 @@
 use anchor_lang::prelude::*;
 use shared::seed;
 
-use firedrill_compound::program::FiredrillCompound;
-use firedrill_offramp::cpi::accounts::EmitCommitReport as OffRampCommitReport;
-use firedrill_offramp::program::FiredrillOfframp;
-use firedrill_onramp::cpi::accounts::EmitMessage as OnRampEmitMessage;
-use firedrill_onramp::program::FiredrillOnramp;
-
-declare_id!("F2dazhBjqX19HZBLvEHoToeggmDMj8xu3gaKkZ9YEpkU");
+declare_id!("Dri11jJrhAN5DEr3b47WqFh6jvskcq4TT8ZWBJuvCphX");
 
 #[program]
 pub mod firedrill_entrypoint {
@@ -17,7 +11,6 @@ pub mod firedrill_entrypoint {
         ctx: Context<Initialize>,
         chain_selector: u64,
         token: Pubkey,
-        on_ramp: Pubkey,
         off_ramp: Pubkey,
         compound: Pubkey,
         receiver: Pubkey,
@@ -26,85 +19,12 @@ pub mod firedrill_entrypoint {
         state.owner = ctx.accounts.authority.key();
         state.chain_selector = chain_selector;
         state.token = token;
-        state.on_ramp = on_ramp;
         state.off_ramp = off_ramp;
         state.compound = compound;
         state.receiver = receiver;
         state.send_last = 0;
         Ok(())
     }
-
-    pub fn prepare_register(ctx: Context<PrepareRegister>) -> Result<()> {
-        firedrill_offramp::cpi::emit_source_chain_added(CpiContext::new(
-            ctx.accounts.offramp_program.to_account_info(),
-            firedrill_offramp::cpi::accounts::EmitConfig {
-                offramp: ctx.accounts.offramp.to_account_info(),
-                owner: ctx.accounts.owner.to_account_info(),
-            },
-        ))
-    }
-
-    pub fn drill_pending_commit_queue_tx_spike(
-        ctx: Context<OnlyOwner>,
-        from: u8,
-        to: u8,
-    ) -> Result<()> {
-        let ep = &mut ctx.accounts.entrypoint;
-
-        require!(from <= to, CustomError::NothingToSend);
-        require!(from > ep.send_last, CustomError::AlreadySent);
-
-        for i in from..=to {
-            firedrill_onramp::cpi::emit_ccip_message_sent(
-                CpiContext::new(
-                    ctx.accounts.onramp_program.to_account_info(),
-                    OnRampEmitMessage {
-                        onramp: ctx.accounts.onramp.to_account_info(),
-                        owner: ctx.accounts.owner.to_account_info(),
-                    },
-                ),
-                ctx.program_id.key(),
-                i as u64,
-            )?;
-        }
-
-        ep.send_last = to;
-        Ok(())
-    }
-
-    pub fn drill_pending_execution(ctx: Context<OnlyOwner>, from: u8, to: u8) -> Result<()> {
-        require!(from <= to, CustomError::NothingToSend);
-        require!(
-            to <= ctx.accounts.entrypoint.send_last,
-            CustomError::NotYetSent
-        );
-
-        firedrill_offramp::cpi::emit_commit_report_accepted(
-            CpiContext::new(
-                ctx.accounts.offramp_program.to_account_info(),
-                OffRampCommitReport {
-                    offramp: ctx.accounts.offramp.to_account_info(),
-                    owner: ctx.accounts.owner.to_account_info(),
-                },
-            ),
-            from.into(),
-            to.into(),
-        )?;
-
-        Ok(())
-    }
-
-    pub fn drill_price_registries(ctx: Context<OnlyOwner>) -> Result<()> {
-        firedrill_compound::cpi::emit_usd_per_token_updated(CpiContext::new(
-            ctx.accounts.compound_program.to_account_info(),
-            firedrill_compound::cpi::accounts::EmitUsdPerToken {
-                compound: ctx.accounts.compound.to_account_info(),
-                owner: ctx.accounts.owner.to_account_info(),
-            },
-        ))?;
-
-        Ok(())
-    }
 }
 
 #[account]
@@ -113,7 +33,6 @@ pub struct FiredrillEntrypoint {
     pub owner: Pubkey,
     pub chain_selector: u64,
     pub token: Pubkey,
-    pub on_ramp: Pubkey,
     pub off_ramp: Pubkey,
     pub compound: Pubkey,
     pub receiver: Pubkey,
@@ -127,53 +46,4 @@ pub struct Initialize<'info> {
     #[account(mut)]
     pub authority: Signer<'info>,
     pub system_program: Program<'info, System>,
-}
-
-#[derive(Accounts)]
-pub struct PrepareRegister<'info> {
-    #[account(mut, has_one = owner)]
-    pub entrypoint: Account<'info, FiredrillEntrypoint>,
-
-    /// CHECK: account is passed to the OffRamp CPI, verified inside that program
-    #[account(mut)]
-    pub offramp: AccountInfo<'info>,
-
-    /// CHECK: only passed to CPI, validated in called program
-    pub owner: Signer<'info>,
-
-    /// CHECK: CPI target program
-    pub offramp_program: Program<'info, FiredrillOfframp>,
-}
-
-#[derive(Accounts)]
-pub struct OnlyOwner<'info> {
-    #[account(mut, has_one = owner)]
-    pub entrypoint: Account<'info, FiredrillEntrypoint>,
-    pub owner: Signer<'info>,
-
-    /// CHECK: CPI
-    #[account(mut)]
-    pub onramp: AccountInfo<'info>,
-
-    /// CHECK: CPI
-    #[account(mut)]
-    pub offramp: AccountInfo<'info>,
-
-    /// CHECK: CPI
-    #[account(mut)]
-    pub compound: AccountInfo<'info>,
-
-    pub onramp_program: Program<'info, FiredrillOnramp>,
-    pub offramp_program: Program<'info, FiredrillOfframp>,
-    pub compound_program: Program<'info, FiredrillCompound>,
-}
-
-#[error_code]
-pub enum CustomError {
-    #[msg("Nothing to send.")]
-    NothingToSend,
-    #[msg("Message already sent.")]
-    AlreadySent,
-    #[msg("Message not yet sent.")]
-    NotYetSent,
-}
+}

chains/solana/contracts/programs/firedrill_entrypoint/Cargo.toml

@@ -1,5 +1,5 @@
 use crate::program::FiredrillOfframp;
-use crate::{CcipOfframpError, Config};
+use crate::{CcipOfframpError, Config, SourceChain};
 use anchor_lang::prelude::*;
 use bytemuck::{Pod, Zeroable};
 use shared::seed;
@@ -8,7 +8,17 @@ use shared::seed;
 pub const ANCHOR_DISCRIMINATOR: usize = 8;
 
 #[derive(Accounts)]
+#[instruction(svm_chain_selector: u64)]
 pub struct InitializeConfig<'info> {
+    #[account(
+        init,
+        seeds = [seed::SOURCE_CHAIN, svm_chain_selector.to_le_bytes().as_ref()],
+        bump,
+        payer = authority,
+        space = ANCHOR_DISCRIMINATOR + SourceChain::INIT_SPACE,
+    )]
+    pub source_chain: Account<'info, SourceChain>,
+
     #[account(
         init,
         seeds = [seed::CONFIG],