@haven-fi/solauto-sdk 1.0.25 → 1.0.26

package/dist/transactions/transactionsManager.js

@@ -193,11 +193,15 @@ class TransactionsManager {
             choresBefore.prepend(updateLookupTable.updateLutTx);
         }
         if (choresBefore.getInstructions().length > 0) {
-            this.items.unshift(new TransactionItem(async () => ({ tx: choresBefore }), "create account(s)"));
+            const chore = new TransactionItem(async () => ({ tx: choresBefore }), "create account(s)");
+            await chore.initialize();
+            this.items.unshift(chore);
             this.client.log("Chores before: ", choresBefore.getInstructions().length);
         }
         if (choresAfter.getInstructions().length > 0) {
-            this.items.push(new TransactionItem(async () => ({ tx: choresAfter })));
+            const chore = new TransactionItem(async () => ({ tx: choresAfter }));
+            await chore.initialize();
+            this.items.push(chore);
             this.client.log("Chores after: ", choresAfter.getInstructions().length);
         }
         const itemSets = await this.assembleTransactionSets(this.items);

package/dist/types/solauto.d.ts

@@ -0,0 +1,13 @@
+import { PublicKey } from "@solana/web3.js";
+import { LendingPlatform } from "../generated";
+export interface SolautoPositionDetails {
+    positionId: number;
+    selfManaged: boolean;
+    lendingPlatform: LendingPlatform;
+}
+export interface SelfManagedPositionDetails extends SolautoPositionDetails {
+    protocolAccount: PublicKey;
+    supplyMint: PublicKey;
+    debtMint: PublicKey;
+}
+//# sourceMappingURL=solauto.d.ts.map

package/dist/types/solauto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solauto.d.ts","sourceRoot":"","sources":["../../src/types/solauto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;CACpC;AAED,MAAM,WAAW,0BAA2B,SAAQ,sBAAsB;IACtE,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;CACvB"}

package/dist/types/solauto.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/marginfiUtils.d.ts

@@ -9,7 +9,11 @@ export declare function findMarginfiBankAccounts({ mint, bank, }: {
     bank?: string;
 }): MarginfiTokenAccounts;
 export declare function getMaxLtvAndLiqThreshold(supplyBank: Bank, debtBank: Bank, supplyPrice?: number): Promise<[number, number]>;
-export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<PublicKey[]>;
+export declare function getAllMarginfiAccountsByAuthority(umi: Umi, authority: PublicKey, compatibleWithSolauto?: boolean): Promise<{
+    marginfiAccount: PublicKey;
+    supplyMint?: PublicKey;
+    debtMint?: PublicKey;
+}[]>;
 export declare function getMarginfiAccountPositionState(umi: Umi, marginfiAccountPk: PublicKey, supplyMint?: PublicKey, debtMint?: PublicKey, livePositionUpdates?: LivePositionUpdates): Promise<PositionState | undefined>;
 export declare function getUpToDateShareValues(umi: Umi, bank: Bank): Promise<[number, number]>;
 //# sourceMappingURL=marginfiUtils.d.ts.map

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,EAOL,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,CAAC,SAAS,EAAE,CAAC,CAuCtB;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,EAOL,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"}

package/dist/utils/marginfiUtils.js

@@ -70,10 +70,16 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
         })));
         return positionStates
             .filter((x) => x.state !== undefined)
-            .map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
+            .map((x) => ({
+            marginfiAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
+            supplyMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.state.supply.mint),
+            debtMint: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.state.debt.mint),
+        }));
     }
     else {
-        return marginfiAccounts.map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey));
+        return marginfiAccounts.map((x) => ({
+            marginfiAccount: (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey),
+        }));
     }
 }
 exports.getAllMarginfiAccountsByAuthority = getAllMarginfiAccountsByAuthority;

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

@@ -1,6 +1,7 @@
 import { PublicKey } from "@solana/web3.js";
 import { Umi } from "@metaplex-foundation/umi";
 import { AutomationSettings, DCASettings, DCASettingsInpArgs, FeeType, LendingPlatform, PositionState, SolautoSettingsParameters, SolautoSettingsParametersInpArgs } from "../../generated";
+import { SolautoPositionDetails } from "../../types/solauto";
 export declare function nextAutomationPeriodTimestamp(automation: AutomationSettings): number;
 export declare function eligibleForNextAutomationPeriod(automation: AutomationSettings): boolean;
 export declare function getUpdatedValueFromAutomation(currValue: number, targetValue: number, automation: AutomationSettings, currentUnixTimestamp: number): number;
@@ -19,11 +20,6 @@ export declare function getSolautoManagedPositions(umi: Umi, authority?: PublicK
 }[]>;
 export declare function getAllReferralStates(umi: Umi): Promise<PublicKey[]>;
 export declare function getReferralsByUser(umi: Umi, user: PublicKey): Promise<PublicKey[]>;
-export interface SolautoPositionDetails {
-    positionId: number;
-    lendingPlatform: LendingPlatform;
-    protocolAccount?: PublicKey;
-}
 export declare function getAllPositionsByAuthority(umi: Umi, user: PublicKey): Promise<SolautoPositionDetails[]>;
 type PositionAdjustment = {
     type: "supply";

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":"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"}
+{"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,EAEL,sBAAsB,EACvB,MAAM,qBAAqB,CAAC;AAgB7B,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,CAkCnC;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

@@ -186,12 +186,16 @@ async function getAllPositionsByAuthority(umi, user) {
     allPositions.push(...solautoManagedPositions.map((x) => ({
         positionId: x.positionId,
         lendingPlatform: x.lendingPlatform,
+        selfManaged: false,
     })));
     const marginfiPositions = await (0, marginfiUtils_1.getAllMarginfiAccountsByAuthority)(umi, user, true);
-    allPositions.push(...marginfiPositions.map((pubkey) => ({
+    allPositions.push(...marginfiPositions.map((x) => ({
         positionId: 0,
+        selfManaged: true,
         lendingPlatform: generated_1.LendingPlatform.Marginfi,
-        protocolAccount: pubkey,
+        protocolAccount: x.marginfiAccount,
+        supplyMint: x.supplyMint,
+        debtMint: x.debtMint,
     })));
     // TODO support other platforms
     return allPositions;

package/dist/utils/solauto/rebalanceUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getJupSwapRebalanceDetails = exports.getFlashLoanDetails = exports.getRebalanceValues = void 0;
+const generated_1 = require("../../generated");
 const generalUtils_1 = require("./generalUtils");
 const umi_web3js_adapters_1 = require("@metaplex-foundation/umi-web3js-adapters");
 const generalUtils_2 = require("../generalUtils");
@@ -98,7 +99,7 @@ function getRebalanceValues(client, targetLiqUtilizationRateBps, limitGapBps) {
         client.solautoPositionState.liqUtilizationRateBps < targetRateBps;
     let adjustmentFeeBps = 0;
     if (increasingLeverage) {
-        adjustmentFeeBps = (0, generalUtils_1.getSolautoFeesBps)(client.referredByState !== undefined, client.solautoPositionData.feeType).total;
+        adjustmentFeeBps = (0, generalUtils_1.getSolautoFeesBps)(client.referredByState !== undefined, client.solautoPositionData?.feeType ?? generated_1.FeeType.Small).total;
     }
     const supplyUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.supply.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS) + amountUsdToDcaIn;
     const debtUsd = (0, numberUtils_1.fromBaseUnit)(client.solautoPositionState.debt.amountUsed.baseAmountUsdValue, generalAccounts_1.USD_DECIMALS);

package/package.json

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

package/src/clients/solautoClient.ts

@@ -88,12 +88,12 @@ export abstract class SolautoClient {
   public solautoPositionState!: PositionState | undefined;
 
   public supplyMint!: PublicKey;
-  public positionSupplyLiquidityTa!: PublicKey;
-  public signerSupplyLiquidityTa!: PublicKey;
+  public positionSupplyTa!: PublicKey;
+  public signerSupplyTa!: PublicKey;
 
   public debtMint!: PublicKey;
-  public positionDebtLiquidityTa!: PublicKey;
-  public signerDebtLiquidityTa!: PublicKey;
+  public positionDebtTa!: PublicKey;
+  public signerDebtTa!: PublicKey;
 
   public authorityReferralState!: PublicKey;
   public authorityReferralStateData!: ReferralState | null;
@@ -157,11 +157,11 @@ export abstract class SolautoClient {
     this.supplyMint =
       args.supplyMint ??
       toWeb3JsPublicKey(this.solautoPositionData!.position.supplyMint);
-    this.positionSupplyLiquidityTa = getTokenAccount(
+    this.positionSupplyTa = getTokenAccount(
       this.solautoPosition,
       this.supplyMint
     );
-    this.signerSupplyLiquidityTa = getTokenAccount(
+    this.signerSupplyTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
       this.supplyMint
     );
@@ -169,11 +169,11 @@ export abstract class SolautoClient {
     this.debtMint =
       args.debtMint ??
       toWeb3JsPublicKey(this.solautoPositionData!.position.debtMint);
-    this.positionDebtLiquidityTa = getTokenAccount(
+    this.positionDebtTa = getTokenAccount(
       this.solautoPosition,
       this.debtMint
     );
-    this.signerDebtLiquidityTa = getTokenAccount(
+    this.signerDebtTa = getTokenAccount(
       toWeb3JsPublicKey(this.signer.publicKey),
       this.debtMint
     );
@@ -280,14 +280,14 @@ export abstract class SolautoClient {
     return [
       this.authority,
       ...(this.signer.publicKey.toString() === this.authority.toString()
-        ? [this.signerSupplyLiquidityTa]
+        ? [this.signerSupplyTa]
         : []),
       ...(this.signer.publicKey.toString() === this.authority.toString()
-        ? [this.signerDebtLiquidityTa]
+        ? [this.signerDebtTa]
         : []),
       this.solautoPosition,
-      this.positionSupplyLiquidityTa,
-      this.positionDebtLiquidityTa,
+      this.positionSupplyTa,
+      this.positionDebtTa,
       this.authorityReferralState,
       ...(this.referredBySupplyTa ? [this.referredBySupplyTa] : []),
     ];
@@ -317,7 +317,6 @@ export abstract class SolautoClient {
       return undefined;
     }
 
-    this.log("Updating authority lookup table...");
     let tx = transactionBuilder();
 
     if (this.authorityLutAddress === undefined) {
@@ -353,10 +352,13 @@ export abstract class SolautoClient {
       );
     }
 
-    const addingReferredBy =
-      accountsToAdd.length === 1 &&
-      accountsToAdd[0].toString().toLowerCase() ===
-        this.referredBySupplyTa?.toString().toLowerCase();
+    const addingReferredBy = accountsToAdd.length === 1
+    // && accountsToAdd[0].toString().toLowerCase() ===
+    //   this.referredBySupplyTa?.toString().toLowerCase();
+
+    if (tx.getInstructions().length > 0) {
+      this.log("Updating authority lookup table...");
+    }
 
     return { updateLutTx: tx, needsToBeIsolated: !addingReferredBy };
   }
@@ -443,8 +445,8 @@ export abstract class SolautoClient {
     let signerDebtTa: UmiPublicKey | undefined = undefined;
     if (isOption(args.dca) && isSome(args.dca)) {
       debtMint = publicKey(this.debtMint);
-      positionDebtTa = publicKey(this.positionDebtLiquidityTa);
-      signerDebtTa = publicKey(this.signerDebtLiquidityTa);
+      positionDebtTa = publicKey(this.positionDebtTa);
+      signerDebtTa = publicKey(this.signerDebtTa);
 
       let addingToPos = false;
       if (
@@ -500,10 +502,10 @@ export abstract class SolautoClient {
     return closePosition(this.umi, {
       signer: this.signer,
       solautoPosition: publicKey(this.solautoPosition),
-      signerSupplyLiquidityTa: publicKey(this.signerSupplyLiquidityTa),
-      positionSupplyLiquidityTa: publicKey(this.positionSupplyLiquidityTa),
-      positionDebtLiquidityTa: publicKey(this.positionDebtLiquidityTa),
-      signerDebtLiquidityTa: publicKey(this.signerDebtLiquidityTa),
+      signerSupplyTa: publicKey(this.signerSupplyTa),
+      positionSupplyTa: publicKey(this.positionSupplyTa),
+      positionDebtTa: publicKey(this.positionDebtTa),
+      signerDebtTa: publicKey(this.signerDebtTa),
     });
   }
 
@@ -516,8 +518,8 @@ export abstract class SolautoClient {
       const positionData = this.solautoPositionData!.position;
       if (positionData.dca.debtToAddBaseUnit) {
         debtMint = publicKey(this.debtMint);
-        positionDebtTa = publicKey(this.positionDebtLiquidityTa);
-        signerDebtTa = publicKey(this.signerDebtLiquidityTa);
+        positionDebtTa = publicKey(this.positionDebtTa);
+        signerDebtTa = publicKey(this.signerDebtTa);
 
         this.livePositionUpdates.new({
           type: "debtDcaIn",
@@ -545,8 +547,8 @@ export abstract class SolautoClient {
         tx = tx.add(
           splTokenTransferUmiIx(
             this.signer,
-            this.signerSupplyLiquidityTa,
-            this.positionSupplyLiquidityTa,
+            this.signerSupplyTa,
+            this.positionSupplyTa,
             toWeb3JsPublicKey(this.signer.publicKey),
             BigInt(args.fields[0])
           )
@@ -556,8 +558,8 @@ export abstract class SolautoClient {
           tx = tx.add(
             splTokenTransferUmiIx(
               this.signer,
-              this.signerDebtLiquidityTa,
-              this.positionDebtLiquidityTa,
+              this.signerDebtTa,
+              this.positionDebtTa,
               toWeb3JsPublicKey(this.signer.publicKey),
               BigInt(args.fields[0].fields[0])
             )
@@ -566,8 +568,8 @@ export abstract class SolautoClient {
           tx = tx.add(
             splTokenTransferUmiIx(
               this.signer,
-              this.signerDebtLiquidityTa,
-              this.positionDebtLiquidityTa,
+              this.signerDebtTa,
+              this.positionDebtTa,
               toWeb3JsPublicKey(this.signer.publicKey),
               BigInt(
                 Math.round(

package/src/clients/solautoMarginfiClient.ts

@@ -11,9 +11,10 @@ import {
   transactionBuilder,
   createSignerFromKeypair,
   AccountMeta,
-  createUmi,
 } from "@metaplex-foundation/umi";
+import { createUmi } from "@metaplex-foundation/umi-bundle-defaults";
 import {
+  clusterApiUrl,
   Keypair,
   PublicKey,
   SYSVAR_INSTRUCTIONS_PUBKEY,
@@ -42,9 +43,11 @@ import {
   MARGINFI_PROGRAM_ID,
   MarginfiAccount,
   lendingAccountBorrow,
+  lendingAccountDeposit,
   lendingAccountEndFlashloan,
   lendingAccountRepay,
   lendingAccountStartFlashloan,
+  lendingAccountWithdraw,
   marginfiAccountInitialize,
   safeFetchAllMarginfiAccount,
   safeFetchMarginfiAccount,
@@ -73,16 +76,14 @@ export function newSolautoMarginfiPositionArgs(
   debtMint: PublicKey,
   referredByAuthority?: PublicKey
 ): SolautoMarginfiClientArgs {
+  const umi = createUmi(clusterApiUrl("mainnet-beta"));
   return {
     positionId,
     signer,
     wallet,
     marginfiAccount:
       positionId === 0
-        ? createSignerFromKeypair(
-            createUmi(),
-            fromWeb3JsKeypair(Keypair.generate())
-          )
+        ? createSignerFromKeypair(umi, umi.eddsa.generateKeypair())
         : undefined,
     marginfiAccountSeedIdx: positionId > 0 ? generateRandomU64() : undefined,
     supplyMint: supplyMint,
@@ -151,7 +152,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     const emptyMarginfiAccounts = (
       await safeFetchAllMarginfiAccount(
         this.umi,
-        existingMarginfiAccounts.map((x) => publicKey(x))
+        existingMarginfiAccounts.map((x) => publicKey(x.marginfiAccount))
       )
     ).filter(
       (x) =>
@@ -166,10 +167,7 @@ export class SolautoMarginfiClient extends SolautoClient {
     this.intermediaryMarginfiAccountSigner =
       emptyMarginfiAccounts.length > 0
         ? undefined
-        : createSignerFromKeypair(
-            this.umi,
-            fromWeb3JsKeypair(Keypair.generate())
-          );
+        : createSignerFromKeypair(this.umi, this.umi.eddsa.generateKeypair());
     this.intermediaryMarginfiAccountPk =
       emptyMarginfiAccounts.length > 0
         ? toWeb3JsPublicKey(emptyMarginfiAccounts[0].publicKey)
@@ -203,9 +201,9 @@ export class SolautoMarginfiClient extends SolautoClient {
     settingParams?: SolautoSettingsParametersInpArgs,
     dca?: DCASettingsInpArgs
   ): TransactionBuilder {
-    let signerDebtLiquidityTa: UmiPublicKey | undefined = undefined;
+    let signerDebtTa: UmiPublicKey | undefined = undefined;
     if (dca) {
-      signerDebtLiquidityTa = publicKey(this.signerDebtLiquidityTa);
+      signerDebtTa = publicKey(this.signerDebtTa);
     }
 
     return marginfiOpenPosition(this.umi, {
@@ -228,11 +226,11 @@ export class SolautoMarginfiClient extends SolautoClient {
           : (this.marginfiAccount as Signer),
       supplyMint: publicKey(this.supplyMint),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
-      positionSupplyTa: publicKey(this.positionSupplyLiquidityTa),
+      positionSupplyTa: publicKey(this.positionSupplyTa),
       debtMint: publicKey(this.debtMint),
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
-      positionDebtTa: publicKey(this.positionDebtLiquidityTa),
-      signerDebtTa: signerDebtLiquidityTa,
+      positionDebtTa: publicKey(this.positionDebtTa),
+      signerDebtTa: signerDebtTa,
       positionData: {
         positionId: this.positionId!,
         settingParams: settingParams ?? null,
@@ -257,22 +255,79 @@ export class SolautoMarginfiClient extends SolautoClient {
   }
 
   protocolInteraction(args: SolautoActionArgs): TransactionBuilder {
-    return super
-      .protocolInteraction(args)
-      .add(this.marginfiProtocolInteractionIx(args));
+    let tx = super.protocolInteraction(args);
+
+    if (this.selfManaged) {
+      return tx.add(this.marginfiProtocolInteractionIx(args));
+    } else {
+      return tx.add(this.marginfiSolautoProtocolInteractionIx(args));
+    }
+  }
+
+  private marginfiProtocolInteractionIx(args: SolautoActionArgs) {
+    switch (args.__kind) {
+      case "Deposit": {
+        return lendingAccountDeposit(this.umi, {
+          amount: args.fields[0],
+          signer: this.signer,
+          signerTokenAccount: publicKey(this.signerSupplyTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiSupplyBankAccounts.bank),
+          bankLiquidityVault: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
+        });
+      }
+      case "Borrow": {
+        return lendingAccountBorrow(this.umi, {
+          amount: args.fields[0],
+          signer: this.signer,
+          destinationTokenAccount: publicKey(this.signerDebtTa),
+          marginfiAccount: publicKey(this.marginfiAccountPk),
+          marginfiGroup: publicKey(this.marginfiGroup),
+          bank: publicKey(this.marginfiDebtBankAccounts.bank),
+          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,
+          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),
+        });
+      }
+      case "Withdraw": {
+        return lendingAccountWithdraw(this.umi, {
+          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),
+        });
+      }
+    }
   }
 
-  private marginfiProtocolInteractionIx(
+  private marginfiSolautoProtocolInteractionIx(
     args: SolautoActionArgs
   ): TransactionBuilder {
-    let sourceSupplyTa: UmiPublicKey | undefined = undefined;
+    let positionSupplyTa: UmiPublicKey | undefined = undefined;
     let vaultSupplyTa: UmiPublicKey | undefined = undefined;
     let supplyVaultAuthority: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Deposit" || args.__kind === "Withdraw") {
-      sourceSupplyTa = publicKey(
+      positionSupplyTa = publicKey(
         args.__kind === "Withdraw" || this.selfManaged
-          ? this.signerSupplyLiquidityTa
-          : this.positionSupplyLiquidityTa
+          ? this.signerSupplyTa
+          : this.positionSupplyTa
       );
       vaultSupplyTa = publicKey(this.marginfiSupplyBankAccounts.liquidityVault);
       supplyVaultAuthority = publicKey(
@@ -280,14 +335,14 @@ export class SolautoMarginfiClient extends SolautoClient {
       );
     }
 
-    let sourceDebtTa: UmiPublicKey | undefined = undefined;
+    let positionDebtTa: UmiPublicKey | undefined = undefined;
     let vaultDebtTa: UmiPublicKey | undefined = undefined;
     let debtVaultAuthority: UmiPublicKey | undefined = undefined;
     if (args.__kind === "Borrow" || args.__kind === "Repay") {
-      sourceDebtTa = publicKey(
+      positionDebtTa = publicKey(
         args.__kind === "Borrow" || this.selfManaged
-          ? this.signerDebtLiquidityTa
-          : this.positionDebtLiquidityTa
+          ? this.signerDebtTa
+          : this.positionDebtTa
       );
       vaultDebtTa = publicKey(this.marginfiDebtBankAccounts.liquidityVault);
       debtVaultAuthority = publicKey(
@@ -312,12 +367,12 @@ export class SolautoMarginfiClient extends SolautoClient {
       marginfiAccount: publicKey(this.marginfiAccountPk),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle,
-      sourceSupplyTa,
+      positionSupplyTa,
       vaultSupplyTa,
       supplyVaultAuthority,
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       debtPriceOracle,
-      sourceDebtTa,
+      positionDebtTa,
       vaultDebtTa,
       debtVaultAuthority,
       solautoAction: args,
@@ -356,14 +411,16 @@ export class SolautoMarginfiClient extends SolautoClient {
       ),
       supplyBank: publicKey(this.marginfiSupplyBankAccounts.bank),
       supplyPriceOracle: publicKey(this.marginfiSupplyBankAccounts.priceOracle),
-      positionSupplyTa: publicKey(this.positionSupplyLiquidityTa),
+      positionSupplyTa: publicKey(this.positionSupplyTa),
+      signerSupplyTa: this.selfManaged ? publicKey(this.signerSupplyTa) : undefined,
       vaultSupplyTa: publicKey(this.marginfiSupplyBankAccounts.liquidityVault),
       supplyVaultAuthority: publicKey(
         this.marginfiSupplyBankAccounts.vaultAuthority
       ),
       debtBank: publicKey(this.marginfiDebtBankAccounts.bank),
       debtPriceOracle: publicKey(this.marginfiDebtBankAccounts.priceOracle),
-      positionDebtTa: publicKey(this.positionDebtLiquidityTa),
+      positionDebtTa: publicKey(this.positionDebtTa),
+      signerDebtTa: this.selfManaged ? publicKey(this.signerDebtTa) : undefined,
       vaultDebtTa: publicKey(this.marginfiDebtBankAccounts.liquidityVault),
       debtVaultAuthority: publicKey(
         this.marginfiDebtBankAccounts.vaultAuthority

package/src/generated/instructions/closePosition.ts

@@ -33,11 +33,11 @@ export type ClosePositionInstructionAccounts = {
   tokenProgram?: PublicKey | Pda;
   ataProgram?: PublicKey | Pda;
   solautoPosition: PublicKey | Pda;
-  signerSupplyLiquidityTa: PublicKey | Pda;
-  positionSupplyLiquidityTa: PublicKey | Pda;
+  signerSupplyTa: PublicKey | Pda;
+  positionSupplyTa: PublicKey | Pda;
   positionSupplyCollateralTa?: PublicKey | Pda;
-  positionDebtLiquidityTa: PublicKey | Pda;
-  signerDebtLiquidityTa: PublicKey | Pda;
+  positionDebtTa: PublicKey | Pda;
+  signerDebtTa: PublicKey | Pda;
 };
 
 // Data.
@@ -102,30 +102,30 @@ export function closePosition(
       isWritable: true as boolean,
       value: input.solautoPosition ?? null,
     },
-    signerSupplyLiquidityTa: {
+    signerSupplyTa: {
       index: 5,
       isWritable: true as boolean,
-      value: input.signerSupplyLiquidityTa ?? null,
+      value: input.signerSupplyTa ?? null,
     },
-    positionSupplyLiquidityTa: {
+    positionSupplyTa: {
       index: 6,
       isWritable: true as boolean,
-      value: input.positionSupplyLiquidityTa ?? null,
+      value: input.positionSupplyTa ?? null,
     },
     positionSupplyCollateralTa: {
       index: 7,
       isWritable: true as boolean,
       value: input.positionSupplyCollateralTa ?? null,
     },
-    positionDebtLiquidityTa: {
+    positionDebtTa: {
       index: 8,
       isWritable: true as boolean,
-      value: input.positionDebtLiquidityTa ?? null,
+      value: input.positionDebtTa ?? null,
     },
-    signerDebtLiquidityTa: {
+    signerDebtTa: {
       index: 9,
       isWritable: true as boolean,
-      value: input.signerDebtLiquidityTa ?? null,
+      value: input.signerDebtTa ?? null,
     },
   } satisfies ResolvedAccountsWithIndices;
 

package/src/generated/instructions/marginfiProtocolInteraction.ts

@@ -45,12 +45,12 @@ export type MarginfiProtocolInteractionInstructionAccounts = {
   marginfiAccount: PublicKey | Pda;
   supplyBank: PublicKey | Pda;
   supplyPriceOracle?: PublicKey | Pda;
-  sourceSupplyTa?: PublicKey | Pda;
+  positionSupplyTa?: PublicKey | Pda;
   vaultSupplyTa?: PublicKey | Pda;
   supplyVaultAuthority?: PublicKey | Pda;
   debtBank: PublicKey | Pda;
   debtPriceOracle?: PublicKey | Pda;
-  sourceDebtTa?: PublicKey | Pda;
+  positionDebtTa?: PublicKey | Pda;
   vaultDebtTa?: PublicKey | Pda;
   debtVaultAuthority?: PublicKey | Pda;
 };
@@ -157,10 +157,10 @@ export function marginfiProtocolInteraction(
       isWritable: false as boolean,
       value: input.supplyPriceOracle ?? null,
     },
-    sourceSupplyTa: {
+    positionSupplyTa: {
       index: 11,
       isWritable: true as boolean,
-      value: input.sourceSupplyTa ?? null,
+      value: input.positionSupplyTa ?? null,
     },
     vaultSupplyTa: {
       index: 12,
@@ -182,10 +182,10 @@ export function marginfiProtocolInteraction(
       isWritable: false as boolean,
       value: input.debtPriceOracle ?? null,
     },
-    sourceDebtTa: {
+    positionDebtTa: {
       index: 16,
       isWritable: true as boolean,
-      value: input.sourceDebtTa ?? null,
+      value: input.positionDebtTa ?? null,
     },
     vaultDebtTa: {
       index: 17,