Sync DVN Program: Add extend_dvn_config instruction (#136)

* feat: add extend_dvn_config instruction and update set_config logic

* feat: add ExtendPriceFeed instruction for price feed management

* chore: format code

* chore: sync price feed logic

Author: ziming-zung

packages/layerzero-v2/solana/programs/programs/dvn/src/instructions/admin/extend_dvn_config.rs

@@ -0,0 +1,24 @@
+use crate::*;
+
+#[derive(Accounts)]
+pub struct ExtendDVNConfig<'info> {
+    #[account(mut)]
+    pub admin: Signer<'info>,
+    #[account(
+        mut,
+        seeds = [DVN_CONFIG_SEED],
+        bump = config.bump,
+        realloc = 8 + DvnConfig::INIT_SPACE + DstConfig::INIT_SPACE * (DST_CONFIG_MAX_LEN - DST_CONFIG_DEFAULT_LEN),
+        realloc::payer = admin,
+        realloc::zero = false,
+        constraint = config.admins.contains(admin.key) @DvnError::NotAdmin
+    )]
+    pub config: Account<'info, DvnConfig>,
+    pub system_program: Program<'info, System>,
+}
+
+impl ExtendDVNConfig<'_> {
+    pub fn apply(_ctx: &mut Context<ExtendDVNConfig>) -> Result<()> {
+        Ok(())
+    }
+}

packages/layerzero-v2/solana/programs/programs/dvn/src/instructions/admin/mod.rs

@@ -1,9 +1,11 @@
 pub mod close_execute;
+pub mod extend_dvn_config;
 pub mod invoke;
 pub mod set_config;
 pub mod withdraw_fee;
 
 pub use close_execute::*;
+pub use extend_dvn_config::*;
 pub use invoke::*;
 pub use set_config::*;
 pub use withdraw_fee::*;

packages/layerzero-v2/solana/programs/programs/dvn/src/instructions/admin/set_config.rs

@@ -15,7 +15,13 @@ pub struct SetConfig<'info> {
 
 impl SetConfig<'_> {
     pub fn apply(ctx: &mut Context<SetConfig>, params: &SetConfigParams) -> Result<()> {
-        params.config.apply(&mut ctx.accounts.config)?;
+        let account_size = ctx.accounts.config.to_account_info().data_len();
+        let dst_configs_max_len = if account_size > (DvnConfig::INIT_SPACE + 8) {
+            DST_CONFIG_MAX_LEN
+        } else {
+            DST_CONFIG_DEFAULT_LEN
+        };
+        params.config.apply(dst_configs_max_len, &mut ctx.accounts.config)?;
         emit_cpi!(AdminConfigSetEvent { config: params.config.clone() });
         Ok(())
     }
@@ -36,7 +42,7 @@ pub enum AdminConfig {
 }
 
 impl AdminConfig {
-    pub fn apply(&self, config: &mut DvnConfig) -> Result<()> {
+    pub fn apply(&self, dst_configs_max_len: usize, config: &mut DvnConfig) -> Result<()> {
         match self {
             AdminConfig::Admins(admins) => {
                 config.set_admins(admins.clone())?;
@@ -45,7 +51,7 @@ impl AdminConfig {
                 config.default_multiplier_bps = *default_multiplier_bps;
             },
             AdminConfig::DstConfigs(dst_configs) => {
-                config.set_dst_configs(dst_configs.clone())?;
+                config.set_dst_configs(dst_configs_max_len, dst_configs.clone())?;
             },
             AdminConfig::PriceFeed(price_feed) => {
                 config.price_feed = *price_feed;

packages/layerzero-v2/solana/programs/programs/dvn/src/lib.rs

@@ -32,6 +32,10 @@ pub mod dvn {
         SetConfig::apply(&mut ctx, &params)
     }
 
+    pub fn extend_dvn_config(mut ctx: Context<ExtendDVNConfig>) -> Result<()> {
+        ExtendDVNConfig::apply(&mut ctx)
+    }
+
     pub fn invoke(mut ctx: Context<Invoke>, params: InvokeParams) -> Result<()> {
         Invoke::apply(&mut ctx, &params)
     }

packages/layerzero-v2/solana/programs/programs/dvn/src/state/dvn_config.rs

@@ -19,7 +19,8 @@ pub const VERIFY_BYTES: u64 = 320;
 pub const ADMINS_MAX_LEN: usize = 5;
 pub const SIGNERS_MAX_LEN: usize = 7;
 pub const MSGLIBS_MAX_LEN: usize = 10;
-pub const DST_CONFIG_MAX_LEN: usize = 140;
+pub const DST_CONFIG_DEFAULT_LEN: usize = 140;
+pub const DST_CONFIG_MAX_LEN: usize = 200;
 
 #[account]
 #[derive(InitSpace)]
@@ -39,7 +40,7 @@ pub struct DvnConfig {
     pub admins: Vec<Pubkey>,
     // set by admins
     pub price_feed: Pubkey,
-    #[max_len(DST_CONFIG_MAX_LEN)]
+    #[max_len(DST_CONFIG_DEFAULT_LEN)]
     pub dst_configs: Vec<DstConfig>,
     pub default_multiplier_bps: u16,
 }
@@ -64,12 +65,12 @@ impl DvnConfig {
         Ok(())
     }
 
-    pub fn set_dst_configs(&mut self, dst_configs: Vec<DstConfig>) -> Result<()> {
+    pub fn set_dst_configs(&mut self, max_len: usize, dst_configs: Vec<DstConfig>) -> Result<()> {
         for config in &dst_configs {
             sorted_list_helper::insert_or_update_sorted_list_by_eid(
                 &mut self.dst_configs,
                 config.clone(),
-                DST_CONFIG_MAX_LEN,
+                max_len,
             )?;
         }
         Ok(())

packages/layerzero-v2/solana/programs/programs/pricefeed/src/instructions/admin/extend_price_feed.rs

@@ -0,0 +1,22 @@
+use crate::*;
+
+#[derive(Accounts)]
+pub struct ExtendPriceFeed<'info> {
+    #[account(mut)]
+    pub admin: Signer<'info>,
+    #[account(
+        mut,
+        realloc = 8 + PriceFeed::INIT_SPACE + Price::INIT_SPACE * (PRICES_MAX_LEN - PRICES_DEFAULT_LEN),
+        realloc::payer = admin,
+        realloc::zero = false,
+        has_one = admin,
+    )]
+    pub price_feed: Account<'info, PriceFeed>,
+    pub system_program: Program<'info, System>,
+}
+
+impl ExtendPriceFeed<'_> {
+    pub fn apply(_ctx: &mut Context<ExtendPriceFeed>) -> Result<()> {
+        Ok(())
+    }
+}

packages/layerzero-v2/solana/programs/programs/pricefeed/src/instructions/admin/mod.rs

@@ -1,7 +1,9 @@
+pub mod extend_price_feed;
 pub mod init_price_feed;
 pub mod set_price_feed;
 pub mod transfer_admin;
 
+pub use extend_price_feed::*;
 pub use init_price_feed::*;
 pub use set_price_feed::*;
 pub use transfer_admin::*;

packages/layerzero-v2/solana/programs/programs/pricefeed/src/instructions/updater/set_price.rs

@@ -24,10 +24,16 @@ impl SetPrice<'_> {
                 gas_per_byte: price_params.gas_per_byte,
                 model_type: price_params.model_type,
             };
+            let account_size = ctx.accounts.price_feed.to_account_info().data_len();
+            let max_len = if account_size > (PriceFeed::INIT_SPACE + 8) {
+                PRICES_MAX_LEN
+            } else {
+                PRICES_DEFAULT_LEN
+            };
             sorted_list_helper::insert_or_update_sorted_list_by_eid(
                 &mut ctx.accounts.price_feed.prices,
                 price,
-                PRICES_MAX_LEN,
+                max_len,
             )
         } else {
             sorted_list_helper::remove_from_sorted_list_by_eid(

packages/layerzero-v2/solana/programs/programs/pricefeed/src/lib.rs

@@ -27,12 +27,18 @@ pub mod pricefeed {
     ) -> Result<()> {
         InitPriceFeed::apply(&mut ctx, &params)
     }
+
+    pub fn extend_price_feed(mut ctx: Context<ExtendPriceFeed>) -> Result<()> {
+        ExtendPriceFeed::apply(&mut ctx)
+    }
+
     pub fn set_price_feed(
         mut ctx: Context<SetPriceFeed>,
         params: SetPriceFeedParams,
     ) -> Result<()> {
         SetPriceFeed::apply(&mut ctx, &params)
     }
+
     pub fn transfer_admin(
         mut ctx: Context<TransferAdmin>,
         params: TransferAdminParams,

packages/layerzero-v2/solana/programs/programs/pricefeed/src/state/price.rs

@@ -2,7 +2,8 @@ use crate::*;
 use utils::sorted_list_helper;
 
 pub const UPDATERS_MAX_LEN: usize = 8;
-pub const PRICES_MAX_LEN: usize = 140;
+pub const PRICES_DEFAULT_LEN: usize = 140;
+pub const PRICES_MAX_LEN: usize = 340;
 pub const EID_MODULUS: u32 = 30000;
 
 #[account]
@@ -14,7 +15,7 @@ pub struct PriceFeed {
     pub price_ratio_denominator: u128,
     pub arbitrum_compression_percent: u128,
     pub native_token_price_usd: Option<u128>,
-    #[max_len(PRICES_MAX_LEN)]
+    #[max_len(PRICES_DEFAULT_LEN)]
     pub prices: Vec<Price>,
     pub bump: u8,
 }