@haven-fi/solauto-sdk 1.0.133 → 1.0.135

package/src/generated/types/dCASettings.ts

@@ -8,26 +8,32 @@
 
 import {
   Serializer,
-  bytes,
+  array,
   struct,
   u64,
+  u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
   AutomationSettings,
   AutomationSettingsArgs,
+  TokenType,
+  TokenTypeArgs,
   getAutomationSettingsSerializer,
+  getTokenTypeSerializer,
 } from '.';
 
 export type DCASettings = {
   automation: AutomationSettings;
-  debtToAddBaseUnit: bigint;
-  padding: Uint8Array;
+  dcaInBaseUnit: bigint;
+  tokenType: TokenType;
+  padding: Array<number>;
 };
 
 export type DCASettingsArgs = {
   automation: AutomationSettingsArgs;
-  debtToAddBaseUnit: number | bigint;
-  padding: Uint8Array;
+  dcaInBaseUnit: number | bigint;
+  tokenType: TokenTypeArgs;
+  padding: Array<number>;
 };
 
 export function getDCASettingsSerializer(): Serializer<
@@ -37,8 +43,9 @@ export function getDCASettingsSerializer(): Serializer<
   return struct<DCASettings>(
     [
       ['automation', getAutomationSettingsSerializer()],
-      ['debtToAddBaseUnit', u64()],
-      ['padding', bytes({ size: 32 })],
+      ['dcaInBaseUnit', u64()],
+      ['tokenType', getTokenTypeSerializer()],
+      ['padding', array(u8(), { size: 31 })],
     ],
     { description: 'DCASettings' }
   ) as Serializer<DCASettingsArgs, DCASettings>;

package/src/generated/types/dCASettingsInp.ts

@@ -10,17 +10,22 @@ import { Serializer, struct, u64 } from '@metaplex-foundation/umi/serializers';
 import {
   AutomationSettingsInp,
   AutomationSettingsInpArgs,
+  TokenType,
+  TokenTypeArgs,
   getAutomationSettingsInpSerializer,
+  getTokenTypeSerializer,
 } from '.';
 
 export type DCASettingsInp = {
   automation: AutomationSettingsInp;
-  debtToAddBaseUnit: bigint;
+  dcaInBaseUnit: bigint;
+  tokenType: TokenType;
 };
 
 export type DCASettingsInpArgs = {
   automation: AutomationSettingsInpArgs;
-  debtToAddBaseUnit: number | bigint;
+  dcaInBaseUnit: number | bigint;
+  tokenType: TokenTypeArgs;
 };
 
 export function getDCASettingsInpSerializer(): Serializer<
@@ -30,7 +35,8 @@ export function getDCASettingsInpSerializer(): Serializer<
   return struct<DCASettingsInp>(
     [
       ['automation', getAutomationSettingsInpSerializer()],
-      ['debtToAddBaseUnit', u64()],
+      ['dcaInBaseUnit', u64()],
+      ['tokenType', getTokenTypeSerializer()],
     ],
     { description: 'DCASettingsInp' }
   ) as Serializer<DCASettingsInpArgs, DCASettingsInp>;

package/src/generated/types/index.ts

@@ -10,7 +10,6 @@ export * from './automationSettings';
 export * from './automationSettingsInp';
 export * from './dCASettings';
 export * from './dCASettingsInp';
-export * from './feeType';
 export * from './lendingPlatform';
 export * from './podBool';
 export * from './positionData';
@@ -23,4 +22,5 @@ export * from './solautoSettingsParameters';
 export * from './solautoSettingsParametersInp';
 export * from './tokenAmount';
 export * from './tokenBalanceAmount';
+export * from './tokenType';
 export * from './updatePositionData';

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,9 +9,11 @@ import {
   SOLAUTO_PROGRAM_ID,
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
+  TokenType,
   getReferralStateSize,
   getSolautoPositionAccountDataSerializer,
   getSolautoPositionSize,
+  safeFetchAllSolautoPosition,
 } from "../../generated";
 import { currentUnixSeconds, fetchTokenPrices } from "../generalUtils";
 import {
@@ -33,7 +35,8 @@ export function findMintByTicker(ticker: string): PublicKey {
   for (const key in TOKEN_INFO) {
     const account = TOKEN_INFO[key];
     if (
-      account.ticker.toString().toLowerCase() === ticker.toString().toLowerCase()
+      account.ticker.toString().toLowerCase() ===
+      ticker.toString().toLowerCase()
     ) {
       return new PublicKey(key);
     }
@@ -176,14 +179,18 @@ export async function getSolautoManagedPositions(
   // position_id: [u8; 1]
   // self_managed: u8 - (1 for true, 0 for false)
   // padding: [u8; 5]
-  // authority: Pubkey
+  // authority: pubkey
   // lending_platform: u8
+  // padding: [u8; 7]
+  // protocol account: pubkey
+  // supply mint: pubkey
+  // debt mint: pubkey
 
   const accounts = await umi.rpc.getProgramAccounts(SOLAUTO_PROGRAM_ID, {
     commitment: "confirmed",
     dataSlice: {
       offset: 0,
-      length: 1 + 1 + 1 + 5 + 32 + 1, // bump + position_id + self_managed + padding + authority (pubkey) + lending_platform
+      length: 1 + 1 + 1 + 5 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + padding (5) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
     },
     filters: [
       {
@@ -220,6 +227,9 @@ export async function getSolautoManagedPositions(
       authority: toWeb3JsPublicKey(position.authority),
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
+      protocolAccount: toWeb3JsPublicKey(position.position.protocolAccount),
+      supplyMint: toWeb3JsPublicKey(position.position.supplyMint),
+      debtMint: toWeb3JsPublicKey(position.position.debtMint),
     };
   });
 }
@@ -277,44 +287,44 @@ export async function getAllPositionsByAuthority(
   umi: Umi,
   user: PublicKey
 ): Promise<SolautoPositionDetails[]> {
-  const allPositions: SolautoPositionDetails[] = [];
-
-  const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
-  allPositions.push(
-    ...solautoManagedPositions.map((x) => ({
-      publicKey: x.publicKey,
-      authority: user,
-      positionId: x.positionId,
-      lendingPlatform: x.lendingPlatform,
-    }))
-  );
-
-  let marginfiPositions = await getAllMarginfiAccountsByAuthority(
-    umi,
-    user,
-    true
-  );
-  marginfiPositions = marginfiPositions.filter(
-    (x) =>
-      x.supplyMint &&
-      (x.debtMint!.equals(PublicKey.default) ||
-        ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
-  );
-  allPositions.push(
-    ...marginfiPositions.map((x) => ({
-      publicKey: x.marginfiAccount,
-      authority: user,
-      positionId: 0,
-      lendingPlatform: LendingPlatform.Marginfi,
-      protocolAccount: x.marginfiAccount,
-      supplyMint: x.supplyMint,
-      debtMint: x.debtMint,
-    }))
-  );
-
-  // TODO support other platforms
+  const solautoCompatiblePositions: SolautoPositionDetails[][] =
+    await Promise.all([
+      (async () => {
+        const solautoManagedPositions = await getSolautoManagedPositions(
+          umi,
+          user
+        );
+        return solautoManagedPositions.map((x) => ({
+          ...x,
+          authority: user,
+        }));
+      })(),
+      (async () => {
+        let marginfiPositions = await getAllMarginfiAccountsByAuthority(
+          umi,
+          user,
+          true
+        );
+        marginfiPositions = marginfiPositions.filter(
+          (x) =>
+            x.supplyMint &&
+            (x.debtMint!.equals(PublicKey.default) ||
+              ALL_SUPPORTED_TOKENS.includes(x.debtMint!.toString()))
+        );
+        return marginfiPositions.map((x) => ({
+          publicKey: x.marginfiAccount,
+          authority: user,
+          positionId: 0,
+          lendingPlatform: LendingPlatform.Marginfi,
+          protocolAccount: x.marginfiAccount,
+          supplyMint: x.supplyMint,
+          debtMint: x.debtMint,
+        }));
+      })(),
+      // TODO support other platforms
+    ]);
 
-  return allPositions;
+  return solautoCompatiblePositions.flat();
 }
 
 export async function positionStateWithLatestPrices(
@@ -441,15 +451,15 @@ export function createFakePositionState(
   };
 }
 
-export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs): SolautoSettingsParameters {
+export function createSolautoSettings(
+  settings: SolautoSettingsParametersInpArgs
+): SolautoSettingsParameters {
   return {
     automation:
       isOption(settings.automation) && isSome(settings.automation)
         ? {
             ...settings.automation.value,
-            intervalSeconds: BigInt(
-              settings.automation.value.intervalSeconds
-            ),
+            intervalSeconds: BigInt(settings.automation.value.intervalSeconds),
             unixStartDate: BigInt(settings.automation.value.unixStartDate),
             padding: new Uint8Array([]),
             padding1: [],
@@ -463,8 +473,7 @@ export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs
             padding1: [],
           },
     targetBoostToBps:
-      isOption(settings.targetBoostToBps) &&
-      isSome(settings.targetBoostToBps)
+      isOption(settings.targetBoostToBps) && isSome(settings.targetBoostToBps)
         ? settings.targetBoostToBps.value
         : 0,
     boostGap: settings.boostGap,
@@ -479,24 +488,24 @@ export function createSolautoSettings(settings: SolautoSettingsParametersInpArgs
 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);
@@ -510,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)