@haven-fi/solauto-sdk 1.0.45 → 1.0.47

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,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAgH7B;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,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAgHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqMzD,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,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CAgHA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}

package/dist/transactions/transactionUtils.js

@@ -120,8 +120,8 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
     const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
         usesAccount(client.intermediaryMarginfiAccountPk);
-    const checkSignerSupplyTa = client.selfManaged && usesAccount(client.signerSupplyTa);
-    const checkSignerDebtTa = client.selfManaged && usesAccount(client.signerSupplyTa);
+    const checkSignerSupplyTa = usesAccount(client.signerSupplyTa);
+    const checkSignerDebtTa = usesAccount(client.signerDebtTa);
     const accountsNeeded = [
         ...[checkReferralSupplyTa ? client.referredBySupplyTa : web3_js_1.PublicKey.default],
         ...[checkSolautoFeesTa ? client.solautoFeesSupplyTa : web3_js_1.PublicKey.default],

package/dist/utils/numberUtils.js

@@ -62,7 +62,7 @@ function getDebtAdjustmentUsd(liqThresholdBps, supplyUsd, debtUsd, targetLiqUtil
 }
 exports.getDebtAdjustmentUsd = getDebtAdjustmentUsd;
 function getMaxLiqUtilizationRate(maxLtvBps, liqThresholdBps) {
-    return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+    return toBps((fromBps(maxLtvBps) - 0.02) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
 exports.getMaxLiqUtilizationRate = getMaxLiqUtilizationRate;
 function maxRepayFrom(maxLtvBps, liqThresholdBps) {

package/dist/utils/solanaUtils.js

@@ -163,7 +163,7 @@ async function sendSingleOptimizedTransaction(umi, connection, tx, simulateOnly,
     const computeUnitLimit = Math.round(simulationResult.value.unitsConsumed * 1.1);
     console.log("Compute unit limit: ", computeUnitLimit);
     if (!simulateOnly) {
-        const result = await assembleFinalTransaction(umi.identity, tx, feeEstimate, computeUnitLimit).sendAndConfirm(umi, {
+        const result = await assembleFinalTransaction(umi.identity, tx, feeEstimate, 800000).sendAndConfirm(umi, {
             send: {
                 skipPreflight: true,
                 commitment: "finalized",

package/dist/utils/solauto/rebalanceUtils.js

@@ -187,7 +187,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
         outputMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(output.mint),
         destinationWallet: client.solautoPosition,
         // slippageBpsIncFactor: (!values.increasingLeverage ? 0.1 : 0) + ((attemptNum ?? 0) * 0.15),
-        slippageBpsIncFactor: (attemptNum ?? 0) * 0.15,
+        slippageBpsIncFactor: (attemptNum ?? 0) * 0.2,
         amount: rebalancingToZero
             ? client.solautoPositionState.debt.amountUsed.baseUnit +
                 BigInt(Math.round(Number(client.solautoPositionState.debt.amountUsed.baseUnit) *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "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

@@ -245,10 +245,8 @@ export async function rebalanceChoresBefore(
     usesAccount(
       (client as SolautoMarginfiClient).intermediaryMarginfiAccountPk
     );
-  const checkSignerSupplyTa =
-    client.selfManaged && usesAccount(client.signerSupplyTa);
-  const checkSignerDebtTa =
-    client.selfManaged && usesAccount(client.signerSupplyTa);
+  const checkSignerSupplyTa = usesAccount(client.signerSupplyTa);
+  const checkSignerDebtTa = usesAccount(client.signerDebtTa);
 
   const accountsNeeded = [
     ...[checkReferralSupplyTa ? client.referredBySupplyTa : PublicKey.default],

package/src/utils/numberUtils.ts

@@ -81,7 +81,7 @@ export function getMaxLiqUtilizationRate(
   maxLtvBps: number,
   liqThresholdBps: number
 ): number {
-  return toBps((fromBps(maxLtvBps) - 0.01) / fromBps(liqThresholdBps)) - 1;
+  return toBps((fromBps(maxLtvBps) - 0.02) / fromBps(liqThresholdBps)) - 1; // -1 to account for any rounding issues
 }
 
 export function maxRepayFrom(maxLtvBps: number, liqThresholdBps: number) {

package/src/utils/solanaUtils.ts

@@ -315,7 +315,7 @@ export async function sendSingleOptimizedTransaction(
       umi.identity,
       tx,
       feeEstimate,
-      computeUnitLimit
+      800_000
     ).sendAndConfirm(umi, {
       send: {
         skipPreflight: true,

package/src/utils/solauto/rebalanceUtils.ts

@@ -343,7 +343,7 @@ export function getJupSwapRebalanceDetails(
     outputMint: toWeb3JsPublicKey(output.mint),
     destinationWallet: client.solautoPosition,
     // slippageBpsIncFactor: (!values.increasingLeverage ? 0.1 : 0) + ((attemptNum ?? 0) * 0.15),
-    slippageBpsIncFactor: (attemptNum ?? 0) * 0.15,
+    slippageBpsIncFactor: (attemptNum ?? 0) * 0.2,
     amount: rebalancingToZero
       ? client.solautoPositionState!.debt.amountUsed.baseUnit +
         BigInt(

package/tests/transactions/solautoMarginfi.ts

@@ -9,7 +9,7 @@ import {
   SolautoSettingsParametersInpArgs,
 } from "../../src/generated";
 import { buildSolautoRebalanceTransaction } from "../../src/transactions/transactionUtils";
-import { toBaseUnit } from "../../src/utils/numberUtils";
+import { getMaxLiqUtilizationRate, toBaseUnit } from "../../src/utils/numberUtils";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { getTokenPrices } from "../../src/utils/generalUtils";
 import {
@@ -21,10 +21,11 @@ import { USDC_MINT } from "../../src/constants";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
+  // const signer = setupTest("solauto-manager");
 
   const payForTransactions = false;
   const useJitoBundle = false;
-  const positionId = 0;
+  const positionId = 1;
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY!, true);
@@ -37,11 +38,12 @@ describe("Solauto Marginfi tests", async () => {
       {
         signer,
         positionId,
-        marginfiAccount: new PublicKey(
-          "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
-        ),
-        supplyMint: NATIVE_MINT,
-        debtMint: new PublicKey(USDC_MINT),
+        authority: new PublicKey("AprYCPiVeKMCgjQ2ZufwChMzvQ5kFjJo2ekTLSkXsQDm")
+        // marginfiAccount: new PublicKey(
+        //   "4nNvUXF5YqHFcH2nGweSiuvy1ct7V5FXfoCLKFYUN36z"
+        // ),
+        // supplyMint: NATIVE_MINT,
+        // debtMint: new PublicKey(USDC_MINT),
       }
     );
 
@@ -79,6 +81,7 @@ describe("Solauto Marginfi tests", async () => {
     //   );
     // }
 
+    // const maxLiqRate = getMaxLiqUtilizationRate(client.solautoPositionState!.maxLtvBps, client.solautoPositionState!.liqThresholdBps);
     // transactionItems.push(
     //   new TransactionItem(
     //     async () => ({
@@ -115,7 +118,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 5500, attemptNum),
+          await buildSolautoRebalanceTransaction(client, undefined, attemptNum),
         "rebalance"
       )
     );