@haven-fi/solauto-sdk 1.0.762 → 1.0.764

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

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

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -198,7 +198,7 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             .add((0, marginfi_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             signer: this.signer,
-        }).addRemainingAccounts(remainingAccounts));
+        }).addRemainingAccounts((0, utils_1.composeRemainingAccounts)(remainingAccounts)));
     }
     closeBalance(marginfiAccount, bank, marginfiGroup) {
         return (0, umi_1.transactionBuilder)().add((0, marginfi_1.lendingAccountCloseBalance)(this.umi, {

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAY3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAsE5B,mBAAmB;IA4CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAuEhC,aAAa;;;;;;CAWpB"}
+{"version":3,"file":"rebalanceSwapManager.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceSwapManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAkB,UAAU,EAAa,MAAM,SAAS,CAAC;AAChE,OAAO,EAA0B,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAiC,MAAM,iBAAiB,CAAC;AAY3E,qBAAa,oBAAoB;IAS7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IACpC,OAAO,CAAC,SAAS,CAAC;IAZb,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,aAAa,CAAU;gBAGrB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA,EACpC,SAAS,CAAC,EAAE,SAAS,YAAA;IAU/B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,WAAW;IAsCnB,OAAO,CAAC,kCAAkC;YAwD5B,mBAAmB;IA4CjC,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAuEhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -74,19 +74,6 @@ class RebalanceSwapManager {
             flashLoan: this.flRequirements?.flFeeBps ?? 0,
             lpBorrow: this.client.pos.state.debt.borrowFeeBps,
         });
-        // if (isMarginfiPosition(this.client.pos)) {
-        //   console.log(res.newPos.supplyUsd, res.newPos.debtUsd);
-        //   console.log(
-        //     res.newPos.supplyUsd *
-        //       bytesToI80F48(
-        //         this.client.pos.supplyBank!.config.assetWeightInit.value
-        //       ),
-        //     res.newPos.debtUsd *
-        //       bytesToI80F48(
-        //         this.client.pos.debtBank!.config.liabilityWeightInit.value
-        //       )
-        //   );
-        // }
         return (0, utils_1.getLiqUtilzationRateBps)(res.newPos.supplyUsd, res.newPos.debtUsd, this.client.pos.state.liqThresholdBps ?? 0);
     }
     async findSufficientQuote(swapInput, criteria) {

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -18,7 +18,7 @@ class RebalanceTxBuilder {
         this.priceType = generated_1.PriceType.Realtime;
     }
     shouldProceedWithRebalance() {
-        if (this.client.pos.selfManaged && !this.targetLiqUtilizationRateBps) {
+        if (this.client.pos.selfManaged && this.targetLiqUtilizationRateBps === undefined) {
             throw new Error("A target rate must be provided for self managed position rebalances");
         }
         return (this.client.pos.supplyUsd() > 0 &&

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;;;;;CAqCzD"}
+{"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;;;;;CAyCzD"}

package/dist/services/rebalance/solautoFees.js

@@ -20,7 +20,12 @@ class SolautoFeesBps {
         const k = 1.5;
         let feeBps = 0;
         if (this.targetLiqUtilizationRateBps !== undefined) {
-            feeBps = 10;
+            if (this.targetLiqUtilizationRateBps === 0) {
+                feeBps = 15;
+            }
+            else {
+                feeBps = 10;
+            }
         }
         else if (rebalanceDirection === generated_1.RebalanceDirection.Repay) {
             feeBps = 25;

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

@@ -9,7 +9,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     mfiAccounts: MarginfiProgramAccounts;
     marginfiAccount: PublicKey | Signer;
     marginfiAccountPk: PublicKey;
-    healthCheckRemainingAccounts?: AccountMeta[];
+    healthCheckRemainingAccounts: AccountMeta[];
     marginfiGroup: PublicKey;
     marginfiSupplyAccounts: MarginfiAssetAccounts;
     marginfiDebtAccounts: MarginfiAssetAccounts;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAmBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA6ExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAepD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAkFrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAIlB,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAoBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,4BAA4B,EAAG,WAAW,EAAE,CAAC;IAC7C,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IA8ExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB;IAepD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAiGrC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CA4EtB"}

package/dist/services/solauto/solautoMarginfiClient.js

@@ -21,6 +21,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         await super.initialize(args);
         this.mfiAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv);
         this.marginfiGroup = this.pos.lpPoolAccount;
+        this.healthCheckRemainingAccounts = [];
         if (this.pos.selfManaged) {
             this.marginfiAccount =
                 args.lpUserAccount ??
@@ -155,6 +156,14 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     marginfiProtocolInteractionIx(args) {
         switch (args.__kind) {
             case "Deposit": {
+                if (!this.healthCheckRemainingAccounts
+                    .map((x) => x.pubkey.toString())
+                    .includes(this.marginfiSupplyAccounts.bank)) {
+                    this.healthCheckRemainingAccounts.push(...[
+                        (0, utils_1.getAccountMeta)(new web3_js_1.PublicKey(this.marginfiSupplyAccounts.bank)),
+                        (0, utils_1.getAccountMeta)(this.supplyPriceOracle),
+                    ]);
+                }
                 return (0, marginfi_1.lendingAccountDeposit)(this.umi, {
                     signer: this.signer,
                     signerTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
@@ -167,7 +176,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 });
             }
             case "Borrow": {
-                const remainingAccounts = this.healthCheckRemainingAccounts ?? [];
+                const remainingAccounts = this.healthCheckRemainingAccounts;
                 if (!remainingAccounts.find((x) => x.pubkey.toString() === this.marginfiDebtAccounts.bank.toString())) {
                     remainingAccounts.push(...[
                         (0, utils_1.getAccountMeta)(new web3_js_1.PublicKey(this.marginfiDebtAccounts.bank)),
@@ -183,7 +192,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     bank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
                     bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault),
                     bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtAccounts.vaultAuthority),
-                }).addRemainingAccounts(remainingAccounts);
+                }).addRemainingAccounts((0, utils_1.composeRemainingAccounts)(remainingAccounts));
             }
             case "Repay": {
                 return (0, marginfi_1.lendingAccountRepay)(this.umi, {
@@ -208,7 +217,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     bank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
                     bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault),
                     bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.vaultAuthority),
-                }).addRemainingAccounts(this.healthCheckRemainingAccounts ?? []);
+                }).addRemainingAccounts((0, utils_1.composeRemainingAccounts)(this.healthCheckRemainingAccounts));
             }
         }
     }

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -79,7 +79,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     get supplyUsdWithdrawable() {
         const deposits = (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityUsedBaseUnit)(this.supplyBank, true), this.supplyMintInfo.decimals);
         const borrows = (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityUsedBaseUnit)(this.supplyBank, false), this.supplyMintInfo.decimals);
-        return Math.min((deposits - borrows), this.totalSupply) * this.supplyPrice();
+        return Math.min(deposits - borrows, this.totalSupply) * this.supplyPrice();
     }
     async refreshPositionState(priceType) {
         if (!this.canRefreshPositionState()) {

package/dist/utils/jitoUtils.js

@@ -188,7 +188,7 @@ async function sendJitoBundledTransactions(umi, connection, userSigner, otherSig
     (0, generalUtils_1.consoleLog)("Transactions: ", txs.length);
     (0, generalUtils_1.consoleLog)(txs.map((tx) => tx.getInstructions().map((x) => x.programId.toString())));
     (0, generalUtils_1.consoleLog)("Transaction sizes: ", txs.map((x) => x.getTransactionSize(umi)));
-    txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150000));
+    txs[0] = txs[0].prepend(getTipInstruction(userSigner, 250000));
     const latestBlockhash = (await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })).blockhash;
     if (abortController?.signal.aborted) {
         return;

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

@@ -23,5 +23,6 @@ export declare function findMarginfiAccounts(bank: PublicKey): AllMarginfiAssetA
 export declare function getRemainingAccountsForMarginfiHealthCheck(umi: Umi, balance: Balance): Promise<AccountMeta[]>;
 export declare function calcMarginfiMaxLtvAndLiqThresholdBps(supplyBank: Bank, debtBank: Bank, supplyPrice: number): [number, number];
 export declare function marginfiAccountEmpty(marginfiAccount: MarginfiAccount): boolean;
+export declare function composeRemainingAccounts(accs: AccountMeta[]): AccountMeta[];
 export {};
 //# sourceMappingURL=general.d.ts.map

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,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"}
+{"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;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAW3E"}

package/dist/utils/marginfi/general.js

@@ -9,6 +9,7 @@ exports.findMarginfiAccounts = findMarginfiAccounts;
 exports.getRemainingAccountsForMarginfiHealthCheck = getRemainingAccountsForMarginfiHealthCheck;
 exports.calcMarginfiMaxLtvAndLiqThresholdBps = calcMarginfiMaxLtvAndLiqThresholdBps;
 exports.marginfiAccountEmpty = marginfiAccountEmpty;
+exports.composeRemainingAccounts = composeRemainingAccounts;
 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");
@@ -144,3 +145,9 @@ function marginfiAccountEmpty(marginfiAccount) {
         ((0, numberUtils_1.bytesToI80F48)(x.assetShares.value) > 0.000001 ||
             (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0.000001)) === undefined);
 }
+function composeRemainingAccounts(accs) {
+    const banksAndOracles = accs.reduce((acc, _, i) => i % 2 === 0 ? [...acc, [accs[i], accs[i + 1]]] : acc, []);
+    return banksAndOracles
+        .sort((a, b) => b[0].pubkey.toString().localeCompare(a[0].pubkey.toString()))
+        .flat();
+}

package/local/txSandbox.ts

@@ -2,18 +2,14 @@ import { Keypair, PublicKey } from "@solana/web3.js";
 import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
-  bytesToI80F48,
   ClientTransactionsManager,
   consoleLog,
-  fetchBank,
-  fetchMarginfiAccount,
   getBatches,
   getClient,
   getPositionExBulk,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
   LendingPlatform,
-  lendingPoolAccrueBankInterest,
   LOCAL_IRONFORGE_API_URL,
   PriceType,
   PriorityFeeSetting,
@@ -25,7 +21,6 @@ import {
   TransactionItem,
 } from "../src";
 import { getSecretKey } from "./shared";
-import { fromBaseUnit } from "../dist";
 
 const payForTransaction = true;
 const testProgram = false;
@@ -53,22 +48,13 @@ export async function main() {
 
   await client.initializeExistingSolautoPosition({
     positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+    authority: new PublicKey("7TfyMCk8WD7FwscRyZJeyw9CRPxcgSKpz9tmhMGvyuRz"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
     // ),
   });
 
-  const transactionItems = [
-    new TransactionItem(async () => ({
-      tx: lendingPoolAccrueBankInterest(umi, {
-        marginfiGroup: publicKey(
-          "DQ2jqDJw9uzTwttf6h6r217BQ7kws3jZbJXDkfbCJa1q"
-        ),
-        bank: publicKey("EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA"),
-      }),
-    })),
-  ];
+  const transactionItems = [rebalance(client)];
 
   const txManager = new ClientTransactionsManager({
     txHandler: client,
@@ -78,34 +64,6 @@ export async function main() {
   });
   const statuses = await txManager.send(transactionItems);
   consoleLog(statuses);
-
-  await new Promise((resolve) => setTimeout(resolve, 5000));
-
-  const mfiAccount = await fetchMarginfiAccount(
-    umi,
-    publicKey("Fun9UD87tLCxqxoTvpGYAy6Uwk2eevFGDk1VvxpXbd5x")
-  );
-  const bank = await fetchBank(
-    umi,
-    publicKey("EXrnNVfLagt3j4hCHSD9WqK75o6dkZBtjpnrSrSC78MA"),
-    { commitment: "confirmed" }
-  );
-
-  console.log(
-    fromBaseUnit(
-      BigInt(
-        Math.round(
-          bytesToI80F48(
-            mfiAccount.lendingAccount.balances[0].assetShares.value
-          ) * bytesToI80F48(bank.assetShareValue.value)
-        )
-      ),
-      6
-    )
-  );
-  // 1:34pm - $4479.61
-  // 2:51pm - $4513.30
-  // 12:58pm - $4529.16
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -23,6 +23,7 @@ import {
 import { FlProviderBase } from "./flProviderBase";
 import {
   bytesToI80F48,
+  composeRemainingAccounts,
   consoleLog,
   fetchTokenPrices,
   findMarginfiAccounts,
@@ -342,7 +343,7 @@ export class MarginfiFlProvider extends FlProviderBase {
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(iMfiAccount.accountPk),
           signer: this.signer,
-        }).addRemainingAccounts(remainingAccounts)
+        }).addRemainingAccounts(composeRemainingAccounts(remainingAccounts))
       );
   }
 

package/src/services/rebalance/rebalanceSwapManager.ts

@@ -134,20 +134,6 @@ export class RebalanceSwapManager {
       }
     );
 
-    // if (isMarginfiPosition(this.client.pos)) {
-    //   console.log(res.newPos.supplyUsd, res.newPos.debtUsd);
-    //   console.log(
-    //     res.newPos.supplyUsd *
-    //       bytesToI80F48(
-    //         this.client.pos.supplyBank!.config.assetWeightInit.value
-    //       ),
-    //     res.newPos.debtUsd *
-    //       bytesToI80F48(
-    //         this.client.pos.debtBank!.config.liabilityWeightInit.value
-    //       )
-    //   );
-    // }
-
     return getLiqUtilzationRateBps(
       res.newPos.supplyUsd,
       res.newPos.debtUsd,

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -53,7 +53,7 @@ export class RebalanceTxBuilder {
   ) {}
 
   private shouldProceedWithRebalance() {
-    if (this.client.pos.selfManaged && !this.targetLiqUtilizationRateBps) {
+    if (this.client.pos.selfManaged && this.targetLiqUtilizationRateBps === undefined) {
       throw new Error(
         "A target rate must be provided for self managed position rebalances"
       );

package/src/services/rebalance/solautoFees.ts

@@ -29,7 +29,11 @@ export class SolautoFeesBps {
 
     let feeBps: number = 0;
     if (this.targetLiqUtilizationRateBps !== undefined) {
-      feeBps = 10;
+      if (this.targetLiqUtilizationRateBps === 0) {
+        feeBps = 15;
+      } else {
+        feeBps = 10;
+      }
     } else if (rebalanceDirection === RebalanceDirection.Repay) {
       feeBps = 25;
     } else if (this.positionNetWorthUsd <= minSize) {

package/src/services/solauto/solautoMarginfiClient.ts

@@ -37,6 +37,7 @@ import {
   hasFirstRebalance,
   getRemainingAccountsForMarginfiHealthCheck,
   getAccountMeta,
+  composeRemainingAccounts,
 } from "../../utils";
 import {
   Bank,
@@ -61,7 +62,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
   public marginfiAccount!: PublicKey | Signer;
   public marginfiAccountPk!: PublicKey;
-  public healthCheckRemainingAccounts?: AccountMeta[];
+  public healthCheckRemainingAccounts!: AccountMeta[];
   public marginfiGroup!: PublicKey;
 
   public marginfiSupplyAccounts!: MarginfiAssetAccounts;
@@ -76,6 +77,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.mfiAccounts = getMarginfiAccounts(this.lpEnv);
 
     this.marginfiGroup = this.pos.lpPoolAccount;
+    this.healthCheckRemainingAccounts = [];
 
     if (this.pos.selfManaged) {
       this.marginfiAccount =
@@ -258,6 +260,18 @@ export class SolautoMarginfiClient extends SolautoClient {
   private marginfiProtocolInteractionIx(args: SolautoActionArgs) {
     switch (args.__kind) {
       case "Deposit": {
+        if (
+          !this.healthCheckRemainingAccounts
+            .map((x) => x.pubkey.toString())
+            .includes(this.marginfiSupplyAccounts.bank)
+        ) {
+          this.healthCheckRemainingAccounts.push(
+            ...[
+              getAccountMeta(new PublicKey(this.marginfiSupplyAccounts.bank)),
+              getAccountMeta(this.supplyPriceOracle),
+            ]
+          );
+        }
         return lendingAccountDeposit(this.umi, {
           signer: this.signer,
           signerTokenAccount: publicKey(this.signerSupplyTa),
@@ -272,7 +286,7 @@ export class SolautoMarginfiClient extends SolautoClient {
         });
       }
       case "Borrow": {
-        const remainingAccounts = this.healthCheckRemainingAccounts ?? [];
+        const remainingAccounts = this.healthCheckRemainingAccounts;
         if (
           !remainingAccounts.find(
             (x) =>
@@ -286,6 +300,7 @@ export class SolautoMarginfiClient extends SolautoClient {
             ]
           );
         }
+
         return lendingAccountBorrow(this.umi, {
           amount: args.fields[0],
           signer: this.signer,
@@ -299,7 +314,7 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVaultAuthority: publicKey(
             this.marginfiDebtAccounts.vaultAuthority
           ),
-        }).addRemainingAccounts(remainingAccounts);
+        }).addRemainingAccounts(composeRemainingAccounts(remainingAccounts));
       }
       case "Repay": {
         return lendingAccountRepay(this.umi, {
@@ -332,7 +347,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           bankLiquidityVaultAuthority: publicKey(
             this.marginfiSupplyAccounts.vaultAuthority
           ),
-        }).addRemainingAccounts(this.healthCheckRemainingAccounts ?? []);
+        }).addRemainingAccounts(
+          composeRemainingAccounts(this.healthCheckRemainingAccounts)
+        );
       }
     }
   }

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -138,7 +138,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
       getBankLiquidityUsedBaseUnit(this.supplyBank, false),
       this.supplyMintInfo.decimals
     );
-    return Math.min((deposits - borrows), this.totalSupply) * this.supplyPrice()!;
+    return Math.min(deposits - borrows, this.totalSupply) * this.supplyPrice()!;
   }
 
   async refreshPositionState(priceType?: PriceType): Promise<void> {

package/src/utils/jitoUtils.ts

@@ -301,7 +301,7 @@ export async function sendJitoBundledTransactions(
     txs.map((x) => x.getTransactionSize(umi))
   );
 
-  txs[0] = txs[0].prepend(getTipInstruction(userSigner, 150_000));
+  txs[0] = txs[0].prepend(getTipInstruction(userSigner, 250_000));
 
   const latestBlockhash = (
     await umi.rpc.getLatestBlockhash({ commitment: "confirmed" })

package/src/utils/marginfi/general.ts

@@ -224,3 +224,16 @@ export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
     ) === undefined
   );
 }
+
+export function composeRemainingAccounts(accs: AccountMeta[]): AccountMeta[] {
+  const banksAndOracles: [AccountMeta, AccountMeta][] = accs.reduce(
+    (acc: [AccountMeta, AccountMeta][], _, i) =>
+      i % 2 === 0 ? [...acc, [accs[i], accs[i + 1]]] : acc,
+    []
+  );
+  return banksAndOracles
+    .sort((a, b) =>
+      b[0].pubkey.toString().localeCompare(a[0].pubkey.toString())
+    )
+    .flat();
+}

package/tests/transactions/shared.ts

@@ -22,6 +22,7 @@ import {
   closeSolautoPosition,
   getMarginfiAccounts,
   ClientTransactionsManager,
+  ProgramEnv,
 } from "../../src";
 
 export async function e2eTransactionTest(
@@ -29,13 +30,15 @@ export async function e2eTransactionTest(
   testProgram: boolean,
   lendingPlatform: LendingPlatform,
   withFlashLoan: boolean,
-  showLogs?: boolean
+  showLogs?: boolean,
+  lpEnv?: ProgramEnv
 ) {
   const client = getClient(lendingPlatform, {
     signer,
     showLogs,
     rpcUrl: LOCAL_IRONFORGE_API_URL,
     programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+    lpEnv,
   });
 
   const supplyMint = new PublicKey(NATIVE_MINT);
@@ -43,7 +46,7 @@ export async function e2eTransactionTest(
 
   await client.initializeNewSolautoPosition({
     positionId: 1,
-    lpPoolAccount: getMarginfiAccounts().defaultGroup,
+    lpPoolAccount: getMarginfiAccounts(lpEnv).defaultGroup,
     supplyMint,
     debtMint,
   });

package/tests/transactions/solautoMarginfi.ts

@@ -1,11 +1,13 @@
 import { describe, it } from "mocha";
-import { LendingPlatform } from "../../src";
+import { LendingPlatform, ProgramEnv } from "../../src";
 import { setupTest } from "../shared";
 import { e2eTransactionTest } from "./shared";
 
 describe("Solauto Marginfi tests", async () => {
   const signer = setupTest();
   const testProgram = false;
+  const showLogs = false;
+  const lpEnv: ProgramEnv = "Prod";
 
   it("open - deposit - borrow - rebalance to 0 - withdraw - close", async () => {
     await e2eTransactionTest(
@@ -13,7 +15,8 @@ describe("Solauto Marginfi tests", async () => {
       testProgram,
       LendingPlatform.Marginfi,
       false,
-      false
+      showLogs,
+      lpEnv
     );
   });
 
@@ -23,7 +26,8 @@ describe("Solauto Marginfi tests", async () => {
       testProgram,
       LendingPlatform.Marginfi,
       true,
-      false
+      showLogs,
+      lpEnv
     );
   });
 });