add fee quoter

Author: bukata-sa

chains/solana/Makefile

@@ -41,7 +41,15 @@ lint-go-fix:
 
 .PHONY: anchor-go-gen
 anchor-go-gen:
-	cd ./contracts && rm -rf ./gobindings && anchor build && cd .. && ./scripts/anchor-go-gen.sh
+	rm -rf ./gobindings && cd ./contracts && anchor build && cd .. && ./scripts/anchor-go-gen.sh
+
+.PHONY: rematch-ids
+rematch-ids:
+	./scripts/rematch-ids.sh
+
+.PHONY: reclaim-sol
+reclaim-sol:
+	./scripts/reclaim-sol.sh
 
 .PHONY: format
 format:

chains/solana/contracts/Anchor.toml

@@ -6,11 +6,12 @@ seeds = false
 skip-lint = false
 
 [programs.devnet]
+failing_receiver = "Dri11EwVRViqqkjs7SWV3d3ejcanBGMNrcGhD6HVn756"
 firedrill_compound = "Dri11NnBPbx85w8a47ZXBZa3Hi7E2xvHAA9Xpyk7UivQ"
 firedrill_entrypoint = "Dri11c6TXJXELaZUgQtyw3doxbn7bGXQ6z5LRZ8bMPbc"
+firedrill_feequoter = "3d1KhA6K2L6pbzpuhYGHTcsj1B4f3r86wJRE81brYTQW"
 firedrill_offramp = "Dri11kiWR5f1oTn5NLm3wmfaDq3cYauR92wrsTxNaudt"
 firedrill_token = "Dri11r4S1hY8iMpxNh6UoYZ9hsGgmGUUyZ3zxUb2rpc2"
-failing_receiver = "Dri11EwVRViqqkjs7SWV3d3ejcanBGMNrcGhD6HVn756"
 
 [registry]
 url = "https://api.apr.dev"

chains/solana/contracts/Cargo.lock

@@ -1,7 +1,7 @@
 // Fixed seeds - different contexts must use different PDA seeds
 pub const ENTRYPOINT: &[u8] = b"entrypoint";
 pub const OFFRAMP: &[u8] = b"offramp";
-pub const ONRAMP: &[u8] = b"onramp";
+pub const FEE_QUOTER: &[u8] = b"fee_quoter";
 pub const COMPOUND: &[u8] = b"compound";
 pub const TOKEN: &[u8] = b"token";
 pub const CONFIG: &[u8] = b"config";

chains/solana/contracts/crate/shared/src/seed.rs

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

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

@@ -4,20 +4,52 @@ use shared::seed;
 pub mod messages;
 use crate::messages::*;
 
+pub mod state;
+use crate::state::*;
+
 use ethnum::U256;
 
-declare_id!("9foztXMAs3Zdgx7ZkxDksb2S6piKE6R5G9iM5oAuVwFP");
+declare_id!("mjNGiAfCXTWqcD5TSy1wJ65g3kmwepud9NYxj1B36oy");
 
 // FiredrillCompound is Router, OnRamp, RMNRemote, FeeQuoter and TokenAdminRegistry
 #[program]
 pub mod firedrill_compound {
     use super::*;
 
-    pub fn initialize(ctx: Context<Initialize>, token: Pubkey, chain_selector: u64) -> Result<()> {
+    pub fn initialize(ctx: Context<Initialize>, chain_selector: u64, fee_quoter: Pubkey, token: Pubkey) -> Result<()> {
         let compound = &mut ctx.accounts.compound;
         compound.chain_selector = chain_selector;
         compound.owner = ctx.accounts.authority.key();
+        compound.fee_quoter = fee_quoter;
         compound.token = token;
+
+        ctx.accounts.config.set_inner(Config {
+            version: 1,
+            default_code_version: CodeVersion::V1,
+            owner: ctx.accounts.authority.key(),
+            proposed_owner: Pubkey::default(),
+            svm_chain_selector: chain_selector,
+            fee_quoter,
+            rmn_remote: ID,
+            link_token_mint: token,
+            fee_aggregator: ID,
+        });
+
+        ctx.accounts.dest_chain.set_inner(DestChain {
+            version: 1,
+            chain_selector,
+            state: DestChainState {
+                sequence_number: 1,
+                sequence_number_to_restore: 1,
+                restore_on_action: RestoreOnAction::None,
+            },
+            config: DestChainConfig {
+                lane_code_version: CodeVersion::V1,
+                allowed_senders: vec![],
+                allow_list_enabled: false,
+            },
+        });
+
         Ok(())
     }
 
@@ -53,38 +85,66 @@ pub mod firedrill_compound {
 
         Ok(())
     }
-
-    pub fn emit_usd_per_token_updated(ctx: Context<EmitUsdPerToken>) -> Result<()> {
-        let compound = &ctx.accounts.compound;
-
-        let token = compound.token;
-        let mut value = [0u8; 28];
-        let val = 1u128.to_le_bytes(); // 16 bytes
-        value[..16].copy_from_slice(&val);
-        let timestamp = Clock::get()?.unix_timestamp;
-
-        emit!(UsdPerTokenUpdated {
-            token,
-            value,
-            timestamp,
-        });
-
-        Ok(())
-    }
 }
 
 #[account]
 pub struct FiredrillCompound {
     pub chain_selector: u64,
     pub owner: Pubkey,
+    pub fee_quoter: Pubkey,
     pub token: Pubkey,
 }
 
+#[account]
+#[derive(InitSpace, Debug)]
+pub struct DestChain {
+    // Config for SVM2Any
+    pub version: u8,
+    pub chain_selector: u64,     // Chain selector used for the seed
+    pub state: DestChainState,   // values that are updated automatically
+    pub config: DestChainConfig, // values configured by an admin
+}
+
+#[account]
+#[derive(InitSpace, Debug)]
+pub struct Config {
+    pub version: u8,
+
+    pub default_code_version: CodeVersion,
+
+    pub svm_chain_selector: u64,
+    pub owner: Pubkey,
+    pub proposed_owner: Pubkey,
+    pub fee_quoter: Pubkey,
+    pub rmn_remote: Pubkey,
+    pub link_token_mint: Pubkey,
+    pub fee_aggregator: Pubkey, // Allowed address to withdraw billed fees to (will use ATAs derived from it)
+}
+
 #[derive(Accounts)]
+#[instruction(chain_selector: u64, fee_quoter: Pubkey, token: Pubkey)]
 pub struct Initialize<'info> {
-    #[account(init, seeds = [seed::COMPOUND], bump, payer = authority, space = 8 + 8 + 32 + 32)]
+    #[account(init, seeds = [seed::COMPOUND], bump, payer = authority, space = 8 + 8 + 32 + 32 + 32)]
     pub compound: Account<'info, FiredrillCompound>,
 
+    #[account(
+        init,
+        seeds = [seed::CONFIG],
+        bump,
+        payer = authority,
+        space = 8 + Config::INIT_SPACE,
+    )]
+    pub config: Account<'info, Config>,
+
+    #[account(
+        init,
+        seeds = [seed::DEST_CHAIN_STATE, chain_selector.to_le_bytes().as_ref()],
+        bump,
+        payer = authority,
+        space = 8 + DestChain::INIT_SPACE + 4, // 4 = empty Vec<Pubkey> len prefix
+    )]
+    pub dest_chain: Account<'info, DestChain>,
+
     #[account(mut)]
     pub authority: Signer<'info>,
 
@@ -98,23 +158,9 @@ pub struct EmitMessage<'info> {
     pub owner: Signer<'info>,
 }
 
-#[derive(Accounts)]
-pub struct EmitUsdPerToken<'info> {
-    #[account(mut, has_one = owner)]
-    pub compound: Account<'info, FiredrillCompound>,
-    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,
-    pub value: [u8; 28],
-    pub timestamp: i64,
-}

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

@@ -0,0 +1,74 @@
+use std::fmt::Display;
+
+use anchor_lang::prelude::borsh::{BorshDeserialize, BorshSerialize};
+use anchor_lang::prelude::*;
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy, InitSpace, BorshSerialize, BorshDeserialize)]
+#[repr(u8)]
+pub enum CodeVersion {
+    Default = 0,
+    V1,
+}
+
+impl Display for CodeVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            CodeVersion::Default => write!(f, "Default"),
+            CodeVersion::V1 => write!(f, "V1"),
+        }
+    }
+}
+
+#[derive(Clone, AnchorSerialize, AnchorDeserialize, InitSpace, Debug, PartialEq, Eq, Copy)]
+pub enum RestoreOnAction {
+    None,     // initial case, there's no saved sequence number to restore
+    Upgrade, // after a rollback, the saved sequence number must be restored on the following upgrade
+    Rollback, // after an upgrade, the saved sequence number must be restored on the following rollback
+}
+
+impl Display for RestoreOnAction {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            RestoreOnAction::None => write!(f, "None"),
+            RestoreOnAction::Upgrade => write!(f, "Upgrade"),
+            RestoreOnAction::Rollback => write!(f, "Rollback"),
+        }
+    }
+}
+
+#[derive(Clone, AnchorSerialize, AnchorDeserialize, InitSpace, Debug, PartialEq, Eq, Copy)]
+pub struct DestChainState {
+    pub sequence_number: u64, // The last used sequence number. On upgrades, this is reset to 0.
+
+    // The following property is used to support one rollback operation, in which the sequence number of
+    // the previous OnRamp version is restored. The upgrade/rollback is done per-lane (i.e. per dest chain).
+    // If it's 0, that means that it is not possible to rollback to the previous version. As version upgrades
+    // are not often, we won't need to rollback multiple versions.
+    pub sequence_number_to_restore: u64, // The last used sequence number in the previous onramp version
+    pub restore_on_action: RestoreOnAction,
+}
+
+#[derive(Clone, AnchorSerialize, AnchorDeserialize, InitSpace, Debug)]
+pub struct DestChainConfig {
+    // The code version of the lane, in case we need to shift traffic to new logic for a single lane to test an upgrade
+    pub lane_code_version: CodeVersion,
+
+    // list of senders authorized to send messages to this destination chain.
+    // Note: The attribute name `max_len` is slightly misleading: it is not in any
+    // way limiting the actual length of the vector during initialization; it just
+    // helps the InitSpace derive macro work out the initial space. We can leave it at
+    // zero and calculate the actual length in the instruction context.
+    #[max_len(0)]
+    pub allowed_senders: Vec<Pubkey>,
+    pub allow_list_enabled: bool,
+}
+
+impl DestChainConfig {
+    pub fn space(&self) -> usize {
+        Self::INIT_SPACE + self.dynamic_space()
+    }
+
+    pub fn dynamic_space(&self) -> usize {
+        self.allowed_senders.len() * std::mem::size_of::<Pubkey>()
+    }
+}

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

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use shared::seed;
 
-declare_id!("Dri11jJrhAN5DEr3b47WqFh6jvskcq4TT8ZWBJuvCphX");
+declare_id!("351TRJhiMuGnf9YJjhyVA1HHGDAUbwq1U7ppQQZNhsqj");
 
 #[program]
 pub mod firedrill_entrypoint {
@@ -12,6 +12,7 @@ pub mod firedrill_entrypoint {
         chain_selector: u64,
         token: Pubkey,
         off_ramp: Pubkey,
+        fee_quoter: Pubkey,
         compound: Pubkey,
         receiver: Pubkey,
     ) -> Result<()> {
@@ -20,6 +21,7 @@ pub mod firedrill_entrypoint {
         state.chain_selector = chain_selector;
         state.token = token;
         state.off_ramp = off_ramp;
+        state.fee_quoter = fee_quoter;
         state.compound = compound;
         state.receiver = receiver;
         state.send_last = 0;
@@ -34,6 +36,7 @@ pub struct FiredrillEntrypoint {
     pub chain_selector: u64,
     pub token: Pubkey,
     pub off_ramp: Pubkey,
+    pub fee_quoter: Pubkey,
     pub compound: Pubkey,
     pub receiver: Pubkey,
     pub send_last: u8,

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

@@ -0,0 +1,22 @@
+[package]
+name = "firedrill_feequoter"
+version = "0.1.0"
+description = "Created with Anchor"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "firedrill_feequoter"
+
+[features]
+no-entrypoint = []
+no-idl = []
+no-log-ix-name = []
+cpi = ["no-entrypoint"]
+default = []
+
+[dependencies]
+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" }

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

@@ -0,0 +1,2 @@
+[target.bpfel-unknown-unknown.dependencies.std]
+features = []