@haven-fi/solauto-sdk 1.0.133 → 1.0.135

package/dist/utils/solauto/generalUtils.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
+import { AutomationSettings, DCASettings, DCASettingsInpArgs, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs, TokenType } from "../../generated";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 export declare function findMintByTicker(ticker: string): PublicKey;
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
@@ -27,22 +27,32 @@ type PositionAdjustment = {
 } | {
     type: "debt";
     value: bigint;
-} | {
-    type: "debtDcaIn";
-    value: bigint;
 } | {
     type: "settings";
     value: SolautoSettingsParametersInpArgs;
 } | {
     type: "dca";
     value: DCASettingsInpArgs;
+} | {
+    type: "dcaInBalance";
+    value: {
+        amount: bigint;
+        tokenType: TokenType;
+    };
+} | {
+    type: "cancellingDca";
+    value: TokenType;
 };
 export declare class LivePositionUpdates {
     supplyAdjustment: bigint;
     debtAdjustment: bigint;
-    debtTaBalanceAdjustment: bigint;
     settings: SolautoSettingsParameters | undefined;
     activeDca: DCASettings | undefined;
+    dcaInBalance?: {
+        amount: bigint;
+        tokenType: TokenType;
+    };
+    cancellingDca: TokenType | undefined;
     new(update: PositionAdjustment): void;
     reset(): void;
     hasUpdates(): boolean;

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"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"}

package/dist/utils/solauto/generalUtils.js

@@ -27,7 +27,8 @@ const marginfiUtils_1 = require("../marginfiUtils");
 function findMintByTicker(ticker) {
     for (const key in constants_1.TOKEN_INFO) {
         const account = constants_1.TOKEN_INFO[key];
-        if (account.ticker.toString().toLowerCase() === ticker.toString().toLowerCase()) {
+        if (account.ticker.toString().toLowerCase() ===
+            ticker.toString().toLowerCase()) {
             return new web3_js_1.PublicKey(key);
         }
     }
@@ -102,13 +103,17 @@ async function getSolautoManagedPositions(umi, authority) {
     // 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(generated_1.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: [
             {
@@ -142,6 +147,9 @@ async function getSolautoManagedPositions(umi, authority) {
             authority: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.authority),
             positionId: position.positionId[0],
             lendingPlatform: position.position.lendingPlatform,
+            protocolAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolAccount),
+            supplyMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.supplyMint),
+            debtMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.debtMint),
         };
     });
 }
@@ -187,29 +195,32 @@ async function getReferralsByUser(umi, user) {
     return accounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
 }
 async function getAllPositionsByAuthority(umi, user) {
-    const allPositions = [];
-    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 (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
-    marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
-        (x.debtMint.equals(web3_js_1.PublicKey.default) ||
-            constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
-    allPositions.push(...marginfiPositions.map((x) => ({
-        publicKey: x.marginfiAccount,
-        authority: user,
-        positionId: 0,
-        lendingPlatform: generated_1.LendingPlatform.Marginfi,
-        protocolAccount: x.marginfiAccount,
-        supplyMint: x.supplyMint,
-        debtMint: x.debtMint,
-    })));
-    // TODO support other platforms
-    return allPositions;
+    const solautoCompatiblePositions = await Promise.all([
+        (async () => {
+            const solautoManagedPositions = await getSolautoManagedPositions(umi, user);
+            return solautoManagedPositions.map((x) => ({
+                ...x,
+                authority: user,
+            }));
+        })(),
+        (async () => {
+            let marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
+            marginfiPositions = marginfiPositions.filter((x) => x.supplyMint &&
+                (x.debtMint.equals(web3_js_1.PublicKey.default) ||
+                    constants_1.ALL_SUPPORTED_TOKENS.includes(x.debtMint.toString())));
+            return marginfiPositions.map((x) => ({
+                publicKey: x.marginfiAccount,
+                authority: user,
+                positionId: 0,
+                lendingPlatform: generated_1.LendingPlatform.Marginfi,
+                protocolAccount: x.marginfiAccount,
+                supplyMint: x.supplyMint,
+                debtMint: x.debtMint,
+            }));
+        })(),
+        // TODO support other platforms
+    ]);
+    return solautoCompatiblePositions.flat();
 }
 async function positionStateWithLatestPrices(state, supplyPrice, debtPrice) {
     if (!supplyPrice || !debtPrice) {
@@ -320,8 +331,7 @@ function createSolautoSettings(settings) {
                 padding: new Uint8Array([]),
                 padding1: [],
             },
-        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) &&
-            (0, umi_1.isSome)(settings.targetBoostToBps)
+        targetBoostToBps: (0, umi_1.isOption)(settings.targetBoostToBps) && (0, umi_1.isSome)(settings.targetBoostToBps)
             ? settings.targetBoostToBps.value
             : 0,
         boostGap: settings.boostGap,
@@ -336,9 +346,10 @@ class LivePositionUpdates {
     constructor() {
         this.supplyAdjustment = BigInt(0);
         this.debtAdjustment = BigInt(0);
-        this.debtTaBalanceAdjustment = BigInt(0);
         this.settings = undefined;
         this.activeDca = undefined;
+        this.dcaInBalance = undefined;
+        this.cancellingDca = undefined;
     }
     new(update) {
         if (update.type === "supply") {
@@ -347,9 +358,6 @@ class LivePositionUpdates {
         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);
@@ -364,23 +372,32 @@ 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() {
         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);
     }
 }
 exports.LivePositionUpdates = LivePositionUpdates;

package/dist/utils/solauto/rebalanceUtils.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient } from "../../clients/solautoClient";
-import { DCASettings, PositionState, SolautoSettingsParameters } from "../../generated";
+import { DCASettings, PositionState, SolautoSettingsParameters, TokenType } from "../../generated";
 import { QuoteResponse } from "@jup-ag/api";
 import { JupSwapDetails } from "../jupiterUtils";
 export interface RebalanceValues {
@@ -8,6 +8,7 @@ export interface RebalanceValues {
     debtAdjustmentUsd: number;
     amountToDcaIn: number;
     amountUsdToDcaIn: number;
+    dcaTokenType?: TokenType;
 }
 export declare function getRebalanceValues(state: PositionState, settings: SolautoSettingsParameters | undefined, dca: DCASettings | undefined, currentUnixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number, limitGapBps?: number): RebalanceValues;
 export interface FlashLoanDetails {

package/dist/utils/solauto/rebalanceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EAC1B,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAkJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAgEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}
+{"version":3,"file":"rebalanceUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/rebalanceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,aAAa,EAEb,yBAAyB,EACzB,SAAS,EACV,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgJjD,MAAM,WAAW,eAAe;IAC9B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,yBAAyB,GAAG,SAAS,EAC/C,GAAG,EAAE,WAAW,GAAG,SAAS,EAC5B,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,eAAe,CAiEjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE,aAAa,GACtB,gBAAgB,GAAG,SAAS,CAmE9B;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,cAAc,CAkChB"}

package/dist/utils/solauto/rebalanceUtils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRebalanceValues = getRebalanceValues;
 exports.getFlashLoanDetails = getFlashLoanDetails;
 exports.getJupSwapRebalanceDetails = getJupSwapRebalanceDetails;
+const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generalUtils_2 = require("../generalUtils");
@@ -10,10 +11,10 @@ const numberUtils_1 = require("../numberUtils");
 const generalAccounts_1 = require("../../constants/generalAccounts");
 const solautoConstants_1 = require("../../constants/solautoConstants");
 function getAdditionalAmountToDcaIn(dca) {
-    if (dca.debtToAddBaseUnit === BigInt(0)) {
+    if (dca.dcaInBaseUnit === BigInt(0)) {
         return 0;
     }
-    const debtBalance = Number(dca.debtToAddBaseUnit);
+    const debtBalance = Number(dca.dcaInBaseUnit);
     const updatedDebtBalance = (0, generalUtils_1.getUpdatedValueFromAutomation)(debtBalance, 0, dca.automation, (0, generalUtils_2.currentUnixSeconds)());
     return debtBalance - updatedDebtBalance;
 }
@@ -34,7 +35,7 @@ function getStandardTargetLiqUtilizationRateBps(state, settings) {
 function targetLiqUtilizationRateBpsFromDCA(state, settings, dca, currentUnixTime) {
     const adjustedSettings = (0, generalUtils_1.getAdjustedSettingsFromAutomation)(settings, currentUnixTime);
     let targetRateBps = 0;
-    if (dca.debtToAddBaseUnit > BigInt(0)) {
+    if (dca.dcaInBaseUnit > BigInt(0)) {
         targetRateBps = Math.max(state.liqUtilizationRateBps, adjustedSettings.boostToBps);
     }
     else {
@@ -110,10 +111,11 @@ function getRebalanceValues(state, settings, dca, currentUnixTime, supplyPrice,
         debtAdjustmentUsd,
         amountToDcaIn: amountToDcaIn ?? 0,
         amountUsdToDcaIn,
+        dcaTokenType: dca?.tokenType
     };
 }
 function getFlashLoanDetails(client, values, jupQuote) {
-    let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
+    let supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) + (values.dcaTokenType === generated_1.TokenType.Supply ? values.amountUsdToDcaIn : 0);
     let debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);
     const debtAdjustmentWithSlippage = Math.abs(values.debtAdjustmentUsd) +
         Math.abs(values.debtAdjustmentUsd) * (0, numberUtils_1.fromBps)(jupQuote.slippageBps);
@@ -159,7 +161,7 @@ function getJupSwapRebalanceDetails(client, values, targetLiqUtilizationRateBps,
     const output = values.increasingLeverage
         ? client.solautoPositionState.supply
         : client.solautoPositionState.debt;
-    const usdToSwap = Math.abs(values.debtAdjustmentUsd) + values.amountUsdToDcaIn;
+    const usdToSwap = Math.abs(values.debtAdjustmentUsd) + (values.dcaTokenType === generated_1.TokenType.Debt ? values.amountUsdToDcaIn : 0);
     const inputPrice = values.increasingLeverage
         ? (0, generalUtils_2.safeGetPrice)(client.debtMint)
         : (0, generalUtils_2.safeGetPrice)(client.supplyMint);

package/package.json

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

@@ -25,6 +25,7 @@ import {
   SolautoRebalanceTypeArgs,
   SolautoSettingsParameters,
   SolautoSettingsParametersInpArgs,
+  TokenType,
   UpdatePositionDataArgs,
   cancelDCA,
   closePosition,
@@ -360,10 +361,13 @@ export abstract class SolautoClient extends TxHandler {
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
-    if (dca && dca.debtToAddBaseUnit > 0) {
+    if (dca && dca.dcaInBaseUnit > 0) {
       this.livePositionUpdates.new({
-        type: "debtDcaIn",
-        value: BigInt(dca.debtToAddBaseUnit),
+        type: "dcaInBalance",
+        value: {
+          amount: BigInt(dca.dcaInBaseUnit),
+          tokenType: dca.tokenType
+        },
       });
     }
     if (settingParams) {
@@ -383,38 +387,35 @@ export abstract class SolautoClient extends TxHandler {
   }
 
   updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder {
-    let debtMint: UmiPublicKey | undefined = undefined;
-    let positionDebtTa: UmiPublicKey | undefined = undefined;
-    let signerDebtTa: UmiPublicKey | undefined = undefined;
+    let dcaMint: UmiPublicKey | undefined = undefined;
+    let positionDcaTa: UmiPublicKey | undefined = undefined;
+    let signerDcaTa: UmiPublicKey | undefined = undefined;
     if (isOption(args.dca) && isSome(args.dca)) {
-      debtMint = publicKey(this.debtMint);
-      positionDebtTa = publicKey(this.positionDebtTa);
-      signerDebtTa = publicKey(this.signerDebtTa);
+      if (args.dca.value.tokenType === TokenType.Supply) {
+        dcaMint = publicKey(this.supplyMint);
+        positionDcaTa = publicKey(this.positionSupplyTa);
+        signerDcaTa = publicKey(this.signerSupplyTa);
+      } else {
+        dcaMint = publicKey(this.debtMint);
+        positionDcaTa = publicKey(this.positionDebtTa);
+        signerDcaTa = publicKey(this.signerDebtTa);
+      }
 
       let addingToPos = false;
       if (
         isOption(args.dca) &&
         isSome(args.dca) &&
-        args.dca.value.debtToAddBaseUnit > 0
+        args.dca.value.dcaInBaseUnit > 0
       ) {
         this.livePositionUpdates.new({
-          type: "debtDcaIn",
-          value: BigInt(args.dca.value.debtToAddBaseUnit),
+          type: "dcaInBalance",
+          value: {
+            amount: BigInt(args.dca.value.dcaInBaseUnit),
+            tokenType: args.dca.value.tokenType
+          },
         });
         addingToPos = true;
       }
-
-      if (
-        this.solautoPositionData?.position.dca.debtToAddBaseUnit &&
-        !addingToPos
-      ) {
-        this.livePositionUpdates.new({
-          type: "debtDcaIn",
-          value:
-            this.solautoPositionData.position.dca.debtToAddBaseUnit *
-            BigInt(-1),
-        });
-      }
     }
 
     if (isOption(args.settingParams) && isSome(args.settingParams)) {
@@ -434,9 +435,9 @@ export abstract class SolautoClient extends TxHandler {
     return updatePosition(this.umi, {
       signer: this.signer,
       solautoPosition: publicKey(this.solautoPosition),
-      debtMint,
-      positionDebtTa,
-      signerDebtTa,
+      dcaMint,
+      positionDcaTa,
+      signerDcaTa,
       updatePositionData: args,
     });
   }
@@ -454,30 +455,34 @@ export abstract class SolautoClient extends TxHandler {
   }
 
   cancelDCAIx(): TransactionBuilder {
-    let debtMint: UmiPublicKey | undefined = undefined;
-    let positionDebtTa: UmiPublicKey | undefined = undefined;
-    let signerDebtTa: UmiPublicKey | undefined = undefined;
-
-    if (this.solautoPositionData !== null && !this.selfManaged) {
-      const positionData = this.solautoPositionData!.position;
-      if (positionData.dca.debtToAddBaseUnit) {
-        debtMint = publicKey(this.debtMint);
-        positionDebtTa = publicKey(this.positionDebtTa);
-        signerDebtTa = publicKey(this.signerDebtTa);
-
-        this.livePositionUpdates.new({
-          type: "debtDcaIn",
-          value: positionData.dca.debtToAddBaseUnit * BigInt(-1),
-        });
+    let dcaMint: UmiPublicKey | undefined = undefined;
+    let positionDcaTa: UmiPublicKey | undefined = undefined;
+    let signerDcaTa: UmiPublicKey | undefined = undefined;
+
+    const currDca = this.solautoPositionActiveDca()!;
+    if (currDca.dcaInBaseUnit > 0) {
+      if (currDca.tokenType === TokenType.Supply) {
+        dcaMint = publicKey(this.supplyMint);
+        positionDcaTa = publicKey(this.positionSupplyTa);
+        signerDcaTa = publicKey(this.signerSupplyTa);
+      } else {
+        dcaMint = publicKey(this.debtMint);
+        positionDcaTa = publicKey(this.positionDebtTa);
+        signerDcaTa = publicKey(this.signerDebtTa);
       }
+
+      this.livePositionUpdates.new({
+        type: "cancellingDca",
+        value: this.solautoPositionData!.position.dca.tokenType,
+      });
     }
 
     return cancelDCA(this.umi, {
       signer: this.signer,
       solautoPosition: publicKey(this.solautoPosition),
-      debtMint,
-      positionDebtTa,
-      signerDebtTa,
+      dcaMint,
+      positionDcaTa,
+      signerDcaTa,
     });
   }
 

package/src/generated/accounts/solautoPosition.ts

@@ -28,8 +28,6 @@ import {
   u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
-  FeeType,
-  FeeTypeArgs,
   PodBool,
   PodBoolArgs,
   PositionData,
@@ -38,7 +36,6 @@ import {
   PositionStateArgs,
   RebalanceData,
   RebalanceDataArgs,
-  getFeeTypeSerializer,
   getPodBoolSerializer,
   getPositionDataSerializer,
   getPositionStateSerializer,
@@ -56,8 +53,6 @@ export type SolautoPositionAccountData = {
   position: PositionData;
   state: PositionState;
   rebalance: RebalanceData;
-  feeType: FeeType;
-  padding2: Array<number>;
   padding: Array<number>;
 };
 
@@ -70,8 +65,6 @@ export type SolautoPositionAccountDataArgs = {
   position: PositionDataArgs;
   state: PositionStateArgs;
   rebalance: RebalanceDataArgs;
-  feeType: FeeTypeArgs;
-  padding2: Array<number>;
   padding: Array<number>;
 };
 
@@ -89,9 +82,7 @@ export function getSolautoPositionAccountDataSerializer(): Serializer<
       ['position', getPositionDataSerializer()],
       ['state', getPositionStateSerializer()],
       ['rebalance', getRebalanceDataSerializer()],
-      ['feeType', getFeeTypeSerializer()],
-      ['padding2', array(u8(), { size: 7 })],
-      ['padding', array(u32(), { size: 30 })],
+      ['padding', array(u32(), { size: 32 })],
     ],
     { description: 'SolautoPositionAccountData' }
   ) as Serializer<SolautoPositionAccountDataArgs, SolautoPositionAccountData>;
@@ -179,8 +170,6 @@ export function getSolautoPositionGpaBuilder(
       position: PositionDataArgs;
       state: PositionStateArgs;
       rebalance: RebalanceDataArgs;
-      feeType: FeeTypeArgs;
-      padding2: Array<number>;
       padding: Array<number>;
     }>({
       bump: [0, array(u8(), { size: 1 })],
@@ -191,9 +180,7 @@ export function getSolautoPositionGpaBuilder(
       position: [40, getPositionDataSerializer()],
       state: [360, getPositionStateSerializer()],
       rebalance: [648, getRebalanceDataSerializer()],
-      feeType: [704, getFeeTypeSerializer()],
-      padding2: [705, array(u8(), { size: 7 })],
-      padding: [712, array(u32(), { size: 30 })],
+      padding: [704, array(u32(), { size: 32 })],
     })
     .deserializeUsing<SolautoPosition>((account) =>
       deserializeSolautoPosition(account)

package/src/generated/instructions/cancelDCA.ts

@@ -33,9 +33,9 @@ export type CancelDCAInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ataProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
-  debtMint?: PublicKey | Pda;
-  positionDebtTa?: PublicKey | Pda;
-  signerDebtTa?: PublicKey | Pda;
+  dcaMint?: PublicKey | Pda;
+  positionDcaTa?: PublicKey | Pda;
+  signerDcaTa?: PublicKey | Pda;
 };
 
 // Data.
@@ -97,20 +97,20 @@ export function cancelDCA(
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
-    debtMint: {
+    dcaMint: {
       index: 5,
       isWritable: false as boolean,
-      value: input.debtMint ?? null,
+      value: input.dcaMint ?? null,
     },
-    positionDebtTa: {
+    positionDcaTa: {
       index: 6,
       isWritable: true as boolean,
-      value: input.positionDebtTa ?? null,
+      value: input.positionDcaTa ?? null,
     },
-    signerDebtTa: {
+    signerDcaTa: {
       index: 7,
       isWritable: true as boolean,
-      value: input.signerDebtTa ?? null,
+      value: input.signerDcaTa ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;
 

package/src/generated/instructions/closePosition.ts

@@ -34,9 +34,8 @@ export type ClosePositionInstructionAccounts = {
   ataProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
   protocolAccount: PublicKey | Pda;
-  signerSupplyTa: PublicKey | Pda;
   positionSupplyTa: PublicKey | Pda;
-  positionSupplyCollateralTa?: PublicKey | Pda;
+  signerSupplyTa: PublicKey | Pda;
   positionDebtTa: PublicKey | Pda;
   signerDebtTa: PublicKey | Pda;
 };
@@ -108,28 +107,23 @@ export function closePosition(
       isWritable: true as boolean,
       value: input.protocolAccount ?? null,
     },
-    signerSupplyTa: {
-      index: 6,
-      isWritable: true as boolean,
-      value: input.signerSupplyTa ?? null,
-    },
     positionSupplyTa: {
-      index: 7,
+      index: 6,
       isWritable: true as boolean,
       value: input.positionSupplyTa ?? null,
     },
-    positionSupplyCollateralTa: {
-      index: 8,
+    signerSupplyTa: {
+      index: 7,
       isWritable: true as boolean,
-      value: input.positionSupplyCollateralTa ?? null,
+      value: input.signerSupplyTa ?? null,
     },
     positionDebtTa: {
-      index: 9,
+      index: 8,
       isWritable: true as boolean,
       value: input.positionDebtTa ?? null,
     },
     signerDebtTa: {
-      index: 10,
+      index: 9,
       isWritable: true as boolean,
       value: input.signerDebtTa ?? null,
     },

package/src/generated/instructions/updatePosition.ts

@@ -37,9 +37,9 @@ export type UpdatePositionInstructionAccounts = {
   systemProgram?: PublicKey | Pda;
   tokenProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
-  debtMint?: PublicKey | Pda;
-  positionDebtTa?: PublicKey | Pda;
-  signerDebtTa?: PublicKey | Pda;
+  dcaMint?: PublicKey | Pda;
+  positionDcaTa?: PublicKey | Pda;
+  signerDcaTa?: PublicKey | Pda;
 };
 
 // Data.
@@ -111,20 +111,20 @@ export function updatePosition(
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
-    debtMint: {
+    dcaMint: {
       index: 4,
       isWritable: false as boolean,
-      value: input.debtMint ?? null,
+      value: input.dcaMint ?? null,
     },
-    positionDebtTa: {
+    positionDcaTa: {
       index: 5,
       isWritable: true as boolean,
-      value: input.positionDebtTa ?? null,
+      value: input.positionDcaTa ?? null,
     },
-    signerDebtTa: {
+    signerDcaTa: {
       index: 6,
       isWritable: true as boolean,
-      value: input.signerDebtTa ?? null,
+      value: input.signerDcaTa ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;