@haven-fi/solauto-sdk 1.0.678 → 1.0.680

package/dist/services/flashLoans/flProviderAggregator.d.ts

@@ -11,6 +11,7 @@ export declare class FlProviderAggregator extends FlProviderBase {
     otherSigners(): Signer[];
     lutAccountsToAdd(): PublicKey[];
     private flProvider;
+    liquiditySource(source: TokenType): PublicKey;
     liquidityAvailable(source: TokenType): bigint;
     flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
     flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;

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

@@ -1 +1 @@
-{"version":3,"file":"flProviderAggregator.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/flProviderAggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,OAAO,CAAC,kBAAkB,CAAsB;gBAG9C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,UAAU,CAAC,EAAE,UAAU;IAanB,UAAU;IAMV,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIvD,YAAY,IAAI,MAAM,EAAE;IAKxB,gBAAgB,IAAI,SAAS,EAAE;IAS/B,OAAO,CAAC,UAAU;IAKlB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAI9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAOrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;CAK5D"}
+{"version":3,"file":"flProviderAggregator.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/flProviderAggregator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,qBAAa,oBAAqB,SAAQ,cAAc;IACtD,OAAO,CAAC,kBAAkB,CAAsB;gBAG9C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,UAAU,CAAC,EAAE,UAAU;IAanB,UAAU;IAMV,kBAAkB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIvD,YAAY,IAAI,MAAM,EAAE;IAKxB,gBAAgB,IAAI,SAAS,EAAE;IAS/B,OAAO,CAAC,UAAU;IAKlB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAI7C,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAI9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAOrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;CAK5D"}

package/dist/services/flashLoans/flProviderAggregator.js

@@ -10,7 +10,7 @@ class FlProviderAggregator extends flProviderBase_1.FlProviderBase {
         this.marginfiFlProvider = new marginfiFlProvider_1.MarginfiFlProvider(umi, signer, authority, supplyMint, debtMint, programEnv);
     }
     async initialize() {
-        // TODO: PF
+        // TODO: LP
         // Once we have more than one, set the right fl provider for each liquidity source
         await this.marginfiFlProvider.initialize();
     }
@@ -18,7 +18,7 @@ class FlProviderAggregator extends flProviderBase_1.FlProviderBase {
         return await this.marginfiFlProvider.initializeIMfiAccounts();
     }
     otherSigners() {
-        // TODO: PF
+        // TODO: LP
         return [...this.flSigners, ...this.marginfiFlProvider.otherSigners()];
     }
     lutAccountsToAdd() {
@@ -30,9 +30,12 @@ class FlProviderAggregator extends flProviderBase_1.FlProviderBase {
             : [];
     }
     flProvider(source) {
-        // TODO: PF
+        // TODO: LP
         return this.marginfiFlProvider;
     }
+    liquiditySource(source) {
+        return this.flProvider(source).liquiditySource(source);
+    }
     liquidityAvailable(source) {
         return this.flProvider(source).liquidityAvailable(source);
     }

package/dist/services/flashLoans/flProviderBase.d.ts

@@ -17,6 +17,7 @@ export declare abstract class FlProviderBase {
     mint(source: TokenType): PublicKey;
     abstract liquidityAvailable(source: TokenType): bigint;
     liquidityAvailableUsd(source: TokenType): number;
+    abstract liquiditySource(source: TokenType): PublicKey;
     abstract flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
     abstract flashBorrow(flashLoan: FlashLoanDetails, destTokenAccount: PublicKey): TransactionBuilder;
     abstract flashRepay(flashLoan: FlashLoanDetails): TransactionBuilder;

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

@@ -1 +1 @@
-{"version":3,"file":"flProviderBase.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/flProviderBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE3D,8BAAsB,cAAc;IAIhC,SAAS,CAAC,GAAG,EAAE,GAAG;IAClB,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,UAAU,EAAE,SAAS;IAC/B,SAAS,CAAC,QAAQ,EAAE,SAAS;IAC7B,SAAS,CAAC,UAAU,EAAE,UAAU;IARlC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAM;gBAGvB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,UAAU,GAAE,UAAmB;IAG3C,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAEpC,gBAAgB,IAAI,SAAS,EAAE;IAI/B,YAAY,IAAI,MAAM,EAAE;IAIxB,IAAI,CAAC,MAAM,EAAE,SAAS;IAItB,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IACtD,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAShD,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IACvE,QAAQ,CAAC,WAAW,CAClB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IACrB,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAEpE,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;CAyBtB"}
+{"version":3,"file":"flProviderBase.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/flProviderBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,MAAM,EAEN,kBAAkB,EAClB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE3D,8BAAsB,cAAc;IAIhC,SAAS,CAAC,GAAG,EAAE,GAAG;IAClB,SAAS,CAAC,MAAM,EAAE,MAAM;IACxB,SAAS,CAAC,SAAS,EAAE,SAAS;IAC9B,SAAS,CAAC,UAAU,EAAE,SAAS;IAC/B,SAAS,CAAC,QAAQ,EAAE,SAAS;IAC7B,SAAS,CAAC,UAAU,EAAE,UAAU;IARlC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,CAAM;gBAGvB,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,UAAU,GAAE,UAAmB;IAG3C,QAAQ,CAAC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAEpC,gBAAgB,IAAI,SAAS,EAAE;IAI/B,YAAY,IAAI,MAAM,EAAE;IAIxB,IAAI,CAAC,MAAM,EAAE,SAAS;IAItB,QAAQ,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IACtD,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAShD,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS;IAEtD,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IACvE,QAAQ,CAAC,WAAW,CAClB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IACrB,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAEpE,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;CAyBtB"}

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

@@ -16,6 +16,7 @@ export declare class MarginfiFlProvider extends FlProviderBase {
     private setIntermediaryAccount;
     initializeIMfiAccounts(): Promise<TransactionBuilder>;
     lutAccountsToAdd(): PublicKey[];
+    liquiditySource(source: TokenType): PublicKey;
     private liquidityBank;
     private iMfiAccount;
     liquidityAvailable(source: TokenType): bigint;

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,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;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"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -124,6 +124,9 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             ])).map((x) => new web3_js_1.PublicKey(x)),
         ];
     }
+    liquiditySource(source) {
+        return (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.liquidityBank(source).publicKey);
+    }
     liquidityBank(source) {
         return source === generated_1.TokenType.Supply
             ? this.supplyBankLiquiditySource

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAS3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IATtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAS;gBAGhB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IAyC5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA0CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}
+{"version":3,"file":"rebalanceTxBuilder.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceTxBuilder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAGL,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAgCrB,qBAAa,kBAAkB;IAS3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IATtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;IAC/C,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAS;gBAGhB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAclC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;IA2C5B,OAAO,CAAC,iCAAiC;YAgC3B,qBAAqB;IA2CnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,yBAAyB;YAqBnB,mBAAmB;YAwBnB,sBAAsB;YAyBtB,mBAAmB;IAmEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAe9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -29,12 +29,14 @@ class RebalanceTxBuilder {
     getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
         const insufficientLiquidity = (amountNeededUsd, liquidityAvailable, tokenMint) => {
-            return (amountNeededUsd >
-                (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
-                    ((0, utils_1.safeGetPrice)(tokenMint) ?? 0) *
-                    0.95);
+            const liquidityUsd = (0, utils_1.fromBaseUnit)(liquidityAvailable, (0, utils_1.tokenInfo)(tokenMint).decimals) *
+                ((0, utils_1.safeGetPrice)(tokenMint) ?? 0);
+            (0, utils_1.consoleLog)(liquidityUsd);
+            return amountNeededUsd > liquidityUsd * 0.95;
         };
+        (0, utils_1.consoleLog)("Supply liquidity available:", supplyLiquidityAvailable);
         const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint);
+        (0, utils_1.consoleLog)("Debt liquidity available:", debtLiquidityAvailable);
         const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint);
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
             insufficientSupplyLiquidity;
@@ -70,6 +72,7 @@ class RebalanceTxBuilder {
         }
         const stdFlLiquiditySource = this.getFlLiquiditySource(this.client.flProvider.liquidityAvailable(generated_1.TokenType.Supply), this.client.flProvider.liquidityAvailable(generated_1.TokenType.Debt));
         if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+            (0, utils_1.consoleLog)("Checking signer liquidity");
             const { supplyBalance, debtBalance } = await this.client.signerBalances();
             const signerFlLiquiditySource = this.getFlLiquiditySource(supplyBalance, debtBalance);
             if (signerFlLiquiditySource) {

package/dist/services/transactions/transactionUtils.js

@@ -57,7 +57,7 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
             !(await (0, utils_1.getSolanaAccountCreated)(client.umi, client.marginfiAccountPk))) {
             chores = chores.add(client.marginfiAccountInitialize(client.marginfiAccount));
         }
-        // TODO: PF
+        // TODO: LP
         if (!client.pos.exists) {
             chores = chores.add(client.openPositionIx());
         }
@@ -297,7 +297,7 @@ function getSolautoActions(umi, tx) {
             }
             catch { }
         }
-        // TODO: PF
+        // TODO: LP
     });
     return solautoActions;
 }

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -7,12 +7,15 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     maxLtvPriceType: PriceType;
     private supplyBank;
     private debtBank;
+    private getBankAccounts;
     getBanks(): Promise<Bank[]>;
     priceOracles(): Promise<PublicKey[]>;
     maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
     private getUpToDateLiquidityAvailable;
     updateSupplyLiquidityDepositable(banks: Bank[]): void;
     updateDebtLiquidityAvailable(banks: Bank[]): void;
+    get lpSupplyAccount(): PublicKey;
+    get lpDebtAccount(): PublicKey;
     get supplyLiquidityAvailable(): number;
     refreshPositionState(priceType?: PriceType): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAoB,MAAM,iBAAiB,CAAC;AAezD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEhC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAgB3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAoB,MAAM,iBAAiB,CAAC;AAezD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAC3C,eAAe,YAAiB;IAEhC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAErC,OAAO,CAAC,eAAe;IAMjB,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW3B,YAAY,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IASpC,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAa3D,OAAO,CAAC,6BAA6B;IAwBrC,gCAAgC,CAAC,KAAK,EAAE,IAAI,EAAE;IAK9C,4BAA4B,CAAC,KAAK,EAAE,IAAI,EAAE;IAQ1C,IAAI,eAAe,cAElB;IAED,IAAI,aAAa,cAEhB;IAED,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarginfiSolautoPositionEx = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const umi_1 = require("@metaplex-foundation/umi");
 const utils_1 = require("../utils");
@@ -15,15 +16,16 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         this.supplyBank = null;
         this.debtBank = null;
     }
+    getBankAccounts(mint) {
+        const group = this.lpPoolAccount.toString();
+        const bankAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv).bankAccounts;
+        return bankAccounts[group][mint.toString()];
+    }
     async getBanks() {
         if (!this.supplyBank || !this.debtBank) {
-            const group = this.lpPoolAccount.toString();
-            const bankAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv).bankAccounts;
-            const supplyBank = bankAccounts[group][this.supplyMint.toString()].bank;
-            const debtBank = bankAccounts[group][this.debtMint.toString()].bank;
             [this.supplyBank, this.debtBank] = await (0, marginfi_sdk_1.safeFetchAllBank)(this.umi, [
-                (0, umi_1.publicKey)(supplyBank),
-                (0, umi_1.publicKey)(debtBank),
+                (0, umi_1.publicKey)(this.lpSupplyAccount),
+                (0, umi_1.publicKey)(this.lpDebtAccount),
             ]);
         }
         return [this.supplyBank, this.debtBank];
@@ -58,6 +60,12 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     updateDebtLiquidityAvailable(banks) {
         this._data.state.debt.amountCanBeUsed = this.getUpToDateLiquidityAvailable(banks, this.debtMint, false);
     }
+    get lpSupplyAccount() {
+        return new web3_js_1.PublicKey(this.getBankAccounts(this.supplyMint).bank);
+    }
+    get lpDebtAccount() {
+        return new web3_js_1.PublicKey(this.getBankAccounts(this.debtMint).bank);
+    }
     get supplyLiquidityAvailable() {
         return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.supplyMintInfo.decimals);
     }

package/dist/solautoPosition/positionUtils.js

@@ -31,7 +31,7 @@ async function getPositionExBulk(umi, publicKeys) {
                     publicKey: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
                     data: x,
                 });
-            // TODO: PF
+            // TODO: LP
         }
     });
 }
@@ -59,7 +59,7 @@ async function getOrCreatePositionEx(umi, authority, positionId, programId, cust
     switch (lendingPlatform) {
         case generated_1.LendingPlatform.Marginfi:
             position = new marginfiSolautoPositionEx_1.MarginfiSolautoPositionEx(args);
-        // TODO: PF
+        // TODO: LP
     }
     if (position.selfManaged) {
         await position.refreshPositionState();

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -78,6 +78,8 @@ export declare abstract class SolautoPositionEx {
     get supplyLiquidityUsdAvailable(): number;
     get debtLiquidityAvailable(): number;
     get debtLiquidityUsdAvailable(): number;
+    abstract get lpSupplyAccount(): PublicKey;
+    abstract get lpDebtAccount(): PublicKey;
     abstract get supplyLiquidityAvailable(): number;
     abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
     abstract priceOracles(): Promise<PublicKey[]>;

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/utils/solautoUtils.js

@@ -126,7 +126,7 @@ async function getSolautoManagedPositions(umi, authority, positionTypeFilter) {
                     .mint,
             ];
         }
-        // TODO: PF
+        // TODO: LP
         return {
             publicKey: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
             authority: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(position.authority),

package/local/txSandbox.ts

@@ -1,8 +1,9 @@
 import { Keypair, PublicKey } from "@solana/web3.js";
-import { createSignerFromKeypair } from "@metaplex-foundation/umi";
+import { createSignerFromKeypair, publicKey } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
+  fromBaseUnit,
   getBatches,
   getClient,
   getPositionExBulk,
@@ -10,6 +11,7 @@ import {
   getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  openSolautoPosition,
   PriceType,
   PriorityFeeSetting,
   ProgramEnv,
@@ -17,13 +19,25 @@ import {
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
   SolautoClient,
+  tokenInfo,
   TransactionItem,
   TransactionsManager,
+  USDC,
+  deposit,
+  toBaseUnit,
+  RETARDIO,
+  withdraw,
+  closeSolautoPosition,
+  fetchBank,
+  getBankLiquidityAvailableBaseUnit,
+  fetchTokenPrices,
+  fetchMarginfiAccount,
+  marginfiAccountEmpty,
 } from "../src";
 import { getSecretKey } from "./shared";
 
-const payForTransaction = false;
-const testProgram = false;
+const payForTransaction = true;
+const testProgram = true;
 const lpEnv: ProgramEnv = "Prod";
 
 let [, umi] = getSolanaRpcConnection(
@@ -34,7 +48,7 @@ let [, umi] = getSolanaRpcConnection(
 
 const signer = createSignerFromKeypair(
   umi,
-  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey("solauto-manager")))
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
 );
 
 export async function main() {
@@ -46,27 +60,53 @@ export async function main() {
     lpEnv,
   });
 
-  await client.initialize({
-    positionId: 1,
-    authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
-    // lpUserAccount: new PublicKey(
-    //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
-    // ),
-  });
+  // await client.initialize({
+  //   positionId: 2,
+  //   supplyMint: new PublicKey(USDC),
+  //   debtMint: new PublicKey(RETARDIO),
+  //   lpPoolAccount: new PublicKey("EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm")
+  //   // authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
+  //   // lpUserAccount: new PublicKey(
+  //   //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
+  //   // ),
+  // });
 
-  const transactionItems = [rebalance(client)];
+  const bank = await fetchBank(client.umi, publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"));
 
-  const txManager = new TransactionsManager(
-    client,
-    undefined,
-    payForTransaction ? "normal" : "only-simulate",
-    PriorityFeeSetting.High,
-    true,
-    undefined,
-    { totalRetries: 5 }
-  );
-  const statuses = await txManager.clientSend(transactionItems);
-  consoleLog(statuses);
+  const mint = new PublicKey(RETARDIO);
+  const [price] = await fetchTokenPrices([mint]);
+  const debtAvailableBaseUnit = getBankLiquidityAvailableBaseUnit(bank, false);
+  const debtAvailable = fromBaseUnit(debtAvailableBaseUnit, tokenInfo(mint).decimals);
+  const debtAvailableUsd = debtAvailable * price;
+
+  console.log(debtAvailable, debtAvailableUsd);
+
+  const account = await fetchMarginfiAccount(umi, publicKey("CKDgZfh7b7FdYyL7qWxYTKmyKYgr2PzsQcm2b5ptDxYW"));
+
+  console.log(marginfiAccountEmpty(account));
+
+  // const transactionItems = [
+  //   openSolautoPosition(client, {
+  //     boostGap: 250,
+  //     boostToBps: 8681,
+  //     repayGap: 250,
+  //     repayToBps: 8681,
+  //   }),
+  //   deposit(client, toBaseUnit(10, tokenInfo(new PublicKey(USDC)).decimals)),
+  //   rebalance(client, 8500),
+  // ];
+
+  // const txManager = new TransactionsManager(
+  //   client,
+  //   undefined,
+  //   payForTransaction ? "normal" : "only-simulate",
+  //   PriorityFeeSetting.High,
+  //   true,
+  //   undefined,
+  //   { totalRetries: 5 }
+  // );
+  // const statuses = await txManager.clientSend(transactionItems);
+  // consoleLog(statuses);
 }
 
 async function refreshAll() {

package/package.json

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

package/src/services/flashLoans/flProviderAggregator.ts

@@ -29,7 +29,7 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   async initialize() {
-    // TODO: PF
+    // TODO: LP
     // Once we have more than one, set the right fl provider for each liquidity source
     await this.marginfiFlProvider.initialize();
   }
@@ -39,7 +39,7 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   otherSigners(): Signer[] {
-    // TODO: PF
+    // TODO: LP
     return [...this.flSigners, ...this.marginfiFlProvider.otherSigners()];
   }
 
@@ -53,10 +53,14 @@ export class FlProviderAggregator extends FlProviderBase {
   }
 
   private flProvider(source: TokenType): FlProviderBase {
-    // TODO: PF
+    // TODO: LP
     return this.marginfiFlProvider;
   }
 
+  liquiditySource(source: TokenType): PublicKey {
+    return this.flProvider(source).liquiditySource(source);
+  }
+
   liquidityAvailable(source: TokenType): bigint {
     return this.flProvider(source).liquidityAvailable(source);
   }

package/src/services/flashLoans/flProviderBase.ts

@@ -52,6 +52,8 @@ export abstract class FlProviderBase {
     );
   }
 
+  abstract liquiditySource(source: TokenType): PublicKey;
+
   abstract flFeeBps(source: TokenType, signerFlashLoan?: boolean): number;
   abstract flashBorrow(
     flashLoan: FlashLoanDetails,

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -225,6 +225,10 @@ export class MarginfiFlProvider extends FlProviderBase {
     ];
   }
 
+  liquiditySource(source: TokenType): PublicKey {
+    return toWeb3JsPublicKey(this.liquidityBank(source).publicKey);
+  }
+
   private liquidityBank(source: TokenType): Bank {
     return source === TokenType.Supply
       ? this.supplyBankLiquiditySource

package/src/services/rebalance/rebalanceTxBuilder.ts

@@ -90,19 +90,21 @@ export class RebalanceTxBuilder {
       liquidityAvailable: bigint,
       tokenMint: PublicKey
     ) => {
-      return (
-        amountNeededUsd >
+      const liquidityUsd =
         fromBaseUnit(liquidityAvailable, tokenInfo(tokenMint).decimals) *
-          (safeGetPrice(tokenMint) ?? 0) *
-          0.95
-      );
+        (safeGetPrice(tokenMint) ?? 0);
+      consoleLog(liquidityUsd);
+      return amountNeededUsd > liquidityUsd * 0.95;
     };
 
+    consoleLog("Supply liquidity available:", supplyLiquidityAvailable);
     const insufficientSupplyLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       supplyLiquidityAvailable,
       this.client.pos.supplyMint
     );
+
+    consoleLog("Debt liquidity available:", debtLiquidityAvailable);
     const insufficientDebtLiquidity = insufficientLiquidity(
       debtAdjustmentUsd,
       debtLiquidityAvailable,
@@ -172,6 +174,7 @@ export class RebalanceTxBuilder {
     );
 
     if ((attemptNum ?? 0) >= 3 || stdFlLiquiditySource === undefined) {
+      consoleLog("Checking signer liquidity");
       const { supplyBalance, debtBalance } = await this.client.signerBalances();
       const signerFlLiquiditySource = this.getFlLiquiditySource(
         supplyBalance,

package/src/services/transactions/transactionUtils.ts

@@ -145,7 +145,7 @@ async function transactionChoresBefore(
         client.marginfiAccountInitialize(client.marginfiAccount as Signer)
       );
     }
-    // TODO: PF
+    // TODO: LP
 
     if (!client.pos.exists) {
       chores = chores.add(client.openPositionIx());
@@ -517,7 +517,7 @@ function getSolautoActions(umi: Umi, tx: TransactionBuilder): SolautoAction[] {
       } catch {}
     }
 
-    // TODO: PF
+    // TODO: LP
   });
 
   return solautoActions;

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -24,16 +24,17 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   private supplyBank: Bank | null = null;
   private debtBank: Bank | null = null;
 
+  private getBankAccounts(mint: PublicKey) {
+    const group = this.lpPoolAccount.toString();
+    const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
+    return bankAccounts[group][mint.toString()];
+  }
+
   async getBanks(): Promise<Bank[]> {
     if (!this.supplyBank || !this.debtBank) {
-      const group = this.lpPoolAccount.toString();
-      const bankAccounts = getMarginfiAccounts(this.lpEnv).bankAccounts;
-      const supplyBank = bankAccounts[group][this.supplyMint.toString()].bank;
-      const debtBank = bankAccounts[group][this.debtMint.toString()].bank;
-
       [this.supplyBank, this.debtBank] = await safeFetchAllBank(this.umi, [
-        publicKey(supplyBank),
-        publicKey(debtBank),
+        publicKey(this.lpSupplyAccount),
+        publicKey(this.lpDebtAccount),
       ]);
     }
 
@@ -99,6 +100,14 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     );
   }
 
+  get lpSupplyAccount() {
+    return new PublicKey(this.getBankAccounts(this.supplyMint).bank);
+  }
+
+  get lpDebtAccount() {
+    return new PublicKey(this.getBankAccounts(this.debtMint).bank);
+  }
+
   get supplyLiquidityAvailable(): number {
     return fromBaseUnit(
       getBankLiquidityAvailableBaseUnit(this.supplyBank, false),

package/src/solautoPosition/positionUtils.ts

@@ -70,7 +70,7 @@ export async function getPositionExBulk(
           publicKey: toWeb3JsPublicKey(x.publicKey),
           data: x,
         });
-      // TODO: PF
+      // TODO: LP
     }
   });
 }
@@ -117,7 +117,7 @@ export async function getOrCreatePositionEx(
   switch (lendingPlatform) {
     case LendingPlatform.Marginfi:
       position = new MarginfiSolautoPositionEx(args);
-    // TODO: PF
+    // TODO: LP
   }
 
   if (position.selfManaged) {

package/src/solautoPosition/solautoPositionEx.ts

@@ -240,41 +240,45 @@ export abstract class SolautoPositionEx {
     return this._supplyPrice ?? safeGetPrice(this.supplyMint, priceType);
   }
 
+  
   get totalDebt() {
     return calcTotalDebt(this.state);
   }
-
+  
   debtUsd(priceType?: PriceType) {
     const debtPrice = this.debtPrice(priceType);
     return debtPrice
-      ? calcTotalDebt(this.state) * debtPrice
-      : calcDebtUsd(this.state);
+    ? calcTotalDebt(this.state) * debtPrice
+    : calcDebtUsd(this.state);
   }
-
+  
   protected debtPrice(priceType?: PriceType) {
     return this._debtPrice ?? safeGetPrice(this.debtMint, priceType);
   }
-
+  
+  
   get supplyLiquidityDepositable() {
     return supplyLiquidityDepositable(this.state);
   }
-
+  
   get supplyLiquidityUsdDepositable() {
     return supplyLiquidityUsdDepositable(this.state);
   }
-
+  
   get supplyLiquidityUsdAvailable() {
     return this.supplyLiquidityAvailable * (this.supplyPrice() ?? 0);
   }
-
+  
   get debtLiquidityAvailable() {
     return debtLiquidityAvailable(this.state);
   }
-
+  
   get debtLiquidityUsdAvailable() {
     return debtLiquidityUsdAvailable(this.state);
   }
-
+  
+  abstract get lpSupplyAccount(): PublicKey;
+  abstract get lpDebtAccount(): PublicKey;
   abstract get supplyLiquidityAvailable(): number;
 
   abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;

package/src/utils/solautoUtils.ts

@@ -188,7 +188,7 @@ export async function getSolautoManagedPositions(
           .mint,
       ];
     }
-    // TODO: PF
+    // TODO: LP
 
     return {
       publicKey: toWeb3JsPublicKey(x.publicKey),