add tests for init if and init competitor

.eslintignore

@@ -0,0 +1 @@
+drift-competitions

.github/workflows/main.yml

@@ -14,7 +14,7 @@ defaults:
 env:
   CARGO_TERM_COLOR: always
   RUST_TOOLCHAIN: 1.67.0
-  SOLANA_VERSION: '1.14.7'
+  SOLANA_VERSION: "1.14.7"
 
 jobs:
   fmt-clippy:
@@ -59,8 +59,8 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "16.x"
+          registry-url: "https://registry.npmjs.org"
       - name: Install yarn
         run: yarn
       - name: Run prettier
@@ -72,8 +72,8 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "16.x"
+          registry-url: "https://registry.npmjs.org"
       - name: Install yarn
         run: yarn
       - name: Run lint
@@ -82,7 +82,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout main
+        uses: actions/checkout@v3
+
+      - name: Checkout competitions
+        uses: actions/checkout@v3
+        with:
+          repository: drift-labs/drift-competitions
+          ssh-key: ${{ secrets.DRIFT_COMMON_DEPLOY_KEY }}
+          path: drift-competitions
+          submodules: recursive
 
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
@@ -93,7 +102,7 @@ jobs:
       - name: Cache build artefacts
         uses: Swatinem/rust-cache@v1
         with:
-          cache-on-failure: 'true'
+          cache-on-failure: "true"
 
       - uses: ./.github/actions/setup-solana/
 
@@ -103,8 +112,8 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
-          registry-url: 'https://registry.npmjs.org'
+          node-version: "16.x"
+          registry-url: "https://registry.npmjs.org"
 
       - name: Setup yarn
         run: npm install -g yarn
@@ -121,7 +130,16 @@ jobs:
           npm install --global mocha
 
       - name: build sdk
-        run: cd ts/sdk/ && yarn && tsc && cd ../..
+        run: |
+          yarn
+          tsc
+        working-directory: ts/sdk
+
+      - name: build competitions sdk
+        run: |
+          yarn
+          yarn build
+        working-directory: drift-competitions/ts/sdk
 
       - name: run anchor tests
         run: anchor test

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "drift-competitions"]
+	path = drift-competitions
+	url = [email protected]:drift-labs/drift-competitions.git

Anchor.toml

@@ -15,5 +15,9 @@ wallet = "~/.config/solana/id.json"
 address = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
 program = "./deps/drift.so"
 
+[[test.genesis]]
+address = "DraWMeQX9LfzQQSYoeBwHAgM5JcqFkgrX7GbTfjzVMVL"
+program = "./deps/drift_competitions.so"
+
 [scripts]
 test = "yarn anchor-tests"

programs/drift_vaults/src/cpi.rs

@@ -34,24 +34,6 @@ pub trait InitializeInsuranceFundStakeCPI {
     fn drift_initialize_insurance_fund_stake(&self, market_index: u16) -> Result<()>;
 }
 
-pub trait AddInsuranceFundStakeCPI {
-    fn drift_add_insurance_fund_stake(&self, market_index: u16, amount: u64) -> Result<()>;
-}
-
-pub trait RequestRemoveInsuranceFundStakeCPI {
-    fn drift_request_remove_insurance_fund_stake(
-        &self,
-        market_index: u16,
-        amount: u64,
-    ) -> Result<()>;
-
-    fn drift_cancel_request_remove_insurance_fund_stake(&self, market_index: u16) -> Result<()>;
-}
-
-pub trait RemoveInsuranceFundStakeCPI {
-    fn drift_remove_insurance_fund_stake(&self, market_index: u16) -> Result<()>;
-}
-
 pub trait InitializeCompetitorCPI {
     fn drift_competition_initialize_competitor(&self) -> Result<()>;
 }

programs/drift_vaults/src/instructions/initialize_competitor.rs

@@ -6,8 +6,6 @@ use anchor_lang::prelude::*;
 use drift::state::user::UserStats;
 use drift_competitions::cpi::accounts::InitializeCompetitor as DriftCompetitionInitializeCompetitor;
 use drift_competitions::program::DriftCompetitions;
-// use drift_competitions::state::{Competition, Competitor};
-use drift_competitions::state::{Competition, Competitor};
 
 pub fn initialize_competitor<'info>(
     ctx: Context<'_, '_, '_, 'info, InitializeCompetitor<'info>>,
@@ -17,7 +15,6 @@ pub fn initialize_competitor<'info>(
 }
 
 #[derive(Accounts)]
-#[instruction(market_index: u16)]
 pub struct InitializeCompetitor<'info> {
     #[account(
         mut,
@@ -33,11 +30,14 @@ pub struct InitializeCompetitor<'info> {
     #[account(
         mut,
         seeds = [b"competitor",  competition.key().as_ref(), vault.key().as_ref()],
-        bump
+        bump,
+        seeds::program = drift_competitions_program.key(),
     )]
-    pub competitor: AccountLoader<'info, Competitor>,
+    /// CHECK: checked in drift cpi
+    pub competitor: AccountInfo<'info>,
     #[account(mut)]
-    pub competition: AccountLoader<'info, Competition>,
+    /// CHECK: checked in drift cpi
+    pub competition: AccountInfo<'info>,
     #[account(
         mut,
         constraint = is_user_stats_for_vault(&vault, &drift_user_stats.to_account_info())?

programs/drift_vaults/src/instructions/initialize_insurance_fund_stake.rs

@@ -5,7 +5,6 @@ use crate::Vault;
 use anchor_lang::prelude::*;
 use drift::cpi::accounts::InitializeInsuranceFundStake as DriftInitializeInsuranceFundStake;
 use drift::program::Drift;
-use drift::state::insurance_fund_stake::InsuranceFundStake;
 use drift::state::spot_market::SpotMarket;
 
 pub fn initialize_insurance_fund_stake<'info>(
@@ -34,12 +33,14 @@ pub struct InitializeInsuranceFundStake<'info> {
         constraint = is_spot_market_for_vault(&vault, &drift_spot_market, market_index)?,
     )]
     pub drift_spot_market: AccountLoader<'info, SpotMarket>,
+    /// CHECK: checked in drift cpi
     #[account(
         mut,
         seeds = [b"insurance_fund_stake", vault.key().as_ref(), market_index.to_le_bytes().as_ref()],
-        bump
+        bump,
+        seeds::program = drift_program.key(),
     )]
-    pub insurance_fund_stake: AccountLoader<'info, InsuranceFundStake>,
+    pub insurance_fund_stake: AccountInfo<'info>,
     #[account(
         mut,
         constraint = is_user_stats_for_vault(&vault, &drift_user_stats)?

programs/drift_vaults/src/instructions/mod.rs

@@ -1,4 +1,3 @@
-pub use add_insurance_fund_stake::*;
 pub use apply_profit_share::*;
 pub use cancel_withdraw_request::*;
 pub use deposit::*;
@@ -12,8 +11,6 @@ pub use manager_cancel_withdraw_request::*;
 pub use manager_deposit::*;
 pub use manager_request_withdraw::*;
 pub use manager_withdraw::*;
-pub use remove_insurance_fund_stake::*;
-pub use request_remove_insurance_fund_stake::*;
 
 pub use request_withdraw::*;
 pub use reset_delegate::*;
@@ -22,7 +19,6 @@ pub use update_margin_trading_enabled::*;
 pub use update_vault::*;
 pub use withdraw::*;
 
-mod add_insurance_fund_stake;
 mod apply_profit_share;
 mod cancel_withdraw_request;
 pub mod constraints;
@@ -37,8 +33,6 @@ mod manager_cancel_withdraw_request;
 mod manager_deposit;
 mod manager_request_withdraw;
 mod manager_withdraw;
-mod remove_insurance_fund_stake;
-mod request_remove_insurance_fund_stake;
 mod request_withdraw;
 mod reset_delegate;
 mod update_delegate;