@haven-fi/solauto-sdk 1.0.629 → 1.0.631

package/dist/services/solauto/solautoClient.js

@@ -33,50 +33,50 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             lendingPlatform: this.lendingPlatform,
             lpEnv: this.lpEnv,
         }, this.contextUpdates);
-        this.positionSupplyTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.supplyMint());
-        this.signerSupplyTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint());
-        this.positionDebtTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.debtMint());
-        this.signerDebtTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.debtMint());
-        this.solautoFeesSupplyTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.supplyMint());
-        this.solautoFeesDebtTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.debtMint());
+        this.positionSupplyTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.supplyMint);
+        this.signerSupplyTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.supplyMint);
+        this.positionDebtTa = (0, utils_1.getTokenAccount)(this.pos.publicKey, this.pos.debtMint);
+        this.signerDebtTa = (0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.pos.debtMint);
+        this.solautoFeesSupplyTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.supplyMint);
+        this.solautoFeesDebtTa = (0, utils_1.getTokenAccount)(constants_1.SOLAUTO_FEES_WALLET, this.pos.debtMint);
         this.authorityLutAddress =
             this.referralStateData?.lookupTable &&
                 !(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable).equals(web3_js_1.PublicKey.default)
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.referralStateData.lookupTable)
                 : undefined;
-        this.flProvider = new flashLoans_1.FlProviderAggregator(this.umi, this.signer, this.authority, this.pos.supplyMint(), this.pos.debtMint(), this.lpEnv);
+        this.flProvider = new flashLoans_1.FlProviderAggregator(this.umi, this.signer, this.authority, this.pos.supplyMint, this.pos.debtMint, this.lpEnv);
         await this.flProvider.initialize();
         this.otherSigners.push(...this.flProvider.otherSigners());
-        this.log("Position state: ", this.pos.state());
-        this.log("Position settings: ", this.pos.settings());
-        this.log("Position DCA: ", this.pos.dca());
-        this.log("Supply mint:", this.pos.supplyMint().toString());
-        this.log("Debt mint:", this.pos.debtMint().toString());
+        this.log("Position state: ", this.pos.state);
+        this.log("Position settings: ", this.pos.settings);
+        this.log("Position DCA: ", this.pos.dca);
+        this.log("Supply mint:", this.pos.supplyMint.toString());
+        this.log("Debt mint:", this.pos.debtMint.toString());
     }
     referredBySupplyTa() {
         if (this.referredByState !== undefined) {
-            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.supplyMint());
+            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.supplyMint);
         }
         return undefined;
     }
     referredByDebtTa() {
         if (this.referredByState !== undefined) {
-            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.debtMint());
+            return (0, utils_1.getTokenAccount)(this.referredByState, this.pos.debtMint);
         }
         return undefined;
     }
     async resetLiveTxUpdates(success) {
         this.log("Resetting context updates...");
         if (success) {
-            if (!this.pos.exists()) {
+            if (!this.pos.exists) {
                 await this.pos.refetchPositionData();
             }
             else {
                 if (this.contextUpdates.settings) {
-                    this.pos.data().position.settings = this.contextUpdates.settings;
+                    this.pos.updateSettings(this.contextUpdates.settings);
                 }
                 if (this.contextUpdates.dca) {
-                    this.pos.data().position.dca = this.contextUpdates.dca;
+                    this.pos.updateDca(this.contextUpdates.dca);
                 }
                 // All other live position updates can be derived by getting a fresh position state, so we don't need to do anything else form contextUpdates
             }
@@ -162,7 +162,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
     async signerBalances() {
         if (!this.signerSupplyBalance || !this.signerDebtBalance) {
             [this.signerSupplyBalance, this.signerDebtBalance] =
-                await (0, utils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint(), this.pos.debtMint()]);
+                await (0, utils_1.getWalletSplBalances)(this.connection, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), [this.pos.supplyMint, this.pos.debtMint]);
         }
         return {
             supplyBalance: this.signerSupplyBalance,
@@ -199,12 +199,12 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let signerDcaTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
             if (args.dca.value.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint);
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint);
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
@@ -245,21 +245,21 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         let dcaMint = undefined;
         let positionDcaTa = undefined;
         let signerDcaTa = undefined;
-        const currDca = this.pos.dca();
+        const currDca = this.pos.dca;
         if (currDca.dcaInBaseUnit > 0) {
             if (currDca.tokenType === generated_1.TokenType.Supply) {
-                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.supplyMint);
                 positionDcaTa = (0, umi_1.publicKey)(this.positionSupplyTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerSupplyTa);
             }
             else {
-                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint());
+                dcaMint = (0, umi_1.publicKey)(this.pos.debtMint);
                 positionDcaTa = (0, umi_1.publicKey)(this.positionDebtTa);
                 signerDcaTa = (0, umi_1.publicKey)(this.signerDebtTa);
             }
             this.contextUpdates.new({
                 type: "cancellingDca",
-                value: this.pos.dca().tokenType,
+                value: this.pos.dca.tokenType,
             });
         }
         return (0, generated_1.cancelDCA)(this.umi, {
@@ -281,7 +281,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
                     tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
                 }
                 else {
-                    tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.pos.state().debt.amountUsed.baseUnit) * 1.01))));
+                    tx = tx.add((0, utils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.pos.state.debt.amountUsed.baseUnit) * 1.01))));
                 }
             }
         }
@@ -301,7 +301,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "supply",
-                    value: (this.pos.state().supply.amountUsed.baseUnit ?? BigInt(0)) *
+                    value: (this.pos.state.supply.amountUsed.baseUnit ?? BigInt(0)) *
                         BigInt(-1),
                 });
             }
@@ -322,8 +322,7 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
             else {
                 this.contextUpdates.new({
                     type: "debt",
-                    value: (this.pos.state().debt.amountUsed.baseUnit ?? BigInt(0)) *
-                        BigInt(-1),
+                    value: (this.pos.state.debt.amountUsed.baseUnit ?? BigInt(0)) * BigInt(-1),
                 });
             }
         }

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

@@ -2,7 +2,7 @@ import { PublicKey } from "@solana/web3.js";
 import { Signer, TransactionBuilder } from "@metaplex-foundation/umi";
 import { MarginfiAssetAccounts, RebalanceDetails } from "../../types";
 import { MarginfiProgramAccounts } from "../../constants";
-import { DCASettingsInpArgs, LendingPlatform, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs } from "../../generated";
+import { DCASettingsInpArgs, LendingPlatform, PriceType, RebalanceStep, SolautoActionArgs, SolautoSettingsParametersInpArgs } from "../../generated";
 import { SolautoClient, SolautoClientArgs } from "./solautoClient";
 export declare class SolautoMarginfiClient extends SolautoClient {
     lendingPlatform: LendingPlatform;
@@ -21,7 +21,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     openPositionIx(settings?: SolautoSettingsParametersInpArgs, dca?: DCASettingsInpArgs): TransactionBuilder;
     private marginfiOpenPositionIx;
     closePositionIx(): TransactionBuilder;
-    refreshIx(): TransactionBuilder;
+    refreshIx(priceType: PriceType): TransactionBuilder;
     protocolInteractionIx(args: SolautoActionArgs): TransactionBuilder;
     private marginfiProtocolInteractionIx;
     private marginfiSolautoProtocolInteractionIx;

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

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAGf,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAiExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,IAAI,kBAAkB;IAc/B,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAiGtB"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../../src/services/solauto/solautoMarginfiClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,MAAM,EACN,kBAAkB,EAInB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAuB,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,kBAAkB,EAClB,eAAe,EAEf,SAAS,EAET,aAAa,EACb,iBAAiB,EAEjB,gCAAgC,EAOjC,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,kBAA4B;IAE3C,WAAW,EAAG,uBAAuB,CAAC;IAEtC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAE7B,UAAU,CAAC,IAAI,EAAE,iBAAiB;IAiExC,mBAAmB,IAAI,MAAM,EAAE;IAO/B,gBAAgB,IAAI,SAAS,EAAE;IAI/B,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,cAAc,CACZ,QAAQ,CAAC,EAAE,gCAAgC,EAC3C,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA0C9B,eAAe,IAAI,kBAAkB;IAYrC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAenD,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUlE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,WAAW,CACT,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CAkGtB"}

package/dist/services/solauto/solautoMarginfiClient.js

@@ -24,7 +24,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                     (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
         }
         else {
-            if (this.pos.exists()) {
+            if (this.pos.exists) {
                 this.marginfiAccount = this.pos.lpUserAccount;
             }
             else {
@@ -46,9 +46,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             this.otherSigners.push(this.marginfiAccount);
         }
         this.marginfiSupplyAccounts =
-            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.supplyMint().toString()];
+            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.supplyMint.toString()];
         this.marginfiDebtAccounts =
-            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.debtMint().toString()];
+            this.mfiAccounts.bankAccounts[this.marginfiGroup.toString()][this.pos.debtMint.toString()];
         [this.supplyPriceOracle, this.debtPriceOracle] =
             await this.pos.priceOracles();
         this.log("Marginfi account:", this.marginfiAccountPk.toString());
@@ -97,10 +97,10 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiAccount: "publicKey" in this.marginfiAccount
                 ? this.marginfiAccount
                 : (0, umi_1.publicKey)(this.marginfiAccount),
-            supplyMint: (0, umi_1.publicKey)(this.pos.supplyMint()),
+            supplyMint: (0, umi_1.publicKey)(this.pos.supplyMint),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyAccounts.bank),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            debtMint: (0, umi_1.publicKey)(this.pos.debtMint()),
+            debtMint: (0, umi_1.publicKey)(this.pos.debtMint),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             signerDebtTa: signerDebtTa,
@@ -123,7 +123,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             lpUserAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
         });
     }
-    refreshIx() {
+    refreshIx(priceType) {
         return (0, generated_1.marginfiRefreshData)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(this.mfiAccounts.program),
@@ -134,6 +134,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtAccounts.bank),
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             solautoPosition: (0, umi_1.publicKey)(this.pos.publicKey),
+            priceType,
         });
     }
     protocolInteractionIx(args) {
@@ -244,8 +245,8 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         });
     }
     rebalanceIx(rebalanceStep, data) {
-        const inputIsSupply = new web3_js_1.PublicKey(data.swapQuote.inputMint).equals(this.pos.supplyMint());
-        const outputIsSupply = new web3_js_1.PublicKey(data.swapQuote.outputMint).equals(this.pos.supplyMint());
+        const inputIsSupply = new web3_js_1.PublicKey(data.swapQuote.inputMint).equals(this.pos.supplyMint);
+        const outputIsSupply = new web3_js_1.PublicKey(data.swapQuote.outputMint).equals(this.pos.supplyMint);
         const preSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PreSwap;
         const postSwapRebalance = rebalanceStep === generated_1.RebalanceStep.PostSwap;
         const needSupplyAccounts = (inputIsSupply && preSwapRebalance) ||
@@ -282,7 +283,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             supplyPriceOracle: (0, umi_1.publicKey)(this.supplyPriceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             authoritySupplyTa: addAuthorityTas
-                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.supplyMint()))
+                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.supplyMint))
                 : undefined,
             vaultSupplyTa: needSupplyAccounts
                 ? (0, umi_1.publicKey)(this.marginfiSupplyAccounts.liquidityVault)
@@ -294,7 +295,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             debtPriceOracle: (0, umi_1.publicKey)(this.debtPriceOracle),
             positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
             authorityDebtTa: addAuthorityTas
-                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.debtMint()))
+                ? (0, umi_1.publicKey)((0, utils_1.getTokenAccount)(this.authority, this.pos.debtMint))
                 : undefined,
             vaultDebtTa: needDebtAccounts
                 ? (0, umi_1.publicKey)(this.marginfiDebtAccounts.liquidityVault)
@@ -310,6 +311,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             swapType: data.swapQuote.swapMode === "ExactOut" && isFirstRebalance
                 ? generated_1.SwapType.ExactOut
                 : null,
+            priceType: isFirstRebalance ? data.priceType : null,
             flashLoanFeeBps: data.flashLoan?.flFeeBps && isFirstRebalance
                 ? data.flashLoan.flFeeBps
                 : null,

package/dist/services/transactions/transactionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAgBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA2BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAwL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA6LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA8G/B"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../../src/services/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAKxE,OAAO,EAIL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AA2BjE,OAAO,EAAE,qBAAqB,EAAyB,MAAM,aAAa,CAAC;AAwL3E,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,EACtB,sBAAsB,EAAE,MAAM,EAAE,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAyF7B;AA8LD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,eAAe,EAAE,oBAAoB,EACrC,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,SAAS,GACzB,OAAO,CAAC,qBAAqB,GAAG,SAAS,CAAC,CAuC5C;AAED,wBAAgB,YAAY,CAC1B,GAAG,EAAE,GAAG,EACR,GAAG,EAAE,kBAAkB,EAAE,EACzB,KAAK,EAAE,KAAK,EACZ,oBAAoB,CAAC,EAAE,OAAO;;;;EA8G/B"}

package/dist/services/transactions/transactionUtils.js

@@ -16,8 +16,8 @@ const jupiter_sdk_1 = require("../../jupiter-sdk");
 const types_1 = require("../../types");
 const constants_1 = require("../../constants");
 function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn) {
-    const supplyIsWsol = client.pos.supplyMint().equals(spl_token_1.NATIVE_MINT);
-    const debtIsWsol = client.pos.debtMint().equals(spl_token_1.NATIVE_MINT);
+    const supplyIsWsol = client.pos.supplyMint.equals(spl_token_1.NATIVE_MINT);
+    const debtIsWsol = client.pos.debtMint.equals(spl_token_1.NATIVE_MINT);
     if (!supplyIsWsol && !debtIsWsol) {
         return undefined;
     }
@@ -58,7 +58,7 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
             chores = chores.add(client.marginfiAccountInitialize(client.marginfiAccount));
         }
         // TODO: PF
-        if (!client.pos.exists()) {
+        if (!client.pos.exists) {
             chores = chores.add(client.openPositionIx());
         }
     }
@@ -104,8 +104,8 @@ async function transactionChoresBefore(client, accountsGettingCreated, solautoAc
         }
         if (!(0, utils_1.getSolanaAccountCreated)(client.umi, tokenAccount)) {
             chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
-                ? client.pos.supplyMint()
-                : client.pos.debtMint()));
+                ? client.pos.supplyMint
+                : client.pos.debtMint));
             accountsGettingCreated.push(tokenAccount.toString());
         }
     }
@@ -135,24 +135,24 @@ async function rebalanceChoresBefore(client, tx, accountsGettingCreated) {
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, utils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by supply TA");
-        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.supplyMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.supplyMint));
     }
     if (checkReferralDebtTa && !(0, utils_1.rpcAccountCreated)(referredByDebtTa)) {
         client.log("Creating referred-by debt TA");
-        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.debtMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, client.referredByState, client.pos.debtMint));
     }
     if (checkSignerSupplyTa &&
         !(0, utils_1.rpcAccountCreated)(signerSupplyTa) &&
         !accountsGettingCreated.includes(signerSupplyTa.publicKey.toString())) {
         client.log("Creating signer supply token account");
-        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.supplyMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.supplyMint));
         accountsGettingCreated.push(signerSupplyTa.publicKey.toString());
     }
     if (checkSignerDebtTa &&
         !(0, utils_1.rpcAccountCreated)(signerDebtTa) &&
         !accountsGettingCreated.includes(signerDebtTa.publicKey.toString())) {
         client.log("Creating signer debt token account");
-        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.debtMint()));
+        chores = chores.add((0, utils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.pos.debtMint));
         accountsGettingCreated.push(signerDebtTa.publicKey.toString());
     }
     return chores;
@@ -176,6 +176,7 @@ function getRebalanceInstructions(umi, tx) {
                     rebalanceType: generated_1.SolautoRebalanceType.Regular,
                     swapType: generated_1.SwapType.ExactIn,
                     targetLiqUtilizationRateBps: 0,
+                    priceType: generated_1.PriceType.Realtime,
                     flashLoanFeeBps: null,
                 })[0];
                 const [data, _] = serializer.deserialize(x.data);

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Bank } from "../marginfi-sdk";
 import { SolautoPositionEx } from "./solautoPositionEx";
-import { LendingPlatform } from "../generated";
+import { LendingPlatform, PriceType } from "../generated";
 export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     lendingPlatform: LendingPlatform;
     private marginfiAccountData;
@@ -11,7 +11,7 @@ export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     getBanks(): Promise<Bank[]>;
     priceOracles(): Promise<PublicKey[]>;
     maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
-    supplyLiquidityAvailable(): number;
-    refreshPositionState(): Promise<void>;
+    get supplyLiquidityAvailable(): number;
+    refreshPositionState(priceType?: PriceType): 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,EACL,IAAI,EAIL,MAAM,iBAAiB,CAAC;AAYzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,qBAAa,yBAA0B,SAAQ,iBAAiB;IAC9D,eAAe,kBAA4B;IAE3C,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,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,wBAAwB,IAAI,MAAM;IAO5B,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B5C"}
+{"version":3,"file":"marginfiSolautoPositionEx.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/marginfiSolautoPositionEx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,IAAI,EAIL,MAAM,iBAAiB,CAAC;AAYzB,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;IAE3C,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAExB,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBxC,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,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -36,8 +36,8 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         if (!this.supplyBank || !this.debtBank) {
             const group = (await this.lendingPool()).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;
+            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),
@@ -54,23 +54,23 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     }
     async maxLtvAndLiqThresholdBps() {
         const [supplyBank, debtBank] = await this.getBanks();
-        const [supplyPrice] = await (0, utils_1.fetchTokenPrices)([this.supplyMint()]);
+        const [supplyPrice] = await (0, utils_1.fetchTokenPrices)([this.supplyMint]);
         const [maxLtvBps, liqThresholdBps] = (0, utils_1.calcMarginfiMaxLtvAndLiqThresholdBps)(supplyBank, debtBank, supplyPrice);
         return [maxLtvBps, liqThresholdBps];
     }
-    supplyLiquidityAvailable() {
-        return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.state().supply.decimals);
+    get supplyLiquidityAvailable() {
+        return (0, utils_1.fromBaseUnit)((0, utils_1.getBankLiquidityAvailableBaseUnit)(this.supplyBank, false), this.state.supply.decimals);
     }
-    async refreshPositionState() {
+    async refreshPositionState(priceType) {
         if (!this.canRefreshPositionState()) {
             return;
         }
         const useDesignatedMint = !this._data.position || !this._data.selfManaged;
         const resp = await (0, utils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.lpUserAccount }, await this.lendingPool(), useDesignatedMint
-            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().supply.mint) }
+            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state.supply.mint) }
             : undefined, useDesignatedMint
-            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state().debt.mint) }
-            : undefined, this.lpEnv, this.contextUpdates);
+            ? { mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state.debt.mint) }
+            : undefined, this.lpEnv, this.contextUpdates, priceType);
         if (resp) {
             this.supplyBank = resp.supplyBank;
             this.debtBank = resp.debtBank;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { DCASettings, LendingPlatform, PositionState, SolautoPosition, SolautoSettingsParameters } from "../generated";
+import { DCASettings, LendingPlatform, PositionState, PriceType, SolautoPosition, SolautoSettingsParameters } from "../generated";
 import { ContextUpdates } from "../utils";
 import { ProgramEnv, RebalanceAction } from "../types";
 import { TokenInfo } from "../constants";
@@ -34,47 +34,58 @@ export declare abstract class SolautoPositionEx {
     private readonly firstState;
     constructor(args: PositionExArgs);
     abstract lendingPool(): Promise<PublicKey>;
-    exists(): boolean;
-    authority(): PublicKey | undefined;
-    positionId(): number | undefined;
-    strategyName(): string;
-    data(): SolautoPositionExData;
-    state(): PositionState;
-    settings(): SolautoSettingsParameters | undefined;
-    dca(): DCASettings | undefined;
-    supplyMint(): PublicKey;
-    supplyMintInfo(): TokenInfo;
-    debtMint(): PublicKey;
-    debtMintInfo(): TokenInfo;
-    boostToBps(): number;
-    boostFromBps(): number;
-    repayToBps(): number;
-    repayFromBps(): number;
-    netWorth(): number;
-    netWorthUsd(): number;
-    totalSupply(): number;
-    supplyUsd(): number;
-    totalDebt(): number;
-    debtUsd(): number;
-    supplyLiquidityDepositable(): number;
-    supplyLiquidityUsdDepositable(): number;
-    supplyLiquidityUsdAvailable(): number;
-    debtLiquidityAvailable(): number;
-    debtLiquidityUsdAvailable(): number;
+    get exists(): boolean;
+    get authority(): PublicKey;
+    get positionId(): number | undefined;
+    get positionType(): import("../generated").PositionType | undefined;
+    get strategyName(): string;
+    liqUtilizationRateBps(priceType?: PriceType): number;
+    protected get data(): SolautoPositionExData;
+    get state(): PositionState;
+    get settings(): SolautoSettingsParameters | undefined;
+    updateSettings(settings: SolautoSettingsParameters): void;
+    get dca(): DCASettings | undefined;
+    updateDca(dca: DCASettings): void;
+    get supplyMint(): PublicKey;
+    get supplyMintInfo(): TokenInfo;
+    get debtMint(): PublicKey;
+    get debtMintInfo(): TokenInfo;
+    get boostToBps(): number;
+    get maxBoostToBps(): number;
+    get boostFromBps(): number;
+    get repayToBps(): number;
+    get maxRepayToBps(): number;
+    get repayFromBps(): number;
+    get maxRepayFromBps(): number;
+    get netWorth(): number;
+    get netWorthUsd(): number;
+    get totalSupply(): number;
+    supplyUsd(priceType?: PriceType): number;
+    get totalDebt(): number;
+    debtUsd(priceType?: PriceType): number;
+    get supplyLiquidityDepositable(): number;
+    get supplyLiquidityUsdDepositable(): number;
+    get supplyLiquidityUsdAvailable(): number;
+    get debtLiquidityAvailable(): number;
+    get debtLiquidityUsdAvailable(): number;
+    abstract get supplyLiquidityAvailable(): number;
     abstract maxLtvAndLiqThresholdBps(): Promise<[number, number]>;
     abstract priceOracles(): Promise<PublicKey[]>;
-    abstract supplyLiquidityAvailable(): number;
-    sufficientLiquidityToBoost(): boolean;
+    private sufficientLiquidityToBoost;
     eligibleForRebalance(bpsDistanceThreshold?: number): RebalanceAction | undefined;
     eligibleForRefresh(): boolean;
     protected canRefreshPositionState(): boolean;
-    abstract refreshPositionState(): Promise<void>;
+    abstract refreshPositionState(priceType?: PriceType): Promise<void>;
     utilizationRateBpsDrift(): Promise<number>;
     updateSupply(newSupplyUsd: number, supplyPrice?: number): void;
     updateDebt(newDebtUsd: number, debtPrice?: number): void;
     updateNetWorth(supplyPrice?: number): void;
-    updateLiqUtilizationRate(): void;
-    updateWithLatestPrices(supplyPrice?: number, debtPrice?: number): Promise<void>;
+    updateLiqUtilizationRate(priceType?: PriceType): void;
+    updateWithLatestPrices(data?: {
+        priceType?: PriceType;
+        supplyPrice?: number;
+        debtPrice?: number;
+    }): Promise<void>;
     simulateRebalance(unixTime: number, supplyPrice: number, debtPrice: number, targetLiqUtilizationRateBps?: number): void;
     refetchPositionData(): Promise<void>;
 }

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