@haven-fi/solauto-sdk 1.0.101 → 1.0.102

package/dist/transactions/transactionUtils.d.ts

@@ -1,5 +1,5 @@
 import { TransactionBuilder, Umi } from "@metaplex-foundation/umi";
-import { Account as SplTokenAccount } from "@solana/spl-token";
+import { PublicKey } from "@solana/web3.js";
 import { ReferralState } from "../generated";
 import { SolautoClient } from "../clients/solautoClient";
 export declare function rebalanceChoresBefore(client: SolautoClient, tx: TransactionBuilder, accountsGettingCreated: string[]): Promise<TransactionBuilder>;
@@ -8,5 +8,5 @@ export declare function buildSolautoRebalanceTransaction(client: SolautoClient,
     tx: TransactionBuilder;
     lookupTableAddresses: string[];
 } | undefined>;
-export declare function convertReferralFeesToDestination(umi: Umi, referralState: ReferralState, tokenAccount: SplTokenAccount): Promise<[TransactionBuilder, string[]] | undefined>;
+export declare function convertReferralFeesToDestination(umi: Umi, referralState: ReferralState, tokenAccount: PublicKey): Promise<[TransactionBuilder, string[]] | undefined>;
 //# sourceMappingURL=transactionUtils.d.ts.map

package/dist/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAGL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;IACT,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACG,SAAS,CACZ,CAyHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CA8BrD"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAMxE,OAAO,EAGL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAuMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CA8G7B;AAkLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA4BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;IACT,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACG,SAAS,CACZ,CAyHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAmCrD"}

package/dist/transactions/transactionUtils.js

@@ -373,10 +373,14 @@ async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRate
     };
 }
 async function convertReferralFeesToDestination(umi, referralState, tokenAccount) {
+    const tokenAccountData = await (0, accountUtils_1.getTokenAccountData)(umi, tokenAccount);
+    if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
+        return undefined;
+    }
     const { lookupTableAddresses, setupInstructions, swapIx } = await (0, jupiterUtils_1.getJupSwapTransaction)(umi.identity, {
-        amount: tokenAccount.amount,
+        amount: tokenAccountData.amount,
         destinationWallet: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.publicKey),
-        inputMint: tokenAccount.mint,
+        inputMint: tokenAccountData.mint,
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(referralState.destFeesMint),
         exactIn: true,
         slippageBpsIncFactor: 0.15,
@@ -385,10 +389,10 @@ async function convertReferralFeesToDestination(umi, referralState, tokenAccount
         .add(setupInstructions)
         .add((0, generated_1.convertReferralFees)(umi, {
         signer: umi.identity,
-        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(umi.identity.publicKey), tokenAccount.mint)),
+        intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(umi.identity.publicKey), tokenAccountData.mint)),
         ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
         referralState: referralState.publicKey,
-        referralFeesTa: (0, umi_1.publicKey)(tokenAccount.address),
+        referralFeesTa: (0, umi_1.publicKey)(tokenAccount),
     }))
         .add(swapIx);
     return [tx, lookupTableAddresses];

package/dist/utils/accountUtils.d.ts

@@ -1,8 +1,10 @@
 import { PublicKey } from "@solana/web3.js";
+import { Umi } from "@metaplex-foundation/umi";
 export declare function bufferFromU8(num: number): Buffer;
 export declare function bufferFromU64(num: bigint): Buffer;
 export declare function getTokenAccount(wallet: PublicKey, tokenMint: PublicKey): PublicKey;
 export declare function getTokenAccounts(wallet: PublicKey, tokenMints: PublicKey[]): PublicKey[];
+export declare function getTokenAccountData(umi: Umi, tokenAccount: PublicKey): Promise<import("@solana/spl-token").RawAccount | undefined>;
 export declare function getSolautoPositionAccount(signer: PublicKey, positionId: number): PublicKey;
 export declare function getReferralState(authority: PublicKey): PublicKey;
 export declare function getMarginfiAccountPDA(solautoPositionAccount: PublicKey, marginfiAccountSeedIdx: bigint): Promise<PublicKey>;

package/dist/utils/accountUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,aAQnB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,aAUpD;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B"}
+{"version":3,"file":"accountUtils.d.ts","sourceRoot":"","sources":["../../src/utils/accountUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIhD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAIjD;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,GAAG,SAAS,CAMlF;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAExF;AAED,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,+DAO1E;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,aAQnB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,aAUpD;AAED,wBAAsB,qBAAqB,CACzC,sBAAsB,EAAE,SAAS,EACjC,sBAAsB,EAAE,MAAM,sBAa/B"}

package/dist/utils/accountUtils.js

@@ -4,12 +4,14 @@ exports.bufferFromU8 = bufferFromU8;
 exports.bufferFromU64 = bufferFromU64;
 exports.getTokenAccount = getTokenAccount;
 exports.getTokenAccounts = getTokenAccounts;
+exports.getTokenAccountData = getTokenAccountData;
 exports.getSolautoPositionAccount = getSolautoPositionAccount;
 exports.getReferralState = getReferralState;
 exports.getMarginfiAccountPDA = getMarginfiAccountPDA;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const generated_1 = require("../generated");
+const umi_1 = require("@metaplex-foundation/umi");
 function bufferFromU8(num) {
     const buffer = Buffer.alloc(1);
     buffer.writeUInt8(num);
@@ -26,6 +28,15 @@ function getTokenAccount(wallet, tokenMint) {
 function getTokenAccounts(wallet, tokenMints) {
     return tokenMints.map(x => getTokenAccount(wallet, x));
 }
+async function getTokenAccountData(umi, tokenAccount) {
+    const resp = await umi.rpc.getAccount((0, umi_1.publicKey)(tokenAccount));
+    if (resp.exists) {
+        return spl_token_1.AccountLayout.decode(resp.data);
+    }
+    else {
+        return undefined;
+    }
+}
 function getSolautoPositionAccount(signer, positionId) {
     const [positionAccount, _] = web3_js_1.PublicKey.findProgramAddressSync([bufferFromU8(positionId), signer.toBuffer()], new web3_js_1.PublicKey(generated_1.SOLAUTO_PROGRAM_ID));
     return positionAccount;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/transactions/transactionUtils.ts

@@ -48,7 +48,7 @@ import {
   uint8ArrayToBigInt,
 } from "../utils/numberUtils";
 import { eligibleForRebalance } from "../utils/solauto/generalUtils";
-import { getTokenAccount } from "../utils/accountUtils";
+import { getTokenAccount, getTokenAccountData } from "../utils/accountUtils";
 import {
   getLendingAccountBorrowInstructionDataSerializer,
   getLendingAccountDepositInstructionDataSerializer,
@@ -684,13 +684,18 @@ export async function buildSolautoRebalanceTransaction(
 export async function convertReferralFeesToDestination(
   umi: Umi,
   referralState: ReferralState,
-  tokenAccount: SplTokenAccount
+  tokenAccount: PublicKey
 ): Promise<[TransactionBuilder, string[]] | undefined> {
+  const tokenAccountData = await getTokenAccountData(umi, tokenAccount);
+  if (!tokenAccountData || tokenAccountData.amount === BigInt(0)) {
+    return undefined;
+  }
+
   const { lookupTableAddresses, setupInstructions, swapIx } =
     await getJupSwapTransaction(umi.identity, {
-      amount: tokenAccount.amount,
+      amount: tokenAccountData.amount,
       destinationWallet: toWeb3JsPublicKey(referralState.publicKey),
-      inputMint: tokenAccount.mint,
+      inputMint: tokenAccountData.mint,
       outputMint: toWeb3JsPublicKey(referralState.destFeesMint),
       exactIn: true,
       slippageBpsIncFactor: 0.15,
@@ -704,12 +709,12 @@ export async function convertReferralFeesToDestination(
         intermediaryTa: publicKey(
           getTokenAccount(
             toWeb3JsPublicKey(umi.identity.publicKey),
-            tokenAccount.mint
+            tokenAccountData.mint
           )
         ),
         ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
         referralState: referralState.publicKey,
-        referralFeesTa: publicKey(tokenAccount.address),
+        referralFeesTa: publicKey(tokenAccount),
       })
     )
     .add(swapIx);

package/src/utils/accountUtils.ts

@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
-import { getAssociatedTokenAddressSync } from "@solana/spl-token";
+import { AccountLayout as SplTokenAccountLayout, getAssociatedTokenAddressSync } from "@solana/spl-token";
 import { SOLAUTO_PROGRAM_ID } from "../generated";
+import { publicKey, Umi } from "@metaplex-foundation/umi";
 
 export function bufferFromU8(num: number): Buffer {
   const buffer = Buffer.alloc(1);
@@ -26,6 +27,15 @@ export function getTokenAccounts(wallet: PublicKey, tokenMints: PublicKey[]): Pu
   return tokenMints.map(x => getTokenAccount(wallet, x));
 }
 
+export async function getTokenAccountData(umi: Umi, tokenAccount: PublicKey) {
+  const resp = await umi.rpc.getAccount(publicKey(tokenAccount));
+  if (resp.exists) {
+    return SplTokenAccountLayout.decode(resp.data);
+  } else {
+    return undefined;
+  }
+}
+
 export function getSolautoPositionAccount(
   signer: PublicKey,
   positionId: number

package/tests/transactions/solautoMarginfi.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "mocha";
-import { none, some } from "@metaplex-foundation/umi";
+import { none, publicKey, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import {
   SolautoMarginfiClient,
@@ -154,11 +154,11 @@ describe("Solauto Marginfi tests", async () => {
     //   )
     // );
 
-    await new TransactionsManager(
-      client,
-      undefined,
-      !payForTransactions,
-      useJitoBundle
-    ).clientSend(transactionItems);
+    // await new TransactionsManager(
+    //   client,
+    //   undefined,
+    //   !payForTransactions,
+    //   useJitoBundle
+    // ).clientSend(transactionItems);
   });
 });