VLT-230 adjusting to follow token-2022-support

Splyce-Finance · Dec 10, 2024 · eaeebae · eaeebae
1 parent ccd2a44
commit eaeebae
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 1 deletion.
diff --git a/programs/strategy/src/instructions/deposit.rs b/programs/strategy/src/instructions/deposit.rs
@@ -58,6 +58,7 @@ pub fn handle_deposit<'info>(
         let deploy_funds = DeployFunds {
             strategy: ctx.accounts.strategy.clone(),
             underlying_token_account: ctx.accounts.underlying_token_account.clone(),
+            underlying_mint: ctx.accounts.underlying_mint.clone(),
             signer: ctx.accounts.signer.clone(),
             token_program: ctx.accounts.token_program.clone(),
         };

diff --git a/programs/strategy/src/state/orca_strategy.rs b/programs/strategy/src/state/orca_strategy.rs
@@ -128,6 +128,7 @@ impl Strategy for OrcaStrategy {
             &mut Report {
                 strategy: accounts.strategy.clone(),
                 underlying_token_account: accounts.underlying_token_account.clone(),
+                underlying_mint: accounts.underlying_mint.clone(),
                 token_program: accounts.token_program.clone(),
                 signer: accounts.signer.clone(),
             },
@@ -148,6 +149,7 @@ impl Strategy for OrcaStrategy {
             &mut Report {
                 strategy: accounts.strategy.clone(),
                 underlying_token_account: accounts.underlying_token_account.clone(),
+                underlying_mint: accounts.underlying_mint.clone(),
                 token_program: accounts.token_program.clone(),
                 signer: accounts.signer.clone(),
             },

diff --git a/scripts/orca/0_init_orca_strategy.ts b/scripts/orca/0_init_orca_strategy.ts
@@ -5,6 +5,8 @@ import { Strategy } from "../../target/types/strategy";
 import { OrcaStrategyConfig, OrcaStrategyConfigSchema } from "../../tests/utils/schemas";
 import { BN } from "@coral-xyz/anchor";
 import * as token from "@solana/spl-token";
+import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
+
 import * as borsh from 'borsh';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -205,7 +207,8 @@ async function main() {
     await vaultProgram.methods.initVault(vaultConfig)
       .accounts({
         underlyingMint,
-        signer: admin.publicKey
+        signer: admin.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID,
       })
       .signers([admin])
       .rpc();
@@ -294,6 +297,7 @@ async function main() {
         underlyingMint,
         vault,
         signer: admin.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID,
       })
       .signers([admin])
       .rpc();

diff --git a/scripts/orca/10_report_profit.ts b/scripts/orca/10_report_profit.ts
@@ -16,6 +16,9 @@ const TMAC_MINT = new PublicKey(
   "Afn8YB1p4NsoZeS5XJBZ18LTfEy5NFPwN46wapZcBQr6"
 );
 
+const USDC_MINT = new PublicKey("BRjpCHtyQLNCo8gqRUr8jtdAj5AjPYQaoqbvcZiHok1k");
+
+
 function deserializeOrcaStrategy(data: Buffer) {
     // Skip 8 byte discriminator
     let offset = 8;
@@ -171,6 +174,8 @@ async function main() {
       .accounts({
         strategy,
         signer: admin.publicKey,
+        tokenProgram: TOKEN_PROGRAM_ID,
+        underlyingMint: USDC_MINT,
       })
       .remainingAccounts([
         {

diff --git a/scripts/orca/3_4_5_direct_deposit.ts b/scripts/orca/3_4_5_direct_deposit.ts
@@ -190,6 +190,7 @@ async function main() {
         userSharesAccount: userSharesATA.address,
         strategy: strategy,
         user: admin.publicKey,
+        underlyingMint: USDC_MINT,
       })
       .remainingAccounts(combinedRemainingAccounts)
       .preInstructions([computeUnitIx, computePriceIx])

diff --git a/scripts/orca/5_deploy_funds.ts b/scripts/orca/5_deploy_funds.ts
@@ -377,6 +377,7 @@ async function main() {
         .deployFunds(amount)
         .accounts({
           strategy: strategy,
+          underlyingMint: USDC_MINT,
           signer: admin.publicKey,
         })
         .remainingAccounts(combinedRemainingAccounts)

diff --git a/scripts/orca/7_free_funds_with_vault_redeem.ts b/scripts/orca/7_free_funds_with_vault_redeem.ts
@@ -500,6 +500,8 @@ async function main() {
         userTokenAccount: userUsdcATA,
         userSharesAccount: userSharesATA,
         user: admin.publicKey,
+        underlyingMint: USDC_MINT,
+        tokenProgram: TOKEN_PROGRAM_ID,
       })
       .remainingAccounts(combinedRemainingAccounts)
       .instruction();

diff --git a/scripts/orca/8_free_funds_directly.ts b/scripts/orca/8_free_funds_directly.ts
@@ -192,6 +192,8 @@ async function main() {
       .accounts({
         strategy: strategy,
         signer: admin.publicKey,
+        underlyingMint: USDC_MINT,
+        tokenProgram: TOKEN_PROGRAM_ID,
       })
       .remainingAccounts(remainingAccounts)
       .signers([admin])