@haven-fi/solauto-sdk 1.0.628 → 1.0.630

package/README.md

@@ -8,16 +8,15 @@ Solauto is a program on the Solana blockchain that lets you manage leveraged lon
 import { PublicKey } from "@solana/web3.js";
 import * as solauto from "@haven-fi/solauto-sdk";
 
-// Initialize the client
+// Create new Solauto client
 const client = solauto.getClient(solauto.LendingPlatform.MARGINFI, {
   signer: yourSigner,
   rpcUrl: "[YOUR_RPC_URL]",
 });
 
+// Initialize the client
 const supplyMint = new PublicKey(NATIVE_MINT);
 const debtMint = new PublicKey(USDC);
-
-// Initialize a new position
 await client.initialize({
   positionId: 1,
   new: true,
@@ -50,13 +49,13 @@ const transactionItems = [
     client,
     toBaseUnit(
       supplyUsdToDeposit / supplyPrice,
-      client.pos.supplyMintInfo().decimals
+      client.pos.supplyMintInfo.decimals
     )
   ),
   // Borrow debt (USDC) transaction
   solauto.borrow(
     client,
-    toBaseUnit(debtUsdToBorrow / debtPrice, client.pos.debtMintInfo().decimals)
+    toBaseUnit(debtUsdToBorrow / debtPrice, client.pos.debtMintInfo.decimals)
   ),
   // Rebalance to 0 LTV (repays all debt using collateral)
   solauto.rebalance(client, 0),
@@ -70,4 +69,34 @@ const transactionItems = [
 const statuses = await new solauto.TransactionsManager(client).clientSend(
   transactionItems
 );
-```
+```
+
+## Rebalancing an existing position
+
+```typescript
+import { PublicKey } from "@solana/web3.js";
+import * as solauto from "@haven-fi/solauto-sdk";
+
+// Create new Solauto client
+const client = solauto.getClient(solauto.LendingPlatform.MARGINFI, {
+  signer: yourSigner,
+  rpcUrl: "[YOUR_RPC_URL]",
+});
+
+// Initialize the client
+await client.initialize({
+  positionId: myPositionId,
+  authority: "[POSITION AUTHORITY]",
+});
+
+const transactionItems = [
+  solauto.rebalance(
+    client,
+    undefined // Provide target liquidation utilization rate if you want a specific LTV, otherwise it will rebalance according to position's settings (default)
+  ),
+];
+
+const statuses = await new solauto.TransactionsManager(client).clientSend(
+  transactionItems
+);
+```

package/dist/constants/marginfiAccounts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAetC,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AAgLF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,WAKrD"}
+{"version":3,"file":"marginfiAccounts.d.ts","sourceRoot":"","sources":["../../src/constants/marginfiAccounts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAetC,MAAM,MAAM,uBAAuB,GAAG;IACpC,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,qBAAqB,CAAA;KAAE,CAAC;CAC7D,CAAC;AAgLF,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,SAAS,CAAC;IACnB,YAAY,EAAE,SAAS,CAAC;IACxB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,uBAAuB,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CACjC,UAAU,CAAC,EAAE,UAAU,EACvB,aAAa,CAAC,EAAE,SAAS,GACxB,uBAAuB,CA4BzB;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,WAKrD"}

package/dist/constants/solautoConstants.d.ts

@@ -8,7 +8,8 @@ export declare const MIN_USD_SUPPORTED_POSITION = 1000;
 export declare const REFERRER_PERCENTAGE = 0.15;
 export declare const PRICES: {
     [key: string]: {
-        price: number;
+        realtimePrice: number;
+        emaPrice: number;
         time: number;
     };
 };

package/dist/constants/solautoConstants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAE7E,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}
+{"version":3,"file":"solautoConstants.d.ts","sourceRoot":"","sources":["../../src/constants/solautoConstants.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,SAAS,EACV,MAAM,iBAAiB,CAAC;AAQzB,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AACF,eAAO,MAAM,oBAAoB,WAEhC,CAAC;AAIF,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,iBAAiB,KAAK,CAAC;AACpC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,eAAO,MAAM,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAO,CAAC;AAEvG,eAAO,MAAM,iBAAiB,UAS7B,CAAC;AAEF,eAAO,MAAM,WAAW,iDAAiD,CAAC;AAC1E,eAAO,MAAM,qBAAqB,UAYR,CAAC"}

package/dist/generated/instructions/marginfiRebalance.d.ts

@@ -7,7 +7,7 @@
  */
 import { Context, Option, OptionOrNullable, Pda, PublicKey, Signer, TransactionBuilder } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { SolautoRebalanceType, SolautoRebalanceTypeArgs, SwapType, SwapTypeArgs } from '../types';
+import { PriceType, PriceTypeArgs, SolautoRebalanceType, SolautoRebalanceTypeArgs, SwapType, SwapTypeArgs } from '../types';
 export type MarginfiRebalanceInstructionAccounts = {
     signer: Signer;
     marginfiProgram: PublicKey | Pda;
@@ -38,16 +38,18 @@ export type MarginfiRebalanceInstructionAccounts = {
 export type MarginfiRebalanceInstructionData = {
     discriminator: number;
     rebalanceType: SolautoRebalanceType;
-    targetLiqUtilizationRateBps: Option<number>;
     swapInAmountBaseUnit: Option<bigint>;
+    targetLiqUtilizationRateBps: Option<number>;
     flashLoanFeeBps: Option<number>;
+    priceType: Option<PriceType>;
     swapType: Option<SwapType>;
 };
 export type MarginfiRebalanceInstructionDataArgs = {
     rebalanceType: SolautoRebalanceTypeArgs;
-    targetLiqUtilizationRateBps: OptionOrNullable<number>;
     swapInAmountBaseUnit: OptionOrNullable<number | bigint>;
+    targetLiqUtilizationRateBps: OptionOrNullable<number>;
     flashLoanFeeBps: OptionOrNullable<number>;
+    priceType: OptionOrNullable<PriceTypeArgs>;
     swapType: OptionOrNullable<SwapTypeArgs>;
 };
 export declare function getMarginfiRebalanceInstructionDataSerializer(): Serializer<MarginfiRebalanceInstructionDataArgs, MarginfiRebalanceInstructionData>;

package/dist/generated/instructions/marginfiRebalance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAOX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,QAAQ,EACR,YAAY,EAGb,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,sBAAsB,EAAE,SAAS,GAAG,GAAG,CAAC;IACxC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,oBAAoB,EAAE,gBAAgB,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACxD,eAAe,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;CAC1C,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAsBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CAkLpB"}
+{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"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"}

package/dist/generated/instructions/marginfiRebalance.js

@@ -17,9 +17,10 @@ function getMarginfiRebalanceInstructionDataSerializer() {
     return (0, serializers_1.mapSerializer)((0, serializers_1.struct)([
         ['discriminator', (0, serializers_1.u8)()],
         ['rebalanceType', (0, types_1.getSolautoRebalanceTypeSerializer)()],
-        ['targetLiqUtilizationRateBps', (0, serializers_1.option)((0, serializers_1.u16)())],
         ['swapInAmountBaseUnit', (0, serializers_1.option)((0, serializers_1.u64)())],
+        ['targetLiqUtilizationRateBps', (0, serializers_1.option)((0, serializers_1.u16)())],
         ['flashLoanFeeBps', (0, serializers_1.option)((0, serializers_1.u16)())],
+        ['priceType', (0, serializers_1.option)((0, types_1.getPriceTypeSerializer)())],
         ['swapType', (0, serializers_1.option)((0, types_1.getSwapTypeSerializer)())],
     ], { description: 'MarginfiRebalanceInstructionData' }), (value) => ({ ...value, discriminator: 9 }));
 }

package/dist/generated/instructions/marginfiRefreshData.d.ts

@@ -7,6 +7,7 @@
  */
 import { Context, Pda, PublicKey, Signer, TransactionBuilder } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
+import { PriceType, PriceTypeArgs } from '../types';
 export type MarginfiRefreshDataInstructionAccounts = {
     signer: Signer;
     marginfiProgram: PublicKey | Pda;
@@ -20,8 +21,12 @@ export type MarginfiRefreshDataInstructionAccounts = {
 };
 export type MarginfiRefreshDataInstructionData = {
     discriminator: number;
+    priceType: PriceType;
+};
+export type MarginfiRefreshDataInstructionDataArgs = {
+    priceType: PriceTypeArgs;
 };
-export type MarginfiRefreshDataInstructionDataArgs = {};
 export declare function getMarginfiRefreshDataInstructionDataSerializer(): Serializer<MarginfiRefreshDataInstructionDataArgs, MarginfiRefreshDataInstructionData>;
-export declare function marginfiRefreshData(context: Pick<Context, 'programs'>, input: MarginfiRefreshDataInstructionAccounts): TransactionBuilder;
+export type MarginfiRefreshDataInstructionArgs = MarginfiRefreshDataInstructionDataArgs;
+export declare function marginfiRefreshData(context: Pick<Context, 'programs'>, input: MarginfiRefreshDataInstructionAccounts & MarginfiRefreshDataInstructionArgs): TransactionBuilder;
 //# sourceMappingURL=marginfiRefreshData.d.ts.map

package/dist/generated/instructions/marginfiRefreshData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiRefreshData.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRefreshData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,sCAAsC,GAAG;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;CAClC,CAAC;AAGF,MAAM,MAAM,kCAAkC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3E,MAAM,MAAM,sCAAsC,GAAG,EAAE,CAAC;AAExD,wBAAgB,+CAA+C,IAAI,UAAU,CAC3E,sCAAsC,EACtC,kCAAkC,CACnC,CAcA;AAGD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,sCAAsC,GAC5C,kBAAkB,CA6EpB"}
+{"version":3,"file":"marginfiRefreshData.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRefreshData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAA0B,MAAM,UAAU,CAAC;AAG5E,MAAM,MAAM,sCAAsC,GAAG;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;CAClC,CAAC;AAGF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG;IACnD,SAAS,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF,wBAAgB,+CAA+C,IAAI,UAAU,CAC3E,sCAAsC,EACtC,kCAAkC,CACnC,CAkBA;AAGD,MAAM,MAAM,kCAAkC,GAC5C,sCAAsC,CAAC;AAGzC,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,sCAAsC,GAC3C,kCAAkC,GACnC,kBAAkB,CAkFpB"}

package/dist/generated/instructions/marginfiRefreshData.js

@@ -12,10 +12,12 @@ exports.marginfiRefreshData = marginfiRefreshData;
 const umi_1 = require("@metaplex-foundation/umi");
 const serializers_1 = require("@metaplex-foundation/umi/serializers");
 const shared_1 = require("../shared");
+const types_1 = require("../types");
 function getMarginfiRefreshDataInstructionDataSerializer() {
-    return (0, serializers_1.mapSerializer)((0, serializers_1.struct)([['discriminator', (0, serializers_1.u8)()]], {
-        description: 'MarginfiRefreshDataInstructionData',
-    }), (value) => ({ ...value, discriminator: 7 }));
+    return (0, serializers_1.mapSerializer)((0, serializers_1.struct)([
+        ['discriminator', (0, serializers_1.u8)()],
+        ['priceType', (0, types_1.getPriceTypeSerializer)()],
+    ], { description: 'MarginfiRefreshDataInstructionData' }), (value) => ({ ...value, discriminator: 7 }));
 }
 // Instruction.
 function marginfiRefreshData(context, input) {
@@ -69,12 +71,14 @@ function marginfiRefreshData(context, input) {
             value: input.solautoPosition ?? null,
         },
     };
+    // Arguments.
+    const resolvedArgs = { ...input };
     // Accounts in order.
     const orderedAccounts = Object.values(resolvedAccounts).sort((a, b) => a.index - b.index);
     // Keys and Signers.
     const [keys, signers] = (0, shared_1.getAccountMetasAndSigners)(orderedAccounts, 'programId', programId);
     // Data.
-    const data = getMarginfiRefreshDataInstructionDataSerializer().serialize({});
+    const data = getMarginfiRefreshDataInstructionDataSerializer().serialize(resolvedArgs);
     // Bytes Created On Chain.
     const bytesCreatedOnChain = 0;
     return (0, umi_1.transactionBuilder)([

package/dist/generated/types/index.d.ts

@@ -15,6 +15,7 @@ export * from './positionData';
 export * from './positionState';
 export * from './positionTokenState';
 export * from './positionType';
+export * from './priceType';
 export * from './rebalanceData';
 export * from './rebalanceDirection';
 export * from './rebalanceInstructionData';

package/dist/generated/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/generated/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC"}

package/dist/generated/types/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./positionData"), exports);
 __exportStar(require("./positionState"), exports);
 __exportStar(require("./positionTokenState"), exports);
 __exportStar(require("./positionType"), exports);
+__exportStar(require("./priceType"), exports);
 __exportStar(require("./rebalanceData"), exports);
 __exportStar(require("./rebalanceDirection"), exports);
 __exportStar(require("./rebalanceInstructionData"), exports);

package/dist/generated/types/priceType.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+import { Serializer } from '@metaplex-foundation/umi/serializers';
+export declare enum PriceType {
+    Realtime = 0,
+    Ema = 1
+}
+export type PriceTypeArgs = PriceType;
+export declare function getPriceTypeSerializer(): Serializer<PriceTypeArgs, PriceType>;
+//# sourceMappingURL=priceType.d.ts.map

package/dist/generated/types/priceType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"priceType.d.ts","sourceRoot":"","sources":["../../../src/generated/types/priceType.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAc,MAAM,sCAAsC,CAAC;AAE9E,oBAAY,SAAS;IACnB,QAAQ,IAAA;IACR,GAAG,IAAA;CACJ;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC;AAEtC,wBAAgB,sBAAsB,IAAI,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC,CAI7E"}

package/dist/generated/types/priceType.js

@@ -0,0 +1,22 @@
+"use strict";
+/**
+ * This code was AUTOGENERATED using the kinobi library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun kinobi to update it.
+ *
+ * @see https://github.com/metaplex-foundation/kinobi
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PriceType = void 0;
+exports.getPriceTypeSerializer = getPriceTypeSerializer;
+const serializers_1 = require("@metaplex-foundation/umi/serializers");
+var PriceType;
+(function (PriceType) {
+    PriceType[PriceType["Realtime"] = 0] = "Realtime";
+    PriceType[PriceType["Ema"] = 1] = "Ema";
+})(PriceType || (exports.PriceType = PriceType = {}));
+function getPriceTypeSerializer() {
+    return (0, serializers_1.scalarEnum)(PriceType, {
+        description: 'PriceType',
+    });
+}

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,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAYpD,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IAV/B,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAK9C,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA6B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IAkFhC,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,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAWpD,qBAAa,oBAAoB;IAQ7B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,2BAA2B,CAAC;IAV/B,UAAU,EAAG,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IAE/B,OAAO,CAAC,cAAc,CAAkB;gBAG9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,eAAe,EACvB,cAAc,CAAC,EAAE,qBAAqB,YAAA,EACtC,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAK9C,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kCAAkC;YA6B5B,mBAAmB;IAoCjC,OAAO,CAAC,WAAW;IAoBnB,OAAO,CAAC,mBAAmB;IAIrB,aAAa,CAAC,UAAU,EAAE,MAAM;IA+EhC,aAAa;;;;;;CAWpB"}

package/dist/services/rebalance/rebalanceSwapManager.js

@@ -24,8 +24,8 @@ class RebalanceSwapManager {
         // TODO: add token balance change
         let debtUsd = this.client.pos.debtUsd();
         const outputToken = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.isBoost()
-            ? this.client.pos.state().supply.mint
-            : this.client.pos.state().debt.mint);
+            ? this.client.pos.state.supply.mint
+            : this.client.pos.state.debt.mint);
         const swapOutputUsd = swapOutputAmount
             ? (0, utils_1.fromBaseUnit)(swapOutputAmount, (0, utils_1.tokenInfo)(outputToken).decimals) *
                 ((0, utils_1.safeGetPrice)(outputToken) ?? 0)
@@ -36,7 +36,7 @@ class RebalanceSwapManager {
         debtUsd = this.isBoost()
             ? debtUsd + this.usdToSwap()
             : debtUsd - swapOutputUsd;
-        return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.pos.state().liqThresholdBps ?? 0);
+        return (0, utils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, this.client.pos.state.liqThresholdBps ?? 0);
     }
     async findSufficientQuote(swapInput, criteria) {
         let swapQuote;
@@ -63,11 +63,11 @@ class RebalanceSwapManager {
     }
     swapDetails() {
         const input = this.isBoost()
-            ? this.client.pos.state().debt
-            : this.client.pos.state().supply;
+            ? this.client.pos.state.debt
+            : this.client.pos.state.supply;
         const output = this.isBoost()
-            ? this.client.pos.state().supply
-            : this.client.pos.state().debt;
+            ? this.client.pos.state.supply
+            : this.client.pos.state.debt;
         let inputAmount = (0, utils_1.toBaseUnit)(this.usdToSwap() / (0, utils_1.safeGetPrice)(input.mint), input.decimals);
         return {
             input,
@@ -116,7 +116,7 @@ class RebalanceSwapManager {
             this.swapQuote = await this.findSufficientQuote(swapInput, {
                 minOutputAmount: rebalanceToZero ? outputAmount : undefined,
                 maxLiqUtilizationRateBps: this.values.repayingCloseToMaxLtv
-                    ? (0, utils_1.maxRepayToBps)(this.client.pos.state().maxLtvBps ?? 0, this.client.pos.state().liqThresholdBps ?? 0) - 15
+                    ? this.client.pos.maxRepayToBps - 15
                     : undefined,
             });
         }

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

@@ -7,6 +7,7 @@ export declare class RebalanceTxBuilder {
     private rebalanceType;
     private swapManager;
     private flRequirements?;
+    private priceType;
     constructor(client: SolautoClient, targetLiqUtilizationRateBps?: number | undefined);
     private shouldProceedWithRebalance;
     private getRebalanceValues;
@@ -14,6 +15,7 @@ export declare class RebalanceTxBuilder {
     private flashLoanRequirements;
     private getFlashLoanDetails;
     private setRebalanceType;
+    private realtimeUsdToEmaUsd;
     private setRebalanceDetails;
     private refreshBeforeRebalance;
     private assembleTransaction;

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;AAwBrB,qBAAa,kBAAkB;IAO3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IAPtC,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,cAAc,CAAC,CAAwB;gBAGrC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,kBAAkB;IAa1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAyCnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;YA+BV,mBAAmB;YAmBnB,sBAAsB;YAyBtB,mBAAmB;IAiEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAW9C"}
+{"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;AA0BrB,qBAAa,kBAAkB;IAQ3B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,2BAA2B,CAAC;IARtC,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,CAAa;gBAGpB,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAyCnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,gBAAgB;IA+BxB,OAAO,CAAC,mBAAmB;YAOb,mBAAmB;YAqCnB,sBAAsB;YAyBtB,mBAAmB;IAkEpB,gBAAgB,CAC3B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC;CAW9C"}

package/dist/services/rebalance/rebalanceTxBuilder.js

@@ -19,8 +19,8 @@ class RebalanceTxBuilder {
             (this.targetLiqUtilizationRateBps !== undefined ||
                 this.client.pos.eligibleForRebalance()));
     }
-    getRebalanceValues(flFee) {
-        return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, this.targetLiqUtilizationRateBps, solautoFees_1.SolautoFeesBps.create(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd()), flFee ?? 0);
+    getRebalanceValues(priceType, flFee) {
+        return (0, rebalanceValues_1.getRebalanceValues)(this.client.pos, priceType, this.targetLiqUtilizationRateBps, solautoFees_1.SolautoFeesBps.create(this.client.isReferred(), this.targetLiqUtilizationRateBps, this.client.pos.netWorthUsd), flFee ?? 0);
     }
     getFlLiquiditySource(supplyLiquidityAvailable, debtLiquidityAvailable) {
         const debtAdjustmentUsd = Math.abs(this.values.debtAdjustmentUsd);
@@ -30,8 +30,8 @@ class RebalanceTxBuilder {
                     ((0, utils_1.safeGetPrice)(tokenMint) ?? 0) *
                     0.95);
         };
-        const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint());
-        const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint());
+        const insufficientSupplyLiquidity = insufficientLiquidity(debtAdjustmentUsd, supplyLiquidityAvailable, this.client.pos.supplyMint);
+        const insufficientDebtLiquidity = insufficientLiquidity(debtAdjustmentUsd, debtLiquidityAvailable, this.client.pos.debtMint);
         let useDebtLiquidity = this.values.rebalanceDirection === generated_1.RebalanceDirection.Boost ||
             insufficientSupplyLiquidity;
         if (useDebtLiquidity) {
@@ -42,7 +42,7 @@ class RebalanceTxBuilder {
         }
     }
     async flashLoanRequirements(attemptNum) {
-        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state().maxLtvBps, this.client.pos.state().liqThresholdBps, 0.02);
+        const maxLtvRateBps = (0, utils_1.getMaxLiqUtilizationRateBps)(this.client.pos.state.maxLtvBps, this.client.pos.state.liqThresholdBps, 0.02);
         if (this.values.intermediaryLiqUtilizationRateBps < maxLtvRateBps) {
             return undefined;
         }
@@ -75,10 +75,10 @@ class RebalanceTxBuilder {
         const useDebtLiquidity = this.flRequirements.liquiditySource === generated_1.TokenType.Debt;
         let flashLoanToken = undefined;
         if (boosting || useDebtLiquidity) {
-            flashLoanToken = this.client.pos.state().debt;
+            flashLoanToken = this.client.pos.state.debt;
         }
         else {
-            flashLoanToken = this.client.pos.state().supply;
+            flashLoanToken = this.client.pos.state.supply;
         }
         return {
             ...this.flRequirements,
@@ -113,8 +113,18 @@ class RebalanceTxBuilder {
             this.rebalanceType = generated_1.SolautoRebalanceType.Regular;
         }
     }
+    realtimeUsdToEmaUsd(realtimeAmountUsd, mint) {
+        return ((realtimeAmountUsd / (0, utils_1.safeGetPrice)(mint, generated_1.PriceType.Realtime)) *
+            (0, utils_1.safeGetPrice)(mint, generated_1.PriceType.Ema));
+    }
     async setRebalanceDetails(attemptNum) {
-        this.values = this.getRebalanceValues();
+        this.priceType = generated_1.PriceType.Realtime;
+        this.values = this.getRebalanceValues(this.priceType);
+        const postRebalanceEmaUtilRateBps = (0, utils_1.getLiqUtilzationRateBps)(this.realtimeUsdToEmaUsd(this.values.endResult.supplyUsd, this.client.pos.supplyMint), this.realtimeUsdToEmaUsd(this.values.endResult.debtUsd, this.client.pos.debtMint), this.client.pos.state.liqThresholdBps);
+        if (postRebalanceEmaUtilRateBps > this.client.pos.maxBoostToBps) {
+            this.priceType = generated_1.PriceType.Ema;
+            this.values = this.getRebalanceValues(this.priceType);
+        }
         this.flRequirements = await this.flashLoanRequirements(attemptNum);
         if (this.flRequirements?.flFeeBps) {
             this.values = this.getRebalanceValues(this.flRequirements.flFeeBps);
@@ -127,7 +137,7 @@ class RebalanceTxBuilder {
         if (this.client.selfManaged ||
             this.client.contextUpdates.supplyAdjustment > BigInt(0) ||
             this.client.contextUpdates.debtAdjustment > BigInt(0) ||
-            !this.client.pos.exists()) {
+            !this.client.pos.exists) {
             return false;
         }
         // Rebalance ix will already refresh internally if position is self managed
@@ -147,7 +157,7 @@ class RebalanceTxBuilder {
             : undefined;
         let tx = (0, umi_1.transactionBuilder)();
         if (await this.refreshBeforeRebalance()) {
-            tx = tx.add(this.client.refreshIx());
+            tx = tx.add(this.client.refreshIx(this.priceType));
         }
         const rebalanceDetails = {
             values: this.values,
@@ -155,6 +165,7 @@ class RebalanceTxBuilder {
             flashLoan: flashLoanDetails,
             swapQuote,
             targetLiqUtilizationRateBps: this.targetLiqUtilizationRateBps,
+            priceType: this.priceType,
         };
         (0, utils_1.consoleLog)("Rebalance details:", rebalanceDetails);
         const firstRebalance = this.client.rebalanceIx(generated_1.RebalanceStep.PreSwap, rebalanceDetails);

package/dist/services/rebalance/rebalanceValues.d.ts

@@ -1,4 +1,4 @@
-import { RebalanceDirection, TokenBalanceChange } from "../../generated";
+import { PriceType, RebalanceDirection, TokenBalanceChange } from "../../generated";
 import { SolautoPositionEx } from "../../solautoPosition";
 import { SolautoFeesBps } from "./solautoFees";
 export interface PositionValues {
@@ -26,6 +26,6 @@ export interface RebalanceValues extends DebtAdjustment {
     tokenBalanceChange?: TokenBalanceChange;
     repayingCloseToMaxLtv: boolean;
 }
-export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, targetLiqUtilizationRateBps?: number, solautoFeeBps?: SolautoFeesBps, flFeeBps?: number): RebalanceValues;
+export declare function getRebalanceValues(solautoPosition: SolautoPositionEx, priceType: PriceType, targetLiqUtilizationRateBps?: number, solautoFeeBps?: SolautoFeesBps, flFeeBps?: number): RebalanceValues;
 export {};
 //# sourceMappingURL=rebalanceValues.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA8B3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAgChB;AAqED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,CA6CjB"}
+{"version":3,"file":"rebalanceValues.d.ts","sourceRoot":"","sources":["../../../src/services/rebalance/rebalanceValues.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,kBAAkB,EAEnB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,yBAAyB;IACjC,MAAM,EAAE,cAAc,CAAC;IACvB,iCAAiC,EAAE,MAAM,CAAC;CAC3C;AAED,wBAAgB,sBAAsB,CACpC,iBAAiB,EAAE,MAAM,EACzB,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,MAAM,EACpB,IAAI,CAAC,EAAE,gBAAgB,GACtB,yBAAyB,CA8B3B;AAED,wBAAgB,iBAAiB,CAC/B,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,cAAc,EACnB,2BAA2B,EAAE,MAAM,EACnC,IAAI,CAAC,EAAE,gBAAgB,GACtB,cAAc,CAgChB;AA2ED,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,kBAAkB,CAChC,eAAe,EAAE,iBAAiB,EAClC,SAAS,EAAE,SAAS,EACpB,2BAA2B,CAAC,EAAE,MAAM,EACpC,aAAa,CAAC,EAAE,cAAc,EAC9B,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,CA2CjB"}

package/dist/services/rebalance/rebalanceValues.js

@@ -51,16 +51,17 @@ function getTokenBalanceChange() {
     // TODO: DCA, limit orders, take profit, stop loss, etc.
     return undefined;
 }
-function getTargetLiqUtilizationRateBps(solautoPosition, targetLiqUtilizationRateBps, tokenBalanceChange) {
+function getTargetLiqUtilizationRateBps(solautoPosition, priceType, targetLiqUtilizationRateBps, tokenBalanceChange) {
     if (targetLiqUtilizationRateBps !== undefined) {
         return targetLiqUtilizationRateBps;
     }
-    const currentRate = solautoPosition.state().liqUtilizationRateBps;
-    if (currentRate <= solautoPosition.boostFromBps()) {
-        return solautoPosition.settings().boostToBps;
+    if (solautoPosition.liqUtilizationRateBps(generated_1.PriceType.Realtime) >=
+        solautoPosition.repayFromBps) {
+        return solautoPosition.settings.repayToBps;
     }
-    else if (currentRate >= solautoPosition.repayFromBps()) {
-        return solautoPosition.settings().repayToBps;
+    else if (solautoPosition.liqUtilizationRateBps(priceType) <=
+        solautoPosition.boostFromBps) {
+        return solautoPosition.settings.boostToBps;
     }
     // TODO: DCA, limit orders, take profit, stop loss, etc.
     //   else if (tokenBalanceChange !== null) {
@@ -68,9 +69,9 @@ function getTargetLiqUtilizationRateBps(solautoPosition, targetLiqUtilizationRat
     //   }
     throw new Error("Invalid rebalance condition");
 }
-function getAdjustedPositionValues(solautoPosition, tokenBalanceChange) {
-    let supplyUsd = solautoPosition.supplyUsd();
-    const debtUsd = solautoPosition.debtUsd();
+function getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChange) {
+    let supplyUsd = solautoPosition.supplyUsd(priceType);
+    const debtUsd = solautoPosition.debtUsd(priceType);
     if (tokenBalanceChange) {
         const tb = tokenBalanceChange;
         switch (tb.changeType) {
@@ -92,26 +93,25 @@ function getAdjustedPositionValues(solautoPosition, tokenBalanceChange) {
     };
 }
 function getRebalanceDirection(solautoPosition, targetLtvBps) {
-    return solautoPosition.state().liqUtilizationRateBps < targetLtvBps
+    return solautoPosition.state.liqUtilizationRateBps < targetLtvBps
         ? generated_1.RebalanceDirection.Boost
         : generated_1.RebalanceDirection.Repay;
 }
-function getRebalanceValues(solautoPosition, targetLiqUtilizationRateBps, solautoFeeBps, flFeeBps) {
+function getRebalanceValues(solautoPosition, priceType, targetLiqUtilizationRateBps, solautoFeeBps, flFeeBps) {
     const tokenBalanceChange = getTokenBalanceChange();
-    const targetRate = getTargetLiqUtilizationRateBps(solautoPosition, targetLiqUtilizationRateBps, tokenBalanceChange);
+    const targetRate = getTargetLiqUtilizationRateBps(solautoPosition, priceType, targetLiqUtilizationRateBps, tokenBalanceChange);
     const rebalanceDirection = getRebalanceDirection(solautoPosition, targetRate);
-    const position = getAdjustedPositionValues(solautoPosition, tokenBalanceChange);
+    const position = getAdjustedPositionValues(solautoPosition, priceType, tokenBalanceChange);
     const fees = {
         solauto: solautoFeeBps
             ? solautoFeeBps.getSolautoFeesBps(rebalanceDirection).total
             : 0,
-        lpBorrow: solautoPosition.state().debt.borrowFeeBps,
+        lpBorrow: solautoPosition.state.debt.borrowFeeBps,
         flashLoan: flFeeBps ?? 0,
     };
-    const debtAdjustment = getDebtAdjustment(solautoPosition.state().liqThresholdBps, position, targetRate, fees);
+    const debtAdjustment = getDebtAdjustment(solautoPosition.state.liqThresholdBps, position, targetRate, fees);
     const repayingCloseToMaxLtv = rebalanceDirection === generated_1.RebalanceDirection.Repay &&
-        targetRate >=
-            (0, utils_1.maxRepayToBps)(solautoPosition.state().maxLtvBps, solautoPosition.state().liqThresholdBps);
+        targetRate >= solautoPosition.maxRepayToBps;
     return {
         ...debtAdjustment,
         rebalanceDirection,

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

@@ -1,7 +1,7 @@
 import "rpc-websockets/dist/lib/client";
 import { PublicKey } from "@solana/web3.js";
 import { TransactionBuilder } from "@metaplex-foundation/umi";
-import { DCASettingsInpArgs, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../../generated";
+import { DCASettingsInpArgs, LendingPlatform, PriceType, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs, UpdatePositionDataArgs } from "../../generated";
 import { ContextUpdates } from "../../utils";
 import { ProgramEnv, RebalanceDetails } from "../../types";
 import { ReferralStateManager, ReferralStateManagerArgs } from "./referralStateManager";
@@ -53,7 +53,7 @@ export declare abstract class SolautoClient extends ReferralStateManager {
     updatePositionIx(args: UpdatePositionDataArgs): TransactionBuilder;
     abstract closePositionIx(): TransactionBuilder;
     cancelDCAIx(): TransactionBuilder;
-    abstract refreshIx(): TransactionBuilder;
+    abstract refreshIx(priceType: PriceType): TransactionBuilder;
     protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
     abstract rebalanceIx(rebalanceStep: RebalanceStep, data: RebalanceDetails): TransactionBuilder;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,EACL,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAML,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,WAAW,iBAAkB,SAAQ,wBAAwB;IACjE,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,8BAAsB,aAAc,SAAQ,oBAAoB;IACvD,eAAe,EAAG,eAAe,CAAC;IAClC,KAAK,EAAG,UAAU,CAAC;IAEnB,SAAS,EAAG,SAAS,CAAC;IAEtB,UAAU,EAAG,MAAM,CAAC;IACpB,WAAW,EAAG,OAAO,CAAC;IACtB,GAAG,EAAG,iBAAiB,CAAC;IAExB,gBAAgB,EAAG,SAAS,CAAC;IAC7B,cAAc,EAAG,SAAS,CAAC;IAE3B,cAAc,EAAG,SAAS,CAAC;IAC3B,YAAY,EAAG,SAAS,CAAC;IAEzB,mBAAmB,EAAG,SAAS,CAAC;IAChC,iBAAiB,EAAG,SAAS,CAAC;IAE9B,mBAAmB,CAAC,EAAE,SAAS,CAAC;IAEhC,UAAU,EAAG,oBAAoB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAwB;IAE7D,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,iBAAiB,CAAqB;IAExC,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAoFxC,kBAAkB,IAAI,SAAS,GAAG,SAAS;IAO3C,gBAAgB,IAAI,SAAS,GAAG,SAAS;IAOnC,kBAAkB,CAAC,OAAO,CAAC,EAAE,OAAO;IAkB1C,mBAAmB,IAAI,MAAM,EAAE;IAS/B,gBAAgB,IAAI,SAAS,EAAE;IAgBzB,iCAAiC,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAUzD,iBAAiB,IAAI,OAAO,CAC9B;QACE,EAAE,EAAE,kBAAkB,CAAC;QACvB,GAAG,EAAE,OAAO,CAAC;QACb,aAAa,EAAE,SAAS,EAAE,CAAC;KAC5B,GACD,SAAS,CACZ;IAgEK,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAgBF,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IA0BrB,gBAAgB,CAAC,IAAI,EAAE,sBAAsB,GAAG,kBAAkB;IAsDlE,QAAQ,CAAC,eAAe,IAAI,kBAAkB;IAE9C,WAAW,IAAI,kBAAkB;IAgCjC,QAAQ,CAAC,SAAS,IAAI,kBAAkB;IAExC,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAsFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}
+{"version":3,"file":"solautoClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoClient.ts"],"names":[],"mappings":"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"}