@haven-fi/solauto-sdk 1.0.616 → 1.0.617

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,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA0G3D,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,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA0CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAyG3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -212,13 +212,9 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
                 },
             ]);
         }
-        // TODO: add back closing balances?
-        // const closeBalances = remainingAccounts
-        //   .filter(
-        //     (x, index) =>
-        //       index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString()
-        //   )
-        //   .map((x) => toWeb3JsPublicKey(x.pubkey));
+        const closeBalances = remainingAccounts
+            .filter((x, index) => index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString())
+            .map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.pubkey));
         return (0, umi_1.transactionBuilder)()
             .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
             amount: flashLoan.baseUnitAmount,
@@ -230,13 +226,9 @@ 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(
-            //   closeBalances.length
-            //     ? closeBalances.map((bank) =>
-            //         this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
-            //       )
-            //     : []
-            // )
+            .add(closeBalances.length
+            ? closeBalances.map((bank) => this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup))
+            : [])
             .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             signer: this.signer,

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -6,9 +6,7 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     private debtBank;
     lendingPool(): Promise<PublicKey>;
     maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-    supplyLiquidityAvailable(): bigint;
-    supplyLiquidityDepositable(): bigint;
-    debtLiquidityAvailable(): bigint;
+    supplyLiquidityAvailable(): number;
     refreshPositionState(): Promise<void>;
 }
 //# sourceMappingURL=marginfiSolautoPositionEx.d.ts.map

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,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAkBxD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;IAI1B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmBxD,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwB3D,wBAAwB,IAAI,MAAM;IAO5B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAyB5C"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -45,13 +45,7 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         return [maxLtvBps, liqThresholdBps];
     }
     supplyLiquidityAvailable() {
-        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false);
-    }
-    supplyLiquidityDepositable() {
-        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, true);
-    }
-    debtLiquidityAvailable() {
-        return (0, utils_1.getBankLiquidityAvailableBaseUnit)(this.debtBank, false);
+        return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.state().supply.decimals);
     }
     async refreshPositionState() {
         if (!this.canRefreshPositionState()) {

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -53,12 +53,13 @@ export declare abstract class SolautoPositionEx {
     supplyUsd(): number;
     totalDebt(): number;
     debtUsd(): number;
+    supplyLiquidityDepositable(): number;
     supplyLiquidityUsdDepositable(): number;
+    supplyLiquidityUsdAvailable(): number;
+    debtLiquidityAvailable(): number;
     debtLiquidityUsdAvailable(): number;
     abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-    abstract supplyLiquidityDepositable(): bigint;
-    abstract supplyLiquidityAvailable(): bigint;
-    abstract debtLiquidityAvailable(): bigint;
+    abstract supplyLiquidityAvailable(): number;
     sufficientLiquidityToBoost(): boolean;
     eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
     eligibleForRefresh(): boolean;

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

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

package/dist/solautoPosition/solautoPositionEx.js

@@ -90,9 +90,18 @@ class SolautoPositionEx {
     debtUsd() {
         return (0, utils_1.calcDebtUsd)(this.state());
     }
+    supplyLiquidityDepositable() {
+        return (0, utils_1.supplyLiquidityDepositable)(this.state());
+    }
     supplyLiquidityUsdDepositable() {
         return (0, utils_1.supplyLiquidityUsdDepositable)(this.state());
     }
+    supplyLiquidityUsdAvailable() {
+        return this.supplyLiquidityAvailable() * ((0, utils_1.safeGetPrice)(this.supplyMint()) ?? 0);
+    }
+    debtLiquidityAvailable() {
+        return (0, utils_1.debtLiquidityAvailable)(this.state());
+    }
     debtLiquidityUsdAvailable() {
         return (0, utils_1.debtLiquidityUsdAvailable)(this.state());
     }

package/dist/utils/numberUtils.d.ts

@@ -5,7 +5,9 @@ export declare function calcDebtUsd(state?: PositionState): number;
 export declare function calcNetWorth(state?: PositionState): number;
 export declare function calcTotalSupply(state?: PositionState): number;
 export declare function calcTotalDebt(state?: PositionState): number;
+export declare function debtLiquidityAvailable(state?: PositionState): number;
 export declare function debtLiquidityUsdAvailable(state?: PositionState): number;
+export declare function supplyLiquidityDepositable(state?: PositionState): number;
 export declare function supplyLiquidityUsdDepositable(state?: PositionState): number;
 export declare function fromRoundedUsdValue(number: bigint): number;
 export declare function toRoundedUsdValue(number: number): bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAC9C,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,WAAqB,GACjC,MAAM,CAOR;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}
+{"version":3,"file":"numberUtils.d.ts","sourceRoot":"","sources":["../../src/utils/numberUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlD;AAED,wBAAgB,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa,UAIhD;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,UAKjD;AAED,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,aAAa,UAKpD;AAED,wBAAgB,aAAa,CAAC,KAAK,CAAC,EAAE,aAAa,UAKlD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,CAAC,EAAE,aAAa,UAK3D;AAED,wBAAgB,yBAAyB,CAAC,KAAK,CAAC,EAAE,aAAa,UAI9D;AAED,wBAAgB,0BAA0B,CAAC,KAAK,CAAC,EAAE,aAAa,UAK/D;AAED,wBAAgB,6BAA6B,CAAC,KAAK,CAAC,EAAE,aAAa,UAIlE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,UAEjD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAE/C;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,MAAM,GACtB,MAAM,CAMR;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKlE;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,KAAK,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;AAC9C,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,WAAW,GAAE,WAAqB,GACjC,MAAM,CAOR;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAqBrD;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAejE;AAED,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,gBAAgB,EAAE,MAAM,GACvB,MAAM,CAKR;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKzE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,UAKvE"}

package/dist/utils/numberUtils.js

@@ -6,7 +6,9 @@ exports.calcDebtUsd = calcDebtUsd;
 exports.calcNetWorth = calcNetWorth;
 exports.calcTotalSupply = calcTotalSupply;
 exports.calcTotalDebt = calcTotalDebt;
+exports.debtLiquidityAvailable = debtLiquidityAvailable;
 exports.debtLiquidityUsdAvailable = debtLiquidityUsdAvailable;
+exports.supplyLiquidityDepositable = supplyLiquidityDepositable;
 exports.supplyLiquidityUsdDepositable = supplyLiquidityUsdDepositable;
 exports.fromRoundedUsdValue = fromRoundedUsdValue;
 exports.toRoundedUsdValue = toRoundedUsdValue;
@@ -40,9 +42,15 @@ function calcTotalSupply(state) {
 function calcTotalDebt(state) {
     return fromBaseUnit(state?.debt.amountUsed.baseUnit ?? BigInt(0), state?.debt.decimals ?? 1);
 }
+function debtLiquidityAvailable(state) {
+    return fromBaseUnit(state?.debt.amountCanBeUsed.baseUnit ?? BigInt(0), state?.debt.decimals ?? 1);
+}
 function debtLiquidityUsdAvailable(state) {
     return fromRoundedUsdValue(state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
 }
+function supplyLiquidityDepositable(state) {
+    return fromBaseUnit(state?.supply.amountCanBeUsed.baseUnit ?? BigInt(0), state?.supply.decimals ?? 1);
+}
 function supplyLiquidityUsdDepositable(state) {
     return fromRoundedUsdValue(state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0));
 }

package/local/txSandbox.ts

@@ -38,7 +38,7 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 1,
+    positionId: 5,
     authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.616",
+  "version": "1.0.617",
   "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

@@ -340,13 +340,12 @@ export class MarginfiFlProvider extends FlProviderBase {
       );
     }
 
-    // TODO: add back closing balances?
-    // const closeBalances = remainingAccounts
-    //   .filter(
-    //     (x, index) =>
-    //       index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString()
-    //   )
-    //   .map((x) => toWeb3JsPublicKey(x.pubkey));
+    const closeBalances = remainingAccounts
+      .filter(
+        (x, index) =>
+          index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString()
+      )
+      .map((x) => toWeb3JsPublicKey(x.pubkey));
 
     return transactionBuilder()
       .add(
@@ -366,13 +365,13 @@ export class MarginfiFlProvider extends FlProviderBase {
           ),
         })
       )
-      // .add(
-      //   closeBalances.length
-      //     ? closeBalances.map((bank) =>
-      //         this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
-      //       )
-      //     : []
-      // )
+      .add(
+        closeBalances.length
+          ? closeBalances.map((bank) =>
+              this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
+            )
+          : []
+      )
       .add(
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(iMfiAccount.accountPk),

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -58,7 +58,7 @@ export class RebalanceTxBuilder {
         this.targetLiqUtilizationRateBps,
         this.client.pos.netWorthUsd()
       ),
-      flFee ?? 0,
+      flFee ?? 0
     );
   }
 

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -11,6 +11,7 @@ import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
   fetchTokenPrices,
+  fromBaseUnit,
   getBankLiquidityAvailableBaseUnit,
   getMarginfiAccountPositionState,
   toBps,
@@ -71,16 +72,11 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     return [maxLtvBps, liqThresholdBps];
   }
 
-  supplyLiquidityAvailable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.supplyBank, false);
-  }
-
-  supplyLiquidityDepositable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.supplyBank, true);
-  }
-
-  debtLiquidityAvailable(): bigint {
-    return getBankLiquidityAvailableBaseUnit(this.debtBank, false);
+  supplyLiquidityAvailable(): number {
+    return fromBaseUnit(
+      getBankLiquidityAvailableBaseUnit(this.supplyBank, false),
+      this.state().supply.decimals
+    );
   }
 
   async refreshPositionState(): Promise<void> {

package/src/solautoPosition/solautoPositionEx.ts

@@ -18,6 +18,7 @@ import {
   consoleLog,
   ContextUpdates,
   currentUnixSeconds,
+  debtLiquidityAvailable,
   debtLiquidityUsdAvailable,
   fetchTokenPrices,
   getLiqUtilzationRateBps,
@@ -26,6 +27,7 @@ import {
   positionStateWithLatestPrices,
   safeGetPrice,
   solautoStrategyName,
+  supplyLiquidityDepositable,
   supplyLiquidityUsdDepositable,
   toBaseUnit,
   tokenInfo,
@@ -192,18 +194,28 @@ export abstract class SolautoPositionEx {
     return calcDebtUsd(this.state());
   }
 
+  supplyLiquidityDepositable() {
+    return supplyLiquidityDepositable(this.state());
+  }
+
   supplyLiquidityUsdDepositable() {
     return supplyLiquidityUsdDepositable(this.state());
   }
 
+  supplyLiquidityUsdAvailable() {
+    return this.supplyLiquidityAvailable() * (safeGetPrice(this.supplyMint()) ?? 0);
+  }
+
+  debtLiquidityAvailable() {
+    return debtLiquidityAvailable(this.state());
+  }
+
   debtLiquidityUsdAvailable() {
     return debtLiquidityUsdAvailable(this.state());
   }
 
   abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-  abstract supplyLiquidityDepositable(): bigint;
-  abstract supplyLiquidityAvailable(): bigint;
-  abstract debtLiquidityAvailable(): bigint;
+  abstract supplyLiquidityAvailable(): number;
 
   sufficientLiquidityToBoost() {
     const limitsUpToDate =

package/src/utils/numberUtils.ts

@@ -1,5 +1,6 @@
 import { BASIS_POINTS, MIN_REPAY_GAP_BPS, USD_DECIMALS } from "../constants";
 import { PositionState } from "../generated";
+import { tokenInfo } from "./generalUtils";
 
 export function calcNetWorthUsd(state?: PositionState) {
   return fromRoundedUsdValue(state?.netWorth.baseAmountUsdValue ?? BigInt(0));
@@ -38,12 +39,26 @@ export function calcTotalDebt(state?: PositionState) {
   );
 }
 
+export function debtLiquidityAvailable(state?: PositionState) {
+  return fromBaseUnit(
+    state?.debt.amountCanBeUsed.baseUnit ?? BigInt(0),
+    state?.debt.decimals ?? 1
+  );
+}
+
 export function debtLiquidityUsdAvailable(state?: PositionState) {
   return fromRoundedUsdValue(
     state?.debt.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)
   );
 }
 
+export function supplyLiquidityDepositable(state?: PositionState) {
+  return fromBaseUnit(
+    state?.supply.amountCanBeUsed.baseUnit ?? BigInt(0),
+    state?.supply.decimals ?? 1
+  );
+}
+
 export function supplyLiquidityUsdDepositable(state?: PositionState) {
   return fromRoundedUsdValue(
     state?.supply.amountCanBeUsed.baseAmountUsdValue ?? BigInt(0)