@haven-fi/solauto-sdk 1.0.31 → 1.0.33

package/dist/clients/solautoMarginfiClient.d.ts

@@ -6,16 +6,15 @@ import { DCASettingsInpArgs, PositionState, SolautoActionArgs, SolautoRebalanceT
 import { MarginfiAccount } from "../marginfi-sdk";
 import { JupSwapDetails } from "../utils/jupiterUtils";
 import { FlashLoanDetails } from "../utils/solauto/rebalanceUtils";
-import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
     marginfiAccount?: PublicKey | Signer;
     marginfiAccountSeedIdx?: bigint;
     marginfiGroup?: PublicKey;
 }
-export declare function newSolautoMarginfiPositionArgs(positionId: number, signer: Signer | undefined, wallet: WalletAdapter | undefined, supplyMint: PublicKey, debtMint: PublicKey, referredByAuthority?: PublicKey): SolautoMarginfiClientArgs;
 export declare class SolautoMarginfiClient extends SolautoClient {
+    private initialized;
     marginfiProgram: PublicKey;
-    marginfiAccountSeedIdx?: bigint;
+    marginfiAccountSeedIdx: bigint;
     marginfiAccount: PublicKey | Signer;
     marginfiAccountPk: PublicKey;
     marginfiGroup: PublicKey;
@@ -25,6 +24,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     intermediaryMarginfiAccountPk: PublicKey;
     intermediaryMarginfiAccount?: MarginfiAccount;
     initialize(args: SolautoMarginfiClientArgs): Promise<void>;
+    setIntermediaryMarginfiDetails(): Promise<void>;
     defaultLookupTables(): string[];
     lutAccountsToAdd(): PublicKey[];
     marginfiAccountInitialize(): TransactionBuilder;

package/dist/clients/solautoMarginfiClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAGL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,SAAS,EACnB,mBAAmB,CAAC,EAAE,SAAS,GAC9B,yBAAyB,CAe3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IAC/C,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAoEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAsDrC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IA8CrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,MAAM,EACN,kBAAkB,EAMnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,SAAS,EAEV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAK1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EACb,iBAAiB,EACjB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAGtB,OAAO,EAEL,eAAe,EAUhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAQnE,MAAM,WAAW,yBAA0B,SAAQ,iBAAiB;IAClE,eAAe,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,qBAAa,qBAAsB,SAAQ,aAAa;IACtD,OAAO,CAAC,WAAW,CAAkB;IAE9B,eAAe,EAAG,SAAS,CAAC;IAE5B,sBAAsB,EAAE,MAAM,CAAa;IAC3C,eAAe,EAAG,SAAS,GAAG,MAAM,CAAC;IACrC,iBAAiB,EAAG,SAAS,CAAC;IAC9B,aAAa,EAAG,SAAS,CAAC;IAE1B,0BAA0B,EAAG,qBAAqB,CAAC;IACnD,wBAAwB,EAAG,qBAAqB,CAAC;IAGjD,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAE/C,UAAU,CAAC,IAAI,EAAE,yBAAyB;IA0C1C,8BAA8B;IAsCpC,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,yBAAyB,IAAI,kBAAkB;IAS/C,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA2C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAoErC,OAAO,CAAC,oCAAoC;IA8D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,WAAW,EAAE,cAAc,EAC3B,aAAa,EAAE,wBAAwB,EACvC,2BAA2B,CAAC,EAAE,MAAM,EACpC,WAAW,CAAC,EAAE,MAAM,GACnB,kBAAkB;IAgDrB,WAAW,CACT,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA2BrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IA8ElE,iCAAiC,IAAI,kBAAkB;IASjD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;CAiBlE"}

package/dist/clients/solautoMarginfiClient.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolautoMarginfiClient = exports.newSolautoMarginfiPositionArgs = void 0;
+exports.SolautoMarginfiClient = void 0;
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const umi_1 = require("@metaplex-foundation/umi");
-const umi_bundle_defaults_1 = require("@metaplex-foundation/umi-bundle-defaults");
 const web3_js_1 = require("@solana/web3.js");
 const solautoClient_1 = require("./solautoClient");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
@@ -13,34 +12,25 @@ const generalUtils_1 = require("../utils/generalUtils");
 const marginfi_sdk_1 = require("../marginfi-sdk");
 const marginfiUtils_1 = require("../utils/marginfiUtils");
 const numberUtils_1 = require("../utils/numberUtils");
-function newSolautoMarginfiPositionArgs(positionId, signer, wallet, supplyMint, debtMint, referredByAuthority) {
-    const umi = (0, umi_bundle_defaults_1.createUmi)((0, web3_js_1.clusterApiUrl)("mainnet-beta"));
-    return {
-        positionId,
-        signer,
-        wallet,
-        marginfiAccount: positionId === 0
-            ? (0, umi_1.createSignerFromKeypair)(umi, umi.eddsa.generateKeypair())
-            : undefined,
-        marginfiAccountSeedIdx: positionId > 0 ? (0, generalUtils_1.generateRandomU64)() : undefined,
-        supplyMint: supplyMint,
-        debtMint: debtMint,
-        referredByAuthority,
-    };
-}
-exports.newSolautoMarginfiPositionArgs = newSolautoMarginfiPositionArgs;
 class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
+    constructor() {
+        super(...arguments);
+        this.initialized = false;
+        this.marginfiAccountSeedIdx = BigInt(0);
+    }
     async initialize(args) {
-        if (args.marginfiAccount) {
-            this.marginfiAccount = args.marginfiAccount;
-        }
         await super.initialize(args, generated_1.LendingPlatform.Marginfi);
-        this.marginfiAccountSeedIdx = args.marginfiAccountSeedIdx;
-        this.marginfiAccount =
-            this.marginfiAccountSeedIdx !== undefined
-                ? await (0, accountUtils_1.getMarginfiAccountPDA)(this.solautoPosition, this.marginfiAccountSeedIdx)
-                : args.marginfiAccount ??
-                    (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolAccount);
+        if (this.selfManaged) {
+            this.marginfiAccount =
+                args.marginfiAccount ??
+                    (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
+        }
+        else {
+            this.marginfiAccountSeedIdx = (0, generalUtils_1.generateRandomU64)();
+            this.marginfiAccount = this.solautoPositionData
+                ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.protocolAccount)
+                : await (0, accountUtils_1.getMarginfiAccountPDA)(this.solautoPosition, this.marginfiAccountSeedIdx);
+        }
         this.marginfiAccountPk =
             "publicKey" in this.marginfiAccount
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.marginfiAccount.publicKey)
@@ -55,10 +45,18 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         this.marginfiDebtBankAccounts = (0, marginfiUtils_1.findMarginfiBankAccounts)({
             mint: this.debtMint.toString(),
         });
-        const existingMarginfiAccounts = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false);
-        const emptyMarginfiAccounts = (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, existingMarginfiAccounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
-            (Math.round((0, numberUtils_1.bytesToI80F48)(y.assetShares.value)) != 0 ||
-                Math.round((0, numberUtils_1.bytesToI80F48)(y.liabilityShares.value)) != 0)) === undefined);
+        if (!this.initialized) {
+            await this.setIntermediaryMarginfiDetails();
+        }
+        this.initialized = true;
+    }
+    async setIntermediaryMarginfiDetails() {
+        const existingMarginfiAccounts = (await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(this.umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), false)).filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk));
+        const emptyMarginfiAccounts = existingMarginfiAccounts.length > 0
+            ? (await (0, marginfi_sdk_1.safeFetchAllMarginfiAccount)(this.umi, existingMarginfiAccounts.map((x) => (0, umi_1.publicKey)(x.marginfiAccount)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
+                (Math.round((0, numberUtils_1.bytesToI80F48)(y.assetShares.value)) != 0 ||
+                    Math.round((0, numberUtils_1.bytesToI80F48)(y.liabilityShares.value)) != 0)) === undefined)
+            : [];
         this.intermediaryMarginfiAccountSigner =
             emptyMarginfiAccounts.length > 0
                 ? undefined
@@ -270,7 +268,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle),
             positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
-            signerSupplyTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerSupplyTa) : undefined,
+            signerSupplyTa: this.selfManaged
+                ? (0, umi_1.publicKey)(this.signerSupplyTa)
+                : undefined,
             vaultSupplyTa: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
             supplyVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),

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

@@ -1 +1 @@
-{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EAQd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CAgE7B;AAgKD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA2GA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}
+{"version":3,"file":"transactionUtils.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,kBAAkB,EAClB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,OAAO,IAAI,eAAe,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,aAAa,EASd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAqMzD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,kBAAkB,CAAC,CA8F7B;AAmLD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,EAAE,EAAE,kBAAkB,GACrB,OAAO,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,CA0BnD;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,aAAa,EACrB,2BAA2B,CAAC,EAAE,MAAM,EACpC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CACN;IACE,EAAE,EAAE,kBAAkB,CAAC;IACvB,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,GACD,SAAS,CACZ,CA4GA;AAED,wBAAsB,gCAAgC,CACpD,GAAG,EAAE,GAAG,EACR,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC,CAAC,CA8BzC"}

package/dist/transactions/transactionUtils.js

@@ -112,13 +112,18 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
     return chores;
 }
 async function rebalanceChoresBefore(client, tx) {
-    const usesAccount = (key) => tx
-        .getInstructions()
+    const rebalanceInstructions = getRebalanceInstructions(tx);
+    if (rebalanceInstructions.length === 0) {
+        return (0, umi_1.transactionBuilder)();
+    }
+    const usesAccount = (key) => rebalanceInstructions
         .some((t) => t.keys.some((k) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(k.pubkey).equals(key)));
     const checkReferralSupplyTa = client.referredBySupplyTa && usesAccount(client.referredBySupplyTa);
     const checkSolautoFeesTa = usesAccount(client.solautoFeesSupplyTa);
     const checkIntermediaryMfiAccount = client.lendingPlatform === generated_1.LendingPlatform.Marginfi &&
         usesAccount(client.intermediaryMarginfiAccountPk);
+    const checkSignerSupplyTa = client.selfManaged && usesAccount(client.signerSupplyTa);
+    const checkSignerDebtTa = client.selfManaged && usesAccount(client.signerSupplyTa);
     const accountsNeeded = [
         ...[checkReferralSupplyTa ? client.referredBySupplyTa : web3_js_1.PublicKey.default],
         ...[checkSolautoFeesTa ? client.solautoFeesSupplyTa : web3_js_1.PublicKey.default],
@@ -127,8 +132,10 @@ async function rebalanceChoresBefore(client, tx) {
                 ? client.intermediaryMarginfiAccountPk
                 : web3_js_1.PublicKey.default,
         ],
+        ...[checkSignerSupplyTa ? client.signerSupplyTa : web3_js_1.PublicKey.default],
+        ...[checkSignerDebtTa ? client.signerDebtTa : web3_js_1.PublicKey.default],
     ];
-    const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
+    const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa] = await client.umi.rpc.getAccounts(accountsNeeded.map((x) => (0, umi_1.publicKey)(x ?? web3_js_1.PublicKey.default)));
     let chores = (0, umi_1.transactionBuilder)();
     if (checkReferralSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(referredBySupplyTa)) {
         client.log("Creating referred-by TA for ", client.supplyMint.toString());
@@ -142,6 +149,14 @@ async function rebalanceChoresBefore(client, tx) {
         !(0, generalUtils_1.rpcAccountCreated)(intermediaryMarginfiAccount)) {
         chores = chores.add(client.createIntermediaryMarginfiAccount());
     }
+    if (checkSignerSupplyTa && !(0, generalUtils_1.rpcAccountCreated)(signerSupplyTa)) {
+        client.log("Creating signer supply token account");
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.supplyMint));
+    }
+    if (checkSignerDebtTa && !(0, generalUtils_1.rpcAccountCreated)(signerDebtTa)) {
+        client.log("Creating signer debt token account");
+        chores = chores.add((0, solanaUtils_1.createAssociatedTokenAccountUmiIx)(client.signer, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey), client.debtMint));
+    }
     return chores;
 }
 exports.rebalanceChoresBefore = rebalanceChoresBefore;
@@ -153,6 +168,26 @@ function transactionChoresAfter(client, solautoActions, cancellingDcaIn) {
     }
     return chores;
 }
+function getRebalanceInstructions(tx) {
+    return tx.getInstructions().filter((x) => {
+        if (x.programId === generated_1.SOLAUTO_PROGRAM_ID) {
+            try {
+                const serializer = (0, generated_1.getMarginfiRebalanceInstructionDataSerializer)();
+                const discriminator = serializer.serialize({
+                    limitGapBps: 0,
+                    rebalanceType: generated_1.SolautoRebalanceType.None,
+                    targetLiqUtilizationRateBps: 0
+                })[0];
+                const [data, _] = serializer.deserialize(x.data);
+                if (data.discriminator === discriminator) {
+                    return true;
+                }
+            }
+            catch { }
+            return false;
+        }
+    });
+}
 function getSolautoActions(tx) {
     let solautoActions = [];
     tx.getInstructions().forEach((x) => {
@@ -162,8 +197,7 @@ function getSolautoActions(tx) {
                 const discriminator = serializer
                     .serialize({
                     solautoAction: (0, generated_1.solautoAction)("Deposit", [BigInt(0)]),
-                })
-                    .slice(0, 1)[0];
+                })[0];
                 const [data, _] = serializer.deserialize(x.data);
                 if (data.discriminator === discriminator) {
                     solautoActions?.push(data.solautoAction);
@@ -281,10 +315,11 @@ async function getTransactionChores(client, tx) {
 exports.getTransactionChores = getTransactionChores;
 async function buildSolautoRebalanceTransaction(client, targetLiqUtilizationRateBps, attemptNum) {
     client.solautoPositionState = await client.getFreshPositionState();
-    if (targetLiqUtilizationRateBps === undefined &&
-        !(0, generalUtils_2.eligibileForRebalance)(client.solautoPositionState, client.livePositionUpdates.settings ??
-            client.solautoPositionData?.position.settingParams, client.livePositionUpdates.activeDca ??
-            client.solautoPositionData?.position.dca)) {
+    if (client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) ||
+        (targetLiqUtilizationRateBps === undefined &&
+            !(0, generalUtils_2.eligibileForRebalance)(client.solautoPositionState, client.livePositionUpdates.settings ??
+                client.solautoPositionData?.position.settingParams, client.livePositionUpdates.activeDca ??
+                client.solautoPositionData?.position.dca))) {
         client.log("Not eligible for a rebalance");
         return undefined;
     }

package/dist/utils/deleteme.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const numberUtils_1 = require("./numberUtils");
 // TODO delete this file
-function check() {
+async function check() {
     let supply = 458948;
     let debt = 212846;
     let supply_weight = 0.899999976158142;

package/dist/utils/marginfiUtils.d.ts

@@ -8,7 +8,7 @@ export declare function findMarginfiBankAccounts({ mint, bank, }: {
     mint?: string;
     bank?: string;
 }): MarginfiTokenAccounts;
-export declare function getMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank, supplyPrice?: number): Promise<[number, number]>;
+export declare function getMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank | null, supplyPrice?: number): Promise<[number, number]>;
 export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
     marginfiAccount: PublicKey;
     supplyMint?: PublicKey;

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,wBAAwB,CAAC,EACvC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA6CA;AAoDD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}
+{"version":3,"file":"marginfiUtils.d.ts","sourceRoot":"","sources":["../../src/utils/marginfiUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAa,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,wBAAgB,wBAAwB,CAAC,EACvC,IAAI,EACJ,IAAI,GACL,EAAE;IACD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,qBAAqB,CAWxB;AAED,wBAAsB,wBAAwB,CAC5C,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,GAAG,IAAI,EACrB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAsC3B;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,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,CA8CA;AA0DD,wBAAsB,+BAA+B,CACnD,GAAG,EAAE,GAAG,EACR,iBAAiB,EAAE,SAAS,EAC5B,UAAU,CAAC,EAAE,SAAS,EACtB,QAAQ,CAAC,EAAE,SAAS,EACpB,mBAAmB,CAAC,EAAE,mBAAmB,GACxC,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA4IpC;AA+DD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,IAAI,GACT,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0B3B"}

package/dist/utils/marginfiUtils.js

@@ -29,6 +29,9 @@ async function getMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice) {
         const [price] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(supplyBank.mint)]);
         supplyPrice = price;
     }
+    if (debtBank === null) {
+        return [0, 0];
+    }
     let maxLtv = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightInit.value) /
         (0, numberUtils_1.bytesToI80F48)(debtBank.config.liabilityWeightInit.value);
     const liqThreshold = (0, numberUtils_1.bytesToI80F48)(supplyBank.config.assetWeightMaint.value) /
@@ -64,6 +67,7 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
         ],
     });
     if (compatibleWithSolauto) {
+        console.log(marginfiAccounts);
         const positionStates = await Promise.all(marginfiAccounts.map(async (x) => ({
             publicKey: x.publicKey,
             state: await getMarginfiAccountPositionState(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey)),
@@ -84,27 +88,32 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
 }
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;
 async function getTokenUsage(umi, bank, isAsset, shares, amountUsedAdjustment) {
-    let [marketPrice] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
-    const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(umi, bank);
-    const shareValue = isAsset ? assetShareValue : liabilityShareValue;
-    const amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
-    const totalDeposited = (0, numberUtils_1.bytesToI80F48)(bank.totalAssetShares.value) * assetShareValue;
-    const amountCanBeUsd = isAsset
-        ? Number(bank.config.depositLimit) - totalDeposited
-        : totalDeposited -
-            (0, numberUtils_1.bytesToI80F48)(bank.totalLiabilityShares.value) * liabilityShareValue;
+    let amountUsed = 0;
+    let amountCanBeUsed = 0;
+    let marketPrice = 0;
+    if (bank !== null) {
+        [marketPrice] = await (0, generalUtils_1.getTokenPrices)([(0, umi_web3js_adapters_1.toWeb3JsPublicKey)(bank.mint)]);
+        const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(umi, bank);
+        const shareValue = isAsset ? assetShareValue : liabilityShareValue;
+        amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
+        const totalDeposited = (0, numberUtils_1.bytesToI80F48)(bank.totalAssetShares.value) * assetShareValue;
+        amountCanBeUsed = isAsset
+            ? Number(bank.config.depositLimit) - totalDeposited
+            : totalDeposited -
+                (0, numberUtils_1.bytesToI80F48)(bank.totalLiabilityShares.value) * liabilityShareValue;
+    }
     return {
-        mint: bank.mint,
-        decimals: bank.mintDecimals,
+        mint: bank?.mint ?? (0, umi_1.publicKey)(web3_js_1.PublicKey.default),
+        decimals: bank?.mintDecimals ?? 0,
         amountUsed: {
             baseUnit: BigInt(Math.round(amountUsed)),
-            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
-                marketPrice, generalAccounts_1.USD_DECIMALS),
+            baseAmountUsdValue: bank ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
+                marketPrice, generalAccounts_1.USD_DECIMALS) : BigInt(0),
         },
         amountCanBeUsed: {
-            baseUnit: BigInt(Math.round(amountCanBeUsd)),
-            baseAmountUsdValue: (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountCanBeUsd)), bank.mintDecimals) *
-                marketPrice, generalAccounts_1.USD_DECIMALS),
+            baseUnit: BigInt(Math.round(amountCanBeUsed)),
+            baseAmountUsdValue: bank ? (0, numberUtils_1.toBaseUnit)((0, numberUtils_1.fromBaseUnit)(BigInt(Math.round(amountCanBeUsed)), bank.mintDecimals) *
+                marketPrice, generalAccounts_1.USD_DECIMALS) : BigInt(0),
         },
         baseAmountMarketPriceUsd: (0, numberUtils_1.toBaseUnit)(marketPrice, generalAccounts_1.USD_DECIMALS),
         flashLoanFeeBps: 0,
@@ -151,15 +160,15 @@ async function getMarginfiAccountPositionState(umi, marginfiAccountPk, supplyMin
             debtUsage = await getTokenUsage(umi, debtBank, false, (0, numberUtils_1.bytesToI80F48)(debtBalances[0].liabilityShares.value), livePositionUpdates?.debtAdjustment);
         }
     }
-    if (supplyBank !== null && !supplyUsage) {
+    if (supplyBank === null) {
+        return undefined;
+    }
+    if (!supplyUsage) {
         supplyUsage = await getTokenUsage(umi, supplyBank, true, 0, livePositionUpdates?.supplyAdjustment);
     }
-    if (debtBank !== null && !debtUsage) {
+    if (!debtUsage) {
         debtUsage = await getTokenUsage(umi, debtBank, false, 0, livePositionUpdates?.debtAdjustment);
     }
-    if (supplyBank === null || debtBank === null) {
-        return undefined;
-    }
     const supplyPrice = solautoConstants_1.PRICES[supplyMint.toString()].price;
     let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(supplyBank, debtBank, supplyPrice);
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(supplyUsage.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);

package/dist/utils/solauto/generalUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAoB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAgB7D,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAgB3B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,GACf;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAYA;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GACvB,OAAO,CA+BT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAST;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACR;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,EAAE,CACJ,CAkDA;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAezE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6BnC;AA4DD,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAE/C,qBAAa,mBAAmB;IACvB,gBAAgB,EAAE,MAAM,CAAa;IACrC,cAAc,EAAE,MAAM,CAAa;IACnC,uBAAuB,EAAE,MAAM,CAAa;IAC5C,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAEtD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IAyD9B,KAAK;IAQL,UAAU,IAAI,OAAO;CAQtB"}
+{"version":3,"file":"generalUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/solauto/generalUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAoB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,eAAe,EACf,aAAa,EAEb,yBAAyB,EACzB,gCAAgC,EAIjC,MAAM,iBAAiB,CAAC;AAczB,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAgB7D,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,kBAAkB,GAC7B,MAAM,CAKR;AAED,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,kBAAkB,GAC7B,OAAO,CAET;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,kBAAkB,EAC9B,oBAAoB,EAAE,MAAM,UAY7B;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,yBAAyB,EACnC,kBAAkB,EAAE,MAAM,GACzB,yBAAyB,CAgB3B;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,OAAO,EACnB,OAAO,EAAE,OAAO,GACf;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAYA;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,EAC3C,WAAW,EAAE,WAAW,GACvB,OAAO,CAmCT;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,yBAAyB,GAC1C,OAAO,CAST;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CACR;IACE,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,eAAe,CAAC;CAClC,EAAE,CACJ,CAkDA;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAezE;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,SAAS,EAAE,CAAC,CA2BtB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA6BnC;AA4DD,KAAK,kBAAkB,GACnB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,gCAAgC,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAE/C,qBAAa,mBAAmB;IACvB,gBAAgB,EAAE,MAAM,CAAa;IACrC,cAAc,EAAE,MAAM,CAAa;IACnC,uBAAuB,EAAE,MAAM,CAAa;IAC5C,QAAQ,EAAE,yBAAyB,GAAG,SAAS,CAAa;IAC5D,SAAS,EAAE,WAAW,GAAG,SAAS,CAAa;IAEtD,GAAG,CAAC,MAAM,EAAE,kBAAkB;IAyD9B,KAAK;IAQL,UAAU,IAAI,OAAO;CAQtB"}

package/dist/utils/solauto/generalUtils.js

@@ -63,6 +63,9 @@ function eligibileForRebalance(positionState, positionSettings, positionDca) {
         eligibleForNextAutomationPeriod(positionDca.automation)) {
         return true;
     }
+    if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
+        return false;
+    }
     const boostToBps = eligibleForRefresh(positionState, positionSettings) &&
         positionSettings.automation.targetPeriods > 0
         ? getUpdatedValueFromAutomation(positionSettings.boostToBps, positionSettings.targetBoostToBps, positionSettings.automation, (0, generalUtils_1.currentUnixSeconds)())

package/package.json

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

package/src/clients/solautoMarginfiClient.ts

@@ -1,5 +1,4 @@
 import {
-  fromWeb3JsKeypair,
   fromWeb3JsPublicKey,
   toWeb3JsPublicKey,
 } from "@metaplex-foundation/umi-web3js-adapters";
@@ -12,10 +11,7 @@ import {
   createSignerFromKeypair,
   AccountMeta,
 } from "@metaplex-foundation/umi";
-import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
-  clusterApiUrl,
-  Keypair,
   PublicKey,
   SYSVAR_INSTRUCTIONS_PUBKEY,
 } from "@solana/web3.js";
@@ -60,7 +56,6 @@ import {
   getMarginfiAccountPositionState,
 } from "../utils/marginfiUtils";
 import { bytesToI80F48 } from "../utils/numberUtils";
-import { WalletAdapter } from "@metaplex-foundation/umi-signer-wallet-adapters";
 
 export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiAccount?: PublicKey | Signer;
@@ -68,34 +63,12 @@ export interface SolautoMarginfiClientArgs extends SolautoClientArgs {
   marginfiGroup?: PublicKey;
 }
 
-export function newSolautoMarginfiPositionArgs(
-  positionId: number,
-  signer: Signer | undefined,
-  wallet: WalletAdapter | undefined,
-  supplyMint: PublicKey,
-  debtMint: PublicKey,
-  referredByAuthority?: PublicKey
-): SolautoMarginfiClientArgs {
-  const umi = createUmi(clusterApiUrl("mainnet-beta"));
-  return {
-    positionId,
-    signer,
-    wallet,
-    marginfiAccount:
-      positionId === 0
-        ? createSignerFromKeypair(umi, umi.eddsa.generateKeypair())
-        : undefined,
-    marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
-    supplyMint: supplyMint,
-    debtMint: debtMint,
-    referredByAuthority,
-  };
-}
-
 export class SolautoMarginfiClient extends SolautoClient {
+  private initialized: boolean = false;
+
   public marginfiProgram!: PublicKey;
 
-  public marginfiAccountSeedIdx?: bigint;
+  public marginfiAccountSeedIdx: bigint = BigInt(0);
   public marginfiAccount!: PublicKey | Signer;
   public marginfiAccountPk!: PublicKey;
   public marginfiGroup!: PublicKey;
@@ -109,21 +82,21 @@ export class SolautoMarginfiClient extends SolautoClient {
   public intermediaryMarginfiAccount?: MarginfiAccount;
 
   async initialize(args: SolautoMarginfiClientArgs) {
-    if (args.marginfiAccount) {
-      this.marginfiAccount = args.marginfiAccount;
-    }
-
     await super.initialize(args, LendingPlatform.Marginfi);
 
-    this.marginfiAccountSeedIdx = args.marginfiAccountSeedIdx;
-    this.marginfiAccount =
-      this.marginfiAccountSeedIdx !== undefined
-        ? await getMarginfiAccountPDA(
+    if (this.selfManaged) {
+      this.marginfiAccount =
+        args.marginfiAccount ??
+        createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
+    } else {
+      this.marginfiAccountSeedIdx = generateRandomU64();
+      this.marginfiAccount = this.solautoPositionData
+        ? toWeb3JsPublicKey(this.solautoPositionData.position.protocolAccount)
+        : await getMarginfiAccountPDA(
             this.solautoPosition,
             this.marginfiAccountSeedIdx
-          )
-        : args.marginfiAccount ??
-          toWeb3JsPublicKey(this.solautoPositionData!.position.protocolAccount);
+          );
+    }
     this.marginfiAccountPk =
       "publicKey" in this.marginfiAccount
         ? toWeb3JsPublicKey(this.marginfiAccount.publicKey)
@@ -144,25 +117,37 @@ export class SolautoMarginfiClient extends SolautoClient {
       mint: this.debtMint.toString(),
     })!;
 
-    const existingMarginfiAccounts = await getAllMarginfiAccountsByAuthority(
-      this.umi,
-      toWeb3JsPublicKey(this.signer.publicKey),
-      false
-    );
-    const emptyMarginfiAccounts = (
-      await safeFetchAllMarginfiAccount(
+    if (!this.initialized) {
+      await this.setIntermediaryMarginfiDetails();
+    }
+    this.initialized = true;
+  }
+
+  async setIntermediaryMarginfiDetails() {
+    const existingMarginfiAccounts = (
+      await getAllMarginfiAccountsByAuthority(
         this.umi,
-        existingMarginfiAccounts.map((x) => publicKey(x.marginfiAccount))
+        toWeb3JsPublicKey(this.signer.publicKey),
+        false
       )
-    ).filter(
-      (x) =>
-        x.lendingAccount.balances.find(
-          (y) =>
-            y.bankPk.toString() !== PublicKey.default.toString() &&
-            (Math.round(bytesToI80F48(y.assetShares.value)) != 0 ||
-              Math.round(bytesToI80F48(y.liabilityShares.value)) != 0)
-        ) === undefined
-    );
+    ).filter((x) => !x.marginfiAccount.equals(this.marginfiAccountPk));
+    const emptyMarginfiAccounts =
+      existingMarginfiAccounts.length > 0
+        ? (
+            await safeFetchAllMarginfiAccount(
+              this.umi,
+              existingMarginfiAccounts.map((x) => publicKey(x.marginfiAccount))
+            )
+          ).filter(
+            (x) =>
+              x.lendingAccount.balances.find(
+                (y) =>
+                  y.bankPk.toString() !== PublicKey.default.toString() &&
+                  (Math.round(bytesToI80F48(y.assetShares.value)) != 0 ||
+                    Math.round(bytesToI80F48(y.liabilityShares.value)) != 0)
+              ) === undefined
+          )
+        : [];
 
     this.intermediaryMarginfiAccountSigner =
       emptyMarginfiAccounts.length > 0
@@ -284,7 +269,9 @@ export class SolautoMarginfiClient extends SolautoClient {
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiSupplyBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
+          bankLiquidityVault: publicKey(
+            this.marginfiSupplyBankAccounts.liquidityVault
+          ),
         });
       }
       case "Borrow": {
@@ -295,33 +282,45 @@ export class SolautoMarginfiClient extends SolautoClient {
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiDebtBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
-          bankLiquidityVaultAuthority: publicKey(this.marginfiDebtBankAccounts.vaultAuthority),
+          bankLiquidityVault: publicKey(
+            this.marginfiDebtBankAccounts.liquidityVault
+          ),
+          bankLiquidityVaultAuthority: publicKey(
+            this.marginfiDebtBankAccounts.vaultAuthority
+          ),
         });
       }
       case "Repay": {
         return lendingAccountRepay(this.umi, {
-          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          amount:
+            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
           repayAll: args.fields[0].__kind === "All" ? true : false,
           signer: this.signer,
           signerTokenAccount: publicKey(this.signerDebtTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiDebtBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
+          bankLiquidityVault: publicKey(
+            this.marginfiDebtBankAccounts.liquidityVault
+          ),
         });
       }
       case "Withdraw": {
         return lendingAccountWithdraw(this.umi, {
-          amount: args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
+          amount:
+            args.fields[0].__kind === "Some" ? args.fields[0].fields[0] : 0,
           withdrawAll: args.fields[0].__kind === "All" ? true : false,
           signer: this.signer,
           destinationTokenAccount: publicKey(this.signerSupplyTa),
           marginfiAccount: publicKey(this.marginfiAccountPk),
           marginfiGroup: publicKey(this.marginfiGroup),
           bank: publicKey(this.marginfiSupplyBankAccounts.bank),
-          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
-          bankLiquidityVaultAuthority: publicKey(this.marginfiSupplyBankAccounts.vaultAuthority),
+          bankLiquidityVault: publicKey(
+            this.marginfiSupplyBankAccounts.liquidityVault
+          ),
+          bankLiquidityVaultAuthority: publicKey(
+            this.marginfiSupplyBankAccounts.vaultAuthority
+          ),
         });
       }
     }
@@ -422,7 +421,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
-      signerSupplyTa: this.selfManaged ? publicKey(this.signerSupplyTa) : undefined,
+      signerSupplyTa: this.selfManaged
+        ? publicKey(this.signerSupplyTa)
+        : undefined,
       vaultSupplyTa: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
       supplyVaultAuthority: publicKey(
         this.marginfiSupplyBankAccounts.vaultAuthority

package/src/transactions/transactionUtils.ts

@@ -1,4 +1,5 @@
 import {
+  Instruction,
   Signer,
   TransactionBuilder,
   Umi,
@@ -20,6 +21,7 @@ import {
   SolautoRebalanceType,
   convertReferralFees,
   getMarginfiProtocolInteractionInstructionDataSerializer,
+  getMarginfiRebalanceInstructionDataSerializer,
   isSolautoAction,
   solautoAction,
 } from "../generated";
@@ -224,9 +226,13 @@ export async function rebalanceChoresBefore(
   client: SolautoClient,
   tx: TransactionBuilder
 ): Promise<TransactionBuilder> {
+  const rebalanceInstructions = getRebalanceInstructions(tx);
+  if (rebalanceInstructions.length === 0) {
+    return transactionBuilder();
+  }
+
   const usesAccount = (key: PublicKey) =>
-    tx
-      .getInstructions()
+    rebalanceInstructions
       .some((t) => t.keys.some((k) => toWeb3JsPublicKey(k.pubkey).equals(key)));
 
   const checkReferralSupplyTa =
@@ -237,6 +243,8 @@ export async function rebalanceChoresBefore(
     usesAccount(
       (client as SolautoMarginfiClient).intermediaryMarginfiAccountPk
     );
+  const checkSignerSupplyTa = client.selfManaged && usesAccount(client.signerSupplyTa);
+  const checkSignerDebtTa = client.selfManaged && usesAccount(client.signerSupplyTa);
 
   const accountsNeeded = [
     ...[checkReferralSupplyTa ? client.referredBySupplyTa : PublicKey.default],
@@ -246,9 +254,11 @@ export async function rebalanceChoresBefore(
         ? (client as SolautoMarginfiClient).intermediaryMarginfiAccountPk
         : PublicKey.default,
     ],
+    ...[checkSignerSupplyTa ? client.signerSupplyTa : PublicKey.default],
+    ...[checkSignerDebtTa ? client.signerDebtTa : PublicKey.default],
   ];
 
-  const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount] =
+  const [referredBySupplyTa, solautoFeesSupplyTa, intermediaryMarginfiAccount, signerSupplyTa, signerDebtTa] =
     await client.umi.rpc.getAccounts(
       accountsNeeded.map((x) => publicKey(x ?? PublicKey.default))
     );
@@ -286,6 +296,28 @@ export async function rebalanceChoresBefore(
     );
   }
 
+  if (checkSignerSupplyTa && !rpcAccountCreated(signerSupplyTa)) {
+    client.log("Creating signer supply token account");
+    chores = chores.add(
+      createAssociatedTokenAccountUmiIx(
+        client.signer,
+        toWeb3JsPublicKey(client.signer.publicKey),
+        client.supplyMint
+      )
+    );
+  }
+
+  if (checkSignerDebtTa && !rpcAccountCreated(signerDebtTa)) {
+    client.log("Creating signer debt token account");
+    chores = chores.add(
+      createAssociatedTokenAccountUmiIx(
+        client.signer,
+        toWeb3JsPublicKey(client.signer.publicKey),
+        client.debtMint
+      )
+    );
+  }
+
   return chores;
 }
 
@@ -315,6 +347,26 @@ function transactionChoresAfter(
   return chores;
 }
 
+function getRebalanceInstructions(tx: TransactionBuilder): Instruction[] {
+  return tx.getInstructions().filter((x) => {
+    if (x.programId === SOLAUTO_PROGRAM_ID) {
+      try {
+        const serializer = getMarginfiRebalanceInstructionDataSerializer();
+        const discriminator = serializer.serialize({
+          limitGapBps: 0,
+          rebalanceType: SolautoRebalanceType.None,
+          targetLiqUtilizationRateBps: 0
+        })[0];
+        const [data, _] = serializer.deserialize(x.data);
+        if (data.discriminator === discriminator) {
+          return true;
+        }
+      } catch {}
+      return false;
+    }
+  });
+}
+
 function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
   let solautoActions: SolautoAction[] = [];
 
@@ -326,8 +378,7 @@ function getSolautoActions(tx: TransactionBuilder): SolautoAction[] {
         const discriminator = serializer
           .serialize({
             solautoAction: solautoAction("Deposit", [BigInt(0)]),
-          })
-          .slice(0, 1)[0];
+          })[0];
         const [data, _] = serializer.deserialize(x.data);
         if (data.discriminator === discriminator) {
           solautoActions?.push(data.solautoAction);
@@ -491,14 +542,15 @@ export async function buildSolautoRebalanceTransaction(
 > {
   client.solautoPositionState = await client.getFreshPositionState();
   if (
-    targetLiqUtilizationRateBps === undefined &&
-    !eligibileForRebalance(
-      client.solautoPositionState!,
-      client.livePositionUpdates.settings ??
-        client.solautoPositionData?.position.settingParams!,
-      client.livePositionUpdates.activeDca ??
-        client.solautoPositionData?.position.dca!
-    )
+    client.solautoPositionState?.supply.amountUsed.baseUnit === BigInt(0) ||
+    (targetLiqUtilizationRateBps === undefined &&
+      !eligibileForRebalance(
+        client.solautoPositionState!,
+        client.livePositionUpdates.settings ??
+          client.solautoPositionData?.position.settingParams!,
+        client.livePositionUpdates.activeDca ??
+          client.solautoPositionData?.position.dca!
+      ))
   ) {
     client.log("Not eligible for a rebalance");
     return undefined;

package/src/utils/deleteme.ts

@@ -1,7 +1,7 @@
 import { getDebtAdjustmentUsd, getLiqUtilzationRateBps } from "./numberUtils";
 
 // TODO delete this file
-function check() {
+async function check() {
   let supply = 458948;
   let debt = 212846;
   let supply_weight = 0.899999976158142;
@@ -37,4 +37,4 @@ function check() {
   console.log!(liq_utilization_rate);
 }
 
-check();
+check();

package/src/utils/marginfiUtils.ts

@@ -44,7 +44,7 @@ export function findMarginfiBankAccounts({
 
 export async function getMaxLtvAndLiqThreshold(
   supplyBank: Bank,
-  debtBank: Bank,
+  debtBank: Bank | null,
   supplyPrice?: number
 ): Promise<[number, number]> {
   if (!supplyPrice) {
@@ -52,6 +52,10 @@ export async function getMaxLtvAndLiqThreshold(
     supplyPrice = price;
   }
 
+  if (debtBank === null) {
+    return [0, 0];
+  }
+
   let maxLtv =
     bytesToI80F48(supplyBank.config.assetWeightInit.value) /
     bytesToI80F48(debtBank.config.liabilityWeightInit.value);
@@ -112,6 +116,7 @@ export async function getAllMarginfiAccountsByAuthority(
   );
 
   if (compatibleWithSolauto) {
+    console.log(marginfiAccounts);
     const positionStates = await Promise.all(
       marginfiAccounts.map(async (x) => ({
         publicKey: x.publicKey,
@@ -137,44 +142,50 @@ export async function getAllMarginfiAccountsByAuthority(
 
 async function getTokenUsage(
   umi: Umi,
-  bank: Bank,
+  bank: Bank | null,
   isAsset: boolean,
   shares: number,
   amountUsedAdjustment?: bigint
 ): Promise<PositionTokenUsage> {
-  let [marketPrice] = await getTokenPrices([toWeb3JsPublicKey(bank.mint)]);
-  const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(
-    umi,
-    bank
-  );
-  const shareValue = isAsset ? assetShareValue : liabilityShareValue;
-  const amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
+  let amountUsed = 0;
+  let amountCanBeUsed = 0;
+  let marketPrice = 0;
 
-  const totalDeposited =
-    bytesToI80F48(bank.totalAssetShares.value) * assetShareValue;
-  const amountCanBeUsd = isAsset
-    ? Number(bank.config.depositLimit) - totalDeposited
-    : totalDeposited -
-      bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
+  if (bank !== null) {
+    [marketPrice] = await getTokenPrices([toWeb3JsPublicKey(bank.mint)]);
+    const [assetShareValue, liabilityShareValue] = await getUpToDateShareValues(
+      umi,
+      bank
+    );
+    const shareValue = isAsset ? assetShareValue : liabilityShareValue;
+    amountUsed = shares * shareValue + Number(amountUsedAdjustment ?? 0);
+  
+    const totalDeposited =
+      bytesToI80F48(bank.totalAssetShares.value) * assetShareValue;
+    amountCanBeUsed = isAsset
+      ? Number(bank.config.depositLimit) - totalDeposited
+      : totalDeposited -
+        bytesToI80F48(bank.totalLiabilityShares.value) * liabilityShareValue;
+  }
 
   return {
-    mint: bank.mint,
-    decimals: bank.mintDecimals,
+    mint: bank?.mint ?? publicKey(PublicKey.default),
+    decimals: bank?.mintDecimals ?? 0,
     amountUsed: {
       baseUnit: BigInt(Math.round(amountUsed)),
-      baseAmountUsdValue: toBaseUnit(
+      baseAmountUsdValue: bank ? toBaseUnit(
         fromBaseUnit(BigInt(Math.round(amountUsed)), bank.mintDecimals) *
           marketPrice,
         USD_DECIMALS
-      ),
+      ) : BigInt(0),
     },
     amountCanBeUsed: {
-      baseUnit: BigInt(Math.round(amountCanBeUsd)),
-      baseAmountUsdValue: toBaseUnit(
-        fromBaseUnit(BigInt(Math.round(amountCanBeUsd)), bank.mintDecimals) *
+      baseUnit: BigInt(Math.round(amountCanBeUsed)),
+      baseAmountUsdValue: bank ? toBaseUnit(
+        fromBaseUnit(BigInt(Math.round(amountCanBeUsed)), bank.mintDecimals) *
           marketPrice,
         USD_DECIMALS
-      ),
+      ) : BigInt(0),
     },
     baseAmountMarketPriceUsd: toBaseUnit(marketPrice, USD_DECIMALS),
     flashLoanFeeBps: 0,
@@ -270,7 +281,11 @@ export async function getMarginfiAccountPositionState(
     }
   }
 
-  if (supplyBank !== null && !supplyUsage) {
+  if (supplyBank === null) {
+    return undefined;
+  }
+
+  if (!supplyUsage) {
     supplyUsage = await getTokenUsage(
       umi,
       supplyBank,
@@ -280,7 +295,7 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
-  if (debtBank !== null && !debtUsage) {
+  if (!debtUsage) {
     debtUsage = await getTokenUsage(
       umi,
       debtBank,
@@ -290,10 +305,6 @@ export async function getMarginfiAccountPositionState(
     );
   }
 
-  if (supplyBank === null || debtBank === null) {
-    return undefined;
-  }
-
   const supplyPrice = PRICES[supplyMint!.toString()].price;
   let [maxLtv, liqThreshold] = await getMaxLtvAndLiqThreshold(
     supplyBank,

package/src/utils/solauto/generalUtils.ts

@@ -130,6 +130,10 @@ export function eligibileForRebalance(
     return true;
   }
 
+  if (positionState.supply.amountUsed.baseUnit === BigInt(0)) {
+    return false;
+  }
+
   const boostToBps =
     eligibleForRefresh(positionState, positionSettings) &&
     positionSettings.automation.targetPeriods > 0

package/tests/transactions/solautoMarginfi.ts

@@ -3,7 +3,6 @@ import { none, some } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import {
   SolautoMarginfiClient,
-  newSolautoMarginfiPositionArgs,
 } from "../../src/clients/solautoMarginfiClient";
 import {
   solautoAction,
@@ -35,13 +34,6 @@ describe("Solauto Marginfi tests", async () => {
     const debtDecimals = 6;
 
     await client.initialize(
-      // newSolautoMarginfiPositionArgs(
-      //   positionId,
-      //   signer,
-      //   undefined,
-      //   supply,
-      //   new PublicKey(USDC_MINT)
-      // )
       {
         signer,
         positionId,

package/tests/unit/rebalanceCalculations.ts

@@ -1,11 +1,8 @@
-import { describe, it, before } from 'mocha';
+import { describe, it, before } from "mocha";
 import { PublicKey } from "@solana/web3.js";
 import { NATIVE_MINT } from "@solana/spl-token";
 import { assert } from "chai";
-import {
-  newSolautoMarginfiPositionArgs,
-  SolautoMarginfiClient,
-} from "../../src/clients/solautoMarginfiClient";
+import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
 import { setupTest } from "../shared";
 import { MARGINFI_ACCOUNTS } from "../../src/constants/marginfiAccounts";
 import { getRebalanceValues } from "../../src/utils/solauto/rebalanceUtils";
@@ -92,16 +89,16 @@ async function getFakePosition(
   settings: SolautoSettingsParameters,
   dca?: DCASettings
 ): Promise<SolautoClient> {
-  const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY ?? "", true);
-  await client.initialize(
-    newSolautoMarginfiPositionArgs(
-      1,
-      signer,
-      undefined,
-      new PublicKey(NATIVE_MINT),
-      new PublicKey(MARGINFI_ACCOUNTS.USDC.mint)
-    )
+  const client = new SolautoMarginfiClient(
+    process.env.HELIUS_API_KEY ?? "",
+    true
   );
+  await client.initialize({
+    positionId: 1,
+    signer,
+    supplyMint: new PublicKey(NATIVE_MINT),
+    debtMint: new PublicKey(MARGINFI_ACCOUNTS.USDC.mint),
+  });
 
   const state = await client.getFreshPositionState();
   client.solautoPositionData = {
@@ -261,7 +258,6 @@ describe("Rebalance tests", async () => {
   let supplyPrice: number, debtPrice: number;
 
   before(async () => {
-    console.log("Fetching prices for test");
     [supplyPrice, debtPrice] = await getTokenPrices([
       NATIVE_MINT,
       new PublicKey(USDC_MINT),
@@ -269,16 +265,16 @@ describe("Rebalance tests", async () => {
   });
 
   it("Standard rebalance with target rate", async () => {
-    const client = new SolautoMarginfiClient(process.env.HELIUS_API_KEY ?? "", true);
-    await client.initialize(
-      newSolautoMarginfiPositionArgs(
-        1,
-        signer,
-        undefined,
-        new PublicKey(NATIVE_MINT),
-        new PublicKey(MARGINFI_ACCOUNTS.USDC.mint)
-      )
+    const client = new SolautoMarginfiClient(
+      process.env.HELIUS_API_KEY ?? "",
+      true
     );
+    await client.initialize({
+      positionId: 1,
+      signer,
+      supplyMint: new PublicKey(NATIVE_MINT),
+      debtMint: new PublicKey(MARGINFI_ACCOUNTS.USDC.mint),
+    });
 
     client.livePositionUpdates.new({
       type: "supply",