@haven-fi/solauto-sdk 1.0.40 → 1.0.42

package/dist/clients/solautoMarginfiClient.d.ts

@@ -1,7 +1,7 @@
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { PublicKey } from "@solana/web3.js";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiTokenAccounts } from "../types/accounts";
+import { MarginfiAssetAccounts } from "../types/accounts";
 import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceTypeArgs, SolautoSettingsParametersInpArgs } from "../generated";
 import { MarginfiAccount } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
@@ -18,8 +18,8 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     marginfiAccount: PublicKey | Signer;
     marginfiAccountPk: PublicKey;
     marginfiGroup: PublicKey;
-    marginfiSupplyBankAccounts: MarginfiTokenAccounts;
-    marginfiDebtBankAccounts: MarginfiTokenAccounts;
+    marginfiSupplyAccounts: MarginfiAssetAccounts;
+    marginfiDebtAccounts: MarginfiAssetAccounts;
     intermediaryMarginfiAccountSigner?: Signer;
     intermediaryMarginfiAccountPk: PublicKey;
     intermediaryMarginfiAccount?: MarginfiAccount;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IAsCpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAG7C,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IA0CpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA4DrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -39,10 +39,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiGroup = marginfiAccountData
             ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(marginfiAccountData.group)
             : args.marginfiGroup ?? new web3_js_1.PublicKey(marginfiAccounts_1.DEFAULT_MARGINFI_GROUP);
-        this.marginfiSupplyBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
+        this.marginfiSupplyAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
             mint: this.supplyMint.toString(),
         });
-        this.marginfiDebtBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
+        this.marginfiDebtAccounts = (0, marginfiUtils_1.findMarginfiAccounts)({
             mint: this.debtMint.toString(),
         });
         if (!this.initialized) {
@@ -51,7 +51,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.initialized = true;
     }
     async setIntermediaryMarginfiDetails() {
-        const existingMarginfiAccounts = (await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false)).filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk));
+        const existingMarginfiAccounts = (await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false))
+            .filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk))
+            .sort((a, b) => a.marginfiAccount.toString().localeCompare(b.marginfiAccount.toString()));
         const emptyMarginfiAccounts = existingMarginfiAccounts.length > 0
             ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, existingMarginfiAccounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
                 (Math.round((0, numberUtils_1.bytesToI80F48)(y.assetShares.value)) != 0 ||
@@ -114,10 +116,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 ? this.marginfiAccount
                 : (0, umi_1.publicKey)(this.marginfiAccount),
             supplyMint: (0, umi_1.publicKey)(this.supplyMint),
-            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             debtMint: (0, umi_1.publicKey)(this.debtMint),
-            debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: signerDebtTa,
             positionData: {
@@ -136,10 +138,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccount),
-            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle),
-            debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.priceOracle),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
         });
     }
@@ -161,8 +163,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     signerTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
                     marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
                     marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
-                    bank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
-                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault),
                 });
             }
             case "Borrow": {
@@ -172,9 +174,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     destinationTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
                     marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
                     marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
-                    bank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
-                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
-                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority),
                 });
             }
             case "Repay": {
@@ -185,8 +187,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     signerTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
                     marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
                     marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
-                    bank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
-                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault),
                 });
             }
             case "Withdraw": {
@@ -197,9 +199,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     destinationTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
                     marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
                     marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
-                    bank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
-                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
-                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority),
                 });
             }
         }
@@ -212,8 +214,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             positionSupplyTa = (0, umi_1.publicKey)(args.__kind === "Withdraw" || this.selfManaged
                 ? this.signerSupplyTa
                 : this.positionSupplyTa);
-            vaultSupplyTa = (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault);
-            supplyVaultAuthority = (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority);
+            vaultSupplyTa = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault);
+            supplyVaultAuthority = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority);
         }
         let positionDebtTa = undefined;
         let vaultDebtTa = undefined;
@@ -222,14 +224,14 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             positionDebtTa = (0, umi_1.publicKey)(args.__kind === "Borrow" || this.selfManaged
                 ? this.signerDebtTa
                 : this.positionDebtTa);
-            vaultDebtTa = (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault);
-            debtVaultAuthority = (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority);
+            vaultDebtTa = (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault);
+            debtVaultAuthority = (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority);
         }
         let supplyPriceOracle = undefined;
         let debtPriceOracle = undefined;
         if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
-            supplyPriceOracle = (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle);
-            debtPriceOracle = (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.priceOracle);
+            supplyPriceOracle = (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle);
+            debtPriceOracle = (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle);
         }
         return (0, generated_1.marginfiProtocolInteraction)(this.umi, {
             signer: this.signer,
@@ -237,12 +239,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
-            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             supplyPriceOracle,
             positionSupplyTa,
             vaultSupplyTa,
             supplyVaultAuthority,
-            debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             debtPriceOracle,
             positionDebtTa,
             vaultDebtTa,
@@ -259,40 +261,41 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         const needDebtAccounts = (!inputIsSupply && rebalanceStep === "A") ||
             (!outputIsSupply && rebalanceStep === "B") ||
             (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
+        console.log(rebalanceStep, needDebtAccounts);
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),
             ixsSysvar: (0, umi_1.publicKey)(web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY),
             solautoFeesSupplyTa: rebalanceStep === "B" ? (0, umi_1.publicKey)(this.solautoFeesSupplyTa) : undefined,
             authorityReferralState: (0, umi_1.publicKey)(this.authorityReferralState),
-            referredBySupplyTa: rebalanceStep === "B" && this.referredBySupplyTa
+            referredBySupplyTa: this.referredBySupplyTa
                 ? (0, umi_1.publicKey)(this.referredBySupplyTa)
                 : undefined,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
             marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
             intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), swapDetails.inputMint)),
-            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
-            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle),
+            supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
+            supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.priceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             signerSupplyTa: this.selfManaged
                 ? (0, umi_1.publicKey)(this.signerSupplyTa)
                 : undefined,
             vaultSupplyTa: needSupplyAccounts
-                ? (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault)
+                ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
                 : undefined,
             supplyVaultAuthority: needSupplyAccounts
-                ? (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority)
+                ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority)
                 : undefined,
-            debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
-            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.priceOracle),
+            debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
+            debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtAccounts.priceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
             vaultDebtTa: needDebtAccounts
-                ? (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault)
+                ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)
                 : undefined,
             debtVaultAuthority: needDebtAccounts
-                ? (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority)
+                ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority)
                 : undefined,
             rebalanceType,
             targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
@@ -301,8 +304,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     }
     flashBorrow(flashLoanDetails, destinationTokenAccount) {
         const bank = flashLoanDetails.mint.equals(this.supplyMint)
-            ? this.marginfiSupplyBankAccounts
-            : this.marginfiDebtBankAccounts;
+            ? this.marginfiSupplyAccounts
+            : this.marginfiDebtAccounts;
         return (0, umi_1.transactionBuilder)()
             .add((0, marginfi_sdk_1.lendingAccountStartFlashloan)(this.umi, {
             endIndex: 0,
@@ -323,8 +326,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     }
     flashRepay(flashLoanDetails) {
         const bank = flashLoanDetails.mint.equals(this.supplyMint)
-            ? this.marginfiSupplyBankAccounts
-            : this.marginfiDebtBankAccounts;
+            ? this.marginfiSupplyAccounts
+            : this.marginfiDebtAccounts;
         const remainingAccounts = [];
         let includedFlashLoanToken = false;
         if (this.intermediaryMarginfiAccount) {
@@ -340,7 +343,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                             isWritable: false,
                         },
                         {
-                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiBankAccounts)({ bank: x.bankPk.toString() })
+                            pubkey: (0, umi_1.publicKey)((0, marginfiUtils_1.findMarginfiAccounts)({ bank: x.bankPk.toString() })
                                 .priceOracle),
                             isSigner: false,
                             isWritable: false,

package/dist/constants/marginfiAccounts.d.ts

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

package/dist/generated/instructions/marginfiRebalance.js

@@ -114,7 +114,7 @@ function marginfiRebalance(context, input) {
         },
         supplyVaultAuthority: {
             index: 17,
-            isWritable: false,
+            isWritable: true,
             value: input.supplyVaultAuthority ?? null,
         },
         debtBank: {
@@ -144,7 +144,7 @@ function marginfiRebalance(context, input) {
         },
         debtVaultAuthority: {
             index: 23,
-            isWritable: false,
+            isWritable: true,
             value: input.debtVaultAuthority ?? null,
         },
     };

package/dist/types/accounts.d.ts

@@ -1,4 +1,4 @@
-export interface MarginfiTokenAccounts {
+export interface MarginfiAssetAccounts {
     mint: string;
     bank: string;
     liquidityVault: string;

package/dist/types/solauto.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform } from "../generated";
 export interface SolautoPositionDetails {
-    publicKey: PublicKey;
+    publicKey?: PublicKey;
     authority: PublicKey;
     positionId: number;
     lendingPlatform: LendingPlatform;

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

@@ -1 +1 @@
-{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB"}
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;CACtB"}

package/dist/utils/marginfiUtils.d.ts

@@ -1,13 +1,13 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { Bank } from "../marginfi-sdk";
-import { MarginfiTokenAccounts } from "../types/accounts";
+import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState } from "../generated";
 import { LivePositionUpdates } from "./solauto/generalUtils";
-export declare function findMarginfiBankAccounts({ mint, bank, }: {
+export declare function findMarginfiAccounts({ mint, bank, }: {
     mint?: string;
     bank?: string;
-}): MarginfiTokenAccounts;
+}): MarginfiAssetAccounts;
 export declare function getMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank | null, supplyPrice?: number): Promise<[number, number]>;
 export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
     marginfiAccount: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,wBAAwB,CAAC,EACvC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,GAAG,IAAI,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CA6CA;AA0DD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,oBAAoB,CAAC,EACnC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,GAAG,IAAI,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CA6CA;AA0DD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUpToDateShareValues = exports.getMarginfiAccountPositionState = exports.getAllMarginfiAccountsByAuthority = exports.getMaxLtvAndLiqThreshold = exports.findMarginfiBankAccounts = void 0;
+exports.getUpToDateShareValues = exports.getMarginfiAccountPositionState = exports.getAllMarginfiAccountsByAuthority = exports.getMaxLtvAndLiqThreshold = exports.findMarginfiAccounts = void 0;
 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");
@@ -11,7 +11,7 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("./solanaUtils");
-function findMarginfiBankAccounts({ mint, bank, }) {
+function findMarginfiAccounts({ mint, bank, }) {
     for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
         const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[key];
         if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
@@ -23,7 +23,7 @@ function findMarginfiBankAccounts({ mint, bank, }) {
     }
     throw new Error(`Marginfi accounts not found by the mint: ${mint}`);
 }
-exports.findMarginfiBankAccounts = findMarginfiBankAccounts;
+exports.findMarginfiAccounts = findMarginfiAccounts;
 async function getMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice) {
     if (!supplyPrice) {
         const [price] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint)]);
@@ -125,10 +125,10 @@ async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
 async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMint, debtMint, livePositionUpdates) {
     let marginfiAccount = await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(marginfiAccountPk));
     let supplyBank = supplyMint && supplyMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiBankAccounts({ mint: supplyMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: supplyMint.toString() }).bank))
         : null;
     let debtBank = debtMint && debtMint !== web3_js_1.PublicKey.default
-        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiBankAccounts({ mint: debtMint.toString() }).bank))
+        ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)(findMarginfiAccounts({ mint: debtMint.toString() }).bank))
         : null;
     let supplyUsage = undefined;
     let debtUsage = undefined;

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -13,7 +13,7 @@ import {
 } from "@metaplex-foundation/umi";
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from "@solana/web3.js";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
-import { MarginfiTokenAccounts } from "../types/accounts";
+import { MarginfiAssetAccounts } from "../types/accounts";
 import {
   DEFAULT_MARGINFI_GROUP,
   MARGINFI_ACCOUNTS_LOOKUP_TABLE,
@@ -48,7 +48,7 @@ import {
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
 import {
-  findMarginfiBankAccounts,
+  findMarginfiAccounts,
   getAllMarginfiAccountsByAuthority,
   getMarginfiAccountPositionState,
 } from "../utils/marginfiUtils";
@@ -70,8 +70,8 @@ export class SolautoMarginfiClient extends SolautoClient {
   public marginfiAccountPk!: PublicKey;
   public marginfiGroup!: PublicKey;
 
-  public marginfiSupplyBankAccounts!: MarginfiTokenAccounts;
-  public marginfiDebtBankAccounts!: MarginfiTokenAccounts;
+  public marginfiSupplyAccounts!: MarginfiAssetAccounts;
+  public marginfiDebtAccounts!: MarginfiAssetAccounts;
 
   // For flash loans
   public intermediaryMarginfiAccountSigner?: Signer;
@@ -107,10 +107,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       ? toWeb3JsPublicKey(marginfiAccountData.group)
       : args.marginfiGroup ?? new PublicKey(DEFAULT_MARGINFI_GROUP);
 
-    this.marginfiSupplyBankAccounts = findMarginfiBankAccounts({
+    this.marginfiSupplyAccounts = findMarginfiAccounts({
       mint: this.supplyMint.toString(),
     })!;
-    this.marginfiDebtBankAccounts = findMarginfiBankAccounts({
+    this.marginfiDebtAccounts = findMarginfiAccounts({
       mint: this.debtMint.toString(),
     })!;
 
@@ -127,7 +127,11 @@ export class SolautoMarginfiClient extends SolautoClient {
         toWeb3JsPublicKey(this.signer.publicKey),
         false
       )
-    ).filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk));
+    )
+      .filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk))
+      .sort((a, b) =>
+        a.marginfiAccount.toString().localeCompare(b.marginfiAccount.toString())
+      );
     const emptyMarginfiAccounts =
       existingMarginfiAccounts.length > 0
         ? (
@@ -216,10 +220,10 @@ export class SolautoMarginfiClient extends SolautoClient {
           ? (this.marginfiAccount as Signer)
           : publicKey(this.marginfiAccount),
       supplyMint: publicKey(this.supplyMint),
-      supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
+      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       debtMint: publicKey(this.debtMint),
-      debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
+      debtBank: publicKey(this.marginfiDebtAccounts.bank),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: signerDebtTa,
       positionData: {
@@ -239,10 +243,10 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccount),
-      supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
-      debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtBankAccounts.priceOracle),
+      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
+      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
+      debtBank: publicKey(this.marginfiDebtAccounts.bank),
+      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
       solautoPosition: publicKey(this.solautoPosition),
     });
   }
@@ -266,9 +270,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           signerTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiSupplyBankAccounts.bank),
+          bank: publicKey(this.marginfiSupplyAccounts.bank),
           bankLiquidityVault: publicKey(
-            this.marginfiSupplyBankAccounts.liquidityVault
+            this.marginfiSupplyAccounts.liquidityVault
           ),
         });
       }
@@ -279,12 +283,12 @@ export class SolautoMarginfiClient extends SolautoClient {
           destinationTokenAccount: publicKey(this.signerDebtTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiDebtBankAccounts.bank),
+          bank: publicKey(this.marginfiDebtAccounts.bank),
           bankLiquidityVault: publicKey(
-            this.marginfiDebtBankAccounts.liquidityVault
+            this.marginfiDebtAccounts.liquidityVault
           ),
           bankLiquidityVaultAuthority: publicKey(
-            this.marginfiDebtBankAccounts.vaultAuthority
+            this.marginfiDebtAccounts.vaultAuthority
           ),
         });
       }
@@ -297,9 +301,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           signerTokenAccount: publicKey(this.signerDebtTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiDebtBankAccounts.bank),
+          bank: publicKey(this.marginfiDebtAccounts.bank),
           bankLiquidityVault: publicKey(
-            this.marginfiDebtBankAccounts.liquidityVault
+            this.marginfiDebtAccounts.liquidityVault
           ),
         });
       }
@@ -312,12 +316,12 @@ export class SolautoMarginfiClient extends SolautoClient {
           destinationTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
-          bank: publicKey(this.marginfiSupplyBankAccounts.bank),
+          bank: publicKey(this.marginfiSupplyAccounts.bank),
           bankLiquidityVault: publicKey(
-            this.marginfiSupplyBankAccounts.liquidityVault
+            this.marginfiSupplyAccounts.liquidityVault
           ),
           bankLiquidityVaultAuthority: publicKey(
-            this.marginfiSupplyBankAccounts.vaultAuthority
+            this.marginfiSupplyAccounts.vaultAuthority
           ),
         });
       }
@@ -336,9 +340,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           ? this.signerSupplyTa
           : this.positionSupplyTa
       );
-      vaultSupplyTa = publicKey(this.marginfiSupplyBankAccounts.liquidityVault);
+      vaultSupplyTa = publicKey(this.marginfiSupplyAccounts.liquidityVault);
       supplyVaultAuthority = publicKey(
-        this.marginfiSupplyBankAccounts.vaultAuthority
+        this.marginfiSupplyAccounts.vaultAuthority
       );
     }
 
@@ -351,9 +355,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           ? this.signerDebtTa
           : this.positionDebtTa
       );
-      vaultDebtTa = publicKey(this.marginfiDebtBankAccounts.liquidityVault);
+      vaultDebtTa = publicKey(this.marginfiDebtAccounts.liquidityVault);
       debtVaultAuthority = publicKey(
-        this.marginfiDebtBankAccounts.vaultAuthority
+        this.marginfiDebtAccounts.vaultAuthority
       );
     }
 
@@ -361,9 +365,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     let debtPriceOracle: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Withdraw" || args.__kind === "Borrow") {
       supplyPriceOracle = publicKey(
-        this.marginfiSupplyBankAccounts.priceOracle
+        this.marginfiSupplyAccounts.priceOracle
       );
-      debtPriceOracle = publicKey(this.marginfiDebtBankAccounts.priceOracle);
+      debtPriceOracle = publicKey(this.marginfiDebtAccounts.priceOracle);
     }
 
     return marginfiProtocolInteraction(this.umi, {
@@ -372,12 +376,12 @@ export class SolautoMarginfiClient extends SolautoClient {
       solautoPosition: publicKey(this.solautoPosition),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
-      supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
+      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
       supplyPriceOracle,
       positionSupplyTa,
       vaultSupplyTa,
       supplyVaultAuthority,
-      debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
+      debtBank: publicKey(this.marginfiDebtAccounts.bank),
       debtPriceOracle,
       positionDebtTa,
       vaultDebtTa,
@@ -392,7 +396,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     rebalanceType: SolautoRebalanceTypeArgs,
     flashLoan?: FlashLoanDetails,
     targetLiqUtilizationRateBps?: number,
-    limitGapBps?: number,
+    limitGapBps?: number
   ): TransactionBuilder {
     const inputIsSupply = swapDetails.inputMint.equals(this.supplyMint);
     const outputIsSupply = swapDetails.outputMint.equals(this.supplyMint);
@@ -405,6 +409,7 @@ export class SolautoMarginfiClient extends SolautoClient {
       (!outputIsSupply && rebalanceStep === "B") ||
       (!inputIsSupply && flashLoan !== undefined && rebalanceStep == "B");
 
+    console.log(rebalanceStep, needDebtAccounts);
     return marginfiRebalance(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
@@ -412,10 +417,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       solautoFeesSupplyTa:
         rebalanceStep === "B" ? publicKey(this.solautoFeesSupplyTa) : undefined,
       authorityReferralState: publicKey(this.authorityReferralState),
-      referredBySupplyTa:
-        rebalanceStep === "B" && this.referredBySupplyTa
-          ? publicKey(this.referredBySupplyTa)
-          : undefined,
+      referredBySupplyTa: this.referredBySupplyTa
+        ? publicKey(this.referredBySupplyTa)
+        : undefined,
       solautoPosition: publicKey(this.solautoPosition),
       marginfiGroup: publicKey(this.marginfiGroup),
       marginfiAccount: publicKey(this.marginfiAccountPk),
@@ -425,27 +429,27 @@ export class SolautoMarginfiClient extends SolautoClient {
           swapDetails.inputMint
         )
       ),
-      supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
-      supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
+      supplyBank: publicKey(this.marginfiSupplyAccounts.bank),
+      supplyPriceOracle: publicKey(this.marginfiSupplyAccounts.priceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       signerSupplyTa: this.selfManaged
         ? publicKey(this.signerSupplyTa)
         : undefined,
       vaultSupplyTa: needSupplyAccounts
-        ? publicKey(this.marginfiSupplyBankAccounts.liquidityVault)
+        ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
         : undefined,
       supplyVaultAuthority: needSupplyAccounts
-        ? publicKey(this.marginfiSupplyBankAccounts.vaultAuthority)
+        ? publicKey(this.marginfiSupplyAccounts.vaultAuthority)
         : undefined,
-      debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
-      debtPriceOracle: publicKey(this.marginfiDebtBankAccounts.priceOracle),
+      debtBank: publicKey(this.marginfiDebtAccounts.bank),
+      debtPriceOracle: publicKey(this.marginfiDebtAccounts.priceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
       vaultDebtTa: needDebtAccounts
-        ? publicKey(this.marginfiDebtBankAccounts.liquidityVault)
+        ? publicKey(this.marginfiDebtAccounts.liquidityVault)
         : undefined,
       debtVaultAuthority: needDebtAccounts
-        ? publicKey(this.marginfiDebtBankAccounts.vaultAuthority)
+        ? publicKey(this.marginfiDebtAccounts.vaultAuthority)
         : undefined,
       rebalanceType,
       targetLiqUtilizationRateBps: targetLiqUtilizationRateBps ?? null,
@@ -458,8 +462,8 @@ export class SolautoMarginfiClient extends SolautoClient {
     destinationTokenAccount: PublicKey
   ): TransactionBuilder {
     const bank = flashLoanDetails.mint.equals(this.supplyMint)
-      ? this.marginfiSupplyBankAccounts
-      : this.marginfiDebtBankAccounts;
+      ? this.marginfiSupplyAccounts
+      : this.marginfiDebtAccounts;
     return transactionBuilder()
       .add(
         lendingAccountStartFlashloan(this.umi, {
@@ -485,8 +489,8 @@ export class SolautoMarginfiClient extends SolautoClient {
 
   flashRepay(flashLoanDetails: FlashLoanDetails): TransactionBuilder {
     const bank = flashLoanDetails.mint.equals(this.supplyMint)
-      ? this.marginfiSupplyBankAccounts
-      : this.marginfiDebtBankAccounts;
+      ? this.marginfiSupplyAccounts
+      : this.marginfiDebtAccounts;
 
     const remainingAccounts: AccountMeta[] = [];
     let includedFlashLoanToken = false;
@@ -507,7 +511,7 @@ export class SolautoMarginfiClient extends SolautoClient {
               },
               {
                 pubkey: publicKey(
-                  findMarginfiBankAccounts({ bank: x.bankPk.toString() })
+                  findMarginfiAccounts({ bank: x.bankPk.toString() })
                     .priceOracle
                 ),
                 isSigner: false,

package/src/constants/marginfiAccounts.ts

@@ -1,10 +1,10 @@
 import { NATIVE_MINT } from "@solana/spl-token";
 import { USDC_MINT } from "./tokenConstants";
-import { MarginfiTokenAccounts } from "../types/accounts";
+import { MarginfiAssetAccounts } from "../types/accounts";
 
 export const DEFAULT_MARGINFI_GROUP = "4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8";
 
-export const MARGINFI_ACCOUNTS: { [key: string]: MarginfiTokenAccounts } = {
+export const MARGINFI_ACCOUNTS: { [key: string]: MarginfiAssetAccounts } = {
   SOL: {
     mint: NATIVE_MINT.toString(),
     bank: "CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh",

package/src/generated/instructions/marginfiRebalance.ts

@@ -206,7 +206,7 @@ export function marginfiRebalance(
     },
     supplyVaultAuthority: {
       index: 17,
-      isWritable: false as boolean,
+      isWritable: true as boolean,
       value: input.supplyVaultAuthority ?? null,
     },
     debtBank: {
@@ -236,7 +236,7 @@ export function marginfiRebalance(
     },
     debtVaultAuthority: {
       index: 23,
-      isWritable: false as boolean,
+      isWritable: true as boolean,
       value: input.debtVaultAuthority ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;

package/src/types/accounts.ts

@@ -1,4 +1,4 @@
-export interface MarginfiTokenAccounts {
+export interface MarginfiAssetAccounts {
   mint: string;
   bank: string;
   liquidityVault: string;

package/src/types/solauto.ts

@@ -2,7 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { LendingPlatform } from "../generated";
 
 export interface SolautoPositionDetails {
-  publicKey: PublicKey;
+  publicKey?: PublicKey;
   authority: PublicKey;
   positionId: number;
   lendingPlatform: LendingPlatform;

package/src/utils/marginfiUtils.ts

@@ -17,19 +17,19 @@ import {
 } from "./numberUtils";
 import { PRICES } from "../constants/solautoConstants";
 import { MARGINFI_ACCOUNTS } from "../constants/marginfiAccounts";
-import { MarginfiTokenAccounts } from "../types/accounts";
+import { MarginfiAssetAccounts } from "../types/accounts";
 import { PositionState, PositionTokenUsage } from "../generated";
 import { USD_DECIMALS } from "../constants/generalAccounts";
 import { LivePositionUpdates } from "./solauto/generalUtils";
 import { currentUnixSecondsSolana } from "./solanaUtils";
 
-export function findMarginfiBankAccounts({
+export function findMarginfiAccounts({
   mint,
   bank,
 }: {
   mint?: string;
   bank?: string;
-}): MarginfiTokenAccounts {
+}): MarginfiAssetAccounts {
   for (const key in MARGINFI_ACCOUNTS) {
     const account = MARGINFI_ACCOUNTS[key];
     if (mint && account.mint.toString().toLowerCase() === mint.toLowerCase()) {
@@ -212,7 +212,7 @@ export async function getMarginfiAccountPositionState(
       ? await safeFetchBank(
           umi,
           publicKey(
-            findMarginfiBankAccounts({ mint: supplyMint.toString() }).bank
+            findMarginfiAccounts({ mint: supplyMint.toString() }).bank
           )
         )
       : null;
@@ -221,7 +221,7 @@ export async function getMarginfiAccountPositionState(
       ? await safeFetchBank(
           umi,
           publicKey(
-            findMarginfiBankAccounts({ mint: debtMint.toString() }).bank
+            findMarginfiAccounts({ mint: debtMint.toString() }).bank
           )
         )
       : null;

package/tests/transactions/solautoMarginfi.ts

@@ -115,7 +115,7 @@ describe("Solauto Marginfi tests", async () => {
     transactionItems.push(
       new TransactionItem(
         async (attemptNum) =>
-          await buildSolautoRebalanceTransaction(client, 5000, attemptNum),
+          await buildSolautoRebalanceTransaction(client, 5500, attemptNum),
         "rebalance"
       )
     );