@haven-fi/solauto-sdk 1.0.625 → 1.0.626

package/dist/constants/marginfiAccounts.d.ts

@@ -1,13 +1,18 @@
 import { PublicKey } from "@solana/web3.js";
 import { MarginfiAssetAccounts } from "../types/accounts";
+import { ProgramEnv } from "../types";
 export declare const MARGINFI_PROD_PROGRAM: PublicKey;
 export declare const MARGINFI_STAGING_PROGRAM: PublicKey;
-export declare const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
-export declare const MARGINFI_ACCOUNTS: {
+export type MarginfiAccountsMap = {
     [group: string]: {
         [token: string]: MarginfiAssetAccounts;
     };
 };
-export declare const MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
-export declare const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE = "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
+export interface MarginfiProgramAccounts {
+    program: PublicKey;
+    defaultGroup: PublicKey;
+    lookupTable: PublicKey;
+    bankAccounts: MarginfiAccountsMap;
+}
+export declare function getMarginfiAccounts(programEnv?: ProgramEnv, marginfiGroup?: PublicKey): MarginfiProgramAccounts;
 //# 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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,eAAO,MAAM,qBAAqB,WAEjC,CAAC;AACF,eAAO,MAAM,wBAAwB,WAEpC,CAAC;AAEF,eAAO,MAAM,sBAAsB,iDACa,CAAC;AAIjD,eAAO,MAAM,iBAAiB,EAAE;IAC9B,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CA+K7D,CAAC;AAEF,eAAO,MAAM,8BAA8B,iDACK,CAAC;AAEjD,eAAO,MAAM,sCAAsC,iDACH,CAAC"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,eAAO,MAAM,qBAAqB,WAEjC,CAAC;AACF,eAAO,MAAM,wBAAwB,WAEpC,CAAC;AAUF,MAAM,MAAM,mBAAmB,GAAG;IAChC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AA+MF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,mBAAmB,CAAC;CACnC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB"}

package/dist/constants/marginfiAccounts.js

@@ -23,17 +23,41 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE = exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = exports.MARGINFI_ACCOUNTS = exports.DEFAULT_MARGINFI_GROUP = exports.MARGINFI_STAGING_PROGRAM = exports.MARGINFI_PROD_PROGRAM = void 0;
+exports.MARGINFI_STAGING_PROGRAM = exports.MARGINFI_PROD_PROGRAM = void 0;
+exports.getMarginfiAccounts = getMarginfiAccounts;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const tokens = __importStar(require("./tokenConstants"));
 const switchboardConstants_1 = require("./switchboardConstants");
 exports.MARGINFI_PROD_PROGRAM = new web3_js_1.PublicKey("MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA");
 exports.MARGINFI_STAGING_PROGRAM = new web3_js_1.PublicKey("stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct");
-exports.DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
+const PROD_DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
+const STAGING_DEFAULT_MARGINFI_GROUP = "FCPfpHA69EbS8f9KKSreTRkXbzFpunsKuYf5qNmnJjpo";
 const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
-exports.MARGINFI_ACCOUNTS = {
-    [exports.DEFAULT_MARGINFI_GROUP.toString()]: {
+const MARGINFI_STAGING_ACCOUNTS = {
+    [STAGING_DEFAULT_MARGINFI_GROUP]: {
+        [spl_token_1.NATIVE_MINT.toString()]: {
+            bank: "3evdJSa25nsUiZzEUzd92UNa13TPRJrje1dRyiQP5Lhp",
+            liquidityVault: "FVXESa7wCd1tf3o9LGroBc3Ym8Gpcq1HdsLek6oo7Ykv",
+            vaultAuthority: "DuYk1WGq8UsjW5ThLtaehFLrnJeupTjtF7TaPzja9LBQ",
+            priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE",
+        },
+        [tokens.USDC]: {
+            bank: "Ek5JSFJFD8QgXM6rPDCzf31XhDp1q3xezaWYSkJWqbqc",
+            liquidityVault: "6n7xXMni5WJKUMb4Vm5Zis6UaUtGF5xEGmagZNVWWoKB",
+            vaultAuthority: "9mXNyA5yS4WSTpYUa5gi3yBrSJWWM7XNPNDWRzWGjdVe",
+            priceOracle: USDC_PRICE_ORACLE,
+        },
+        [tokens.USDT]: {
+            bank: "4WFCsVXwfnQvZG52VvPwae7CtL13PUFVWdjkw5YCRBo6",
+            liquidityVault: "BFSyniKfXU9rHqUvHLKeZMivQsAKWTE7HZ1fW6vZcvJp",
+            vaultAuthority: "Fgxe3SUMzcNuLtT9Xkv8QhhWXCmu4VxynzUMwCF4HvJd",
+            priceOracle: "HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM",
+        },
+    },
+};
+const MARGINFI_PROD_ACCOUNTS = {
+    [PROD_DEFAULT_MARGINFI_GROUP.toString()]: {
         [spl_token_1.NATIVE_MINT.toString()]: {
             bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
             liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
@@ -206,5 +230,33 @@ exports.MARGINFI_ACCOUNTS = {
         },
     },
 };
-exports.MARGINFI_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
-exports.MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE = "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
+const MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE = "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
+const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE = "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
+function getMarginfiAccounts(programEnv, marginfiGroup) {
+    if (programEnv === undefined) {
+        if (Boolean(marginfiGroup)) {
+            programEnv = Object.keys(MARGINFI_PROD_ACCOUNTS).includes(marginfiGroup.toString())
+                ? "Prod"
+                : "Staging";
+        }
+        else {
+            programEnv = "Prod";
+        }
+    }
+    if (programEnv === "Prod") {
+        return {
+            program: exports.MARGINFI_PROD_PROGRAM,
+            defaultGroup: new web3_js_1.PublicKey(PROD_DEFAULT_MARGINFI_GROUP),
+            lookupTable: new web3_js_1.PublicKey(MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE),
+            bankAccounts: MARGINFI_PROD_ACCOUNTS,
+        };
+    }
+    else {
+        return {
+            program: exports.MARGINFI_STAGING_PROGRAM,
+            defaultGroup: new web3_js_1.PublicKey(STAGING_DEFAULT_MARGINFI_GROUP),
+            lookupTable: new web3_js_1.PublicKey(MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE),
+            bankAccounts: MARGINFI_STAGING_ACCOUNTS,
+        };
+    }
+}

package/dist/services/flashLoans/marginfiFlProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAelD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA2E3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
+{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAclC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAelD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA6C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA2E3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -23,13 +23,14 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         }
     }
     async setAvailableBanks() {
+        const bankAccounts = (0, constants_1.getMarginfiAccounts)(this.programEnv).bankAccounts;
         const availableBanks = [];
         const checkIfUsable = (group, mint) => {
-            if (Object.keys(constants_1.MARGINFI_ACCOUNTS[group]).includes(mint.toString())) {
-                availableBanks.push(constants_1.MARGINFI_ACCOUNTS[group][mint.toString()].bank);
+            if (Object.keys(bankAccounts[group]).includes(mint.toString())) {
+                availableBanks.push(bankAccounts[group][mint.toString()].bank);
             }
         };
-        for (const group of Object.keys(constants_1.MARGINFI_ACCOUNTS)) {
+        for (const group of Object.keys(bankAccounts)) {
             checkIfUsable(group, this.supplyMint);
             checkIfUsable(group, this.debtMint);
         }

package/dist/services/solauto/solautoClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAML,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAClC,KAAK,EAAG,UAAU,CAAC;IAEnB,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAmFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAgBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAML,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAClC,KAAK,EAAG,UAAU,CAAC;IAEnB,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAoFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAoBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IA4DK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAgBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}

package/dist/services/solauto/solautoClient.js

@@ -31,6 +31,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             lendingPool: args.lendingPool,
             lpUserAccount: args.lpUserAccount,
             lendingPlatform: this.lendingPlatform,
+            lpEnv: this.lpEnv,
         }, this.contextUpdates);
         this.positionSupplyTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.supplyMint());
         this.signerSupplyTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint());

package/dist/services/solauto/solautoMarginfiClient.d.ts

@@ -1,11 +1,12 @@
 import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
+import { MarginfiProgramAccounts } from "../../constants";
 import { DCASettingsInpArgs, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs } from "../../generated";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 export declare class SolautoMarginfiClient extends SolautoClient {
     lendingPlatform: LendingPlatform;
-    marginfiProgram: PublicKey;
+    mfiAccounts: MarginfiProgramAccounts;
     marginfiAccount: PublicKey | Signer;
     marginfiAccountPk: PublicKey;
     marginfiGroup: PublicKey;

package/dist/services/solauto/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAKtE,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,eAAe,EAAG,SAAS,CAAC;IAE5B,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;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA0ExC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAiGtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,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;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAwExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAiGtB"}

package/dist/services/solauto/solautoMarginfiClient.js

@@ -16,7 +16,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     }
     async initialize(args) {
         await super.initialize(args);
-        this.marginfiProgram = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.umi.programs.get("marginfi").publicKey);
+        this.mfiAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv);
         this.marginfiGroup = await this.pos.lendingPool();
         if (this.selfManaged) {
             this.marginfiAccount =
@@ -46,9 +46,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.otherSigners.push(this.marginfiAccount);
         }
         this.marginfiSupplyAccounts =
-            constants_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
+            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
         this.marginfiDebtAccounts =
-            constants_1.MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][this.pos.debtMint().toString()];
+            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.debtMint().toString()];
         // TODO: Don't dynamically pull oracle from bank until Marginfi sorts out their price oracle issues.
         // const [supplyBank, debtBank] = await safeFetchAllBank(this.umi, [
         //   publicKey(this.marginfiSupplyAccounts.bank),
@@ -61,7 +61,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.log("Marginfi account:", this.marginfiAccountPk.toString());
     }
     defaultLookupTables() {
-        return [constants_1.MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
+        return [
+            this.mfiAccounts.lookupTable.toString(),
+            ...super.defaultLookupTables(),
+        ];
     }
     lutAccountsToAdd() {
         return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
@@ -86,7 +89,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }
         return (0, generated_1.marginfiOpenPosition)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
+            marginfiProgram: (0, umi_1.publicKey)(this.mfiAccounts.program),
             signerReferralState: (0, umi_1.publicKey)(this.referralState),
             referredByState: this.referredByState
                 ? (0, umi_1.publicKey)(this.referredByState)
@@ -128,7 +131,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     refreshIx() {
         return (0, generated_1.marginfiRefreshData)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
+            marginfiProgram: (0, umi_1.publicKey)(this.mfiAccounts.program),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
@@ -228,7 +231,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         }
         return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
+            marginfiProgram: (0, umi_1.publicKey)(this.mfiAccounts.program),
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
@@ -262,7 +265,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const addAuthorityTas = this.selfManaged || data.values.tokenBalanceChange !== undefined;
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
-            marginfiProgram: (0, umi_1.publicKey)(this.marginfiProgram),
+            marginfiProgram: (0, umi_1.publicKey)(this.mfiAccounts.program),
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             solautoFeesTa: (0, umi_1.publicKey)(data.values.rebalanceDirection === generated_1.RebalanceDirection.Boost
                 ? this.solautoFeesSupplyTa

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAiB5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAO5B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAiB5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAuB3D,wBAAwB,IAAI,MAAM;IAO5B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B5C"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -26,15 +26,16 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
             this.lp = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccountData.group);
         }
         if (!this.lp) {
-            this.lp = new web3_js_1.PublicKey(constants_1.DEFAULT_MARGINFI_GROUP);
+            this.lp = (0, constants_1.getMarginfiAccounts)(this.lpEnv).defaultGroup;
         }
         return this.lp;
     }
     async maxLtvAndLiqThresholdBps() {
         if (!this.supplyBank || !this.debtBank) {
             const group = (await this.lendingPool()).toString();
-            const supplyBank = constants_1.MARGINFI_ACCOUNTS[group][this.supplyMint().toString()].bank;
-            const debtBank = constants_1.MARGINFI_ACCOUNTS[group][this.debtMint().toString()].bank;
+            const bankAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv).bankAccounts;
+            const supplyBank = bankAccounts[group][this.supplyMint().toString()].bank;
+            const debtBank = bankAccounts[group][this.debtMint().toString()].bank;
             [this.supplyBank, this.debtBank] = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, [
                 (0, umi_1.publicKey)(supplyBank),
                 (0, umi_1.publicKey)(debtBank),
@@ -56,7 +57,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
             ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint) }
             : undefined, useDesignatedMint
             ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint) }
-            : undefined, this.contextUpdates);
+            : undefined, this.lpEnv, this.contextUpdates);
         if (resp) {
             this.supplyBank = resp.supplyBank;
             this.debtBank = resp.debtBank;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -2,7 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { DCASettings, LendingPlatform, PositionState, SolautoPosition, SolautoSettingsParameters } from "../generated";
 import { ContextUpdates } from "../utils";
-import { RebalanceAction } from "../types";
+import { ProgramEnv, RebalanceAction } from "../types";
 import { TokenInfo } from "../constants";
 export interface PositionCustomArgs {
     lendingPlatform: LendingPlatform;
@@ -10,6 +10,7 @@ export interface PositionCustomArgs {
     debtMint?: PublicKey;
     lendingPool?: PublicKey;
     lpUserAccount?: PublicKey;
+    lpEnv?: ProgramEnv;
 }
 interface SolautoPositionExData extends Partial<SolautoPosition> {
     state: PositionState;
@@ -26,6 +27,7 @@ export declare abstract class SolautoPositionEx {
     publicKey: PublicKey;
     protected _data: SolautoPositionExData;
     protected lp?: PublicKey;
+    protected lpEnv: ProgramEnv;
     lpUserAccount?: PublicKey;
     protected contextUpdates?: ContextUpdates;
     private readonly firstState;

package/dist/solautoPosition/solautoPositionEx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EACL,WAAW,EAEX,eAAe,EACf,aAAa,EACb,eAAe,EACf,yBAAyB,EAC1B,MAAM,cAAc,CAAC;AACtB,OAAO,EAQL,cAAc,EAgBf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,OAAO,EAAqC,SAAS,EAAE,MAAM,cAAc,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,UAAU,qBAAsB,SAAQ,OAAO,CAAC,eAAe,CAAC;IAC9D,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,GAAG,CAAC;IACT,SAAS,EAAE,SAAS,CAAC;IACrB,IAAI,EAAE,qBAAqB,CAAC;IAC5B,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,8BAAsB,iBAAiB;IAC9B,GAAG,EAAG,GAAG,CAAC;IACV,SAAS,EAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,KAAK,EAAG,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,CAAC,EAAE,SAAS,CAAa;IAC9B,aAAa,CAAC,EAAE,SAAS,CAAa;IAC7C,SAAS,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiB;gBAEhC,IAAI,EAAE,cAAc;IAgBhC,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAE1C,MAAM;IAIN,SAAS;IAMT,UAAU;IAIV,YAAY;IAOZ,IAAI,IAAI,qBAAqB;IAI7B,KAAK,IAAI,aAAa;IAItB,QAAQ,IAAI,yBAAyB,GAAG,SAAS;IAIjD,GAAG,IAAI,WAAW,GAAG,SAAS;IAI9B,UAAU,IAAI,SAAS;IAIvB,cAAc,IAAI,SAAS;IAI3B,QAAQ,IAAI,SAAS;IAIrB,YAAY,IAAI,SAAS;IAIzB,UAAU;IAOV,YAAY;IAIZ,UAAU;IAOV,YAAY;IAMZ,QAAQ;IAIR,WAAW;IAIX,WAAW;IAIX,SAAS;IAIT,SAAS;IAIT,OAAO;IAIP,0BAA0B;IAI1B,6BAA6B;IAI7B,2BAA2B;IAI3B,sBAAsB;IAItB,yBAAyB;IAIzB,QAAQ,CAAC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9D,QAAQ,CAAC,wBAAwB,IAAI,MAAM;IAE3C,0BAA0B;IA0B1B,oBAAoB,CAAC,oBAAoB,SAAI,GAAG,eAAe,GAAG,SAAS;IAqB3E,kBAAkB,IAAI,OAAO;IAS7B,SAAS,CAAC,uBAAuB;IAWjC,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAExC,uBAAuB;IAiB7B,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;IASvD,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IASjD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM;IAUnC,wBAAwB;IAQlB,sBAAsB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM;IAiBrE,iBAAiB,CACf,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,2BAA2B,CAAC,EAAE,MAAM;IAkBhC,mBAAmB;CAM1B"}
+{"version":3,"file":"solautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/solautoPositionEx.ts"],"names":[],"mappings":"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"}

package/dist/solautoPosition/solautoPositionEx.js

@@ -19,6 +19,7 @@ class SolautoPositionEx {
                 (args.data.position
                     ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.data.position.protocolUserAccount)
                     : undefined);
+        this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
         this._data = args.data;
         this.firstState = { ...args.data.state };
     }
@@ -82,13 +83,19 @@ class SolautoPositionEx {
         return (0, utils_1.calcTotalSupply)(this.state());
     }
     supplyUsd() {
-        return (0, utils_1.calcSupplyUsd)(this.state());
+        const supplyPrice = (0, utils_1.safeGetPrice)(this.supplyMint());
+        return supplyPrice
+            ? (0, utils_1.calcTotalSupply)(this.state()) * supplyPrice
+            : (0, utils_1.calcSupplyUsd)(this.state());
     }
     totalDebt() {
         return (0, utils_1.calcTotalDebt)(this.state());
     }
     debtUsd() {
-        return (0, utils_1.calcDebtUsd)(this.state());
+        const debtPrice = (0, utils_1.safeGetPrice)(this.debtMint());
+        return debtPrice
+            ? (0, utils_1.calcTotalDebt)(this.state()) * debtPrice
+            : (0, utils_1.calcDebtUsd)(this.state());
     }
     supplyLiquidityDepositable() {
         return (0, utils_1.supplyLiquidityDepositable)(this.state());
@@ -97,7 +104,7 @@ class SolautoPositionEx {
         return (0, utils_1.supplyLiquidityUsdDepositable)(this.state());
     }
     supplyLiquidityUsdAvailable() {
-        return this.supplyLiquidityAvailable() * ((0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0);
+        return (this.supplyLiquidityAvailable() * ((0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0));
     }
     debtLiquidityAvailable() {
         return (0, utils_1.debtLiquidityAvailable)(this.state());
@@ -121,7 +128,7 @@ class SolautoPositionEx {
         return true;
     }
     eligibleForRebalance(bpsDistanceThreshold = 0) {
-        if (!this.settings() || !(0, utils_1.calcSupplyUsd)(this.state())) {
+        if (!this.settings() || !this.supplyUsd()) {
             return undefined;
         }
         if (this.state().liqUtilizationRateBps - this.boostFromBps() <=

package/dist/utils/marginfiUtils.d.ts

@@ -8,6 +8,11 @@ export declare function getMarginfiProgram(env: ProgramEnv): PublicKey;
 export declare function isMarginfiProgram(programId: PublicKey): boolean;
 export declare function createDynamicMarginfiProgram(env?: ProgramEnv): Program;
 export declare function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv): Umi;
+export declare function fetchBankAddresses(umi: Umi, bankPk: PublicKey): Promise<{
+    bank: PublicKey;
+    liquidityVault: PublicKey;
+    vaultAuthority: PublicKey | undefined;
+}>;
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
     mint: PublicKey;
 }
@@ -39,7 +44,7 @@ type BanksCache = {
 export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
     pk?: PublicKey;
     data?: MarginfiAccount | null;
-}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, contextUpdates?: ContextUpdates): Promise<{
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates): Promise<{
     supplyBank: Bank | null;
     debtBank: Bank | null;
     state: PositionState;

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

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

package/dist/utils/marginfiUtils.js

@@ -4,6 +4,7 @@ exports.getMarginfiProgram = getMarginfiProgram;
 exports.isMarginfiProgram = isMarginfiProgram;
 exports.createDynamicMarginfiProgram = createDynamicMarginfiProgram;
 exports.umiWithMarginfiProgram = umiWithMarginfiProgram;
+exports.fetchBankAddresses = fetchBankAddresses;
 exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
 exports.getMarginfiMaxLtvAndLiqThresholdBps = getMarginfiMaxLtvAndLiqThresholdBps;
@@ -22,6 +23,7 @@ const marginfi_sdk_1 = require("../marginfi-sdk");
 const priceUtils_1 = require("./priceUtils");
 const generalUtils_1 = require("./generalUtils");
 const numberUtils_1 = require("./numberUtils");
+const accountUtils_1 = require("./accountUtils");
 function getMarginfiProgram(env) {
     return env === "Prod" ? constants_1.MARGINFI_PROD_PROGRAM : constants_1.MARGINFI_STAGING_PROGRAM;
 }
@@ -51,14 +53,36 @@ function umiWithMarginfiProgram(umi, marginfiEnv) {
         },
     });
 }
+async function fetchBankAddresses(umi, bankPk) {
+    const bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
+    const liquidityVault = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.liquidityVault);
+    const vaultAuthority = (await (0, accountUtils_1.getTokenAccountData)(umi, liquidityVault))
+        ?.owner;
+    return {
+        bank: bankPk,
+        liquidityVault,
+        vaultAuthority,
+    };
+}
 function findMarginfiAccounts(bank) {
-    for (const group in constants_1.MARGINFI_ACCOUNTS) {
-        for (const key in constants_1.MARGINFI_ACCOUNTS[group]) {
-            const account = constants_1.MARGINFI_ACCOUNTS[group][key];
-            if (account.bank.toString().toLowerCase() === bank.toString().toLowerCase()) {
-                return { ...account, mint: new web3_js_1.PublicKey(key) };
+    const search = (bankAccounts) => {
+        for (const group in bankAccounts) {
+            for (const key in bankAccounts[group]) {
+                const account = bankAccounts[group][key];
+                if (account.bank.toString().toLowerCase() ===
+                    bank.toString().toLowerCase()) {
+                    return { ...account, mint: new web3_js_1.PublicKey(key) };
+                }
             }
         }
+    };
+    let res = search((0, constants_1.getMarginfiAccounts)("Prod").bankAccounts);
+    if (res) {
+        return res;
+    }
+    res = search((0, constants_1.getMarginfiAccounts)("Staging").bankAccounts);
+    if (res) {
+        return res;
     }
     throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
@@ -81,12 +105,13 @@ async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, d
     if (!supply.bank && supply.mint.equals(web3_js_1.PublicKey.default)) {
         return [0, 0];
     }
+    const bankAccounts = (0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts;
     if (!supply.bank || supply.bank === null) {
-        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(constants_1.MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank), { commitment: "confirmed" });
+        supply.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(bankAccounts[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)(constants_1.MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
+        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(bankAccounts[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
     }
     if (!supplyPrice) {
         const [price] = await (0, priceUtils_1.fetchTokenPrices)([
@@ -228,10 +253,10 @@ async function getBank(umi, data, marginfiGroup) {
     return data?.banksCache && data.mint && marginfiGroup
         ? data.banksCache[marginfiGroup.toString()][data?.mint?.toString()]
         : data?.mint && data?.mint !== web3_js_1.PublicKey.default
-            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(constants_1.MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][data?.mint.toString()].bank), { commitment: "confirmed" })
+            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts[marginfiGroup?.toString() ?? ""][data?.mint.toString()].bank), { commitment: "confirmed" })
             : null;
 }
-async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, contextUpdates) {
+async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, programEnv, contextUpdates) {
     let marginfiAccount = lpUserAccount.data ??
         (lpUserAccount.pk
             ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
@@ -306,7 +331,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
         debtUsage = await getTokenUsage(debtBank, false, 0, contextUpdates?.debtAdjustment);
     }
     const supplyPrice = (0, priceUtils_1.safeGetPrice)(supply.mint);
-    let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup ?? new web3_js_1.PublicKey(constants_1.DEFAULT_MARGINFI_GROUP), {
+    let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup ?? (0, constants_1.getMarginfiAccounts)(programEnv).defaultGroup, {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,
     }, {

package/local/updateMarginfiLUT.ts

@@ -1,4 +1,4 @@
-import { Keypair, PublicKey } from "@solana/web3.js";
+import { Keypair } from "@solana/web3.js";
 import {
   createSignerFromKeypair,
   publicKey,
@@ -10,22 +10,19 @@ import {
   toWeb3JsKeypair,
 } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-  MARGINFI_ACCOUNTS,
-  DEFAULT_MARGINFI_GROUP,
   getEmptyMarginfiAccountsByAuthority,
   getSolanaRpcConnection,
   SOLAUTO_MANAGER,
   marginfiAccountInitialize,
   LOCAL_IRONFORGE_API_URL,
-  MARGINFI_PROD_PROGRAM,
+  getMarginfiAccounts,
 } from "../src";
 import { createAndSendV0Tx, getSecretKey, updateLookupTable } from "./shared";
 
-const LOOKUP_TABLE_ADDRESS = new PublicKey(MARGINFI_ACCOUNTS_LOOKUP_TABLE);
-let [, umi] = getSolanaRpcConnection(
-  LOCAL_IRONFORGE_API_URL
-);
+const mfiAccounts = getMarginfiAccounts("Prod");
+
+const LOOKUP_TABLE_ADDRESS = mfiAccounts.lookupTable;
+let [, umi] = getSolanaRpcConnection(LOCAL_IRONFORGE_API_URL);
 umi = umi.use(
   signerIdentity(
     createSignerFromKeypair(umi, umi.eddsa.generateKeypair()),
@@ -41,9 +38,9 @@ const solautoManager = createSignerFromKeypair(
 );
 
 async function addBanks() {
-  for (const group in MARGINFI_ACCOUNTS) {
-    for (const key in MARGINFI_ACCOUNTS[group]) {
-      const accounts = MARGINFI_ACCOUNTS[group][key];
+  for (const group in mfiAccounts.bankAccounts) {
+    for (const key in mfiAccounts.bankAccounts[group]) {
+      const accounts = mfiAccounts.bankAccounts[group][key];
       await updateLookupTable(
         [
           group,
@@ -65,7 +62,7 @@ async function addImfiAccounts() {
   );
 
   const iMfiAccountsPerGrp = 2;
-  for (const group in MARGINFI_ACCOUNTS) {
+  for (const group in mfiAccounts.bankAccounts) {
     const emptyAccs = imfiAccounts.filter((x) => x.group.toString() === group);
     if (emptyAccs.length >= iMfiAccountsPerGrp) {
       await updateLookupTable(
@@ -97,7 +94,7 @@ async function addImfiAccounts() {
 }
 
 updateLookupTable(
-  [DEFAULT_MARGINFI_GROUP, MARGINFI_PROD_PROGRAM.toString()], // TODO
+  [mfiAccounts.defaultGroup.toString(), mfiAccounts.program.toString()],
   LOOKUP_TABLE_ADDRESS
 );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.625",
+  "version": "1.0.626",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",

package/src/constants/marginfiAccounts.ts

@@ -3,6 +3,7 @@ import { NATIVE_MINT } from "@solana/spl-token";
 import * as tokens from "./tokenConstants";
 import { MarginfiAssetAccounts } from "../types/accounts";
 import { SWITCHBOARD_PRICE_FEED_IDS } from "./switchboardConstants";
+import { ProgramEnv } from "../types";
 
 export const MARGINFI_PROD_PROGRAM = new PublicKey(
   "MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA"
@@ -11,15 +12,43 @@ export const MARGINFI_STAGING_PROGRAM = new PublicKey(
   "stag8sTKds2h4KzjUw3zKTsxbqvT4XKHdaR9X9E6Rct"
 );
 
-export const DEFAULT_MARGINFI_GROUP =
+const PROD_DEFAULT_MARGINFI_GROUP =
   "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
+const STAGING_DEFAULT_MARGINFI_GROUP =
+  "FCPfpHA69EbS8f9KKSreTRkXbzFpunsKuYf5qNmnJjpo";
+
 const USDC_PRICE_ORACLE = "Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX";
 
-export const MARGINFI_ACCOUNTS: {
+export type MarginfiAccountsMap = {
   [group: string]: { [token: string]: MarginfiAssetAccounts };
-} = {
-  [DEFAULT_MARGINFI_GROUP.toString()]: {
+};
+
+const MARGINFI_STAGING_ACCOUNTS: MarginfiAccountsMap = {
+  [STAGING_DEFAULT_MARGINFI_GROUP]: {
+    [NATIVE_MINT.toString()]: {
+      bank: "3evdJSa25nsUiZzEUzd92UNa13TPRJrje1dRyiQP5Lhp",
+      liquidityVault: "FVXESa7wCd1tf3o9LGroBc3Ym8Gpcq1HdsLek6oo7Ykv",
+      vaultAuthority: "DuYk1WGq8UsjW5ThLtaehFLrnJeupTjtF7TaPzja9LBQ",
+      priceOracle: "7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE",
+    },
+    [tokens.USDC]: {
+      bank: "Ek5JSFJFD8QgXM6rPDCzf31XhDp1q3xezaWYSkJWqbqc",
+      liquidityVault: "6n7xXMni5WJKUMb4Vm5Zis6UaUtGF5xEGmagZNVWWoKB",
+      vaultAuthority: "9mXNyA5yS4WSTpYUa5gi3yBrSJWWM7XNPNDWRzWGjdVe",
+      priceOracle: USDC_PRICE_ORACLE,
+    },
+    [tokens.USDT]: {
+      bank: "4WFCsVXwfnQvZG52VvPwae7CtL13PUFVWdjkw5YCRBo6",
+      liquidityVault: "BFSyniKfXU9rHqUvHLKeZMivQsAKWTE7HZ1fW6vZcvJp",
+      vaultAuthority: "Fgxe3SUMzcNuLtT9Xkv8QhhWXCmu4VxynzUMwCF4HvJd",
+      priceOracle: "HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM",
+    },
+  },
+};
+
+const MARGINFI_PROD_ACCOUNTS: MarginfiAccountsMap = {
+  [PROD_DEFAULT_MARGINFI_GROUP.toString()]: {
     [NATIVE_MINT.toString()]: {
       bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",
       liquidityVault: "2eicbpitfJXDwqCuFAmPgDP7t2oUotnAzbGzRKLMgSLe",
@@ -194,8 +223,48 @@ export const MARGINFI_ACCOUNTS: {
   },
 };
 
-export const MARGINFI_ACCOUNTS_LOOKUP_TABLE =
+const MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE =
   "GAjmWmBPcH5Gxbiykasydj6RsCEaCLyHEvK6kHdFigc6";
 
-export const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE =
+const MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE =
   "EoEVYjz3MnsX6fKyxrwJkRhzMCHKjj6dvnjTCHoZLMc7";
+
+export interface MarginfiProgramAccounts {
+  program: PublicKey;
+  defaultGroup: PublicKey;
+  lookupTable: PublicKey;
+  bankAccounts: MarginfiAccountsMap;
+}
+
+export function getMarginfiAccounts(
+  programEnv?: ProgramEnv,
+  marginfiGroup?: PublicKey
+): MarginfiProgramAccounts {
+  if (programEnv === undefined) {
+    if (Boolean(marginfiGroup)) {
+      programEnv = Object.keys(MARGINFI_PROD_ACCOUNTS).includes(
+        marginfiGroup!.toString()
+      )
+        ? "Prod"
+        : "Staging";
+    } else {
+      programEnv = "Prod";
+    }
+  }
+
+  if (programEnv === "Prod") {
+    return {
+      program: MARGINFI_PROD_PROGRAM,
+      defaultGroup: new PublicKey(PROD_DEFAULT_MARGINFI_GROUP),
+      lookupTable: new PublicKey(MARGINFI_PROD_ACCOUNTS_LOOKUP_TABLE),
+      bankAccounts: MARGINFI_PROD_ACCOUNTS,
+    };
+  } else {
+    return {
+      program: MARGINFI_STAGING_PROGRAM,
+      defaultGroup: new PublicKey(STAGING_DEFAULT_MARGINFI_GROUP),
+      lookupTable: new PublicKey(MARGINFI_STAGING_ACCOUNTS_LOOKUP_TABLE),
+      bankAccounts: MARGINFI_STAGING_ACCOUNTS,
+    };
+  }
+}

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -8,7 +8,7 @@ import {
   TransactionBuilder,
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
-import { MARGINFI_ACCOUNTS } from "../../constants";
+import { getMarginfiAccounts } from "../../constants";
 import {
   Bank,
   lendingAccountBorrow,
@@ -69,14 +69,16 @@ export class MarginfiFlProvider extends FlProviderBase {
   }
 
   private async setAvailableBanks() {
+    const bankAccounts = getMarginfiAccounts(this.programEnv).bankAccounts;
+
     const availableBanks: string[] = [];
     const checkIfUsable = (group: string, mint: PublicKey) => {
-      if (Object.keys(MARGINFI_ACCOUNTS[group]).includes(mint.toString())) {
-        availableBanks.push(MARGINFI_ACCOUNTS[group][mint.toString()].bank);
+      if (Object.keys(bankAccounts[group]).includes(mint.toString())) {
+        availableBanks.push(bankAccounts[group][mint.toString()].bank);
       }
     };
 
-    for (const group of Object.keys(MARGINFI_ACCOUNTS)) {
+    for (const group of Object.keys(bankAccounts)) {
       checkIfUsable(group, this.supplyMint);
       checkIfUsable(group, this.debtMint);
     }

package/src/services/solauto/solautoClient.ts

@@ -102,6 +102,7 @@ export abstract class SolautoClient extends ReferralStateManager {
         lendingPool: args.lendingPool,
         lpUserAccount: args.lpUserAccount,
         lendingPlatform: this.lendingPlatform,
+        lpEnv: this.lpEnv,
       },
       this.contextUpdates
     );

package/src/services/solauto/solautoMarginfiClient.ts

@@ -8,10 +8,7 @@ import {
 } from "@metaplex-foundation/umi";
 import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
-import {
-  MARGINFI_ACCOUNTS,
-  MARGINFI_ACCOUNTS_LOOKUP_TABLE,
-} from "../../constants";
+import { getMarginfiAccounts, MarginfiProgramAccounts } from "../../constants";
 import {
   DCASettingsInpArgs,
   LendingPlatform,
@@ -47,7 +44,7 @@ import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 export class SolautoMarginfiClient extends SolautoClient {
   public lendingPlatform = LendingPlatform.Marginfi;
 
-  public marginfiProgram!: PublicKey;
+  public mfiAccounts!: MarginfiProgramAccounts;
 
   public marginfiAccount!: PublicKey | Signer;
   public marginfiAccountPk!: PublicKey;
@@ -62,9 +59,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   async initialize(args: SolautoClientArgs) {
     await super.initialize(args);
 
-    this.marginfiProgram = toWeb3JsPublicKey(
-      this.umi.programs.get("marginfi").publicKey
-    );
+    this.mfiAccounts = getMarginfiAccounts(this.lpEnv);
 
     this.marginfiGroup = await this.pos.lendingPool();
 
@@ -110,11 +105,11 @@ export class SolautoMarginfiClient extends SolautoClient {
     }
 
     this.marginfiSupplyAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+      this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
         this.pos.supplyMint().toString()
       ]!;
     this.marginfiDebtAccounts =
-      MARGINFI_ACCOUNTS[this.marginfiGroup.toString()][
+      this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][
         this.pos.debtMint().toString()
       ]!;
 
@@ -134,7 +129,10 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   defaultLookupTables(): string[] {
-    return [MARGINFI_ACCOUNTS_LOOKUP_TABLE, ...super.defaultLookupTables()];
+    return [
+      this.mfiAccounts.lookupTable.toString(),
+      ...super.defaultLookupTables(),
+    ];
   }
 
   lutAccountsToAdd(): PublicKey[] {
@@ -171,7 +169,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiOpenPosition(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(this.marginfiProgram),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       signerReferralState: publicKey(this.referralState),
       referredByState: this.referredByState
         ? publicKey(this.referredByState)
@@ -216,7 +214,7 @@ export class SolautoMarginfiClient extends SolautoClient {
   refreshIx(): TransactionBuilder {
     return marginfiRefreshData(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(this.marginfiProgram),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
       supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
@@ -344,7 +342,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiProtocolInteraction(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(this.marginfiProgram),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       solautoPosition: publicKey(this.pos.publicKey),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -395,7 +393,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     return marginfiRebalance(this.umi, {
       signer: this.signer,
-      marginfiProgram: publicKey(this.marginfiProgram),
+      marginfiProgram: publicKey(this.mfiAccounts.program),
       ixsSysvar: publicKey(SYSVAR_INSTRUCTIONS_PUBKEY),
       solautoFeesTa: publicKey(
         data.values.rebalanceDirection === RebalanceDirection.Boost

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -14,7 +14,7 @@ import {
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
 } from "../utils";
-import { DEFAULT_MARGINFI_GROUP, MARGINFI_ACCOUNTS } from "../constants";
+import { getMarginfiAccounts } from "../constants";
 import { SolautoPositionEx } from "./solautoPositionEx";
 
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
@@ -41,7 +41,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     }
 
     if (!this.lp) {
-      this.lp = new PublicKey(DEFAULT_MARGINFI_GROUP);
+      this.lp = getMarginfiAccounts(this.lpEnv).defaultGroup;
     }
 
     return this.lp;
@@ -50,10 +50,9 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   async maxLtvAndLiqThresholdBps(): Promise<[number, number]> {
     if (!this.supplyBank || !this.debtBank) {
       const group = (await this.lendingPool()).toString();
-      const supplyBank =
-        MARGINFI_ACCOUNTS[group][this.supplyMint().toString()].bank;
-      const debtBank =
-        MARGINFI_ACCOUNTS[group][this.debtMint().toString()].bank;
+      const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
+      const supplyBank = bankAccounts[group][this.supplyMint().toString()].bank;
+      const debtBank = bankAccounts[group][this.debtMint().toString()].bank;
 
       [this.supplyBank, this.debtBank] = await safeFetchAllBank(this.umi, [
         publicKey(supplyBank),
@@ -94,6 +93,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       useDesignatedMint
         ? { mint: toWeb3JsPublicKey(this.state().debt.mint) }
         : undefined,
+      this.lpEnv,
       this.contextUpdates
     );
 

package/src/solautoPosition/solautoPositionEx.ts

@@ -37,7 +37,7 @@ import {
   tokenInfo,
   toRoundedUsdValue,
 } from "../utils";
-import { RebalanceAction } from "../types";
+import { ProgramEnv, RebalanceAction } from "../types";
 import {
   getDebtAdjustment,
   getRebalanceValues,
@@ -51,6 +51,7 @@ export interface PositionCustomArgs {
   debtMint?: PublicKey;
   lendingPool?: PublicKey;
   lpUserAccount?: PublicKey;
+  lpEnv?: ProgramEnv;
 }
 
 interface SolautoPositionExData extends Partial<SolautoPosition> {
@@ -70,6 +71,7 @@ export abstract class SolautoPositionEx {
   public publicKey!: PublicKey;
   protected _data!: SolautoPositionExData;
   protected lp?: PublicKey = undefined;
+  protected lpEnv!: ProgramEnv;
   public lpUserAccount?: PublicKey = undefined;
   protected contextUpdates?: ContextUpdates;
 
@@ -86,6 +88,7 @@ export abstract class SolautoPositionEx {
       (args.data.position
         ? toWeb3JsPublicKey(args.data.position!.protocolUserAccount)
         : undefined);
+    this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
 
     this._data = args.data;
     this.firstState = { ...args.data.state };
@@ -183,7 +186,10 @@ export abstract class SolautoPositionEx {
   }
 
   supplyUsd() {
-    return calcSupplyUsd(this.state());
+    const supplyPrice = safeGetPrice(this.supplyMint());
+    return supplyPrice
+      ? calcTotalSupply(this.state()) * supplyPrice
+      : calcSupplyUsd(this.state());
   }
 
   totalDebt() {
@@ -191,7 +197,10 @@ export abstract class SolautoPositionEx {
   }
 
   debtUsd() {
-    return calcDebtUsd(this.state());
+    const debtPrice = safeGetPrice(this.debtMint());
+    return debtPrice
+      ? calcTotalDebt(this.state()) * debtPrice
+      : calcDebtUsd(this.state());
   }
 
   supplyLiquidityDepositable() {
@@ -203,7 +212,9 @@ export abstract class SolautoPositionEx {
   }
 
   supplyLiquidityUsdAvailable() {
-    return this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0);
+    return (
+      this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0)
+    );
   }
 
   debtLiquidityAvailable() {
@@ -244,7 +255,7 @@ export abstract class SolautoPositionEx {
   }
 
   eligibleForRebalance(bpsDistanceThreshold = 0): RebalanceAction | undefined {
-    if (!this.settings() || !calcSupplyUsd(this.state())) {
+    if (!this.settings() || !this.supplyUsd()) {
       return undefined;
     }
 

package/src/utils/marginfiUtils.ts

@@ -1,14 +1,17 @@
 import { PublicKey } from "@solana/web3.js";
 import { Program, publicKey, Umi } from "@metaplex-foundation/umi";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import {
+  fromWeb3JsPublicKey,
+  toWeb3JsPublicKey,
+} from "@metaplex-foundation/umi-web3js-adapters";
 import { ProgramEnv, MarginfiAssetAccounts } from "../types";
 import { PositionState, PositionTokenState } from "../generated";
 import {
-  DEFAULT_MARGINFI_GROUP,
-  MARGINFI_ACCOUNTS,
   ALL_SUPPORTED_TOKENS,
+  getMarginfiAccounts,
   MARGINFI_PROD_PROGRAM,
   MARGINFI_STAGING_PROGRAM,
+  MarginfiAccountsMap,
   TOKEN_INFO,
   USD_DECIMALS,
 } from "../constants";
@@ -34,6 +37,7 @@ import {
   toBaseUnit,
   toBps,
 } from "./numberUtils";
+import { getTokenAccountData } from "./accountUtils";
 
 export function getMarginfiProgram(env: ProgramEnv) {
   return env === "Prod" ? MARGINFI_PROD_PROGRAM : MARGINFI_STAGING_PROGRAM;
@@ -73,6 +77,18 @@ export function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv) {
   });
 }
 
+export async function fetchBankAddresses(umi: Umi, bankPk: PublicKey) {
+  const bank = await safeFetchBank(umi, fromWeb3JsPublicKey(bankPk));
+  const liquidityVault = toWeb3JsPublicKey(bank!.liquidityVault);
+  const vaultAuthority = (await getTokenAccountData(umi, liquidityVault))
+    ?.owner;
+  return {
+    bank: bankPk,
+    liquidityVault,
+    vaultAuthority,
+  };
+}
+
 interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
   mint: PublicKey;
 }
@@ -80,16 +96,29 @@ interface AllMarginfiAssetAccounts extends MarginfiAssetAccounts {
 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, mint: new PublicKey(key) };
+  const search = (bankAccounts: MarginfiAccountsMap) => {
+    for (const group in bankAccounts) {
+      for (const key in bankAccounts[group]) {
+        const account = bankAccounts[group][key];
+        if (
+          account.bank.toString().toLowerCase() ===
+          bank.toString().toLowerCase()
+        ) {
+          return { ...account, mint: new PublicKey(key) };
+        }
       }
     }
+  };
+
+  let res = search(getMarginfiAccounts("Prod").bankAccounts);
+  if (res) {
+    return res;
+  }
+  res = search(getMarginfiAccounts("Staging").bankAccounts);
+  if (res) {
+    return res;
   }
+
   throw new Error(`Marginfi accounts not found by the bank: ${bank}`);
 }
 
@@ -145,11 +174,16 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
     return [0, 0];
   }
 
+  const bankAccounts = getMarginfiAccounts(
+    undefined,
+    marginfiGroup
+  ).bankAccounts;
+
   if (!supply.bank || supply.bank === null) {
     supply.bank = await safeFetchBank(
       umi,
       publicKey(
-        MARGINFI_ACCOUNTS[marginfiGroup.toString()][supply.mint.toString()].bank
+        bankAccounts[marginfiGroup.toString()][supply.mint.toString()].bank
       ),
       { commitment: "confirmed" }
     );
@@ -162,7 +196,7 @@ export async function getMarginfiMaxLtvAndLiqThresholdBps(
     debt.bank = await safeFetchBank(
       umi,
       publicKey(
-        MARGINFI_ACCOUNTS[marginfiGroup.toString()][debt.mint.toString()].bank
+        bankAccounts[marginfiGroup.toString()][debt.mint.toString()].bank
       ),
       { commitment: "confirmed" }
     );
@@ -381,9 +415,9 @@ async function getBank(
       ? await safeFetchBank(
           umi,
           publicKey(
-            MARGINFI_ACCOUNTS[marginfiGroup?.toString() ?? ""][
-              data?.mint.toString()
-            ].bank
+            getMarginfiAccounts(undefined, marginfiGroup).bankAccounts[
+              marginfiGroup?.toString() ?? ""
+            ][data?.mint.toString()].bank
           ),
           { commitment: "confirmed" }
         )
@@ -396,6 +430,7 @@ export async function getMarginfiAccountPositionState(
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
+  programEnv?: ProgramEnv,
   contextUpdates?: ContextUpdates
 ): Promise<
   | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
@@ -523,7 +558,7 @@ export async function getMarginfiAccountPositionState(
   const supplyPrice = safeGetPrice(supply.mint!)!;
   let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(
     umi,
-    marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP),
+    marginfiGroup ?? getMarginfiAccounts(programEnv).defaultGroup,
     {
       mint: toWeb3JsPublicKey(supplyBank.mint),
       bank: supplyBank,