Add reserved bytes in accounts to better support upgradability

psyoptions-american-instrument/program/src/instructions.rs

@@ -12,7 +12,7 @@ const ESCROW_SEED: &str = "escrow";
 pub struct ValidateData<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
 
     /// user provided
     pub american_meta: Account<'info, OptionMarket>,
@@ -25,9 +25,9 @@ pub struct ValidateData<'info> {
 pub struct PrepareToSettle<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
-    pub response: Account<'info, Response>,
+    pub response: Box<Account<'info, Response>>,
 
     /// user provided
     #[account(mut)]
@@ -50,8 +50,8 @@ pub struct PrepareToSettle<'info> {
 pub struct Settle<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
-    pub rfq: Account<'info, Rfq>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
+    pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 
     /// user provided
@@ -68,8 +68,8 @@ pub struct Settle<'info> {
 pub struct RevertPreparation<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
-    pub rfq: Account<'info, Rfq>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
+    pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 
     /// user provided
@@ -86,8 +86,8 @@ pub struct RevertPreparation<'info> {
 pub struct CleanUp<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
-    pub rfq: Account<'info, Rfq>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
+    pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 
     /// user provided

psyoptions-european-instrument/program/src/lib.rs

@@ -327,7 +327,7 @@ fn close_escrow_account<'info>(
 pub struct ValidateData<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
 
     /// user provided
     pub euro_meta: Account<'info, EuroMeta>,
@@ -340,9 +340,9 @@ pub struct ValidateData<'info> {
 pub struct PrepareToSettle<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
-    pub response: Account<'info, Response>,
+    pub response: Box<Account<'info, Response>>,
 
     /// user provided
     #[account(mut)]
@@ -366,7 +366,7 @@ pub struct PrepareToSettle<'info> {
 pub struct Settle<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 
@@ -384,7 +384,7 @@ pub struct Settle<'info> {
 pub struct RevertPreparation<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 
@@ -402,7 +402,7 @@ pub struct RevertPreparation<'info> {
 pub struct CleanUp<'info> {
     /// protocol provided
     #[account(signer)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
     pub response: Account<'info, Response>,
 

rfq/program/src/common.rs

@@ -8,7 +8,7 @@ use crate::{
     interfaces::instrument::validate_leg_instrument_data,
     seeds::COLLATERAL_SEED,
     state::{
-        AuthoritySide, BaseAssetInfo, CollateralInfo, Leg, ProtocolState, Response, Rfq,
+        ApiLeg, AuthoritySide, BaseAssetInfo, CollateralInfo, ProtocolState, Response, Rfq,
         StoredResponseState,
     },
 };
@@ -86,7 +86,7 @@ pub fn update_state_after_preparation(
 }
 
 pub fn validate_legs<'a, 'info: 'a>(
-    legs: &[Leg],
+    legs: &[ApiLeg],
     protocol: &Account<'info, ProtocolState>,
     remaining_accounts: &mut impl Iterator<Item = &'a AccountInfo<'info>>,
 ) -> Result<()> {

rfq/program/src/instructions/collateral/fund_collateral.rs

@@ -14,7 +14,7 @@ pub struct FundCollateralAccounts<'info> {
     pub user_tokens: Account<'info, TokenAccount>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(seeds = [COLLATERAL_SEED.as_bytes(), user.key().as_ref()], bump = collateral_info.bump)]
     pub collateral_info: Account<'info, CollateralInfo>,
     #[account(mut, seeds = [COLLATERAL_TOKEN_SEED.as_bytes(), user.key().as_ref()],

rfq/program/src/instructions/collateral/initialize_collateral.rs

@@ -14,7 +14,7 @@ pub struct InitializeCollateralAccounts<'info> {
     pub user: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(init, payer = user, space = 8 + mem::size_of::<CollateralInfo>(),
                 seeds = [COLLATERAL_SEED.as_bytes(), user.key().as_ref()], bump)]
     pub collateral_info: Account<'info, CollateralInfo>,
@@ -43,6 +43,7 @@ pub fn initialize_collateral_instruction(ctx: Context<InitializeCollateralAccoun
         user: user.key(),
         token_account_bump: *ctx.bumps.get("collateral_token").unwrap(),
         locked_tokens_amount: 0,
+        reserved: [0; 256],
     });
 
     Ok(())

rfq/program/src/instructions/collateral/withdraw_collateral.rs

@@ -15,7 +15,7 @@ pub struct WithdrawCollateralAccounts<'info> {
     pub user_tokens: Account<'info, TokenAccount>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(seeds = [COLLATERAL_SEED.as_bytes(), user.key().as_ref()], bump = collateral_info.bump)]
     pub collateral_info: Account<'info, CollateralInfo>,
     #[account(mut, seeds = [COLLATERAL_TOKEN_SEED.as_bytes(), user.key().as_ref()],

rfq/program/src/instructions/protocol/add_base_asset.rs

@@ -13,7 +13,7 @@ pub struct AddBaseAssetAccounts<'info> {
     #[account(mut, constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(init, payer = authority, space = 8 + mem::size_of::<BaseAssetInfo>() + ticker.as_bytes().len(),
                 seeds = [BASE_ASSET_INFO_SEED.as_bytes(), &u16::from(index).to_le_bytes()], bump)]
     pub base_asset: Account<'info, BaseAssetInfo>,

rfq/program/src/instructions/protocol/add_instrument.rs

@@ -10,7 +10,7 @@ pub struct AddInstrumentAccounts<'info> {
     #[account(constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(mut, seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     /// CHECK: is a valid instrument program id
     #[account(executable)]
     pub instrument_program: UncheckedAccount<'info>,
@@ -60,6 +60,7 @@ pub fn add_instrument_instruction(
         settle_account_amount,
         revert_preparation_account_amount,
         clean_up_account_amount,
+        reserved: [0; 32],
     });
 
     Ok(())

rfq/program/src/instructions/protocol/change_base_asset_parameters.rs

@@ -10,7 +10,7 @@ pub struct ChangeBaseAssetParametersAccounts<'info> {
     #[account(constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut)]
     pub base_asset: Account<'info, BaseAssetInfo>,
 }

rfq/program/src/instructions/protocol/change_protocol_fees.rs

@@ -10,7 +10,7 @@ pub struct ChangeProtocolFeesAccounts<'info> {
     #[account(constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(mut, seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
 }
 
 fn validate(settle_fees: Option<FeeParameters>, default_fees: Option<FeeParameters>) -> Result<()> {

rfq/program/src/instructions/protocol/close_protocol_state.rs

@@ -15,5 +15,5 @@ pub struct CloseProtocolStateAccounts<'info> {
         seeds = [PROTOCOL_SEED.as_bytes()],
         bump
     )]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
 }

rfq/program/src/instructions/protocol/initialize_protocol.rs

@@ -16,7 +16,7 @@ pub struct InitializeProtocolAccounts<'info> {
         space = ProtocolState::get_allocated_size(),
         bump
     )]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     /// CHECK: is a valid risk engine program id
     #[account(executable)]
     pub risk_engine: AccountInfo<'info>,
@@ -53,6 +53,7 @@ pub fn initialize_protocol_instruction(
         risk_engine: risk_engine.key(),
         collateral_mint: collateral_mint.key(),
         instruments: Default::default(),
+        reserved: [0; 1024],
     });
 
     Ok(())

rfq/program/src/instructions/protocol/register_mint.rs

@@ -13,7 +13,7 @@ pub struct RegisterMintAccounts<'info> {
     #[account(mut, constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(init, payer = authority, space = 8 + mem::size_of::<MintInfo>(),
                 seeds = [MINT_INFO_SEED.as_bytes(), mint.key().as_ref()], bump)]
     pub mint_info: Account<'info, MintInfo>,

rfq/program/src/instructions/protocol/set_instrument_enabled_status.rs

@@ -6,7 +6,7 @@ pub struct SetInstrumentEnabledStatusAccounts<'info> {
     #[account(constraint = protocol.authority == authority.key() @ ProtocolError::NotAProtocolAuthority)]
     pub authority: Signer<'info>,
     #[account(mut, seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
 }
 
 fn validate(

rfq/program/src/instructions/rfq/add_legs_to_rfq.rs

@@ -2,7 +2,7 @@ use crate::{
     common::validate_legs,
     errors::ProtocolError,
     seeds::PROTOCOL_SEED,
-    state::{Leg, ProtocolState, Rfq, RfqState},
+    state::{ApiLeg, ProtocolState, Rfq, RfqState},
 };
 use anchor_lang::prelude::*;
 
@@ -12,14 +12,14 @@ pub struct AddLegsToRfqAccounts<'info> {
     pub taker: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut)]
     pub rfq: Box<Account<'info, Rfq>>,
 }
 
 fn validate<'info>(
     ctx: &Context<'_, '_, '_, 'info, AddLegsToRfqAccounts<'info>>,
-    legs: &Vec<Leg>,
+    legs: &Vec<ApiLeg>,
 ) -> Result<()> {
     let AddLegsToRfqAccounts { protocol, rfq, .. } = &ctx.accounts;
     let mut remaining_accounts = ctx.remaining_accounts.iter();
@@ -39,13 +39,15 @@ fn validate<'info>(
 
 pub fn add_legs_to_rfq_instruction<'info>(
     ctx: Context<'_, '_, '_, 'info, AddLegsToRfqAccounts<'info>>,
-    mut legs: Vec<Leg>,
+    legs: Vec<ApiLeg>,
 ) -> Result<()> {
     validate(&ctx, &legs)?;
 
     let AddLegsToRfqAccounts { rfq, .. } = ctx.accounts;
 
-    rfq.legs.append(&mut legs);
+    for leg in legs {
+        rfq.legs.push(leg.into());
+    }
 
     Ok(())
 }

rfq/program/src/instructions/rfq/cancel_response.rs

@@ -11,7 +11,7 @@ pub struct CancelResponseAccounts<'info> {
     pub maker: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
     #[account(mut, constraint = response.rfq == rfq.key() @ ProtocolError::ResponseForAnotherRfq)]
     pub response: Account<'info, Response>,

rfq/program/src/instructions/rfq/cancel_rfq.rs

@@ -11,7 +11,7 @@ pub struct CancelRfqAccounts<'info> {
     pub taker: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut)]
     pub rfq: Box<Account<'info, Rfq>>,
 }

rfq/program/src/instructions/rfq/clean_up_response.rs

@@ -13,7 +13,7 @@ pub struct CleanUpResponseAccounts<'info> {
     pub maker: UncheckedAccount<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut)]
     pub rfq: Box<Account<'info, Rfq>>,
     #[account(mut, close = maker, constraint = response.rfq == rfq.key() @ ProtocolError::ResponseForAnotherRfq)]

rfq/program/src/instructions/rfq/clean_up_response_legs.rs

@@ -9,7 +9,7 @@ use anchor_lang::prelude::*;
 #[derive(Accounts)]
 pub struct CleanUpResponseLegsAccounts<'info> {
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     pub rfq: Box<Account<'info, Rfq>>,
     #[account(mut, constraint = response.rfq == rfq.key() @ ProtocolError::ResponseForAnotherRfq)]
     pub response: Account<'info, Response>,

rfq/program/src/instructions/rfq/clean_up_rfq.rs

@@ -12,7 +12,7 @@ pub struct CleanUpRfqAccounts<'info> {
     pub taker: UncheckedAccount<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut, close = taker)]
     pub rfq: Box<Account<'info, Rfq>>,
 }

rfq/program/src/instructions/rfq/confirm_response.rs

@@ -16,11 +16,11 @@ pub struct ConfirmResponseAccounts<'info> {
     pub taker: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(mut)]
     pub rfq: Box<Account<'info, Rfq>>,
     #[account(mut, constraint = response.rfq == rfq.key() @ ProtocolError::ResponseForAnotherRfq)]
-    pub response: Account<'info, Response>,
+    pub response: Box<Account<'info, Response>>,
     #[account(mut, seeds = [COLLATERAL_SEED.as_bytes(), taker.key().as_ref()],
                 bump = collateral_info.bump)]
     pub collateral_info: Account<'info, CollateralInfo>,

rfq/program/src/instructions/rfq/create_rfq.rs

@@ -5,7 +5,7 @@ use crate::{
     errors::ProtocolError,
     interfaces::instrument::validate_quote_instrument_data,
     seeds::{PROTOCOL_SEED, RFQ_SEED},
-    state::{rfq::QuoteAsset, FixedSize, Leg, OrderType, ProtocolState, Rfq, StoredRfqState},
+    state::{rfq::QuoteAsset, ApiLeg, FixedSize, OrderType, ProtocolState, Rfq, StoredRfqState},
 };
 use anchor_lang::prelude::*;
 use solana_program::hash::hash;
@@ -16,7 +16,7 @@ const RECENT_TIMESTAMP_VALIDITY: u64 = 120; // slightly higher then the recent b
 #[instruction(
     expected_legs_size: u16,
     expected_legs_hash: [u8; 32],
-    _legs: Vec<Leg>,
+    _legs: Vec<ApiLeg>,
     order_type: OrderType,
     quote_asset: QuoteAsset,
     fixed_size: FixedSize,
@@ -29,7 +29,7 @@ pub struct CreateRfqAccounts<'info> {
     pub taker: Signer<'info>,
 
     #[account(seeds = [PROTOCOL_SEED.as_bytes()], bump = protocol.bump)]
-    pub protocol: Account<'info, ProtocolState>,
+    pub protocol: Box<Account<'info, ProtocolState>>,
     #[account(init, payer = taker, space = 8 + mem::size_of::<Rfq>() + expected_legs_size as usize, seeds = [
         RFQ_SEED.as_bytes(),
         taker.key().as_ref(),
@@ -68,7 +68,7 @@ fn validate_legs<'a, 'info: 'a>(
     protocol: &Account<'info, ProtocolState>,
     remaining_accounts: &mut impl Iterator<Item = &'a AccountInfo<'info>>,
     expected_leg_size: u16,
-    legs: &[Leg],
+    legs: &[ApiLeg],
 ) -> Result<()> {
     require!(
         legs.len() <= Rfq::MAX_LEGS_AMOUNT as usize,
@@ -101,7 +101,7 @@ pub fn create_rfq_instruction<'info>(
     ctx: Context<'_, '_, '_, 'info, CreateRfqAccounts<'info>>,
     expected_legs_size: u16,
     expected_legs_hash: [u8; 32],
-    legs: Vec<Leg>,
+    legs: Vec<ApiLeg>,
     order_type: OrderType,
     quote_asset: QuoteAsset,
     fixed_size: FixedSize,
@@ -133,7 +133,8 @@ pub fn create_rfq_instruction<'info>(
         total_responses: 0,
         cleared_responses: 0,
         confirmed_responses: 0,
-        legs,
+        reserved: [0; 256],
+        legs: legs.into_iter().map(Into::into).collect(),
     });
 
     Ok(())