@haven-fi/solauto-sdk 1.0.108 → 1.0.110

package/dist/clients/solautoClient.js

@@ -42,13 +42,13 @@ class SolautoClient extends txHandler_1.TxHandler {
         this.solautoPositionData = await (0, generated_1.safeFetchSolautoPosition)(this.umi, (0, umi_1.publicKey)(this.solautoPosition));
         this.solautoPositionState = this.solautoPositionData?.state;
         this.supplyMint =
-            args.supplyMint ??
-                (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint);
+            (args.supplyMint ??
+                this.solautoPositionData) ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint) : web3_js_1.PublicKey.default;
         this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyMint);
         this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint);
         this.debtMint =
-            args.debtMint ??
-                (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint);
+            (args.debtMint ??
+                this.solautoPositionData) ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint) : web3_js_1.PublicKey.default;
         this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
         this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
         this.referralStateManager = new referralStateManager_1.ReferralStateManager(this.heliusApiKey);

package/dist/transactions/transactionUtils.js

@@ -119,7 +119,7 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     if (rebalanceInstructions.length === 0) {
         return (0, umi_1.transactionBuilder)();
     }
-    const usesAccount = (key) => rebalanceInstructions.some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
+    const usesAccount = (key) => tx.getInstructions().some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
     const checkReferralSupplyTa = client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
     const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
     const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&

package/package.json

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

package/src/clients/solautoClient.ts

@@ -144,7 +144,7 @@ export abstract class SolautoClient extends TxHandler {
 
     this.supplyMint =
       args.supplyMint ??
-      toWeb3JsPublicKey(this.solautoPositionData!.position.supplyMint);
+      this.solautoPositionData ? toWeb3JsPublicKey(this.solautoPositionData!.position.supplyMint) : PublicKey.default;
     this.positionSupplyTa = getTokenAccount(
       this.solautoPosition,
       this.supplyMint
@@ -156,7 +156,7 @@ export abstract class SolautoClient extends TxHandler {
 
     this.debtMint =
       args.debtMint ??
-      toWeb3JsPublicKey(this.solautoPositionData!.position.debtMint);
+      this.solautoPositionData ? toWeb3JsPublicKey(this.solautoPositionData!.position.debtMint) : PublicKey.default;
     this.positionDebtTa = getTokenAccount(this.solautoPosition, this.debtMint);
     this.signerDebtTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),

package/src/transactions/transactionUtils.ts

@@ -235,10 +235,10 @@ export async function rebalanceChoresBefore(
   }
 
   const usesAccount = (key: PublicKey) =>
-    rebalanceInstructions.some((t) =>
+    tx.getInstructions().some((t) =>
       t.keys.some((k) => toWeb3JsPublicKey(k.pubkey).equals(key))
     );
-
+  
   const checkReferralSupplyTa =
     client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
   const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);

package/tests/transactions/solautoMarginfi.ts

@@ -20,12 +20,12 @@ import { PublicKey } from "@solana/web3.js";
 import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
-  // const signer = setupTest();
-  const signer = setupTest("solauto-manager");
+  const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const useJitoBundle = false;
-  const positionId = 255;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
 
@@ -39,7 +39,7 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
-        authority: new PublicKey("92xmP49BQycn3t2HkGxLAweN3jjrExxSNpywA3xF7mYY")
+        // authority: new PublicKey("92xmP49BQycn3t2HkGxLAweN3jjrExxSNpywA3xF7mYY")
         // marginfiAccount: new PublicKey(
         //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
         // ),
@@ -123,7 +123,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 1500, attemptNum),
         "rebalance"
       )
     );