@haven-fi/solauto-sdk 1.0.196 → 1.0.198

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAmE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAyBvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA+C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAgErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA4ClE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAEb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AASnE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAsE1C,8BAA8B;IA0CpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IA0BvE,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA8C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IAqErB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAoFlE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CA6ClE"}

package/dist/clients/solautoMarginfiClient.js

@@ -39,12 +39,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const marginfiAccountData = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(this.umi, (0, umi_1.publicKey)(this.marginfiAccountPk), { commitment: "confirmed" });
         this.marginfiGroup = new web3_js_1.PublicKey(marginfiAccountData
             ? marginfiAccountData.group.toString()
-            : args.marginfiGroup ??
-                marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()].marginfiGroup ??
-                marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
+            : (args.marginfiGroup ?? marginfiAccounts_1.DEFAULT_MARGINFI_GROUP));
         this.marginfiSupplyAccounts =
-            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.supplyMint.toString()];
-        this.marginfiDebtAccounts = marginfiAccounts_1.MARGINFI_ACCOUNTS[this.debtMint.toString()];
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.supplyMint.toString()];
+        this.marginfiDebtAccounts =
+            marginfiAccounts_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.debtMint.toString()];
         // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
         // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
         //   publicKey(this.marginfiSupplyAccounts.bank),
@@ -108,7 +107,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             return [0, 0];
         }
         else {
-            const [maxLtv, liqThreshold] = await (0, marginfiUtils_1.getMaxLtvAndLiqThreshold)(this.umi, {
+            const [maxLtv, liqThreshold] = await (0, marginfiUtils_1.getMaxLtvAndLiqThreshold)(this.umi, this.marginfiGroup, {
                 mint: this.supplyMint,
             }, {
                 mint: this.debtMint,
@@ -140,7 +139,6 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             solautoFeesWallet: (0, umi_1.publicKey)(this.solautoFeesWallet),
-            solautoFeesSupplyTa: (0, umi_1.publicKey)(this.solautoFeesSupplyTa),
             signerReferralState: (0, umi_1.publicKey)(this.referralStateManager.referralState),
             referredByState: this.referredByState
                 ? (0, umi_1.publicKey)(this.referredByState)
@@ -292,8 +290,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         });
     }
     rebalance(rebalanceStep, jupQuote, rebalanceType, flashLoan, targetLiqUtilizationRateBps) {
-        const inputIsSupply = (new web3_js_1.PublicKey(jupQuote.inputMint)).equals(this.supplyMint);
-        const outputIsSupply = (new web3_js_1.PublicKey(jupQuote.outputMint)).equals(this.supplyMint);
+        const inputIsSupply = new web3_js_1.PublicKey(jupQuote.inputMint).equals(this.supplyMint);
+        const outputIsSupply = new web3_js_1.PublicKey(jupQuote.outputMint).equals(this.supplyMint);
         const needSupplyAccounts = (inputIsSupply && rebalanceStep === "A") ||
             (outputIsSupply && rebalanceStep === "B") ||
             (inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
@@ -435,7 +433,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         if (state) {
             return state;
         }
-        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, !this.selfManaged && this.solautoPositionData === null
+        const freshState = await (0, marginfiUtils_1.getMarginfiAccountPositionState)(this.umi, this.marginfiAccountPk, this.marginfiGroup, !this.selfManaged && this.solautoPositionData === null
             ? this.supplyMint
             : undefined, !this.selfManaged && this.solautoPositionData === null
             ? this.debtMint

package/dist/constants/marginfiAccounts.d.ts

@@ -1,7 +1,10 @@
 import { MarginfiAssetAccounts } from "../types/accounts";
 export declare const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
+export declare const DEFAULT_PUBKEY: string;
 export declare const MARGINFI_ACCOUNTS: {
-    [key: string]: MarginfiAssetAccounts;
+    [group: string]: {
+        [token: string]: MarginfiAssetAccounts;
+    };
 };
 export declare const MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
 //# sourceMappingURL=marginfiAccounts.d.ts.map

package/dist/constants/marginfiAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAGrF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB,CAAA;CA+BrE,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,eAAO,MAAM,sBAAsB,iDAAiD,CAAC;AAErF,eAAO,MAAM,cAAc,QAA+B,CAAC;AAE3D,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAA;CA2B5F,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDAAiD,CAAC"}

package/dist/constants/marginfiAccounts.js

@@ -1,41 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = exports.MARGINFI_ACCOUNTS = exports.DEFAULT_MARGINFI_GROUP = void 0;
+exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = exports.MARGINFI_ACCOUNTS = exports.DEFAULT_PUBKEY = exports.DEFAULT_MARGINFI_GROUP = void 0;
 const spl_token_1 = require("@solana/spl-token");
 const tokenConstants_1 = require("./tokenConstants");
 const web3_js_1 = require("@solana/web3.js");
 exports.DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
-const DEFAULT_PUBKEY = web3_js_1.PublicKey.default.toString();
+exports.DEFAULT_PUBKEY = web3_js_1.PublicKey.default.toString();
 exports.MARGINFI_ACCOUNTS = {
-    [DEFAULT_PUBKEY]: {
-        bank: DEFAULT_PUBKEY,
-        liquidityVault: DEFAULT_PUBKEY,
-        vaultAuthority: DEFAULT_PUBKEY,
-        priceOracle: DEFAULT_PUBKEY,
-    },
-    [spl_token_1.NATIVE_MINT.toString()]: {
-        bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
-        liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
-        vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
-        priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
-    },
-    [tokenConstants_1.USDC_MINT]: {
-        bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
-        liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
-        vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
-        priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
-    },
-    [tokenConstants_1.B_SOL]: {
-        bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
-        liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
-        vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
-        priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
-    },
-    [tokenConstants_1.JUP]: {
-        bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
-        liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
-        vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
-        priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
-    },
+    [exports.DEFAULT_MARGINFI_GROUP.toString()]: {
+        [spl_token_1.NATIVE_MINT.toString()]: {
+            bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
+            liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
+            vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
+            priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
+        },
+        [tokenConstants_1.USDC_MINT]: {
+            bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
+            liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
+            vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
+            priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+        },
+        [tokenConstants_1.B_SOL]: {
+            bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+            liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+            vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+            priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+        },
+        [tokenConstants_1.JUP]: {
+            bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+            liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+            vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+            priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
+        }
+    }
 };
 exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/dist/generated/instructions/marginfiOpenPosition.d.ts

@@ -16,7 +16,6 @@ export type MarginfiOpenPositionInstructionAccounts = {
     ataProgram?: PublicKey | Pda;
     rent?: PublicKey | Pda;
     solautoFeesWallet: PublicKey | Pda;
-    solautoFeesSupplyTa: PublicKey | Pda;
     signerReferralState: PublicKey | Pda;
     referredByState?: PublicKey | Pda;
     referredBySupplyTa?: PublicKey | Pda;

package/dist/generated/instructions/marginfiOpenPosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiOpenPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiOpenPosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,uCAAuC,GAAG;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1C,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,mCAAmC,GAAG;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,kBAAkB,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG;IACpD,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,gDAAgD,IAAI,UAAU,CAC5E,uCAAuC,EACvC,mCAAmC,CACpC,CAoBA;AAGD,MAAM,MAAM,mCAAmC,GAC7C,uCAAuC,CAAC;AAG1C,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,uCAAuC,GAC5C,mCAAmC,GACpC,kBAAkB,CAsKpB"}
+{"version":3,"file":"marginfiOpenPosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiOpenPosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EAClB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,uCAAuC,GAAG;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,mBAAmB,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,GAAG,MAAM,CAAC;IAC1C,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CAChC,CAAC;AAGF,MAAM,MAAM,mCAAmC,GAAG;IAChD,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,kBAAkB,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,uCAAuC,GAAG;IACpD,YAAY,EAAE,gBAAgB,CAAC;IAC/B,YAAY,EAAE,sBAAsB,CAAC;IACrC,sBAAsB,EAAE,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;CAC3D,CAAC;AAEF,wBAAgB,gDAAgD,IAAI,UAAU,CAC5E,uCAAuC,EACvC,mCAAmC,CACpC,CAoBA;AAGD,MAAM,MAAM,mCAAmC,GAC7C,uCAAuC,CAAC;AAG1C,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,uCAAuC,GAC5C,mCAAmC,GACpC,kBAAkB,CAiKpB"}

package/dist/generated/instructions/marginfiOpenPosition.js

@@ -58,73 +58,68 @@ function marginfiOpenPosition(context, input) {
             isWritable: false,
             value: input.solautoFeesWallet ?? null,
         },
-        solautoFeesSupplyTa: {
-            index: 7,
-            isWritable: true,
-            value: input.solautoFeesSupplyTa ?? null,
-        },
         signerReferralState: {
-            index: 8,
+            index: 7,
             isWritable: false,
             value: input.signerReferralState ?? null,
         },
         referredByState: {
-            index: 9,
+            index: 8,
             isWritable: false,
             value: input.referredByState ?? null,
         },
         referredBySupplyTa: {
-            index: 10,
+            index: 9,
             isWritable: true,
             value: input.referredBySupplyTa ?? null,
         },
         solautoPosition: {
-            index: 11,
+            index: 10,
             isWritable: true,
             value: input.solautoPosition ?? null,
         },
         marginfiGroup: {
-            index: 12,
+            index: 11,
             isWritable: false,
             value: input.marginfiGroup ?? null,
         },
         marginfiAccount: {
-            index: 13,
+            index: 12,
             isWritable: true,
             value: input.marginfiAccount ?? null,
         },
         supplyMint: {
-            index: 14,
+            index: 13,
             isWritable: false,
             value: input.supplyMint ?? null,
         },
         supplyBank: {
-            index: 15,
+            index: 14,
             isWritable: false,
             value: input.supplyBank ?? null,
         },
         positionSupplyTa: {
-            index: 16,
+            index: 15,
             isWritable: true,
             value: input.positionSupplyTa ?? null,
         },
         debtMint: {
-            index: 17,
+            index: 16,
             isWritable: false,
             value: input.debtMint ?? null,
         },
         debtBank: {
-            index: 18,
+            index: 17,
             isWritable: false,
             value: input.debtBank ?? null,
         },
         positionDebtTa: {
-            index: 19,
+            index: 18,
             isWritable: true,
             value: input.positionDebtTa ?? null,
         },
         signerDebtTa: {
-            index: 20,
+            index: 19,
             isWritable: true,
             value: input.signerDebtTa ?? null,
         },

package/dist/types/accounts.d.ts

@@ -3,6 +3,5 @@ export interface MarginfiAssetAccounts {
     liquidityVault: string;
     vaultAuthority: string;
     priceOracle: string;
-    marginfiGroup?: string;
 }
 //# sourceMappingURL=accounts.d.ts.map

package/dist/types/accounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB"}
+{"version":3,"file":"accounts.d.ts","sourceRoot":"","sources":["../../src/types/accounts.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB"}

package/dist/utils/marginfiUtils.d.ts

@@ -5,7 +5,7 @@ import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 export declare function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts;
-export declare function getMaxLtvAndLiqThreshold(umi: Umi, supply: {
+export declare function getMaxLtvAndLiqThreshold(umi: Umi, marginfiGroup: PublicKey, supply: {
     mint: PublicKey;
     bank?: Bank | null;
 }, debt: {
@@ -17,6 +17,6 @@ export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: P
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
 }[]>;
-export declare function getMarginfiAccountPositionState(umi: Umi, marginfiAccountPk: PublicKey, supplyMint?: PublicKey, debtMint?: PublicKey, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
+export declare function getMarginfiAccountPositionState(umi: Umi, marginfiAccountPk: PublicKey, marginfiGroup?: PublicKey, supplyMint?: PublicKey, debtMint?: PublicKey, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
 export declare function getUpToDateShareValues(umi: Umi, bank: Bank): Promise<[number, number]>;
 //# sourceMappingURL=marginfiUtils.d.ts.map

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,EAKL,MAAM,iBAAiB,CAAC;AAczB,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,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,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,CA+D3B;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;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkKpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}
+{"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,EAKL,MAAM,iBAAiB,CAAC;AAczB,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,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,CA+D3B;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;AAgED,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,aAAa,CAAC,EAAE,SAAS,EACzB,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAuKpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyB3B"}

package/dist/utils/marginfiUtils.js

@@ -15,24 +15,26 @@ const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const constants_1 = require("../constants");
 function findMarginfiAccounts(bank) {
-    for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
-        const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[key];
-        if (account.bank.toString().toLowerCase() === bank.toString().toLowerCase()) {
-            return account;
+    for (const group in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
+        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;
+            }
         }
     }
     throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
-async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
+async function getMaxLtvAndLiqThreshold(umi, marginfiGroup, supply, debt, supplyPrice) {
     if (!supply.bank && supply.mint.equals(web3_js_1.PublicKey.default)) {
         return [0, 0];
     }
     if (!supply.bank || supply.bank === null) {
-        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supply.mint.toString()].bank), { commitment: "confirmed" });
+        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank), { commitment: "confirmed" });
     }
     if ((!debt.bank || debt.bank === null) &&
         !debt.mint.equals(web3_js_1.PublicKey.default)) {
-        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debt.mint.toString()].bank), { commitment: "confirmed" });
+        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
     }
     if (!supplyPrice) {
         const [price] = await (0, generalUtils_1.fetchTokenPrices)([
@@ -136,13 +138,16 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
         padding: new Uint8Array([]),
     };
 }
-async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMint, debtMint, livePositionUpdates) {
+async function getMarginfiAccountPositionState(umi, marginfiAccountPk, marginfiGroup, supplyMint, debtMint, livePositionUpdates) {
     let marginfiAccount = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(marginfiAccountPk), { commitment: "confirmed" });
+    if (!marginfiGroup && marginfiAccount) {
+        marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccount.group);
+    }
     let supplyBank = supplyMint && supplyMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[supplyMint.toString()].bank), { commitment: "confirmed" })
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][supplyMint.toString()].bank), { commitment: "confirmed" })
         : null;
     let debtBank = debtMint && debtMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[debtMint.toString()].bank), { commitment: "confirmed" })
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(marginfiAccounts_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][debtMint.toString()].bank), { commitment: "confirmed" })
         : null;
     let supplyUsage = undefined;
     let debtUsage = undefined;
@@ -195,7 +200,7 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
         debtUsage = await getTokenUsage(umi, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
     const supplyPrice = (0, generalUtils_1.safeGetPrice)(supplyMint);
-    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, {
+    let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(umi, marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP), {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,
     }, {

package/local/updateMarginfiLUT.ts

@@ -10,18 +10,20 @@ import { updateLookupTable } from "./shared";
 const LOOKUP_TABLE_ADDRESS = new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE);
 
 async function addBanks() {
-  for (const key in MARGINFI_ACCOUNTS) {
-    const accounts = MARGINFI_ACCOUNTS[key];
-    await updateLookupTable(
-      [
-        key,
-        accounts.bank,
-        accounts.liquidityVault,
-        accounts.vaultAuthority,
-        accounts.priceOracle,
-      ],
-      LOOKUP_TABLE_ADDRESS
-    );
+  for (const group in MARGINFI_ACCOUNTS) {
+    for (const key in MARGINFI_ACCOUNTS[group]) {
+      const accounts = MARGINFI_ACCOUNTS[group][key];
+      await updateLookupTable(
+        [
+          key,
+          accounts.bank,
+          accounts.liquidityVault,
+          accounts.vaultAuthority,
+          accounts.priceOracle,
+        ],
+        LOOKUP_TABLE_ADDRESS
+      );
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.196",
+  "version": "1.0.198",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -22,6 +22,7 @@
     "@metaplex-foundation/umi-web3js-adapters": "^0.9.1",
     "@solana/spl-token": "^0.4.0",
     "@solana/web3.js": "^1.92.1",
+    "@sqds/multisig": "^2.1.3",
     "@types/node": "^20.14.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",

package/src/clients/solautoMarginfiClient.ts

@@ -47,7 +47,6 @@ import {
   safeFetchAllMarginfiAccount,
   safeFetchMarginfiAccount,
 } from "../marginfi-sdk";
-import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 import {
   findMarginfiAccounts,
@@ -115,14 +114,17 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.marginfiGroup = new PublicKey(
       marginfiAccountData
         ? marginfiAccountData.group.toString()
-        : args.marginfiGroup ??
-          MARGINFI_ACCOUNTS[this.supplyMint.toString()].marginfiGroup ??
-          DEFAULT_MARGINFI_GROUP
+        : (args.marginfiGroup ?? DEFAULT_MARGINFI_GROUP)
     );
 
     this.marginfiSupplyAccounts =
-      MARGINFI_ACCOUNTS[this.supplyMint.toString()]!;
-    this.marginfiDebtAccounts = MARGINFI_ACCOUNTS[this.debtMint.toString()]!;
+      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+        this.supplyMint.toString()
+      ]!;
+    this.marginfiDebtAccounts =
+      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+        this.debtMint.toString()
+      ]!;
 
     // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
     // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
@@ -225,6 +227,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     } else {
       const [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
         this.umi,
+        this.marginfiGroup,
         {
           mint: this.supplyMint,
         },
@@ -270,7 +273,6 @@ export class SolautoMarginfiClient extends SolautoClient {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
       solautoFeesWallet: publicKey(this.solautoFeesWallet),
-      solautoFeesSupplyTa: publicKey(this.solautoFeesSupplyTa),
       signerReferralState: publicKey(this.referralStateManager.referralState),
       referredByState: this.referredByState
         ? publicKey(this.referredByState)
@@ -459,8 +461,12 @@ export class SolautoMarginfiClient extends SolautoClient {
     flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number
   ): TransactionBuilder {
-    const inputIsSupply = (new PublicKey(jupQuote.inputMint)).equals(this.supplyMint);
-    const outputIsSupply = (new PublicKey(jupQuote.outputMint)).equals(this.supplyMint);
+    const inputIsSupply = new PublicKey(jupQuote.inputMint).equals(
+      this.supplyMint
+    );
+    const outputIsSupply = new PublicKey(jupQuote.outputMint).equals(
+      this.supplyMint
+    );
     const needSupplyAccounts =
       (inputIsSupply && rebalanceStep === "A") ||
       (outputIsSupply && rebalanceStep === "B") ||
@@ -518,7 +524,8 @@ export class SolautoMarginfiClient extends SolautoClient {
         : undefined,
       rebalanceType,
       targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
-      targetInAmountBaseUnit: rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
+      targetInAmountBaseUnit:
+        rebalanceStep === "A" ? parseInt(jupQuote.inAmount) : null,
     });
   }
 
@@ -654,6 +661,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     const freshState = await getMarginfiAccountPositionState(
       this.umi,
       this.marginfiAccountPk,
+      this.marginfiGroup,
       !this.selfManaged && this.solautoPositionData === null
         ? this.supplyMint
         : undefined,

package/src/constants/marginfiAccounts.ts

@@ -5,38 +5,35 @@ import { PublicKey } from "@solana/web3.js";
 
 export const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
-const DEFAULT_PUBKEY = PublicKey.default.toString();
-export const MARGINFI_ACCOUNTS: { [key: string]: MarginfiAssetAccounts } = {
-  [DEFAULT_PUBKEY]: {
-    bank: DEFAULT_PUBKEY,
-    liquidityVault: DEFAULT_PUBKEY,
-    vaultAuthority: DEFAULT_PUBKEY,
-    priceOracle: DEFAULT_PUBKEY,
-  },
-  [NATIVE_MINT.toString()]: {
-    bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
-    liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
-    vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
-    priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
-  },
-  [USDC_MINT]: {
-    bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
-    liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
-    vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
-    priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
-  },
-  [B_SOL]: {
-    bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
-    liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
-    vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
-    priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
-  },
-  [JUP]: {
-    bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
-    liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
-    vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
-    priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
-  },
+export const DEFAULT_PUBKEY = PublicKey.default.toString();
+
+export const MARGINFI_ACCOUNTS: { [group: string]: { [token: string]: MarginfiAssetAccounts } } = {
+  [DEFAULT_MARGINFI_GROUP.toString()]: {
+    [NATIVE_MINT.toString()]: {
+      bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
+      liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
+      vaultAuthority: "DD3AeAssFvjqTvRTrRAtpfjkBF8FpVKnFuwnMLN9haXD",
+      priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE"
+    },
+    [USDC_MINT]: {
+      bank: "2s37akK2eyBbp8DZgCm7RtsaEz8eJP3Nxd4urLHQv7yB",
+      liquidityVault: "7jaiZR5Sk8hdYN9MxTpczTcwbWpb5WEoxSANuUwveuat",
+      vaultAuthority: "3uxNepDbmkDNq6JhRja5Z8QwbTrfmkKP8AKZV5chYDGG",
+      priceOracle: "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX"
+    },
+    [B_SOL]: {
+      bank: "6hS9i46WyTq1KXcoa2Chas2Txh9TJAVr6n1t3tnrE23K",
+      liquidityVault: "2WMipeKDB2CENxbzdmnVrRbsxCA2LY6kCtBe6AAqDP9p",
+      vaultAuthority: "8RcZHucpVHkHWRRdMhJZsxBK9mqKSYnMKGqtF84U8YEo",
+      priceOracle: "5cN76Xm2Dtx9MnrQqBDeZZRsWruTTcw37UruznAdSvvE",
+    },
+    [JUP]: {
+      bank: "Guu5uBc8k1WK1U2ihGosNaCy57LSgCkpWAabtzQqrQf8",
+      liquidityVault: "4w49W4fNDn778wsBa6TNq9hvebZKU17ymsptrEZ8zrsm",
+      vaultAuthority: "2MBwwAhL3c73Jy7HkWd9ofzh1bU39JBabrZCFQR2tUof",
+      priceOracle: "7dbob1psH1iZBS7qPsm3Kwbf5DzSXK8Jyg31CTgTnxH5",
+    }
+  }
 };
 
 export const MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";

package/src/generated/instructions/marginfiOpenPosition.ts

@@ -48,7 +48,6 @@ export type MarginfiOpenPositionInstructionAccounts = {
   ataProgram?: PublicKey | Pda;
   rent?: PublicKey | Pda;
   solautoFeesWallet: PublicKey | Pda;
-  solautoFeesSupplyTa: PublicKey | Pda;
   signerReferralState: PublicKey | Pda;
   referredByState?: PublicKey | Pda;
   referredBySupplyTa?: PublicKey | Pda;
@@ -152,73 +151,68 @@ export function marginfiOpenPosition(
       isWritable: false as boolean,
       value: input.solautoFeesWallet ?? null,
     },
-    solautoFeesSupplyTa: {
-      index: 7,
-      isWritable: true as boolean,
-      value: input.solautoFeesSupplyTa ?? null,
-    },
     signerReferralState: {
-      index: 8,
+      index: 7,
       isWritable: false as boolean,
       value: input.signerReferralState ?? null,
     },
     referredByState: {
-      index: 9,
+      index: 8,
       isWritable: false as boolean,
       value: input.referredByState ?? null,
     },
     referredBySupplyTa: {
-      index: 10,
+      index: 9,
       isWritable: true as boolean,
       value: input.referredBySupplyTa ?? null,
     },
     solautoPosition: {
-      index: 11,
+      index: 10,
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
     marginfiGroup: {
-      index: 12,
+      index: 11,
       isWritable: false as boolean,
       value: input.marginfiGroup ?? null,
     },
     marginfiAccount: {
-      index: 13,
+      index: 12,
       isWritable: true as boolean,
       value: input.marginfiAccount ?? null,
     },
     supplyMint: {
-      index: 14,
+      index: 13,
       isWritable: false as boolean,
       value: input.supplyMint ?? null,
     },
     supplyBank: {
-      index: 15,
+      index: 14,
       isWritable: false as boolean,
       value: input.supplyBank ?? null,
     },
     positionSupplyTa: {
-      index: 16,
+      index: 15,
       isWritable: true as boolean,
       value: input.positionSupplyTa ?? null,
     },
     debtMint: {
-      index: 17,
+      index: 16,
       isWritable: false as boolean,
       value: input.debtMint ?? null,
     },
     debtBank: {
-      index: 18,
+      index: 17,
       isWritable: false as boolean,
       value: input.debtBank ?? null,
     },
     positionDebtTa: {
-      index: 19,
+      index: 18,
       isWritable: true as boolean,
       value: input.positionDebtTa ?? null,
     },
     signerDebtTa: {
-      index: 20,
+      index: 19,
       isWritable: true as boolean,
       value: input.signerDebtTa ?? null,
     },

package/src/types/accounts.ts

@@ -3,5 +3,4 @@ export interface MarginfiAssetAccounts {
   liquidityVault: string;
   vaultAuthority: string;
   priceOracle: string;
-  marginfiGroup?: string;
 }

package/src/utils/marginfiUtils.ts

@@ -28,12 +28,14 @@ import { LivePositionUpdates } from "./solauto/generalUtils";
 import { TOKEN_INFO } from "../constants";
 
 export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
-  for (const key in MARGINFI_ACCOUNTS) {
-    const account = MARGINFI_ACCOUNTS[key];
-    if (
-      account.bank.toString().toLowerCase() === bank.toString().toLowerCase()
-    ) {
-      return account;
+  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;
+      }
     }
   }
   throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
@@ -41,6 +43,7 @@ export function findMarginfiAccounts(bank: PublicKey): MarginfiAssetAccounts {
 
 export async function getMaxLtvAndLiqThreshold(
   umi: Umi,
+  marginfiGroup: PublicKey,
   supply: {
     mint: PublicKey;
     bank?: Bank | null;
@@ -58,7 +61,7 @@ export async function getMaxLtvAndLiqThreshold(
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
-      publicKey(MARGINFI_ACCOUNTS[supply.mint.toString()].bank),
+      publicKey(MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank),
       { commitment: "confirmed" }
     );
   }
@@ -69,7 +72,7 @@ export async function getMaxLtvAndLiqThreshold(
   ) {
     debt.bank = await safeFetchBank(
       umi,
-      publicKey(MARGINFI_ACCOUNTS[debt.mint.toString()].bank),
+      publicKey(MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank),
       { commitment: "confirmed" }
     );
   }
@@ -244,6 +247,7 @@ async function getTokenUsage(
 export async function getMarginfiAccountPositionState(
   umi: Umi,
   marginfiAccountPk: PublicKey,
+  marginfiGroup?: PublicKey,
   supplyMint?: PublicKey,
   debtMint?: PublicKey,
   livePositionUpdates?: LivePositionUpdates
@@ -254,11 +258,15 @@ export async function getMarginfiAccountPositionState(
     { commitment: "confirmed" }
   );
 
+  if (!marginfiGroup && marginfiAccount) {
+    marginfiGroup = toWeb3JsPublicKey(marginfiAccount.group);
+  }
+
   let supplyBank: Bank | null =
     supplyMint && supplyMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(MARGINFI_ACCOUNTS[supplyMint.toString()].bank),
+          publicKey(MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][supplyMint.toString()].bank),
           { commitment: "confirmed" }
         )
       : null;
@@ -266,7 +274,7 @@ export async function getMarginfiAccountPositionState(
     debtMint && debtMint !== PublicKey.default
       ? await safeFetchBank(
           umi,
-          publicKey(MARGINFI_ACCOUNTS[debtMint.toString()].bank),
+          publicKey(MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][debtMint.toString()].bank),
           { commitment: "confirmed" }
         )
       : null;
@@ -368,6 +376,7 @@ export async function getMarginfiAccountPositionState(
   const supplyPrice = safeGetPrice(supplyMint!)!;
   let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
     umi,
+    marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP),
     {
       mint: toWeb3JsPublicKey(supplyBank.mint),
       bank: supplyBank,

package/tests/unit/accounts.ts

@@ -0,0 +1,32 @@
+import { describe, it } from "mocha";
+import {
+  ALL_SUPPORTED_TOKENS,
+  TOKEN_INFO,
+} from "../../src/constants/tokenConstants";
+import {
+  buildHeliusApiUrl,
+  getSolanaRpcConnection,
+} from "../../src/utils/solanaUtils";
+import { publicKey } from "@metaplex-foundation/umi";
+import { assert } from "chai";
+
+describe("Assert Solauto fee token accounts are created", async () => {
+  it("all Solauto fee token accounts created", async () => {
+    let [_, umi] = getSolanaRpcConnection(
+      buildHeliusApiUrl(process.env.HELIUS_API_KEY!)
+    );
+
+    const tokenAccounts = await umi.rpc.getAccounts(
+      ALL_SUPPORTED_TOKENS.map((x) => publicKey(x))
+    );
+    for (let i = 0; i < tokenAccounts.length; i++) {
+      if (!tokenAccounts[i].exists) {
+        console.log(
+          "Missing Solauto fees TA for ",
+          TOKEN_INFO[ALL_SUPPORTED_TOKENS[i].toString()].ticker
+        );
+      }
+    }
+    assert(tokenAccounts.filter((x) => !x.exists).length === 0);
+  });
+});

package/tests/unit/lookupTables.ts

@@ -1,6 +1,7 @@
-import { describe, it } from 'mocha';
+import { describe, it } from "mocha";
 import { clusterApiUrl, Connection, PublicKey } from "@solana/web3.js";
 import {
+  DEFAULT_PUBKEY,
   MARGINFI_ACCOUNTS,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
 } from "../../src/constants/marginfiAccounts";
@@ -19,18 +20,24 @@ describe("Assert lookup tables up-to-date", async () => {
     const existingAccounts =
       lookupTable.value?.state.addresses.map((x) => x.toString()) ?? [];
 
-    for (const key in MARGINFI_ACCOUNTS) {
-      const tokenAccounts = MARGINFI_ACCOUNTS[key];
-      const addresses = [
-        tokenAccounts.mint,
-        tokenAccounts.bank,
-        tokenAccounts.liquidityVault,
-        tokenAccounts.vaultAuthority,
-        tokenAccounts.priceOracle,
-      ];
+    for (const group in MARGINFI_ACCOUNTS) {
+      for (const key in MARGINFI_ACCOUNTS[group]) {
+        if (key === DEFAULT_PUBKEY) {
+          continue;
+        }
 
-      if (addresses.find((x) => !existingAccounts.includes(x))) {
-        throw new Error("Marginfi accounts lookup table missing an account");
+        const tokenAccounts = MARGINFI_ACCOUNTS[key];
+        const addresses = [
+          new PublicKey(key),
+          tokenAccounts.bank,
+          tokenAccounts.liquidityVault,
+          tokenAccounts.vaultAuthority,
+          tokenAccounts.priceOracle,
+        ];
+
+        if (addresses.find((x) => !existingAccounts.includes(x.toString()))) {
+          throw new Error("Marginfi accounts lookup table missing an account");
+        }
       }
     }
   });

package/tests/unit/rebalanceCalculations.ts

@@ -10,6 +10,7 @@ import { SolautoClient } from "../../src/clients/solautoClient";
 import {
   DCASettings,
   LendingPlatform,
+  PositionType,
   SolautoRebalanceType,
   SolautoSettingsParameters,
   TokenType,
@@ -175,11 +176,11 @@ async function getFakePosition(
       rebalanceType: SolautoRebalanceType.Regular,
       targetLiqUtilizationRateBps: 0,
       flashLoanAmount: BigInt(0),
-      priceSlippageBps: 0,
       padding1: [],
       padding2: [],
       padding: new Uint8Array([]),
     },
+    positionType: PositionType.Leverage,
     padding1: [],
     padding: [],
     publicKey: publicKey(PublicKey.default),