@haven-fi/solauto-sdk 1.0.669 → 1.0.671

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

@@ -7,7 +7,7 @@
  */
 import { PublicKey } from '@metaplex-foundation/umi';
 import { Serializer } from '@metaplex-foundation/umi/serializers';
-import { DCASettings, DCASettingsArgs, LendingPlatform, LendingPlatformArgs, SolautoSettingsParameters, SolautoSettingsParametersArgs } from '.';
+import { LendingPlatform, LendingPlatformArgs, SolautoSettingsParameters, SolautoSettingsParametersArgs } from '.';
 export type PositionData = {
     lendingPlatform: LendingPlatform;
     padding1: Array<number>;
@@ -15,7 +15,7 @@ export type PositionData = {
     lpSupplyAccount: PublicKey;
     lpDebtAccount: PublicKey;
     settings: SolautoSettingsParameters;
-    dca: DCASettings;
+    lpPoolAccount: PublicKey;
     padding: Array<number>;
 };
 export type PositionDataArgs = {
@@ -25,7 +25,7 @@ export type PositionDataArgs = {
     lpSupplyAccount: PublicKey;
     lpDebtAccount: PublicKey;
     settings: SolautoSettingsParametersArgs;
-    dca: DCASettingsArgs;
+    lpPoolAccount: PublicKey;
     padding: Array<number>;
 };
 export declare function getPositionDataSerializer(): Serializer<PositionDataArgs, PositionData>;

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

@@ -1 +1 @@
-{"version":3,"file":"positionData.d.ts","sourceRoot":"","sources":["../../../src/generated/types/positionData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,WAAW,EACX,eAAe,EACf,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,6BAA6B,EAI9B,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,yBAAyB,CAAC;IACpC,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,6BAA6B,CAAC;IACxC,GAAG,EAAE,eAAe,CAAC;IACrB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,UAAU,CACrD,gBAAgB,EAChB,YAAY,CACb,CAcA"}
+{"version":3,"file":"positionData.d.ts","sourceRoot":"","sources":["../../../src/generated/types/positionData.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,yBAAyB,EACzB,6BAA6B,EAG9B,MAAM,GAAG,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,yBAAyB,CAAC;IACpC,aAAa,EAAE,SAAS,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,mBAAmB,CAAC;IACrC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxB,aAAa,EAAE,SAAS,CAAC;IACzB,eAAe,EAAE,SAAS,CAAC;IAC3B,aAAa,EAAE,SAAS,CAAC;IACzB,QAAQ,EAAE,6BAA6B,CAAC;IACxC,aAAa,EAAE,SAAS,CAAC;IACzB,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAgB,yBAAyB,IAAI,UAAU,CACrD,gBAAgB,EAChB,YAAY,CACb,CAcA"}

package/dist/generated/types/positionData.js

@@ -18,7 +18,7 @@ function getPositionDataSerializer() {
         ['lpSupplyAccount', (0, serializers_1.publicKey)()],
         ['lpDebtAccount', (0, serializers_1.publicKey)()],
         ['settings', (0, _1.getSolautoSettingsParametersSerializer)()],
-        ['dca', (0, _1.getDCASettingsSerializer)()],
-        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 4 })],
+        ['lpPoolAccount', (0, serializers_1.publicKey)()],
+        ['padding', (0, serializers_1.array)((0, serializers_1.u32)(), { size: 20 })],
     ], { description: 'PositionData' });
 }

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;AA2BrB,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,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAQlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAwCnC,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;AA2BrB,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,CAAiC;gBAGxC,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,YAAA;IAG9C,OAAO,CAAC,0BAA0B;IAYlC,OAAO,CAAC,kBAAkB;IAc1B,OAAO,CAAC,oBAAoB;YAyCd,qBAAqB;IAwCnC,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

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

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

@@ -11,7 +11,7 @@ export interface SolautoClientArgs extends ReferralStateManagerArgs {
     positionId?: number;
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
-    lendingPool?: PublicKey;
+    lpPoolAccount?: PublicKey;
     lpUserAccount?: PublicKey;
 }
 export declare abstract class SolautoClient extends ReferralStateManager {

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,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAKL,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,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,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;IA4ExC,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;IAezB,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,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAE5D,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAqFlE,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":"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,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,gCAAgC,EAEhC,sBAAsB,EAGvB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAKL,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,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,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,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;IAyExC,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;IAezB,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,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAE5D,qBAAqB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAqFlE,QAAQ,CAAC,WAAW,CAClB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,gBAAgB,GACrB,kBAAkB;CACtB"}

package/dist/services/solauto/solautoClient.js

@@ -22,14 +22,11 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         this.pos = await (0, solautoPosition_1.getOrCreatePositionEx)(this.umi, this.authority, positionId, this.programId, {
             supplyMint: args.supplyMint,
             debtMint: args.debtMint,
-            lendingPool: args.lendingPool,
+            lpPoolAccount: args.lpPoolAccount,
             lpUserAccount: args.lpUserAccount,
             lendingPlatform: this.lendingPlatform,
             lpEnv: this.lpEnv,
         }, this.contextUpdates);
-        if (this.pos.selfManaged) {
-            await this.pos.refreshPositionState();
-        }
         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);
@@ -46,9 +43,9 @@ class SolautoClient extends referralStateManager_1.ReferralStateManager {
         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("LP pool:", this.pos.lpPoolAccount.toString());
     }
     referredBySupplyTa() {
         if (this.referredByState !== undefined) {

package/dist/services/solauto/solautoMarginfiClient.js

@@ -20,7 +20,7 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
     async initialize(args) {
         await super.initialize(args);
         this.mfiAccounts = (0, constants_1.getMarginfiAccounts)(this.lpEnv);
-        this.marginfiGroup = await this.pos.lendingPool();
+        this.marginfiGroup = this.pos.lpPoolAccount;
         if (this.pos.selfManaged) {
             this.marginfiAccount =
                 args.lpUserAccount ??

package/dist/solautoPosition/marginfiSolautoPositionEx.d.ts

@@ -4,10 +4,8 @@ import { SolautoPositionEx } from "./solautoPositionEx";
 import { LendingPlatform, PriceType } from "../generated";
 export declare class MarginfiSolautoPositionEx extends SolautoPositionEx {
     lendingPlatform: LendingPlatform;
-    private marginfiAccountData;
     private supplyBank;
     private debtBank;
-    lendingPool(): Promise<PublicKey>;
     getBanks(): Promise<Bank[]>;
     priceOracles(): Promise<PublicKey[]>;
     maxLtvAndLiqThresholdBps(): Promise<[number, number]>;

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;AAazB,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;IAqBxC,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;CAuBjE"}
+{"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;AAYzD,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,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,IAAI,wBAAwB,IAAI,MAAM,CAKrC;IAEK,oBAAoB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAuBjE"}

package/dist/solautoPosition/marginfiSolautoPositionEx.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarginfiSolautoPositionEx = void 0;
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const umi_1 = require("@metaplex-foundation/umi");
-const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
 const solautoPositionEx_1 = require("./solautoPositionEx");
@@ -12,26 +11,12 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
     constructor() {
         super(...arguments);
         this.lendingPlatform = generated_1.LendingPlatform.Marginfi;
-        this.marginfiAccountData = null;
         this.supplyBank = null;
         this.debtBank = null;
     }
-    async lendingPool() {
-        if (this.lp) {
-            return this.lp;
-        }
-        if (!this.marginfiAccountData && (0, utils_1.validPubkey)(this.lpUserAccount)) {
-            this.marginfiAccountData = await (0, marginfi_sdk_1.fetchMarginfiAccount)(this.umi, (0, umi_1.publicKey)(this.lpUserAccount), { commitment: "confirmed" });
-            this.lp = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccountData.group);
-        }
-        if (!this.lp) {
-            this.lp = (0, constants_1.getMarginfiAccounts)(this.lpEnv).defaultGroup;
-        }
-        return this.lp;
-    }
     async getBanks() {
         if (!this.supplyBank || !this.debtBank) {
-            const group = (await this.lendingPool()).toString();
+            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;
@@ -62,10 +47,11 @@ class MarginfiSolautoPositionEx extends solautoPositionEx_1.SolautoPositionEx {
         const useDesignatedMint = !this.exists ||
             !this.selfManaged ||
             (this.selfManaged && !(0, utils_1.validPubkey)(this.lpUserAccount));
-        const resp = await (0, utils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.lpUserAccount }, await this.lendingPool(), useDesignatedMint ? { mint: this.supplyMint } : undefined, useDesignatedMint ? { mint: this.debtMint } : undefined, this.lpEnv, this.contextUpdates, priceType);
+        const resp = await (0, utils_1.getMarginfiAccountPositionState)(this.umi, { pk: this.lpUserAccount }, this._lpPoolAccount, useDesignatedMint ? { mint: this.supplyMint } : undefined, useDesignatedMint ? { mint: this.debtMint } : undefined, this.contextUpdates, priceType);
         if (resp) {
             this.supplyBank = resp.supplyBank;
             this.debtBank = resp.debtBank;
+            this._lpPoolAccount = resp.marginfiGroup;
             this._data.state = resp.state;
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"positionUtils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/positionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,kBAAkB,EAElB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAoC5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}
+{"version":3,"file":"positionUtils.d.ts","sourceRoot":"","sources":["../../src/solautoPosition/positionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAK/C,OAAO,EAEL,aAAa,EAGb,yBAAyB,EACzB,gCAAgC,EACjC,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,cAAc,EASf,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,kBAAkB,EAElB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gCAAgC,GACzC,yBAAyB,CAQ3B;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,SAAS,EAAE,GACtB,OAAO,CAAC,iBAAiB,EAAE,CAAC,CA4B9B;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,UAAU,CAAC,EAAE,kBAAkB,EAC/B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CA2C5B;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,GACtB,aAAa,CAgEf"}

package/dist/solautoPosition/positionUtils.js

@@ -55,11 +55,16 @@ async function getOrCreatePositionEx(umi, authority, positionId, programId, cust
         customArgs,
         contextUpdates,
     };
+    let position;
     switch (lendingPlatform) {
         case generated_1.LendingPlatform.Marginfi:
-            return new marginfiSolautoPositionEx_1.MarginfiSolautoPositionEx(args);
+            position = new marginfiSolautoPositionEx_1.MarginfiSolautoPositionEx(args);
         // TODO: PF
     }
+    if (position.selfManaged) {
+        await position.refreshPositionState();
+    }
+    return position;
 }
 function createFakePositionState(supply, debt, maxLtvBps, liqThresholdBps) {
     const supplyDecimals = (0, utils_1.tokenInfo)(supply.mint).decimals;

package/dist/solautoPosition/solautoPositionEx.d.ts

@@ -8,7 +8,7 @@ export interface PositionCustomArgs {
     lendingPlatform: LendingPlatform;
     supplyMint?: PublicKey;
     debtMint?: PublicKey;
-    lendingPool?: PublicKey;
+    lpPoolAccount?: PublicKey;
     lpUserAccount?: PublicKey;
     lpEnv?: ProgramEnv;
 }
@@ -32,22 +32,22 @@ export declare abstract class SolautoPositionEx {
     lendingPlatform: LendingPlatform;
     positionId: number;
     authority: PublicKey;
-    protected _data: SolautoPositionExData;
-    protected lp?: PublicKey;
+    protected _lpPoolAccount?: PublicKey;
     lpUserAccount?: PublicKey;
     protected lpEnv: ProgramEnv;
     private _supplyMint?;
     private _debtMint?;
+    protected _data: SolautoPositionExData;
     private readonly firstState;
     private _supplyPrice?;
     private _debtPrice?;
     rebalance: PositionRebalanceHelper;
     constructor(args: PositionExArgs);
-    abstract lendingPool(): Promise<PublicKey>;
     get exists(): boolean;
     get selfManaged(): boolean;
     get positionType(): import("../generated").PositionType | undefined;
     get strategyName(): string;
+    get lpPoolAccount(): PublicKey;
     liqUtilizationRateBps(priceType?: PriceType): number;
     protected get data(): SolautoPositionExData;
     get state(): PositionState;

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

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

package/dist/solautoPosition/solautoPositionEx.js

@@ -7,7 +7,6 @@ const utils_1 = require("../utils");
 const rebalance_1 = require("../services/rebalance");
 class SolautoPositionEx {
     constructor(args) {
-        this.lp = undefined;
         this.lpUserAccount = undefined;
         this.umi = args.umi;
         this.contextUpdates = args.contextUpdates;
@@ -16,15 +15,15 @@ class SolautoPositionEx {
                 (0, utils_1.getSolautoPositionAccount)(args.authority, args.positionId, args.programId);
         this.positionId = args.positionId ?? args.data.positionId[0];
         this.authority = args.authority ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.data.authority);
-        this._supplyMint = args.customArgs?.supplyMint;
-        this._debtMint = args.customArgs?.debtMint;
-        this.lp = args.customArgs?.lendingPool;
+        this._lpPoolAccount = args.customArgs?.lpPoolAccount;
         this.lpUserAccount =
             args.customArgs?.lpUserAccount ??
                 (args.data.position
                     ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(args.data.position.lpUserAccount)
                     : undefined);
         this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
+        this._supplyMint = args.customArgs?.supplyMint;
+        this._debtMint = args.customArgs?.debtMint;
         this._data = args.data;
         this.firstState = { ...args.data.state };
         this.rebalance = new PositionRebalanceHelper(this);
@@ -41,6 +40,10 @@ class SolautoPositionEx {
     get strategyName() {
         return (0, utils_1.solautoStrategyName)(this.supplyMint, this.debtMint);
     }
+    get lpPoolAccount() {
+        return (this._lpPoolAccount ??
+            (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.data.position.lpPoolAccount));
+    }
     liqUtilizationRateBps(priceType) {
         return (0, utils_1.getLiqUtilzationRateBps)(this.supplyUsd(priceType), this.debtUsd(priceType), this.state.liqThresholdBps);
     }
@@ -56,11 +59,14 @@ class SolautoPositionEx {
     updateSettings(settings) {
         this.data.position.settings = settings;
     }
+    // TODO: DCA
     get dca() {
-        return this.contextUpdates?.dca ?? this.data.position?.dca;
+        // return this.contextUpdates?.dca ?? this.data.position?.dca;
+        return undefined;
     }
+    // TODO: DCA
     updateDca(dca) {
-        this.data.position.dca = dca;
+        // this.data.position!.dca = dca;
     }
     get supplyMint() {
         return this._supplyMint ?? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.state.supply.mint);
@@ -241,7 +247,7 @@ class PositionRebalanceHelper {
         return this.validRealtimePricesBoost(debtAdjustmentUsd);
     }
     eligibleForRebalance(bpsDistanceThreshold, skipExtraChecks) {
-        if (!this.pos.settings || !this.pos.supplyUsd()) {
+        if (this.pos.selfManaged || !this.pos.supplyUsd()) {
             return undefined;
         }
         const realtimeLiqUtilRateBps = this.pos.liqUtilizationRateBps(generated_1.PriceType.Realtime);
@@ -250,7 +256,7 @@ class PositionRebalanceHelper {
             return "repay";
         }
         else if (realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold &&
-            (!skipExtraChecks ||
+            (skipExtraChecks ||
                 (this.validBoostFromHere() && this.sufficientLiquidityToBoost()))) {
             return "boost";
         }

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

@@ -1,6 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
-import { ProgramEnv } from "../../types";
 import { PositionState, PriceType } from "../../generated";
 import { Bank, MarginfiAccount } from "../../marginfi-sdk";
 import { ContextUpdates } from "../solautoUtils";
@@ -30,9 +29,10 @@ type BanksCache = {
 export declare function getMarginfiAccountPositionState(umi: Umi, lpUserAccount: {
     pk?: PublicKey;
     data?: MarginfiAccount | null;
-}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, programEnv?: ProgramEnv, contextUpdates?: ContextUpdates, priceType?: PriceType): Promise<{
+}, marginfiGroup?: PublicKey, supply?: BankSelection, debt?: BankSelection, contextUpdates?: ContextUpdates, priceType?: PriceType): Promise<{
     supplyBank: Bank | null;
     debtBank: Bank | null;
+    marginfiGroup: PublicKey;
     state: PositionState;
 } | undefined>;
 export declare function calculateAnnualAPYs(bank: Bank): [number, number];

package/dist/utils/marginfi/data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAI1D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAajD,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,UAAU,CAAC,EAAE,UAAU,EACvB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IAAE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,KAAK,EAAE,aAAa,CAAA;CAAE,GACxE,SAAS,CACZ,CA2KA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/utils/marginfi/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAsB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAO/E,OAAO,EACL,IAAI,EAGJ,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAgBjD,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,SAAS,EACxB,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA8C3B;AAED,wBAAsB,mCAAmC,CACvD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,GACnB,OAAO,CAAC,eAAe,EAAE,CAAC,CA6B5B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,KAAK,CAAC,EAAE,SAAS,EACjB,qBAAqB,CAAC,EAAE,OAAO,GAC9B,OAAO,CACR;IAAE,eAAe,EAAE,SAAS,CAAC;IAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,EAAE,CAC/E,CAyDA;AAED,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,kBAAkB,EAAE,OAAO,UAqB5B;AA0DD,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,KAAK,UAAU,GAAG;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,CAAC;AAwBhE,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE;IAAE,EAAE,CAAC,EAAE,SAAS,CAAC;IAAC,IAAI,CAAC,EAAE,eAAe,GAAG,IAAI,CAAA;CAAE,EAChE,aAAa,CAAC,EAAE,SAAS,EACzB,MAAM,CAAC,EAAE,aAAa,EACtB,IAAI,CAAC,EAAE,aAAa,EACpB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACN;IACE,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;IACtB,aAAa,EAAE,SAAS,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC;CACtB,GACD,SAAS,CACZ,CA+KA;AA+DD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,oBAU7C;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBnE"}

package/dist/utils/marginfi/data.js

@@ -171,7 +171,7 @@ async function getBank(umi, data, marginfiGroup) {
             ? await (0, marginfi_sdk_1.safeFetchBank)(umi, (0, umi_1.publicKey)((0, constants_1.getMarginfiAccounts)(undefined, marginfiGroup).bankAccounts[marginfiGroup.toString()][mint].bank), { commitment: "confirmed" })
             : null;
 }
-async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, programEnv, contextUpdates, priceType) {
+async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup, supply, debt, contextUpdates, priceType) {
     let marginfiAccount = lpUserAccount.data ??
         ((0, generalUtils_1.validPubkey)(lpUserAccount.pk)
             ? await (0, marginfi_sdk_1.safeFetchMarginfiAccount)(umi, (0, umi_1.publicKey)(lpUserAccount.pk), {
@@ -245,8 +245,11 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
     if (!debtUsage) {
         debtUsage = await getTokenUsage(debtBank, false, 0, contextUpdates?.debtAdjustment);
     }
+    if (!marginfiGroup) {
+        marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.group);
+    }
     const supplyPrice = (0, priceUtils_1.safeGetPrice)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint));
-    let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup ?? (0, constants_1.getMarginfiAccounts)(programEnv).defaultGroup, {
+    let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(umi, marginfiGroup, {
         mint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint),
         bank: supplyBank,
     }, {
@@ -258,6 +261,7 @@ async function getMarginfiAccountPositionState(umi, lpUserAccount, marginfiGroup
     return {
         supplyBank,
         debtBank,
+        marginfiGroup,
         state: {
             liqUtilizationRateBps: (0, numberUtils_1.getLiqUtilzationRateBps)(supplyUsd, debtUsd, liqThresholdBps),
             netWorth: {

package/local/txSandbox.ts

@@ -3,15 +3,21 @@ import { createSignerFromKeypair } from "@metaplex-foundation/umi";
 import { fromWeb3JsKeypair } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   consoleLog,
+  getBatches,
   getClient,
+  getPositionExBulk,
   getSolanaRpcConnection,
+  getSolautoManagedPositions,
   LendingPlatform,
   LOCAL_IRONFORGE_API_URL,
+  PriceType,
   PriorityFeeSetting,
   ProgramEnv,
   rebalance,
   SOLAUTO_PROD_PROGRAM,
   SOLAUTO_TEST_PROGRAM,
+  SolautoClient,
+  TransactionItem,
   TransactionsManager,
 } from "../src";
 import { getSecretKey } from "./shared";
@@ -20,18 +26,18 @@ const payForTransaction = false;
 const testProgram = false;
 const lpEnv: ProgramEnv = "Prod";
 
-export async function main() {
-  let [, umi] = getSolanaRpcConnection(
-    LOCAL_IRONFORGE_API_URL,
-    testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
-    lpEnv
-  );
+let [, umi] = getSolanaRpcConnection(
+  LOCAL_IRONFORGE_API_URL,
+  testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+  lpEnv
+);
 
-  const signer = createSignerFromKeypair(
-    umi,
-    fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
-  );
+const signer = createSignerFromKeypair(
+  umi,
+  fromWeb3JsKeypair(Keypair.fromSecretKey(getSecretKey()))
+);
 
+export async function main() {
   const client = getClient(LendingPlatform.Marginfi, {
     signer,
     showLogs: true,
@@ -41,7 +47,7 @@ export async function main() {
   });
 
   await client.initialize({
-    positionId: 1,
+    positionId: 2,
     authority: new PublicKey("5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe"),
     // lpUserAccount: new PublicKey(
     //   "GEokw9jqbh6d1xUNA3qaeYFFetbSR5Y1nt7C3chwwgSz"
@@ -60,8 +66,57 @@ export async function main() {
     { totalRetries: 5 }
   );
   const statuses = await txManager.clientSend(transactionItems);
-
   consoleLog(statuses);
 }
 
+async function refreshAll() {
+  const allPositions = await getSolautoManagedPositions(umi);
+  const positions = await getPositionExBulk(
+    umi,
+    allPositions.map((x) => new PublicKey(x.publicKey!))
+  );
+
+  let client: SolautoClient | undefined;
+  const transactionItems: TransactionItem[] = [];
+  for (const pos of positions) {
+    client = getClient(pos.lendingPlatform, {
+      signer,
+      showLogs: true,
+      rpcUrl: LOCAL_IRONFORGE_API_URL,
+      programId: testProgram ? SOLAUTO_TEST_PROGRAM : SOLAUTO_PROD_PROGRAM,
+      lpEnv,
+    });
+
+    await client!.initialize({
+      positionId: pos.positionId,
+      authority: pos.authority,
+    });
+
+    const ix = client!.refreshIx(PriceType.Realtime);
+    transactionItems.push(
+      new TransactionItem(
+        async () => ({ tx: ix }),
+        `refresh ${pos.authority} (${pos.positionId})`
+      )
+    );
+  }
+
+  const txBatches = getBatches(transactionItems, 15);
+
+  for (const batch of txBatches) {
+    const txManager = new TransactionsManager(
+      client!,
+      undefined,
+      payForTransaction ? "normal" : "only-simulate",
+      PriorityFeeSetting.High,
+      true,
+      undefined,
+      { totalRetries: 5 }
+    );
+    const statuses = await txManager.send(batch);
+    consoleLog(statuses);
+  }
+}
+
 main();
+// refreshAll();

package/package.json

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

package/src/generated/types/positionData.ts

@@ -16,13 +16,10 @@ import {
   u8,
 } from '@metaplex-foundation/umi/serializers';
 import {
-  DCASettings,
-  DCASettingsArgs,
   LendingPlatform,
   LendingPlatformArgs,
   SolautoSettingsParameters,
   SolautoSettingsParametersArgs,
-  getDCASettingsSerializer,
   getLendingPlatformSerializer,
   getSolautoSettingsParametersSerializer,
 } from '.';
@@ -34,7 +31,7 @@ export type PositionData = {
   lpSupplyAccount: PublicKey;
   lpDebtAccount: PublicKey;
   settings: SolautoSettingsParameters;
-  dca: DCASettings;
+  lpPoolAccount: PublicKey;
   padding: Array<number>;
 };
 
@@ -45,7 +42,7 @@ export type PositionDataArgs = {
   lpSupplyAccount: PublicKey;
   lpDebtAccount: PublicKey;
   settings: SolautoSettingsParametersArgs;
-  dca: DCASettingsArgs;
+  lpPoolAccount: PublicKey;
   padding: Array<number>;
 };
 
@@ -61,8 +58,8 @@ export function getPositionDataSerializer(): Serializer<
       ['lpSupplyAccount', publicKeySerializer()],
       ['lpDebtAccount', publicKeySerializer()],
       ['settings', getSolautoSettingsParametersSerializer()],
-      ['dca', getDCASettingsSerializer()],
-      ['padding', array(u32(), { size: 4 })],
+      ['lpPoolAccount', publicKeySerializer()],
+      ['padding', array(u32(), { size: 20 })],
     ],
     { description: 'PositionData' }
   ) as Serializer<PositionDataArgs, PositionData>;

package/src/services/rebalance/rebalanceTxBuilder.ts

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

package/src/services/solauto/solautoClient.ts

@@ -44,7 +44,7 @@ export interface SolautoClientArgs extends ReferralStateManagerArgs {
   positionId?: number;
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
-  lendingPool?: PublicKey;
+  lpPoolAccount?: PublicKey;
   lpUserAccount?: PublicKey;
 }
 
@@ -85,16 +85,13 @@ export abstract class SolautoClient extends ReferralStateManager {
       {
         supplyMint: args.supplyMint,
         debtMint: args.debtMint,
-        lendingPool: args.lendingPool,
+        lpPoolAccount: args.lpPoolAccount,
         lpUserAccount: args.lpUserAccount,
         lendingPlatform: this.lendingPlatform,
         lpEnv: this.lpEnv,
       },
       this.contextUpdates
     );
-    if (this.pos.selfManaged) {
-      await this.pos.refreshPositionState();
-    }
 
     this.positionSupplyTa = getTokenAccount(
       this.pos.publicKey,
@@ -144,9 +141,9 @@ export abstract class SolautoClient extends ReferralStateManager {
 
     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("LP pool:", this.pos.lpPoolAccount.toString());
   }
 
   referredBySupplyTa(): PublicKey | undefined {

package/src/services/solauto/solautoMarginfiClient.ts

@@ -75,7 +75,7 @@ export class SolautoMarginfiClient extends SolautoClient {
 
     this.mfiAccounts = getMarginfiAccounts(this.lpEnv);
 
-    this.marginfiGroup = await this.pos.lendingPool();
+    this.marginfiGroup = this.pos.lpPoolAccount;
 
     if (this.pos.selfManaged) {
       this.marginfiAccount =

package/src/solautoPosition/marginfiSolautoPositionEx.ts

@@ -1,12 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
-import {
-  Bank,
-  fetchMarginfiAccount,
-  MarginfiAccount,
-  safeFetchAllBank,
-} from "../marginfi-sdk";
+import { Bank, safeFetchAllBank } from "../marginfi-sdk";
 import { publicKey } from "@metaplex-foundation/umi";
-import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import {
   calcMarginfiMaxLtvAndLiqThresholdBps,
   fetchTokenPrices,
@@ -23,34 +17,12 @@ import { LendingPlatform, PriceType } from "../generated";
 export class MarginfiSolautoPositionEx extends SolautoPositionEx {
   lendingPlatform = LendingPlatform.Marginfi;
 
-  private marginfiAccountData: MarginfiAccount | null = null;
   private supplyBank: Bank | null = null;
   private debtBank: Bank | null = null;
 
-  public async lendingPool(): Promise<PublicKey> {
-    if (this.lp) {
-      return this.lp;
-    }
-
-    if (!this.marginfiAccountData && validPubkey(this.lpUserAccount)) {
-      this.marginfiAccountData = await fetchMarginfiAccount(
-        this.umi,
-        publicKey(this.lpUserAccount!),
-        { commitment: "confirmed" }
-      );
-      this.lp = toWeb3JsPublicKey(this.marginfiAccountData.group);
-    }
-
-    if (!this.lp) {
-      this.lp = getMarginfiAccounts(this.lpEnv).defaultGroup;
-    }
-
-    return this.lp;
-  }
-
   async getBanks(): Promise<Bank[]> {
     if (!this.supplyBank || !this.debtBank) {
-      const group = (await this.lendingPool()).toString();
+      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;
@@ -102,10 +74,9 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     const resp = await getMarginfiAccountPositionState(
       this.umi,
       { pk: this.lpUserAccount },
-      await this.lendingPool(),
+      this._lpPoolAccount,
       useDesignatedMint ? { mint: this.supplyMint } : undefined,
       useDesignatedMint ? { mint: this.debtMint } : undefined,
-      this.lpEnv,
       this.contextUpdates,
       priceType
     );
@@ -113,6 +84,7 @@ export class MarginfiSolautoPositionEx extends SolautoPositionEx {
     if (resp) {
       this.supplyBank = resp.supplyBank;
       this.debtBank = resp.debtBank;
+      this._lpPoolAccount = resp.marginfiGroup;
       this._data.state = resp.state;
     }
   }

package/src/solautoPosition/positionUtils.ts

@@ -113,11 +113,18 @@ export async function getOrCreatePositionEx(
     contextUpdates,
   };
 
+  let position: SolautoPositionEx;
   switch (lendingPlatform) {
     case LendingPlatform.Marginfi:
-      return new MarginfiSolautoPositionEx(args);
+      position = new MarginfiSolautoPositionEx(args);
     // TODO: PF
   }
+
+  if (position.selfManaged) {
+    await position.refreshPositionState();
+  }
+
+  return position;
 }
 
 interface AssetProps {

package/src/solautoPosition/solautoPositionEx.ts

@@ -51,7 +51,7 @@ export interface PositionCustomArgs {
   lendingPlatform: LendingPlatform;
   supplyMint?: PublicKey;
   debtMint?: PublicKey;
-  lendingPool?: PublicKey;
+  lpPoolAccount?: PublicKey;
   lpUserAccount?: PublicKey;
   lpEnv?: ProgramEnv;
 }
@@ -79,12 +79,12 @@ export abstract class SolautoPositionEx {
   public lendingPlatform!: LendingPlatform;
   public positionId!: number;
   public authority!: PublicKey;
-  protected _data!: SolautoPositionExData;
-  protected lp?: PublicKey = undefined;
+  protected _lpPoolAccount?: PublicKey;
   public lpUserAccount?: PublicKey = undefined;
   protected lpEnv!: ProgramEnv;
   private _supplyMint?: PublicKey;
   private _debtMint?: PublicKey;
+  protected _data!: SolautoPositionExData;
 
   private readonly firstState!: PositionState;
 
@@ -107,15 +107,15 @@ export abstract class SolautoPositionEx {
     this.positionId = args.positionId ?? args.data.positionId![0];
     this.authority = args.authority ?? toWeb3JsPublicKey(args.data.authority!);
 
-    this._supplyMint = args.customArgs?.supplyMint;
-    this._debtMint = args.customArgs?.debtMint;
-    this.lp = args.customArgs?.lendingPool;
+    this._lpPoolAccount = args.customArgs?.lpPoolAccount;
     this.lpUserAccount =
       args.customArgs?.lpUserAccount ??
       (args.data.position
         ? toWeb3JsPublicKey(args.data.position!.lpUserAccount)
         : undefined);
     this.lpEnv = args.customArgs?.lpEnv ?? "Prod";
+    this._supplyMint = args.customArgs?.supplyMint;
+    this._debtMint = args.customArgs?.debtMint;
 
     this._data = args.data;
     this.firstState = { ...args.data.state };
@@ -123,8 +123,6 @@ export abstract class SolautoPositionEx {
     this.rebalance = new PositionRebalanceHelper(this);
   }
 
-  abstract lendingPool(): Promise<PublicKey>;
-
   get exists() {
     return this._data.position !== undefined;
   }
@@ -141,6 +139,13 @@ export abstract class SolautoPositionEx {
     return solautoStrategyName(this.supplyMint, this.debtMint);
   }
 
+  get lpPoolAccount() {
+    return (
+      this._lpPoolAccount ??
+      toWeb3JsPublicKey(this.data.position!.lpPoolAccount)
+    );
+  }
+
   liqUtilizationRateBps(priceType?: PriceType): number {
     return getLiqUtilzationRateBps(
       this.supplyUsd(priceType),
@@ -165,12 +170,15 @@ export abstract class SolautoPositionEx {
     this.data.position!.settings = settings;
   }
 
+  // TODO: DCA
   get dca(): DCASettings | undefined {
-    return this.contextUpdates?.dca ?? this.data.position?.dca;
+    // return this.contextUpdates?.dca ?? this.data.position?.dca;
+    return undefined;
   }
 
+  // TODO: DCA
   updateDca(dca: DCASettings) {
-    this.data.position!.dca = dca;
+    // this.data.position!.dca = dca;
   }
 
   get supplyMint(): PublicKey {
@@ -488,7 +496,7 @@ class PositionRebalanceHelper {
     bpsDistanceThreshold: number,
     skipExtraChecks?: boolean
   ): RebalanceAction | undefined {
-    if (!this.pos.settings || !this.pos.supplyUsd()) {
+    if (this.pos.selfManaged || !this.pos.supplyUsd()) {
       return undefined;
     }
 
@@ -503,7 +511,7 @@ class PositionRebalanceHelper {
       return "repay";
     } else if (
       realtimeLiqUtilRateBps - this.pos.boostFromBps <= bpsDistanceThreshold &&
-      (!skipExtraChecks ||
+      (skipExtraChecks ||
         (this.validBoostFromHere() && this.sufficientLiquidityToBoost()))
     ) {
       return "boost";

package/src/utils/marginfi/data.ts

@@ -1,8 +1,6 @@
 import { PublicKey } from "@solana/web3.js";
 import { publicKey, Umi } from "@metaplex-foundation/umi";
-import {
-  toWeb3JsPublicKey,
-} from "@metaplex-foundation/umi-web3js-adapters";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
 import { ProgramEnv } from "../../types";
 import { PositionState, PositionTokenState, PriceType } from "../../generated";
 import {
@@ -31,7 +29,10 @@ import {
   toBaseUnit,
   toBps,
 } from "../numberUtils";
-import { calcMarginfiMaxLtvAndLiqThresholdBps, marginfiAccountEmpty } from "./general";
+import {
+  calcMarginfiMaxLtvAndLiqThresholdBps,
+  marginfiAccountEmpty,
+} from "./general";
 
 export async function getMarginfiMaxLtvAndLiqThresholdBps(
   umi: Umi,
@@ -309,11 +310,15 @@ export async function getMarginfiAccountPositionState(
   marginfiGroup?: PublicKey,
   supply?: BankSelection,
   debt?: BankSelection,
-  programEnv?: ProgramEnv,
   contextUpdates?: ContextUpdates,
   priceType?: PriceType
 ): Promise<
-  | { supplyBank: Bank | null; debtBank: Bank | null; state: PositionState }
+  | {
+      supplyBank: Bank | null;
+      debtBank: Bank | null;
+      marginfiGroup: PublicKey;
+      state: PositionState;
+    }
   | undefined
 > {
   let marginfiAccount =
@@ -437,10 +442,13 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
+  if (!marginfiGroup) {
+    marginfiGroup = toWeb3JsPublicKey(supplyBank.group);
+  }
   const supplyPrice = safeGetPrice(toWeb3JsPublicKey(supplyBank.mint))!;
   let [maxLtvBps, liqThresholdBps] = await getMarginfiMaxLtvAndLiqThresholdBps(
     umi,
-    marginfiGroup ?? getMarginfiAccounts(programEnv).defaultGroup,
+    marginfiGroup,
     {
       mint: toWeb3JsPublicKey(supplyBank.mint),
       bank: supplyBank,
@@ -463,6 +471,7 @@ export async function getMarginfiAccountPositionState(
   return {
     supplyBank,
     debtBank,
+    marginfiGroup,
     state: {
       liqUtilizationRateBps: getLiqUtilzationRateBps(
         supplyUsd,