api: fix api failure due to missing dep

glamsystems · Oct 1, 2024 · d741672 · d741672
1 parent 9276c54
commit d741672
Show file tree

Hide file tree

Showing 4 changed files with 514 additions and 49 deletions.
diff --git a/anchor/src/client/investor.ts b/anchor/src/client/investor.ts
@@ -1,7 +1,5 @@
-import * as anchor from "@coral-xyz/anchor";
 import { BN } from "@coral-xyz/anchor";
 import {
-  Keypair,
   PublicKey,
   SystemProgram,
   TransactionInstruction,
@@ -11,7 +9,6 @@ import {
 import {
   getAssociatedTokenAddressSync,
   createAssociatedTokenAccountInstruction,
-  TOKEN_2022_PROGRAM_ID,
   createSyncNativeInstruction,
 } from "@solana/spl-token";
 
@@ -145,8 +142,8 @@ export class InvestorClient {
         signerAssetAtaExists = false;
       }
       const solBalance = new BN(String(await connection.getBalance(signer)));
-      const delta = amount - wsolBalance;
-      if (delta > 0 && solBalance > delta) {
+      const delta = amount.sub(wsolBalance);
+      if (delta > new BN(0) && solBalance > delta) {
         if (!signerAssetAtaExists) {
           preInstructions = preInstructions.concat([
             createAssociatedTokenAccountInstruction(
@@ -161,7 +158,7 @@ export class InvestorClient {
           SystemProgram.transfer({
             fromPubkey: signer,
             toPubkey: signerAssetAta,
-            lamports: delta,
+            lamports: delta.toNumber(),
           }),
           createSyncNativeInstruction(signerAssetAta),
         ]);

diff --git a/anchor/src/client/jupiter.ts b/anchor/src/client/jupiter.ts
@@ -253,13 +253,13 @@ export class JupiterClient {
       const solBalance = new BN(
         await this.base.provider.connection.getBalance(treasuryPda)
       );
-      const delta = amount - wsolBalance;
+      const delta = amount.sub(wsolBalance);
       if (solBalance < delta) {
         throw new Error(
           `Insufficient balance in treasury (${treasuryPda.toBase58()}) for swap. solBalance: ${solBalance}, lamports needed: ${delta}`
         );
       }
-      if (delta > 0 && solBalance > delta) {
+      if (delta > new BN(0) && solBalance > delta) {
         preInstructions.push(
           await this.base.program.methods
             .wsolWrap(new BN(amount))

diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
   "private": true,
   "dependencies": {
     "@coral-xyz/anchor": "^0.30.1",
+    "@drift-labs/sdk": "2.96.0-beta.14",
     "@fast-csv/format": "^5.0.0",
     "@fast-csv/parse": "^5.0.0",
     "@hookform/resolvers": "^3.9.0",
@@ -97,7 +98,6 @@
   "devDependencies": {
     "@babel/core": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
-    "@drift-labs/sdk": "2.71.0-beta.4",
     "@nx/eslint": "^19.4.1",
     "@nx/eslint-plugin": "^19.4.1",
     "@nx/express": "19.3.2",