@haven-fi/solauto-sdk 1.0.285 → 1.0.286

package/dist/clients/solautoClient.js

@@ -31,15 +31,15 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         this.liqThresholdBps = undefined;
         this.supplyMint =
             args.supplyMint ??
-                (this.solautoPositionData
-                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint)
+                (this.solautoPositionData && !this.selfManaged
+                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.state.supply.mint)
                     : 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 ??
-                (this.solautoPositionData
-                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint)
+                (this.solautoPositionData && !this.selfManaged
+                    ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.state.debt.mint)
                     : 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);

package/dist/clients/solautoMarginfiClient.js

@@ -29,7 +29,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         else {
             this.marginfiAccountSeedIdx = (0, generalUtils_1.generateRandomU64)();
             this.marginfiAccount = this.solautoPositionData
-                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolAccount)
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolUserAccount)
                 : (0, accountUtils_1.getMarginfiAccountPDA)(this.solautoPosition, this.marginfiAccountSeedIdx, this.programId);
         }
         this.marginfiAccountPk =

package/dist/generated/types/positionData.d.ts

@@ -11,9 +11,9 @@ import { DCASettings, DCASettingsArgs, LendingPlatform, LendingPlatformArgs, Sol
 export type PositionData = {
     lendingPlatform: LendingPlatform;
     padding1: Array<number>;
-    protocolAccount: PublicKey;
-    supplyMint: PublicKey;
-    debtMint: PublicKey;
+    protocolUserAccount: PublicKey;
+    protocolSupplyAccount: PublicKey;
+    protocolDebtAccount: PublicKey;
     settingParams: SolautoSettingsParameters;
     dca: DCASettings;
     padding: Array<number>;
@@ -21,9 +21,9 @@ export type PositionData = {
 export type PositionDataArgs = {
     lendingPlatform: LendingPlatformArgs;
     padding1: Array<number>;
-    protocolAccount: PublicKey;
-    supplyMint: PublicKey;
-    debtMint: PublicKey;
+    protocolUserAccount: PublicKey;
+    protocolSupplyAccount: PublicKey;
+    protocolDebtAccount: PublicKey;
     settingParams: SolautoSettingsParametersArgs;
     dca: DCASettingsArgs;
     padding: Array<number>;

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

@@ -1 +1 @@
-{"version":3,"file":"positionData.d.ts","sourceRoot":"","sources":["../../../src/generated/types/positionData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,6BAA6B,EAI9B,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,aAAa,EAAE,yBAAyB,CAAC;IACzC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,aAAa,EAAE,6BAA6B,CAAC;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,UAAU,CACrD,gBAAgB,EAChB,YAAY,CACb,CAcA"}
+{"version":3,"file":"positionData.d.ts","sourceRoot":"","sources":["../../../src/generated/types/positionData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,6BAA6B,EAI9B,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,qBAAqB,EAAE,SAAS,CAAC;IACjC,mBAAmB,EAAE,SAAS,CAAC;IAC/B,aAAa,EAAE,yBAAyB,CAAC;IACzC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,qBAAqB,EAAE,SAAS,CAAC;IACjC,mBAAmB,EAAE,SAAS,CAAC;IAC/B,aAAa,EAAE,6BAA6B,CAAC;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,UAAU,CACrD,gBAAgB,EAChB,YAAY,CACb,CAcA"}

package/dist/generated/types/positionData.js

@@ -14,9 +14,9 @@ function getPositionDataSerializer() {
     return (0, serializers_1.struct)([
         ['lendingPlatform', (0, _1.getLendingPlatformSerializer)()],
         ['padding1', (0, serializers_1.array)((0, serializers_1.u8)(), { size: 7 })],
-        ['protocolAccount', (0, serializers_1.publicKey)()],
-        ['supplyMint', (0, serializers_1.publicKey)()],
-        ['debtMint', (0, serializers_1.publicKey)()],
+        ['protocolUserAccount', (0, serializers_1.publicKey)()],
+        ['protocolSupplyAccount', (0, serializers_1.publicKey)()],
+        ['protocolDebtAccount', (0, serializers_1.publicKey)()],
         ['settingParams', (0, _1.getSolautoSettingsParametersSerializer)()],
         ['dca', (0, _1.getDCASettingsSerializer)()],
         ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 4 })],

package/dist/utils/marginfiUtils.d.ts

@@ -4,7 +4,10 @@ import { Bank, MarginfiAccount } from "../marginfi-sdk";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
-export declare function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts;
+interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
+    mint: PublicKey;
+}
+export declare function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetAccounts;
 export declare function marginfiMaxLtvAndLiqThresholdBps(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
 export declare function getMaxLtvAndLiqThreshold(umi: Umi, marginfiGroup: PublicKey, supply: {
     mint: PublicKey;

package/dist/utils/marginfiUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAY3E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AA6DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAGJ,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAiBzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,wBAAwB,CAY9E;AAED,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAwDA;AA6DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAEhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,eAAe,EAAE;IAAE,EAAE,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,CAAA;CAAE,EAC1D,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0LpC;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAgB3B"}

package/dist/utils/marginfiUtils.js

@@ -21,7 +21,7 @@ function findMarginfiAccounts(bank) {
         for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS[group]) {
             const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[group][key];
             if (account.bank.toString().toLowerCase() === bank.toString().toLowerCase()) {
-                return account;
+                return { ...account, mint: new web3_js_1.PublicKey(key) };
             }
         }
     }

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

@@ -26,7 +26,7 @@ const constants_1 = require("../../constants");
 const marginfiUtils_1 = require("../marginfiUtils");
 function createDynamicSolautoProgram(programId) {
     return {
-        name: 'solauto',
+        name: "solauto",
         publicKey: (0, umi_1.publicKey)(programId),
         getErrorFromCode(code, cause) {
             return (0, generated_1.getSolautoErrorFromCode)(code, this, cause);
@@ -86,10 +86,12 @@ function eligibleForRebalance(positionState, positionSettings, positionDca, curr
         : positionSettings.boostToBps;
     const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
     const boostFrom = boostToBps - positionSettings.boostGap;
-    if (Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <= bpsDistanceThreshold) {
+    if (Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <=
+        bpsDistanceThreshold) {
         return "boost";
     }
-    else if (Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <= bpsDistanceThreshold) {
+    else if (Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <=
+        bpsDistanceThreshold) {
         return "repay";
     }
     return undefined;
@@ -141,14 +143,16 @@ async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
                     },
                 ]
                 : []),
-            ...(positionTypeFilter !== undefined ? [
-                {
-                    memcmp: {
-                        bytes: new Uint8Array(positionTypeFilter),
-                        offset: 3
-                    }
-                }
-            ] : [])
+            ...(positionTypeFilter !== undefined
+                ? [
+                    {
+                        memcmp: {
+                            bytes: new Uint8Array(positionTypeFilter),
+                            offset: 3,
+                        },
+                    },
+                ]
+                : []),
         ],
     });
     return accounts.map((x) => {
@@ -156,15 +160,23 @@ async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
             ...x.data,
             ...Array((0, generated_1.getSolautoPositionSize)() - x.data.length).fill(0),
         ]));
+        let tokens;
+        if (position.position.lendingPlatform === generated_1.LendingPlatform.Marginfi) {
+            tokens = [
+                (0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolSupplyAccount)).mint,
+                (0, marginfiUtils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolDebtAccount)).mint,
+            ];
+        }
+        // TODO: PK
         return {
             publicKey: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
             authority: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.authority),
             positionId: position.positionId[0],
             lendingPlatform: position.position.lendingPlatform,
             positionType: position.positionType,
-            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),
+            protocolAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.position.protocolUserAccount),
+            supplyMint: tokens[0],
+            debtMint: tokens[1],
         };
     });
 }

package/package.json

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

@@ -113,8 +113,8 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.supplyMint =
       args.supplyMint ??
-      (this.solautoPositionData
-        ? toWeb3JsPublicKey(this.solautoPositionData!.position.supplyMint)
+      (this.solautoPositionData && !this.selfManaged
+        ? toWeb3JsPublicKey(this.solautoPositionData!.state.supply.mint)
         : PublicKey.default);
     this.positionSupplyTa = getTokenAccount(
       this.solautoPosition,
@@ -127,8 +127,8 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     this.debtMint =
       args.debtMint ??
-      (this.solautoPositionData
-        ? toWeb3JsPublicKey(this.solautoPositionData!.position.debtMint)
+      (this.solautoPositionData && !this.selfManaged
+        ? toWeb3JsPublicKey(this.solautoPositionData!.state.debt.mint)
         : PublicKey.default);
     this.positionDebtTa = getTokenAccount(this.solautoPosition, this.debtMint);
     this.signerDebtTa = getTokenAccount(

package/src/clients/solautoMarginfiClient.ts

@@ -104,7 +104,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     } else {
       this.marginfiAccountSeedIdx = generateRandomU64();
       this.marginfiAccount = this.solautoPositionData
-        ? toWeb3JsPublicKey(this.solautoPositionData.position.protocolAccount)
+        ? toWeb3JsPublicKey(this.solautoPositionData.position.protocolUserAccount)
         : getMarginfiAccountPDA(
             this.solautoPosition,
             this.marginfiAccountSeedIdx,

package/src/generated/types/positionData.ts

@@ -30,9 +30,9 @@ import {
 export type PositionData = {
   lendingPlatform: LendingPlatform;
   padding1: Array<number>;
-  protocolAccount: PublicKey;
-  supplyMint: PublicKey;
-  debtMint: PublicKey;
+  protocolUserAccount: PublicKey;
+  protocolSupplyAccount: PublicKey;
+  protocolDebtAccount: PublicKey;
   settingParams: SolautoSettingsParameters;
   dca: DCASettings;
   padding: Array<number>;
@@ -41,9 +41,9 @@ export type PositionData = {
 export type PositionDataArgs = {
   lendingPlatform: LendingPlatformArgs;
   padding1: Array<number>;
-  protocolAccount: PublicKey;
-  supplyMint: PublicKey;
-  debtMint: PublicKey;
+  protocolUserAccount: PublicKey;
+  protocolSupplyAccount: PublicKey;
+  protocolDebtAccount: PublicKey;
   settingParams: SolautoSettingsParametersArgs;
   dca: DCASettingsArgs;
   padding: Array<number>;
@@ -57,9 +57,9 @@ export function getPositionDataSerializer(): Serializer<
     [
       ['lendingPlatform', getLendingPlatformSerializer()],
       ['padding1', array(u8(), { size: 7 })],
-      ['protocolAccount', publicKeySerializer()],
-      ['supplyMint', publicKeySerializer()],
-      ['debtMint', publicKeySerializer()],
+      ['protocolUserAccount', publicKeySerializer()],
+      ['protocolSupplyAccount', publicKeySerializer()],
+      ['protocolDebtAccount', publicKeySerializer()],
       ['settingParams', getSolautoSettingsParametersSerializer()],
       ['dca', getDCASettingsSerializer()],
       ['padding', array(u32(), { size: 4 })],

package/src/utils/marginfiUtils.ts

@@ -31,14 +31,18 @@ import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { TOKEN_INFO } from "../constants";
 
-export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
+interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
+  mint: PublicKey;
+}
+
+export function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetAccounts {
   for (const group in MARGINFI_ACCOUNTS) {
     for (const key in MARGINFI_ACCOUNTS[group]) {
       const account = MARGINFI_ACCOUNTS[group][key];
       if (
         account.bank.toString().toLowerCase() === bank.toString().toLowerCase()
       ) {
-        return account;
+        return { ...account, mint: new PublicKey(key) };
       }
     }
   }

package/src/utils/solauto/generalUtils.ts

@@ -1,5 +1,11 @@
 import { PublicKey } from "@solana/web3.js";
-import { isOption, isSome, Program, publicKey, Umi } from "@metaplex-foundation/umi";
+import {
+  isOption,
+  isSome,
+  Program,
+  publicKey,
+  Umi,
+} from "@metaplex-foundation/umi";
 import {
   AutomationSettings,
   DCASettings,
@@ -29,12 +35,15 @@ import {
   TOKEN_INFO,
   USD_DECIMALS,
 } from "../../constants";
-import { getAllMarginfiAccountsByAuthority } from "../marginfiUtils";
+import {
+  findMarginfiAccounts,
+  getAllMarginfiAccountsByAuthority,
+} from "../marginfiUtils";
 import { RebalanceAction, SolautoPositionDetails } from "../../types/solauto";
 
 export function createDynamicSolautoProgram(programId: PublicKey): Program {
   return {
-    name: 'solauto',
+    name: "solauto",
     publicKey: publicKey(programId),
     getErrorFromCode(code: number, cause?: Error) {
       return getSolautoErrorFromCode(code, this, cause);
@@ -149,9 +158,15 @@ export function eligibleForRebalance(
   const repayFrom = positionSettings.repayToBps + positionSettings.repayGap;
   const boostFrom = boostToBps - positionSettings.boostGap;
 
-  if (Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <= bpsDistanceThreshold) {
+  if (
+    Math.max(0, positionState.liqUtilizationRateBps - boostFrom) <=
+    bpsDistanceThreshold
+  ) {
     return "boost";
-  } else if (Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <= bpsDistanceThreshold) {
+  } else if (
+    Math.max(0, repayFrom - positionState.liqUtilizationRateBps) <=
+    bpsDistanceThreshold
+  ) {
     return "repay";
   }
 
@@ -193,42 +208,47 @@ export async function getSolautoManagedPositions(
   // supply mint: pubkey
   // debt mint: pubkey
 
-  const accounts = await umi.rpc.getProgramAccounts(umi.programs.get("solauto").publicKey, {
-    commitment: "confirmed",
-    dataSlice: {
-      offset: 0,
-      length: 1 + 1 + 1 + 1 + 4 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + position_type + padding (4) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
-    },
-    filters: [
-      {
-        dataSize: getSolautoPositionSize(),
+  const accounts = await umi.rpc.getProgramAccounts(
+    umi.programs.get("solauto").publicKey,
+    {
+      commitment: "confirmed",
+      dataSlice: {
+        offset: 0,
+        length: 1 + 1 + 1 + 1 + 4 + 32 + 1 + 7 + 32 + 32 + 32, // bump + position_id + self_managed + position_type + padding (4) + authority (pubkey) + lending_platform + padding (7) + protocol account (pubkey) + supply mint (pubkey) + debt mint (pubkey)
       },
-      {
-        memcmp: {
-          bytes: new Uint8Array([0]),
-          offset: 2,
+      filters: [
+        {
+          dataSize: getSolautoPositionSize(),
         },
-      },
-      ...(authority
-        ? [
-            {
-              memcmp: {
-                bytes: new Uint8Array(authority.toBuffer()),
-                offset: 8,
-              },
-            },
-          ]
-        : []),
-      ...(positionTypeFilter !== undefined ? [
         {
           memcmp: {
-            bytes: new Uint8Array(positionTypeFilter),
-            offset: 3
-          }
-        }
-      ] : [])
-    ],
-  });
+            bytes: new Uint8Array([0]),
+            offset: 2,
+          },
+        },
+        ...(authority
+          ? [
+              {
+                memcmp: {
+                  bytes: new Uint8Array(authority.toBuffer()),
+                  offset: 8,
+                },
+              },
+            ]
+          : []),
+        ...(positionTypeFilter !== undefined
+          ? [
+              {
+                memcmp: {
+                  bytes: new Uint8Array(positionTypeFilter),
+                  offset: 3,
+                },
+              },
+            ]
+          : []),
+      ],
+    }
+  );
 
   return accounts.map((x) => {
     const [position, _] = getSolautoPositionAccountDataSerializer().deserialize(
@@ -237,32 +257,49 @@ export async function getSolautoManagedPositions(
         ...Array(getSolautoPositionSize() - x.data.length).fill(0),
       ])
     );
+    
+    let tokens: [PublicKey, PublicKey] | undefined;
+    if (position.position.lendingPlatform === LendingPlatform.Marginfi) {
+      tokens = [
+        findMarginfiAccounts(
+          toWeb3JsPublicKey(position.position.protocolSupplyAccount)
+        ).mint,
+        findMarginfiAccounts(
+          toWeb3JsPublicKey(position.position.protocolDebtAccount)
+        ).mint,
+      ];
+    }
+    // TODO: PK
+
     return {
       publicKey: toWeb3JsPublicKey(x.publicKey),
       authority: toWeb3JsPublicKey(position.authority),
       positionId: position.positionId[0],
       lendingPlatform: position.position.lendingPlatform,
       positionType: position.positionType,
-      protocolAccount: toWeb3JsPublicKey(position.position.protocolAccount),
-      supplyMint: toWeb3JsPublicKey(position.position.supplyMint),
-      debtMint: toWeb3JsPublicKey(position.position.debtMint),
+      protocolAccount: toWeb3JsPublicKey(position.position.protocolUserAccount),
+      supplyMint: tokens![0],
+      debtMint: tokens![1],
     };
   });
 }
 
 export async function getAllReferralStates(umi: Umi): Promise<PublicKey[]> {
-  const accounts = await umi.rpc.getProgramAccounts(umi.programs.get("solauto").publicKey, {
-    commitment: "confirmed",
-    dataSlice: {
-      offset: 0,
-      length: 0,
-    },
-    filters: [
-      {
-        dataSize: getReferralStateSize(),
+  const accounts = await umi.rpc.getProgramAccounts(
+    umi.programs.get("solauto").publicKey,
+    {
+      commitment: "confirmed",
+      dataSlice: {
+        offset: 0,
+        length: 0,
       },
-    ],
-  });
+      filters: [
+        {
+          dataSize: getReferralStateSize(),
+        },
+      ],
+    }
+  );
 
   return accounts.map((x) => toWeb3JsPublicKey(x.publicKey));
 }
@@ -277,7 +314,10 @@ export async function getReferralsByUser(
   // referred_by_state: Pubkey,
 
   const programId = umi.programs.get("solauto").publicKey;
-  const userReferralState = getReferralState(user, toWeb3JsPublicKey(programId));
+  const userReferralState = getReferralState(
+    user,
+    toWeb3JsPublicKey(programId)
+  );
   const accounts = await umi.rpc.getProgramAccounts(programId, {
     commitment: "confirmed",
     dataSlice: {
@@ -513,17 +553,17 @@ type PositionAdjustment =
   | { type: "debt"; value: bigint }
   | { type: "settings"; value: SolautoSettingsParametersInpArgs }
   | { type: "dca"; value: DCASettingsInpArgs }
-  | { type: "dcaInBalance"; value: { amount: bigint; tokenType: TokenType; } }
-  | { type: "cancellingDca"; value: TokenType; };
+  | { type: "dcaInBalance"; value: { amount: bigint; tokenType: TokenType } }
+  | { type: "cancellingDca"; value: TokenType };
 
 export class LivePositionUpdates {
   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 dcaInBalance?: { amount: bigint; tokenType: TokenType } = undefined;
   public cancellingDca: TokenType | undefined = undefined;
-  
+
   new(update: PositionAdjustment) {
     if (update.type === "supply") {
       this.supplyAdjustment += update.value;