@haven-fi/solauto-sdk 1.0.749 → 1.0.750

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -5,7 +5,7 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfi_1 = require("../../externalSdks/marginfi");
 const flProviderBase_1 = require("./flProviderBase");
 const utils_1 = require("../../utils");
 const generated_1 = require("../../generated");
@@ -34,7 +34,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             checkIfUsable(group, this.supplyMint.toString());
             checkIfUsable(group, this.debtMint.toString());
         }
-        const banks = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, availableBanks.map((x) => (0, umi_1.publicKey)(x)));
+        const banks = await (0, marginfi_1.safeFetchAllBank)(this.umi, availableBanks.map((x) => (0, umi_1.publicKey)(x)));
         if (!(0, utils_1.safeGetPrice)(this.supplyMint) || !(0, utils_1.safeGetPrice)(this.debtMint)) {
             await (0, utils_1.fetchTokenPrices)([this.supplyMint, this.debtMint]);
         }
@@ -96,7 +96,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         ]);
         let tx = (0, umi_1.transactionBuilder)();
         if (!(0, utils_1.rpcAccountCreated)(supplyImfiRpcAccount)) {
-            tx = tx.add((0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
+            tx = tx.add((0, marginfi_1.marginfiAccountInitialize)(this.umi, {
                 marginfiAccount: supplyImfiAccount.signer,
                 marginfiGroup: this.supplyBankLiquiditySource.group,
                 authority: this.signer,
@@ -106,7 +106,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         if (supplyImfiAccount.accountPk.toString() !==
             debtImfiAccount.accountPk.toString() &&
             !(0, utils_1.rpcAccountCreated)(debtImfiRpcAccount)) {
-            tx = tx.add((0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
+            tx = tx.add((0, marginfi_1.marginfiAccountInitialize)(this.umi, {
                 marginfiAccount: debtImfiAccount.signer,
                 marginfiGroup: this.debtBankLiquiditySource.group,
                 authority: this.signer,
@@ -155,13 +155,13 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         const associatedBankAccs = (0, utils_1.findMarginfiAccounts)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.publicKey));
         const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource);
         return (0, umi_1.transactionBuilder)()
-            .add((0, marginfi_sdk_1.lendingAccountStartFlashloan)(this.umi, {
+            .add((0, marginfi_1.lendingAccountStartFlashloan)(this.umi, {
             endIndex: 0, // We set this after building the transaction
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             signer: this.signer,
         }))
-            .add((0, marginfi_sdk_1.lendingAccountBorrow)(this.umi, {
+            .add((0, marginfi_1.lendingAccountBorrow)(this.umi, {
             amount: flashLoan.baseUnitAmount,
             bank: (0, umi_1.publicKey)(bank),
             bankLiquidityVault: (0, umi_1.publicKey)(associatedBankAccs.liquidityVault),
@@ -185,7 +185,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             : this.debtRemainingAccounts;
         let iMfiAccountHadPrevFlBalance = remainingAccounts.find((x) => x.pubkey.toString() === bank.publicKey.toString());
         return (0, umi_1.transactionBuilder)()
-            .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
+            .add((0, marginfi_1.lendingAccountRepay)(this.umi, {
             amount: flashLoan.baseUnitAmount,
             repayAll: !iMfiAccountHadPrevFlBalance,
             bank: bank.publicKey,
@@ -195,13 +195,13 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             signer: this.signer,
             signerTokenAccount: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint)),
         }))
-            .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
+            .add((0, marginfi_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             signer: this.signer,
         }).addRemainingAccounts(remainingAccounts));
     }
     closeBalance(marginfiAccount, bank, marginfiGroup) {
-        return (0, umi_1.transactionBuilder)().add((0, marginfi_sdk_1.lendingAccountCloseBalance)(this.umi, {
+        return (0, umi_1.transactionBuilder)().add((0, marginfi_1.lendingAccountCloseBalance)(this.umi, {
             signer: this.signer,
             marginfiAccount: (0, umi_1.publicKey)(marginfiAccount),
             bank: (0, umi_1.publicKey)(bank),

package/dist/services/rebalance/solautoFees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoFees.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/solautoFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,qBAAa,cAAc;IAEvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,mBAAmB;gBAFnB,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,mBAAmB,EAAE,MAAM;IAGrC,MAAM,CAAC,MAAM,CACX,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,WAAW,EAAE,MAAM;IASrB,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB;;;;;CA8CzD"}
+{"version":3,"file":"solautoFees.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/solautoFees.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,qBAAa,cAAc;IAEvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,mBAAmB;gBAFnB,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,mBAAmB,EAAE,MAAM;IAGrC,MAAM,CAAC,MAAM,CACX,UAAU,EAAE,OAAO,EACnB,2BAA2B,EAAE,MAAM,GAAG,SAAS,EAC/C,WAAW,EAAE,MAAM;IASrB,iBAAiB,CAAC,kBAAkB,EAAE,kBAAkB;;;;;CAqCzD"}

package/dist/services/rebalance/solautoFees.js

@@ -18,13 +18,6 @@ class SolautoFeesBps {
         const maxFeeBps = 50; // Fee in basis points for minSize (0.5%)
         const minFeeBps = 25; // Fee in basis points for maxSize (0.25%)
         const k = 1.5;
-        if (this.targetLiqUtilizationRateBps === 0) {
-            return {
-                solauto: 0,
-                referrer: 0,
-                total: 0,
-            };
-        }
         let feeBps = 0;
         if (this.targetLiqUtilizationRateBps !== undefined) {
             feeBps = 15;

package/dist/services/solauto/solautoMarginfiClient.js

@@ -7,7 +7,7 @@ const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters"
 const constants_1 = require("../../constants");
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfi_1 = require("../../externalSdks/marginfi");
 const solautoClient_1 = require("./solautoClient");
 function isSigner(account) {
     return "publicKey" in account;
@@ -33,7 +33,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             else {
                 const accounts = await (0, utils_1.getAllMarginfiAccountsByAuthority)(this.umi, this.pos.publicKey, this.marginfiGroup, false);
                 const reusableAccounts = accounts.length > 0
-                    ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, accounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => (0, utils_1.marginfiAccountEmpty)(x))
+                    ? (await (0, marginfi_1.safeFetchAllMarginfiAccount)(this.umi, accounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => (0, utils_1.marginfiAccountEmpty)(x))
                     : [];
                 this.marginfiAccount =
                     reusableAccounts.length > 0
@@ -48,7 +48,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.otherSigners.push(this.marginfiAccount);
         }
         else if (this.pos.selfManaged) {
-            const accountData = await (0, marginfi_sdk_1.fetchMarginfiAccount)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.marginfiAccount));
+            const accountData = await (0, marginfi_1.fetchMarginfiAccount)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(this.marginfiAccount));
             this.healthCheckRemainingAccounts = (await Promise.all(accountData.lendingAccount.balances.map((balance) => (0, utils_1.getRemainingAccountsForMarginfiHealthCheck)(this.umi, balance)))).flat();
         }
         this.marginfiSupplyAccounts =
@@ -71,7 +71,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         return [...super.lutAccountsToAdd(), this.marginfiAccountPk];
     }
     marginfiAccountInitialize(marginfiAccount) {
-        return (0, marginfi_sdk_1.marginfiAccountInitialize)(this.umi, {
+        return (0, marginfi_1.marginfiAccountInitialize)(this.umi, {
             marginfiAccount: marginfiAccount,
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             authority: this.signer,
@@ -155,7 +155,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     marginfiProtocolInteractionIx(args) {
         switch (args.__kind) {
             case "Deposit": {
-                return (0, marginfi_sdk_1.lendingAccountDeposit)(this.umi, {
+                return (0, marginfi_1.lendingAccountDeposit)(this.umi, {
                     signer: this.signer,
                     signerTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
                     marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
@@ -174,7 +174,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                         (0, utils_1.getAccountMeta)(this.debtPriceOracle),
                     ]);
                 }
-                return (0, marginfi_sdk_1.lendingAccountBorrow)(this.umi, {
+                return (0, marginfi_1.lendingAccountBorrow)(this.umi, {
                     amount: args.fields[0],
                     signer: this.signer,
                     destinationTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
@@ -186,7 +186,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 }).addRemainingAccounts(remainingAccounts);
             }
             case "Repay": {
-                return (0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
+                return (0, marginfi_1.lendingAccountRepay)(this.umi, {
                     amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
                     repayAll: args.fields[0].__kind === "All" ? true : false,
                     signer: this.signer,
@@ -198,7 +198,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 });
             }
             case "Withdraw": {
-                return (0, marginfi_sdk_1.lendingAccountWithdraw)(this.umi, {
+                return (0, marginfi_1.lendingAccountWithdraw)(this.umi, {
                     amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
                     withdrawAll: args.fields[0].__kind === "All" ? true : false,
                     signer: this.signer,

package/dist/services/transactions/transactionUtils.js

@@ -11,9 +11,9 @@ const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generated_1 = require("../../generated");
 const utils_1 = require("../../utils");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfi_1 = require("../../externalSdks/marginfi");
 const swap_1 = require("../swap");
-const jupiter_sdk_1 = require("../../jupiter-sdk");
+const jupiter_1 = require("../../externalSdks/jupiter");
 const types_1 = require("../../types");
 const constants_1 = require("../../constants");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
@@ -209,7 +209,7 @@ function getSolautoActions(umi, tx) {
         }
         if ((0, constants_1.isMarginfiProgram)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.programId))) {
             try {
-                const serializer = (0, marginfi_sdk_1.getLendingAccountDepositInstructionDataSerializer)();
+                const serializer = (0, marginfi_1.getLendingAccountDepositInstructionDataSerializer)();
                 const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
@@ -227,7 +227,7 @@ function getSolautoActions(umi, tx) {
             }
             catch { }
             try {
-                const serializer = (0, marginfi_sdk_1.getLendingAccountBorrowInstructionDataSerializer)();
+                const serializer = (0, marginfi_1.getLendingAccountBorrowInstructionDataSerializer)();
                 const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
@@ -244,7 +244,7 @@ function getSolautoActions(umi, tx) {
             }
             catch { }
             try {
-                const serializer = (0, marginfi_sdk_1.getLendingAccountWithdrawInstructionDataSerializer)();
+                const serializer = (0, marginfi_1.getLendingAccountWithdrawInstructionDataSerializer)();
                 const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
@@ -271,7 +271,7 @@ function getSolautoActions(umi, tx) {
             }
             catch { }
             try {
-                const serializer = (0, marginfi_sdk_1.getLendingAccountRepayInstructionDataSerializer)();
+                const serializer = (0, marginfi_1.getLendingAccountRepayInstructionDataSerializer)();
                 const discriminator = (0, utils_1.uint8ArrayToBigInt)(serializer
                     .serialize({
                     amount: 0,
@@ -384,7 +384,7 @@ function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting)
         (0, utils_1.consoleLog)("Error code:", errCode);
         (0, utils_1.consoleLog)("Error instruction program:", errIx?.programId.toString());
         const solautoError = (0, generated_1.getSolautoErrorFromCode)(errCode ?? -1, (0, generated_1.createSolautoProgram)());
-        const marginfiError = (0, marginfi_sdk_1.getMarginfiErrorFromCode)(errCode ?? -1, (0, marginfi_sdk_1.createMarginfiProgram)());
+        const marginfiError = (0, marginfi_1.getMarginfiErrorFromCode)(errCode ?? -1, (0, marginfi_1.createMarginfiProgram)());
         if (errCode !== undefined &&
             errIx?.programId.toString() ===
                 umi.programs.get("solauto").publicKey.toString()) {
@@ -402,9 +402,9 @@ function getErrorInfo(umi, txs, error, simulationSuccessful, priorityFeeSetting)
             programError = marginfiError;
         }
         else if (errCode !== undefined &&
-            errIx?.programId === jupiter_sdk_1.JUPITER_PROGRAM_ID) {
+            errIx?.programId === jupiter_1.JUPITER_PROGRAM_ID) {
             programName = "Jupiter";
-            programError = (0, jupiter_sdk_1.getJupiterErrorFromCode)(errCode, (0, jupiter_sdk_1.createJupiterProgram)());
+            programError = (0, jupiter_1.getJupiterErrorFromCode)(errCode, (0, jupiter_1.createJupiterProgram)());
         }
         if (programError) {
             errorName = programError?.name;

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-import { Bank } from "../marginfi-sdk";
+import { Bank } from "../externalSdks/marginfi";
 import { SolautoPositionEx } from "./solautoPositionEx";
 import { LendingPlatform, PriceType } from "../generated";
 export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {

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;AAC5C,OAAO,EAAE,IAAI,EAA+B,MAAM,iBAAiB,CAAC;AAgBpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAC/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEpC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAOtD,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAMpD,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAED,IAAI,qBAAqB,IAAI,MAAM,CAUlC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAA+B,MAAM,0BAA0B,CAAC;AAgB7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAQ;IAC/B,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAQ;IAEpC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAOtD,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAMpD,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAED,IAAI,qBAAqB,IAAI,MAAM,CAUlC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarginfiSolautoPositionEx = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const marginfi_sdk_1 = require("../marginfi-sdk");
+const marginfi_1 = require("../externalSdks/marginfi");
 const umi_1 = require("@metaplex-foundation/umi");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
@@ -18,10 +18,10 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     supplyPrice(priceType) {
         return (this._supplyPrice ??
-            (0, utils_1.safeGetPrice)(this.supplyMint, priceType, marginfi_sdk_1.PriceBias.Low));
+            (0, utils_1.safeGetPrice)(this.supplyMint, priceType, marginfi_1.PriceBias.Low));
     }
     debtPrice(priceType) {
-        return (this._debtPrice ?? (0, utils_1.safeGetPrice)(this.debtMint, priceType, marginfi_sdk_1.PriceBias.High));
+        return (this._debtPrice ?? (0, utils_1.safeGetPrice)(this.debtMint, priceType, marginfi_1.PriceBias.High));
     }
     getBankAccounts(mint) {
         const group = this.lpPoolAccount.toString();
@@ -30,7 +30,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     async getBanks() {
         if (!this.supplyBank || !this.debtBank) {
-            [this.supplyBank, this.debtBank] = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, [
+            [this.supplyBank, this.debtBank] = await (0, marginfi_1.safeFetchAllBank)(this.umi, [
                 (0, umi_1.publicKey)(this.lpSupplyAccount),
                 (0, umi_1.publicKey)(this.lpDebtAccount),
             ]);

package/dist/utils/marginfi/data.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { PositionState, PriceType } from "../../generated";
-import { Bank, MarginfiAccount } from "../../marginfi-sdk";
+import { Bank, MarginfiAccount } from "../../externalSdks/marginfi";
 import { ContextUpdates } from "../solautoUtils";
 export declare function getMarginfiMaxLtvAndLiqThresholdBps(umi: Umi, marginfiGroup: PublicKey, supply: {
     mint: PublicKey;

package/dist/utils/marginfi/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBjD,wBAAsB,mCAAmC,CACvD,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,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,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,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,KAAK,EAAE,OAAO,UAgBf;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IACE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,SAAS,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC;CACtB,GACD,SAAS,CACZ,CAmLA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBjD,wBAAsB,mCAAmC,CACvD,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,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,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,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,KAAK,EAAE,OAAO,UAgBf;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IACE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,SAAS,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC;CACtB,GACD,SAAS,CACZ,CAmLA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}

package/dist/utils/marginfi/data.js

@@ -12,7 +12,7 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfi_1 = require("../../externalSdks/marginfi");
 const priceUtils_1 = require("../priceUtils");
 const generalUtils_1 = require("../generalUtils");
 const numberUtils_1 = require("../numberUtils");
@@ -23,10 +23,10 @@ async function getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, supply, d
     }
     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)(bankAccounts[marginfiGroup.toString()][supply.mint.toString()].bank), { commitment: "confirmed" });
+        supply.bank = await (0, marginfi_1.safeFetchBank)(umi, (0, umi_1.publicKey)(bankAccounts[marginfiGroup.toString()][supply.mint.toString()].bank), { commitment: "confirmed" });
     }
     if ((!debt.bank || debt.bank === null) && !(0, generalUtils_1.validPubkey)(debt.mint)) {
-        debt.bank = await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(bankAccounts[marginfiGroup.toString()][debt.mint.toString()].bank), { commitment: "confirmed" });
+        debt.bank = await (0, marginfi_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)([
@@ -44,7 +44,7 @@ async function getEmptyMarginfiAccountsByAuthority(umi, authority) {
         commitment: "confirmed",
         filters: [
             {
-                dataSize: (0, marginfi_sdk_1.getMarginfiAccountSize)(),
+                dataSize: (0, marginfi_1.getMarginfiAccountSize)(),
             },
             {
                 memcmp: {
@@ -62,7 +62,7 @@ async function getEmptyMarginfiAccountsByAuthority(umi, authority) {
         ],
     });
     return marginfiAccounts
-        .map((x) => (0, marginfi_sdk_1.deserializeMarginfiAccount)(x))
+        .map((x) => (0, marginfi_1.deserializeMarginfiAccount)(x))
         .filter((x) => (0, general_1.marginfiAccountEmpty)(x));
 }
 async function getAllMarginfiAccountsByAuthority(umi, authority, group, compatibleWithSolauto) {
@@ -74,7 +74,7 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, group, compatib
         },
         filters: [
             {
-                dataSize: (0, marginfi_sdk_1.getMarginfiAccountSize)(),
+                dataSize: (0, marginfi_1.getMarginfiAccountSize)(),
             },
             {
                 memcmp: {
@@ -179,13 +179,13 @@ async function getBank(umi, data, marginfiGroup) {
     return data?.banksCache && mint
         ? data.banksCache[marginfiGroup.toString()][mint]
         : mint && mint !== web3_js_1.PublicKey.default.toString()
-            ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts[marginfiGroup.toString()][mint].bank), { commitment: "confirmed" })
+            ? await (0, marginfi_1.safeFetchBank)(umi, (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts[marginfiGroup.toString()][mint].bank), { commitment: "confirmed" })
             : null;
 }
 async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, contextUpdates, priceType) {
     let marginfiAccount = lpUserAccount.data ??
         ((0, generalUtils_1.validPubkey)(lpUserAccount.pk)
-            ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
+            ? await (0, marginfi_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
                 commitment: "confirmed",
             })
             : null);
@@ -215,7 +215,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
         }
         if (supplyBalances.length > 0) {
             if (supplyBank === null) {
-                supplyBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, supplyBalances[0].bankPk, {
+                supplyBank = await (0, marginfi_1.safeFetchBank)(umi, supplyBalances[0].bankPk, {
                     commitment: "confirmed",
                 });
             }
@@ -226,7 +226,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
         }
         if (debtBalances.length > 0) {
             if (debtBank === null) {
-                debtBank = await (0, marginfi_sdk_1.safeFetchBank)(umi, debtBalances[0].bankPk, {
+                debtBank = await (0, marginfi_1.safeFetchBank)(umi, debtBalances[0].bankPk, {
                     commitment: "confirmed",
                 });
             }
@@ -252,8 +252,8 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
         (supplyMint.isStableCoin && debtMint.isStableCoin) ||
         !constants_1.ALL_SUPPORTED_TOKENS.includes(supplyBank.mint.toString()) ||
         !constants_1.ALL_SUPPORTED_TOKENS.includes(debtBank.mint.toString()) ||
-        supplyBank.config.oracleSetup === marginfi_sdk_1.OracleSetup.StakedWithPythPush ||
-        debtBank.config.oracleSetup === marginfi_sdk_1.OracleSetup.StakedWithPythPush) {
+        supplyBank.config.oracleSetup === marginfi_1.OracleSetup.StakedWithPythPush ||
+        debtBank.config.oracleSetup === marginfi_1.OracleSetup.StakedWithPythPush) {
         return undefined;
     }
     if (!debtUsage) {

package/dist/utils/marginfi/general.d.ts

@@ -2,7 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { AccountMeta, Program, Umi } from "@metaplex-foundation/umi";
 import { ProgramEnv, MarginfiAssetAccounts } from "../../types";
 import { MarginfiBankAccountsMap } from "../../constants";
-import { Balance, Bank, MarginfiAccount } from "../../marginfi-sdk";
+import { Balance, Bank, MarginfiAccount } from "../../externalSdks/marginfi";
 export declare function createDynamicMarginfiProgram(env?: ProgramEnv): Program;
 export declare function umiWithMarginfiProgram(umi: Umi, marginfiEnv?: ProgramEnv): Umi;
 export declare function getAllBankRelatedAccounts(umi: Umi, bankAccountsMap: MarginfiBankAccountsMap): Promise<PublicKey[]>;

package/dist/utils/marginfi/general.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAS5B,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CAkCtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAgBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}
+{"version":3,"file":"general.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/general.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAKhF,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAGL,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,OAAO,EACP,IAAI,EAIJ,eAAe,EAGhB,MAAM,6BAA6B,CAAC;AASrC,wBAAgB,4BAA4B,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,OAAO,CActE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,UAAU,OASxE;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,GAAG,EACR,eAAe,EAAE,uBAAuB,GACvC,OAAO,CAAC,SAAS,EAAE,CAAC,CAkCtB;AAED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS;;;;;GAanE;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,IAAI,CAAA;CAAE,sBAgBtC;AAED,UAAU,wBAAyB,SAAQ,qBAAqB;IAC9D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,GACd,wBAAwB,CAyB1B;AAED,wBAAsB,0CAA0C,CAC9D,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,WAAW,EAAE,CAAC,CAWxB;AAED,wBAAgB,oCAAoC,CAClD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,EAAE,MAAM,GAClB,CAAC,MAAM,EAAE,MAAM,CAAC,CA6BlB;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,eAAe,WASpE"}

package/dist/utils/marginfi/general.js

@@ -13,7 +13,7 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const constants_1 = require("../../constants");
-const marginfi_sdk_1 = require("../../marginfi-sdk");
+const marginfi_1 = require("../../externalSdks/marginfi");
 const numberUtils_1 = require("../numberUtils");
 const accountUtils_1 = require("../accountUtils");
 const pythUtils_1 = require("../pythUtils");
@@ -23,10 +23,10 @@ function createDynamicMarginfiProgram(env) {
         name: "marginfi",
         publicKey: (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(env ?? "Prod").program),
         getErrorFromCode(code, cause) {
-            return (0, marginfi_sdk_1.getMarginfiErrorFromCode)(code, this, cause);
+            return (0, marginfi_1.getMarginfiErrorFromCode)(code, this, cause);
         },
         getErrorFromName(name, cause) {
-            return (0, marginfi_sdk_1.getMarginfiErrorFromName)(name, this, cause);
+            return (0, marginfi_1.getMarginfiErrorFromName)(name, this, cause);
         },
         isOnCluster() {
             return true;
@@ -42,11 +42,11 @@ function umiWithMarginfiProgram(umi, marginfiEnv) {
 }
 async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
     const banks = Object.values(bankAccountsMap).flatMap((group) => Object.values(group).map((accounts) => accounts.bank));
-    const banksData = await (0, marginfi_sdk_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
+    const banksData = await (0, marginfi_1.safeFetchAllBank)(umi, banks.map((x) => (0, umi_1.publicKey)(x)));
     const oracles = banksData
         .map((bank) => {
         const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.config.oracleKeys[0]);
-        return bank.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+        return bank.config.oracleSetup === marginfi_1.OracleSetup.PythPushOracle
             ? [
                 (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
                 (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),
@@ -65,7 +65,7 @@ async function getAllBankRelatedAccounts(umi, bankAccountsMap) {
         .map((x) => new web3_js_1.PublicKey(x));
 }
 async function fetchBankAddresses(umi, bankPk) {
-    const bank = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bankPk));
+    const bank = await (0, marginfi_1.fetchBank)(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;
@@ -79,10 +79,10 @@ async function fetchBankAddresses(umi, bankPk) {
 }
 async function getMarginfiPriceOracle(umi, bank) {
     if (!bank.data) {
-        bank.data = await (0, marginfi_sdk_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
+        bank.data = await (0, marginfi_1.fetchBank)(umi, (0, umi_web3js_adapters_1.fromWeb3JsPublicKey)(bank.pk));
     }
     const oracleKey = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.data.config.oracleKeys[0]);
-    const priceOracle = bank.data.config.oracleSetup === marginfi_sdk_1.OracleSetup.PythPushOracle
+    const priceOracle = bank.data.config.oracleSetup === marginfi_1.OracleSetup.PythPushOracle
         ? await (0, pythUtils_1.getMostUpToDatePythOracle)(umi, [
             (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.PYTH_SPONSORED_SHARD_ID),
             (0, pythUtils_1.getPythPushOracleAddress)(oracleKey, constants_1.MARGINFI_SPONSORED_SHARD_ID),

package/dist/utils/priceUtils.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { PublicKey as UmiPublicKey } from "@metaplex-foundation/umi";
 import { PriceType } from "../generated";
-import { PriceBias } from "../marginfi-sdk";
+import { PriceBias } from "../externalSdks/marginfi";
 interface PriceResult {
     realtimePrice: number;
     confInterval?: number;

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

@@ -1 +1 @@
-{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}
+{"version":3,"file":"priceUtils.d.ts","sourceRoot":"","sources":["../../src/utils/priceUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBrE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,UAAU,WAAW;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,SAAS,EAAE,EAClB,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4CnB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAqDtC;AAkBD,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAkDtC;AAED,wBAAsB,iBAAiB,CACrC,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAiBtC;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,EACnD,SAAS,GAAE,SAA8B,EACzC,SAAS,CAAC,EAAE,SAAS,GACpB,MAAM,GAAG,SAAS,CAyBpB"}

package/dist/utils/priceUtils.js

@@ -35,7 +35,7 @@ const numberUtils_1 = require("./numberUtils");
 const generalUtils_1 = require("./generalUtils");
 const jupiterUtils_1 = require("./jupiterUtils");
 const generated_1 = require("../generated");
-const marginfi_sdk_1 = require("../marginfi-sdk");
+const marginfi_1 = require("../externalSdks/marginfi");
 async function fetchTokenPrices(mints, priceType = generated_1.PriceType.Realtime, priceBias) {
     const currentTime = (0, generalUtils_1.currentUnixSeconds)();
     const mintStrs = mints.map((x) => x.toString());
@@ -170,7 +170,7 @@ function safeGetPrice(mint, priceType = generated_1.PriceType.Realtime, priceBia
                 ? priceData.emaConfInterval
                 : priceData.confInterval;
             const conf = Math.min(confInterval, price * 0.05);
-            if (priceBias === marginfi_sdk_1.PriceBias.Low) {
+            if (priceBias === marginfi_1.PriceBias.Low) {
                 price -= conf;
             }
             else {

package/dist/utils/pythUtils.js

@@ -6,9 +6,9 @@ const web3_js_1 = require("@solana/web3.js");
 const umi_1 = require("@metaplex-foundation/umi");
 const constants_1 = require("../constants");
 const generalUtils_1 = require("./generalUtils");
-const pyth_sdk_1 = require("../pyth-sdk");
+const pyth_1 = require("../externalSdks/pyth");
 async function getMostUpToDatePythOracle(umi, oracleKeys) {
-    const oracles = (0, generalUtils_1.zip)(oracleKeys, await (0, pyth_sdk_1.safeFetchAllPriceUpdateV2Account)(umi, oracleKeys.map((x) => (0, umi_1.publicKey)(x)), { commitment: "confirmed" })).sort((a, b) => Number(b[1]?.priceMessage.publishTime ?? 0) -
+    const oracles = (0, generalUtils_1.zip)(oracleKeys, await (0, pyth_1.safeFetchAllPriceUpdateV2Account)(umi, oracleKeys.map((x) => (0, umi_1.publicKey)(x)), { commitment: "confirmed" })).sort((a, b) => Number(b[1]?.priceMessage.publishTime ?? 0) -
         Number(a[1]?.priceMessage.publishTime ?? 0));
     return oracles[0][0];
 }

package/dist/utils/solanaUtils.js

@@ -26,11 +26,11 @@ const umi_1 = require("@metaplex-foundation/umi");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
 const types_1 = require("../types");
-const marginfi_sdk_1 = require("../marginfi-sdk");
+const marginfi_1 = require("../externalSdks/marginfi");
 const accountUtils_1 = require("./accountUtils");
 const generalUtils_1 = require("./generalUtils");
 const solautoUtils_1 = require("./solautoUtils");
-const marginfi_1 = require("./marginfi");
+const marginfi_2 = require("./marginfi");
 const services_1 = require("../services");
 function getSolanaRpcConnection(rpcUrl, programId, lpEnv) {
     const connection = new web3_js_1.Connection(rpcUrl, {
@@ -39,7 +39,7 @@ function getSolanaRpcConnection(rpcUrl, programId, lpEnv) {
     const umi = (0, umi_bundle_defaults_1.createUmi)(connection).use({
         install(umi) {
             umi.programs.add((0, solautoUtils_1.createDynamicSolautoProgram)(programId), false);
-            umi.programs.add((0, marginfi_1.createDynamicMarginfiProgram)(lpEnv), false);
+            umi.programs.add((0, marginfi_2.createDynamicMarginfiProgram)(lpEnv), false);
         },
     });
     return [connection, umi];
@@ -129,13 +129,13 @@ function addTxOptimizations(umi, tx, computeUnitPrice, computeUnitLimit) {
 }
 function assembleFinalTransaction(umi, transaction, computeUnitPrice, computeUnitLimit) {
     const tx = addTxOptimizations(umi, transaction, computeUnitPrice, computeUnitLimit);
-    const marginfiStartFlSerializer = (0, marginfi_sdk_1.getLendingAccountStartFlashloanInstructionDataSerializer)();
+    const marginfiStartFlSerializer = (0, marginfi_1.getLendingAccountStartFlashloanInstructionDataSerializer)();
     const marginfiStartFlDiscriminator = marginfiStartFlSerializer
         .serialize({
         endIndex: 0,
     })
         .slice(0, 8);
-    const marginfiEndFlSerializer = (0, marginfi_sdk_1.getLendingAccountEndFlashloanInstructionDataSerializer)();
+    const marginfiEndFlSerializer = (0, marginfi_1.getLendingAccountEndFlashloanInstructionDataSerializer)();
     const marginfiEndFlDiscriminator = marginfiEndFlSerializer
         .serialize({
         endIndex: 0,

package/local/patchLUT.ts

@@ -43,6 +43,7 @@ async function getMissingAccounts() {
   const users = Array.from(
     new Set(positions.map((x) => x.authority.toString()))
   );
+  const usersRequiringPatchLut = [];
   for (const user of users) {
     const authority = new PublicKey(user);
     const referralState = referralStatesData.find((x) =>
@@ -82,9 +83,12 @@ async function getMissingAccounts() {
       console.log("\nMissing accounts for", referralState.publicKey.toString());
       console.log(missingAccounts);
       allMissingAccounts.push(...missingAccounts);
+      usersRequiringPatchLut.push(user);
     }
   }
 
+  console.log("Users requiring patch LUT:");
+  console.log(Array.from(new Set(usersRequiringPatchLut)));
   return allMissingAccounts;
 }
 

package/local/txSandbox.ts

@@ -22,7 +22,7 @@ import {
 } from "../src";
 import { getSecretKey } from "./shared";
 
-const payForTransaction = false;
+const payForTransaction = true;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
@@ -47,8 +47,8 @@ export async function main() {
   });
 
   await client.initializeExistingSolautoPosition({
-    positionId: 2,
-    authority: new PublicKey("EBhRj7jbF2EVE21i19JSuCX1BAbnZFYhoKW64HnaZ3kf"),
+    positionId: 3,
+    authority: new PublicKey("61rtn5tzVkesapo6Cz83SPoShUfAePSxJsqniuF2wRKC"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),

package/package.json

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