@haven-fi/solauto-sdk 1.0.134 → 1.0.135

package/src/generated/types/{feeType.ts → tokenType.ts}

@@ -8,16 +8,15 @@
 
 import { Serializer, scalarEnum } from '@metaplex-foundation/umi/serializers';
 
-export enum FeeType {
-  Small,
-  Default,
+export enum TokenType {
+  Supply,
+  Debt,
 }
 
-export type FeeTypeArgs = FeeType;
+export type TokenTypeArgs = TokenType;
 
-export function getFeeTypeSerializer(): Serializer<FeeTypeArgs, FeeType> {
-  return scalarEnum<FeeType>(FeeType, { description: 'FeeType' }) as Serializer<
-    FeeTypeArgs,
-    FeeType
-  >;
+export function getTokenTypeSerializer(): Serializer<TokenTypeArgs, TokenType> {
+  return scalarEnum<TokenType>(TokenType, {
+    description: 'TokenType',
+  }) as Serializer<TokenTypeArgs, TokenType>;
 }

package/src/transactions/transactionUtils.ts

@@ -17,6 +17,7 @@ import {
   SOLAUTO_PROGRAM_ID,
   SolautoAction,
   SolautoRebalanceType,
+  TokenType,
   convertReferralFees,
   getMarginfiProtocolInteractionInstructionDataSerializer,
   getMarginfiRebalanceInstructionDataSerializer,
@@ -55,18 +56,20 @@ import {
   getLendingAccountWithdrawInstructionDataSerializer,
   MARGINFI_PROGRAM_ID,
 } from "../marginfi-sdk";
-import { PRICES } from "../constants";
 
 interface wSolTokenUsage {
   wSolTokenAccount: PublicKey;
-  solautoAction: SolautoAction;
+  solautoAction?: SolautoAction;
 }
 
 function getWSolUsage(
   client: SolautoClient,
   solautoActions?: SolautoAction[],
-  initiatingDcaIn?: bigint,
-  cancellingDcaIn?: boolean
+  initiatingDcaIn?: {
+    amount: bigint;
+    tokenType: TokenType;
+  },
+  cancellingDcaIn?: TokenType
 ): wSolTokenUsage | undefined {
   const supplyIsWsol = client.supplyMint.equals(NATIVE_MINT);
   const debtIsWsol = client.debtMint.equals(NATIVE_MINT);
@@ -79,18 +82,23 @@ function getWSolUsage(
       isSolautoAction("Deposit", args) || isSolautoAction("Withdraw", args)
   );
   const usingDebtTaAction = solautoActions?.find(
-    (args) =>
-      isSolautoAction("Borrow", args) ||
-      isSolautoAction("Repay", args) ||
-      initiatingDcaIn ||
-      cancellingDcaIn
+    (args) => isSolautoAction("Borrow", args) || isSolautoAction("Repay", args)
   );
-  if (supplyIsWsol && usingSupplyTaAction) {
+
+  const dcaSupply =
+    (initiatingDcaIn && initiatingDcaIn.tokenType === TokenType.Supply) ||
+    (cancellingDcaIn !== undefined && cancellingDcaIn === TokenType.Supply);
+
+  const dcaDebt =
+    (initiatingDcaIn && initiatingDcaIn.tokenType === TokenType.Debt) ||
+    (cancellingDcaIn !== undefined && cancellingDcaIn === TokenType.Debt);
+
+  if (supplyIsWsol && (usingSupplyTaAction || dcaSupply)) {
     return {
       wSolTokenAccount: client.signerSupplyTa,
       solautoAction: usingSupplyTaAction,
     };
-  } else if (debtIsWsol && usingDebtTaAction) {
+  } else if (debtIsWsol && (usingDebtTaAction || dcaDebt)) {
     return {
       wSolTokenAccount: client.signerDebtTa,
       solautoAction: usingDebtTaAction,
@@ -104,7 +112,10 @@ async function transactionChoresBefore(
   client: SolautoClient,
   accountsGettingCreated: string[],
   solautoActions?: SolautoAction[],
-  initiatingDcaIn?: bigint
+  initiatingDcaIn?: {
+    amount: bigint;
+    tokenType: TokenType;
+  }
 ): Promise<TransactionBuilder> {
   let chores = transactionBuilder();
 
@@ -162,18 +173,19 @@ async function transactionChoresBefore(
     }
 
     let amountToTransfer = BigInt(0);
-    if (isSolautoAction("Deposit", wSolUsage.solautoAction)) {
+    if (
+      wSolUsage.solautoAction &&
+      isSolautoAction("Deposit", wSolUsage.solautoAction)
+    ) {
       amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0]);
     } else if (
+      wSolUsage.solautoAction &&
       isSolautoAction("Repay", wSolUsage.solautoAction) &&
       wSolUsage.solautoAction.fields[0].__kind === "Some"
     ) {
       amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
-    } else if (
-      initiatingDcaIn &&
-      client.debtMint.toString() === NATIVE_MINT.toString()
-    ) {
-      amountToTransfer = initiatingDcaIn;
+    } else if (initiatingDcaIn) {
+      amountToTransfer = initiatingDcaIn.amount;
     }
 
     if (amountToTransfer > 0) {
@@ -349,7 +361,7 @@ export async function rebalanceChoresBefore(
 function transactionChoresAfter(
   client: SolautoClient,
   solautoActions?: SolautoAction[],
-  cancellingDcaIn?: boolean
+  cancellingDcaIn?: TokenType
 ): TransactionBuilder {
   let chores = transactionBuilder();
 
@@ -538,9 +550,7 @@ export async function getTransactionChores(
       client,
       accountsGettingCreated,
       solautoActions,
-      client.livePositionUpdates.debtTaBalanceAdjustment > 0
-        ? client.livePositionUpdates.debtTaBalanceAdjustment
-        : undefined
+      client.livePositionUpdates.dcaInBalance
     ),
     await rebalanceChoresBefore(client, tx, accountsGettingCreated),
   ]);
@@ -549,7 +559,7 @@ export async function getTransactionChores(
     transactionChoresAfter(
       client,
       solautoActions,
-      client.livePositionUpdates.debtTaBalanceAdjustment < 0
+      client.livePositionUpdates.cancellingDca
     )
   );
 
@@ -668,8 +678,8 @@ export async function buildSolautoRebalanceTransaction(
         "B",
         swapDetails,
         rebalanceType,
-            jupQuote.slippageBps,
-            undefined,
+        jupQuote.slippageBps,
+        undefined,
         targetLiqUtilizationRateBps
       ),
     ]);

package/src/utils/marginfiUtils.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { publicKey, RpcAccount, Umi } from "@metaplex-foundation/umi";
+import { publicKey, Umi } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   Bank,
@@ -16,13 +16,13 @@ import {
   toBaseUnit,
   toBps,
 } from "./numberUtils";
-import { PRICES } from "../constants/solautoConstants";
 import { MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState, PositionTokenUsage } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { currentUnixSecondsSolana } from "./solanaUtils";
+import { USDC_MINT } from "../constants";
 
 export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
   for (const key in MARGINFI_ACCOUNTS) {

package/src/utils/solauto/generalUtils.ts

@@ -9,6 +9,7 @@ import {
   SOLAUTO_PROGRAM_ID,
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
+  TokenType,
   getReferralStateSize,
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
@@ -487,24 +488,24 @@ export function createSolautoSettings(
 type PositionAdjustment =
   | { type: "supply"; value: bigint }
   | { type: "debt"; value: bigint }
-  | { type: "debtDcaIn"; value: bigint }
   | { type: "settings"; value: SolautoSettingsParametersInpArgs }
-  | { type: "dca"; value: DCASettingsInpArgs };
+  | { type: "dca"; value: DCASettingsInpArgs }
+  | { type: "dcaInBalance"; value: { amount: bigint; tokenType: TokenType; } }
+  | { type: "cancellingDca"; value: TokenType; };
 
 export class LivePositionUpdates {
-  public supplyAdjustment: bigint = BigInt(0);
-  public debtAdjustment: bigint = BigInt(0);
-  public debtTaBalanceAdjustment: bigint = BigInt(0);
+  public supplyAdjustment = BigInt(0);
+  public debtAdjustment = BigInt(0);
   public settings: SolautoSettingsParameters | undefined = undefined;
   public activeDca: DCASettings | undefined = undefined;
-
+  public dcaInBalance?: { amount: bigint; tokenType: TokenType; } = undefined;
+  public cancellingDca: TokenType | undefined = undefined;
+  
   new(update: PositionAdjustment) {
     if (update.type === "supply") {
       this.supplyAdjustment += update.value;
     } else if (update.type === "debt") {
       this.debtAdjustment += update.value;
-    } else if (update.type === "debtDcaIn") {
-      this.debtTaBalanceAdjustment += update.value;
     } else if (update.type === "settings") {
       const settings = update.value;
       this.settings = createSolautoSettings(settings);
@@ -518,26 +519,33 @@ export class LivePositionUpdates {
           padding: new Uint8Array([]),
           padding1: [],
         },
-        debtToAddBaseUnit: BigInt(dca.debtToAddBaseUnit),
-        padding: new Uint8Array([]),
+        dcaInBaseUnit: BigInt(dca.dcaInBaseUnit),
+        tokenType: dca.tokenType,
+        padding: [],
       };
+    } else if (update.type === "cancellingDca") {
+      this.cancellingDca = update.value;
+    } else if (update.type === "dcaInBalance") {
+      this.dcaInBalance = update.value;
     }
   }
 
   reset() {
     this.supplyAdjustment = BigInt(0);
     this.debtAdjustment = BigInt(0);
-    this.debtTaBalanceAdjustment = BigInt(0);
     this.settings = undefined;
     this.activeDca = undefined;
+    this.dcaInBalance = undefined;
+    this.cancellingDca = undefined;
   }
 
   hasUpdates(): boolean {
     return (
       this.supplyAdjustment !== BigInt(0) ||
       this.debtAdjustment !== BigInt(0) ||
-      this.debtTaBalanceAdjustment !== BigInt(0) ||
-      this.settings !== undefined
+      this.dcaInBalance !== undefined ||
+      this.settings !== undefined ||
+      this.cancellingDca !== undefined
     );
   }
 }

package/src/utils/solauto/rebalanceUtils.ts

@@ -5,6 +5,7 @@ import {
   PositionState,
   PositionTokenUsage,
   SolautoSettingsParameters,
+  TokenType,
 } from "../../generated";
 import {
   eligibleForNextAutomationPeriod,
@@ -27,16 +28,14 @@ import {
 import { USD_DECIMALS } from "../../constants/generalAccounts";
 import {
   DEFAULT_LIMIT_GAP_BPS,
-  MIN_POSITION_STATE_FRESHNESS_SECS,
-  PRICES,
 } from "../../constants/solautoConstants";
 
 function getAdditionalAmountToDcaIn(dca: DCASettings): number {
-  if (dca.debtToAddBaseUnit === BigInt(0)) {
+  if (dca.dcaInBaseUnit === BigInt(0)) {
     return 0;
   }
 
-  const debtBalance = Number(dca.debtToAddBaseUnit);
+  const debtBalance = Number(dca.dcaInBaseUnit);
   const updatedDebtBalance = getUpdatedValueFromAutomation(
     debtBalance,
     0,
@@ -80,7 +79,7 @@ function targetLiqUtilizationRateBpsFromDCA(
   );
 
   let targetRateBps = 0;
-  if (dca.debtToAddBaseUnit > BigInt(0)) {
+  if (dca.dcaInBaseUnit > BigInt(0)) {
     targetRateBps = Math.max(
       state.liqUtilizationRateBps,
       adjustedSettings.boostToBps
@@ -126,7 +125,7 @@ function getTargetRateAndDcaAmount(
   dca: DCASettings | undefined,
   currentUnixTime: number,
   targetLiqUtilizationRateBps?: number
-): { targetRateBps: number; amountToDcaIn?: number } {
+): { targetRateBps: number; amountToDcaIn?: number; } {
   if (targetLiqUtilizationRateBps !== undefined) {
     return {
       targetRateBps: targetLiqUtilizationRateBps,
@@ -164,6 +163,7 @@ export interface RebalanceValues {
   debtAdjustmentUsd: number;
   amountToDcaIn: number;
   amountUsdToDcaIn: number;
+  dcaTokenType?: TokenType;
 }
 
 export function getRebalanceValues(
@@ -238,6 +238,7 @@ export function getRebalanceValues(
     debtAdjustmentUsd,
     amountToDcaIn: amountToDcaIn ?? 0,
     amountUsdToDcaIn,
+    dcaTokenType: dca?.tokenType
   };
 }
 
@@ -254,7 +255,7 @@ export function getFlashLoanDetails(
   let supplyUsd = fromBaseUnit(
     client.solautoPositionState!.supply.amountUsed.baseAmountUsdValue,
     USD_DECIMALS
-  );
+  ) + (values.dcaTokenType === TokenType.Supply ? values.amountUsdToDcaIn : 0);
   let debtUsd = fromBaseUnit(
     client.solautoPositionState!.debt.amountUsed.baseAmountUsdValue,
     USD_DECIMALS
@@ -333,7 +334,7 @@ export function getJupSwapRebalanceDetails(
     : client.solautoPositionState!.debt;
 
   const usdToSwap =
-    Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
+    Math.abs(values.debtAdjustmentUsd) + (values.dcaTokenType === TokenType.Debt ? values.amountUsdToDcaIn : 0);
 
   const inputPrice = values.increasingLeverage
     ? safeGetPrice(client.debtMint)

package/tests/unit/rebalanceCalculations.ts

@@ -9,10 +9,10 @@ import { publicKey } from "@metaplex-foundation/umi";
 import { SolautoClient } from "../../src/clients/solautoClient";
 import {
   DCASettings,
-  FeeType,
   LendingPlatform,
   SolautoRebalanceType,
   SolautoSettingsParameters,
+  TokenType,
 } from "../../src/generated";
 import {
   fromBaseUnit,
@@ -35,7 +35,6 @@ import {
   safeGetPrice,
 } from "../../src/utils/generalUtils";
 import { USDC_MINT } from "../../src/constants/tokenConstants";
-import { PRICES } from "../../src/constants";
 
 const signer = setupTest(undefined, true);
 
@@ -159,8 +158,9 @@ async function getFakePosition(
           padding1: [],
           padding: new Uint8Array([]),
         },
-        debtToAddBaseUnit: BigInt(0),
-        padding: new Uint8Array([]),
+        dcaInBaseUnit: BigInt(0),
+        tokenType: TokenType.Debt,
+        padding: [],
       },
       lendingPlatform: LendingPlatform.Marginfi,
       supplyMint: publicKey(client.supplyMint),
@@ -180,9 +180,7 @@ async function getFakePosition(
       padding2: [],
       padding: new Uint8Array([]),
     },
-    feeType: FeeType.Default,
     padding1: [],
-    padding2: [],
     padding: [],
     publicKey: publicKey(PublicKey.default),
     header: {
@@ -246,18 +244,18 @@ async function dcaRebalanceFromFakePosition(
     currentUnixSeconds()
   );
   const expectedLiqUtilizationRateBps =
-    dca.debtToAddBaseUnit > BigInt(0)
+    dca.dcaInBaseUnit > BigInt(0)
       ? Math.max(fakeLiqUtilizationRateBps, adjustedSettings.boostToBps)
       : adjustedSettings.boostToBps;
 
   const expectedDcaInAmount =
-    dca.debtToAddBaseUnit > 0 &&
+    dca.dcaInBaseUnit > BigInt(0) &&
     eligibleForNextAutomationPeriod(dca.automation, currentUnixSeconds())
-      ? dca.debtToAddBaseUnit -
+      ? dca.dcaInBaseUnit -
         BigInt(
           Math.round(
             getUpdatedValueFromAutomation(
-              Number(dca.debtToAddBaseUnit),
+              Number(dca.dcaInBaseUnit),
               0,
               dca.automation,
               currentUnixSeconds()
@@ -390,8 +388,9 @@ describe("Rebalance tests", async () => {
         padding1: [],
         padding: new Uint8Array([]),
       },
-      debtToAddBaseUnit: BigInt(0),
-      padding: new Uint8Array([]),
+      dcaInBaseUnit: BigInt(0),
+      tokenType: TokenType.Debt,
+      padding: [],
     };
     await dcaRebalanceFromFakePosition(
       supplyPrice,
@@ -442,8 +441,9 @@ describe("Rebalance tests", async () => {
         padding1: [],
         padding: new Uint8Array([]),
       },
-      debtToAddBaseUnit: toBaseUnit(debtPrice * 300, 6),
-      padding: new Uint8Array([]),
+      dcaInBaseUnit: toBaseUnit(debtPrice * 300, 6),
+      tokenType: TokenType.Debt,
+      padding: [],
     };
     await dcaRebalanceFromFakePosition(
       supplyPrice,

package/dist/generated/types/feeType.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"feeType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/feeType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,OAAO;IACjB,KAAK,IAAA;IACL,OAAO,IAAA;CACR;AAED,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;AAElC,wBAAgB,oBAAoB,IAAI,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAKvE"}

package/dist/generated/types/feeType.js

@@ -1,20 +0,0 @@
-"use strict";
-/**
- * This code was AUTOGENERATED using the kinobi library.
- * Please DO NOT EDIT THIS FILE, instead use visitors
- * to add features, then rerun kinobi to update it.
- *
- * @see https://github.com/metaplex-foundation/kinobi
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeeType = void 0;
-exports.getFeeTypeSerializer = getFeeTypeSerializer;
-const serializers_1 = require("@metaplex-foundation/umi/serializers");
-var FeeType;
-(function (FeeType) {
-    FeeType[FeeType["Small"] = 0] = "Small";
-    FeeType[FeeType["Default"] = 1] = "Default";
-})(FeeType || (exports.FeeType = FeeType = {}));
-function getFeeTypeSerializer() {
-    return (0, serializers_1.scalarEnum)(FeeType, { description: 'FeeType' });
-}