@haven-fi/solauto-sdk 1.0.24 → 1.0.26

package/dist/clients/solautoClient.d.ts

@@ -30,11 +30,11 @@ export declare abstract class SolautoClient {
     solautoPositionData: SolautoPosition | null;
     solautoPositionState: PositionState | undefined;
     supplyMint: PublicKey;
-    positionSupplyLiquidityTa: PublicKey;
-    signerSupplyLiquidityTa: PublicKey;
+    positionSupplyTa: PublicKey;
+    signerSupplyTa: PublicKey;
     debtMint: PublicKey;
-    positionDebtLiquidityTa: PublicKey;
-    signerDebtLiquidityTa: PublicKey;
+    positionDebtTa: PublicKey;
+    signerDebtTa: PublicKey;
     authorityReferralState: PublicKey;
     authorityReferralStateData: ReferralState | null;
     authorityReferralFeesDestMint: PublicKey;

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

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

package/dist/clients/solautoClient.js

@@ -46,13 +46,13 @@ class SolautoClient {
         this.supplyMint =
             args.supplyMint ??
                 (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.supplyMint);
-        this.positionSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyMint);
-        this.signerSupplyLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint);
+        this.positionSupplyTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.supplyMint);
+        this.signerSupplyTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.supplyMint);
         this.debtMint =
             args.debtMint ??
                 (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.solautoPositionData.position.debtMint);
-        this.positionDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
-        this.signerDebtLiquidityTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
+        this.positionDebtTa = (0, accountUtils_1.getTokenAccount)(this.solautoPosition, this.debtMint);
+        this.signerDebtTa = (0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), this.debtMint);
         this.authorityReferralState = await (0, accountUtils_1.getReferralState)(this.authority);
         this.authorityReferralStateData = await (0, generated_1.safeFetchReferralState)(this.umi, (0, umi_1.publicKey)(this.authorityReferralState));
         this.authorityReferralFeesDestMint = args.referralFeesDestMint
@@ -123,14 +123,14 @@ 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] : []),
         ];
@@ -151,7 +151,6 @@ class SolautoClient {
             .includes(element.toString().toLowerCase()))) {
             return undefined;
         }
-        this.log("Updating authority lookup table...");
         let tx = (0, umi_1.transactionBuilder)();
         if (this.authorityLutAddress === undefined) {
             const [createLookupTableInst, lookupTableAddress] = web3_js_1.AddressLookupTableProgram.createLookupTable({
@@ -174,9 +173,12 @@ class SolautoClient {
                 addresses: accountsToAdd,
             })));
         }
-        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 };
     }
     solautoPositionSettings() {
@@ -243,8 +245,8 @@ class SolautoClient {
         let signerDebtTa = undefined;
         if ((0, umi_1.isOption)(args.dca) && (0, umi_1.isSome)(args.dca)) {
             debtMint = (0, umi_1.publicKey)(this.debtMint);
-            positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
-            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
+            positionDebtTa = (0, umi_1.publicKey)(this.positionDebtTa);
+            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
             let addingToPos = false;
             if ((0, umi_1.isOption)(args.dca) &&
                 (0, umi_1.isSome)(args.dca) &&
@@ -289,10 +291,10 @@ class SolautoClient {
         return (0, generated_1.closePosition)(this.umi, {
             signer: this.signer,
             solautoPosition: (0, umi_1.publicKey)(this.solautoPosition),
-            signerSupplyLiquidityTa: (0, umi_1.publicKey)(this.signerSupplyLiquidityTa),
-            positionSupplyLiquidityTa: (0, umi_1.publicKey)(this.positionSupplyLiquidityTa),
-            positionDebtLiquidityTa: (0, umi_1.publicKey)(this.positionDebtLiquidityTa),
-            signerDebtLiquidityTa: (0, umi_1.publicKey)(this.signerDebtLiquidityTa),
+            signerSupplyTa: (0, umi_1.publicKey)(this.signerSupplyTa),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            signerDebtTa: (0, umi_1.publicKey)(this.signerDebtTa),
         });
     }
     cancelDCAIx() {
@@ -303,8 +305,8 @@ class SolautoClient {
             const positionData = this.solautoPositionData.position;
             if (positionData.dca.debtToAddBaseUnit) {
                 debtMint = (0, umi_1.publicKey)(this.debtMint);
-                positionDebtTa = (0, umi_1.publicKey)(this.positionDebtLiquidityTa);
-                signerDebtTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
+                positionDebtTa = (0, umi_1.publicKey)(this.positionDebtTa);
+                signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
                 this.livePositionUpdates.new({
                     type: "debtDcaIn",
                     value: positionData.dca.debtToAddBaseUnit * BigInt(-1),
@@ -323,14 +325,14 @@ class SolautoClient {
         let tx = (0, umi_1.transactionBuilder)();
         if (!this.selfManaged) {
             if (args.__kind === "Deposit") {
-                tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerSupplyLiquidityTa, this.positionSupplyLiquidityTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0])));
+                tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerSupplyTa, this.positionSupplyTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0])));
             }
             else if (args.__kind === "Repay") {
                 if (args.fields[0].__kind === "Some") {
-                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtLiquidityTa, this.positionDebtLiquidityTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
+                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(args.fields[0].fields[0])));
                 }
                 else {
-                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtLiquidityTa, this.positionDebtLiquidityTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.solautoPositionState.debt.amountUsed.baseUnit) *
+                    tx = tx.add((0, solanaUtils_1.splTokenTransferUmiIx)(this.signer, this.signerDebtTa, this.positionDebtTa, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), BigInt(Math.round(Number(this.solautoPositionState.debt.amountUsed.baseUnit) *
                         1.01))));
                 }
             }

package/dist/clients/solautoMarginfiClient.d.ts

@@ -32,6 +32,7 @@ export declare class SolautoMarginfiClient extends SolautoClient {
     refresh(): TransactionBuilder;
     protocolInteraction(args: SolautoActionArgs): TransactionBuilder;
     private marginfiProtocolInteractionIx;
+    private marginfiSolautoProtocolInteractionIx;
     rebalance(rebalanceStep: "A" | "B", swapDetails: JupSwapDetails, rebalanceType: SolautoRebalanceTypeArgs, targetLiqUtilizationRateBps?: number, limitGapBps?: number): TransactionBuilder;
     flashBorrow(flashLoanDetails: FlashLoanDetails, destinationTokenAccount: PublicKey): TransactionBuilder;
     flashRepay(flashLoanDetails: FlashLoanDetails): 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,EAOnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEL,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,EAQhB,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,CAiB3B;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;IAuEhD,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAQ/B,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;IAMhE,OAAO,CAAC,6BAA6B;IA8DrC,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;IA4CrB,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":"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,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;IAqDrC,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"}

package/dist/clients/solautoMarginfiClient.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolautoMarginfiClient = exports.newSolautoMarginfiPositionArgs = 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,12 +14,13 @@ 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)((0, umi_1.createUmi)(), (0, umi_web3js_adapters_1.fromWeb3JsKeypair)(web3_js_1.Keypair.generate()))
+            ? (0, umi_1.createSignerFromKeypair)(umi, umi.eddsa.generateKeypair())
             : undefined,
         marginfiAccountSeedIdx: positionId > 0 ? (0, generalUtils_1.generateRandomU64)() : undefined,
         supplyMint: supplyMint,
@@ -54,13 +56,13 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             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)))).filter((x) => x.lendingAccount.balances.find((y) => y.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
+        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);
         this.intermediaryMarginfiAccountSigner =
             emptyMarginfiAccounts.length > 0
                 ? undefined
-                : (0, umi_1.createSignerFromKeypair)(this.umi, (0, umi_web3js_adapters_1.fromWeb3JsKeypair)(web3_js_1.Keypair.generate()));
+                : (0, umi_1.createSignerFromKeypair)(this.umi, this.umi.eddsa.generateKeypair());
         this.intermediaryMarginfiAccountPk =
             emptyMarginfiAccounts.length > 0
                 ? (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(emptyMarginfiAccounts[0].publicKey)
@@ -84,9 +86,9 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             .add(this.marginfiOpenPositionIx(settingParams, dca));
     }
     marginfiOpenPositionIx(settingParams, dca) {
-        let signerDebtLiquidityTa = undefined;
+        let signerDebtTa = undefined;
         if (dca) {
-            signerDebtLiquidityTa = (0, umi_1.publicKey)(this.signerDebtLiquidityTa);
+            signerDebtTa = (0, umi_1.publicKey)(this.signerDebtTa);
         }
         return (0, generated_1.marginfiOpenPosition)(this.umi, {
             signer: this.signer,
@@ -107,11 +109,11 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
                 : this.marginfiAccount,
             supplyMint: (0, umi_1.publicKey)(this.supplyMint),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
-            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyLiquidityTa),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
             debtMint: (0, umi_1.publicKey)(this.debtMint),
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
-            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtLiquidityTa),
-            signerDebtTa: signerDebtLiquidityTa,
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            signerDebtTa: signerDebtTa,
             positionData: {
                 positionId: this.positionId,
                 settingParams: settingParams ?? null,
@@ -134,28 +136,84 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
         });
     }
     protocolInteraction(args) {
-        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));
+        }
     }
     marginfiProtocolInteractionIx(args) {
-        let sourceSupplyTa = undefined;
+        switch (args.__kind) {
+            case "Deposit": {
+                return (0, marginfi_sdk_1.lendingAccountDeposit)(this.umi, {
+                    amount: args.fields[0],
+                    signer: this.signer,
+                    signerTokenAccount: (0, umi_1.publicKey)(this.signerSupplyTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
+                });
+            }
+            case "Borrow": {
+                return (0, marginfi_sdk_1.lendingAccountBorrow)(this.umi, {
+                    amount: args.fields[0],
+                    signer: this.signer,
+                    destinationTokenAccount: (0, umi_1.publicKey)(this.signerDebtTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority),
+                });
+            }
+            case "Repay": {
+                return (0, marginfi_sdk_1.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: (0, umi_1.publicKey)(this.signerDebtTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
+                });
+            }
+            case "Withdraw": {
+                return (0, marginfi_sdk_1.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: (0, umi_1.publicKey)(this.signerSupplyTa),
+                    marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
+                    marginfiGroup: (0, umi_1.publicKey)(this.marginfiGroup),
+                    bank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
+                    bankLiquidityVault: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault),
+                    bankLiquidityVaultAuthority: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority),
+                });
+            }
+        }
+    }
+    marginfiSolautoProtocolInteractionIx(args) {
+        let positionSupplyTa = undefined;
         let vaultSupplyTa = undefined;
         let supplyVaultAuthority = undefined;
         if (args.__kind === "Deposit" || args.__kind === "Withdraw") {
-            sourceSupplyTa = (0, umi_1.publicKey)(args.__kind === "Withdraw" || this.selfManaged
-                ? this.signerSupplyLiquidityTa
-                : this.positionSupplyLiquidityTa);
+            positionSupplyTa = (0, umi_1.publicKey)(args.__kind === "Withdraw" || this.selfManaged
+                ? this.signerSupplyTa
+                : this.positionSupplyTa);
             vaultSupplyTa = (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.liquidityVault);
             supplyVaultAuthority = (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.vaultAuthority);
         }
-        let sourceDebtTa = undefined;
+        let positionDebtTa = undefined;
         let vaultDebtTa = undefined;
         let debtVaultAuthority = undefined;
         if (args.__kind === "Borrow" || args.__kind === "Repay") {
-            sourceDebtTa = (0, umi_1.publicKey)(args.__kind === "Borrow" || this.selfManaged
-                ? this.signerDebtLiquidityTa
-                : this.positionDebtLiquidityTa);
+            positionDebtTa = (0, umi_1.publicKey)(args.__kind === "Borrow" || this.selfManaged
+                ? this.signerDebtTa
+                : this.positionDebtTa);
             vaultDebtTa = (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault);
             debtVaultAuthority = (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority);
         }
@@ -173,12 +231,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             marginfiAccount: (0, umi_1.publicKey)(this.marginfiAccountPk),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             supplyPriceOracle,
-            sourceSupplyTa,
+            positionSupplyTa,
             vaultSupplyTa,
             supplyVaultAuthority,
             debtBank: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.bank),
             debtPriceOracle,
-            sourceDebtTa,
+            positionDebtTa,
             vaultDebtTa,
             debtVaultAuthority,
             solautoAction: args,
@@ -202,12 +260,14 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             intermediaryTa: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), swapDetails.inputMint)),
             supplyBank: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.bank),
             supplyPriceOracle: (0, umi_1.publicKey)(this.marginfiSupplyBankAccounts.priceOracle),
-            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyLiquidityTa),
+            positionSupplyTa: (0, umi_1.publicKey)(this.positionSupplyTa),
+            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),
             debtPriceOracle: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.priceOracle),
-            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtLiquidityTa),
+            positionDebtTa: (0, umi_1.publicKey)(this.positionDebtTa),
+            signerDebtTa: this.selfManaged ? (0, umi_1.publicKey)(this.signerDebtTa) : undefined,
             vaultDebtTa: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.liquidityVault),
             debtVaultAuthority: (0, umi_1.publicKey)(this.marginfiDebtBankAccounts.vaultAuthority),
             rebalanceType,

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

@@ -13,11 +13,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;
 };
 export type ClosePositionInstructionData = {
     discriminator: number;

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

@@ -1 +1 @@
-{"version":3,"file":"closePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/closePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,uBAAuB,EAAE,SAAS,GAAG,GAAG,CAAC;IACzC,yBAAyB,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3C,0BAA0B,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7C,uBAAuB,EAAE,SAAS,GAAG,GAAG,CAAC;IACzC,qBAAqB,EAAE,SAAS,GAAG,GAAG,CAAC;CACxC,CAAC;AAGF,MAAM,MAAM,4BAA4B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAElD,wBAAgB,yCAAyC,IAAI,UAAU,CACrE,gCAAgC,EAChC,4BAA4B,CAC7B,CAcA;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,gCAAgC,GACtC,kBAAkB,CAyGpB"}
+{"version":3,"file":"closePosition.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/closePosition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAQ9C,MAAM,MAAM,gCAAgC,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,0BAA0B,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7C,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,EAAE,SAAS,GAAG,GAAG,CAAC;CAC/B,CAAC;AAGF,MAAM,MAAM,4BAA4B,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,MAAM,gCAAgC,GAAG,EAAE,CAAC;AAElD,wBAAgB,yCAAyC,IAAI,UAAU,CACrE,gCAAgC,EAChC,4BAA4B,CAC7B,CAcA;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,gCAAgC,GACtC,kBAAkB,CAyGpB"}

package/dist/generated/instructions/closePosition.js

@@ -48,30 +48,30 @@ function closePosition(context, input) {
             isWritable: true,
             value: input.solautoPosition ?? null,
         },
-        signerSupplyLiquidityTa: {
+        signerSupplyTa: {
             index: 5,
             isWritable: true,
-            value: input.signerSupplyLiquidityTa ?? null,
+            value: input.signerSupplyTa ?? null,
         },
-        positionSupplyLiquidityTa: {
+        positionSupplyTa: {
             index: 6,
             isWritable: true,
-            value: input.positionSupplyLiquidityTa ?? null,
+            value: input.positionSupplyTa ?? null,
         },
         positionSupplyCollateralTa: {
             index: 7,
             isWritable: true,
             value: input.positionSupplyCollateralTa ?? null,
         },
-        positionDebtLiquidityTa: {
+        positionDebtTa: {
             index: 8,
             isWritable: true,
-            value: input.positionDebtLiquidityTa ?? null,
+            value: input.positionDebtTa ?? null,
         },
-        signerDebtLiquidityTa: {
+        signerDebtTa: {
             index: 9,
             isWritable: true,
-            value: input.signerDebtLiquidityTa ?? null,
+            value: input.signerDebtTa ?? null,
         },
     };
     // Default values.

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

@@ -20,12 +20,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;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiProtocolInteraction.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiProtocolInteraction.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,aAAa,EACb,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,8CAA8C,GAAG;IAC3D,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,0CAA0C,GAAG;IACvD,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,8CAA8C,GAAG;IAC3D,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,wBAAgB,uDAAuD,IAAI,UAAU,CACnF,8CAA8C,EAC9C,0CAA0C,CAC3C,CAkBA;AAGD,MAAM,MAAM,0CAA0C,GACpD,8CAA8C,CAAC;AAGjD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,8CAA8C,GACnD,0CAA0C,GAC3C,kBAAkB,CA6JpB"}
+{"version":3,"file":"marginfiProtocolInteraction.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiProtocolInteraction.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAIX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,aAAa,EACb,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,8CAA8C,GAAG;IAC3D,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,UAAU,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvB,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACnC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,0CAA0C,GAAG;IACvD,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,8CAA8C,GAAG;IAC3D,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,wBAAgB,uDAAuD,IAAI,UAAU,CACnF,8CAA8C,EAC9C,0CAA0C,CAC3C,CAkBA;AAGD,MAAM,MAAM,0CAA0C,GACpD,8CAA8C,CAAC;AAGjD,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,8CAA8C,GACnD,0CAA0C,GAC3C,kBAAkB,CA6JpB"}

package/dist/generated/instructions/marginfiProtocolInteraction.js

@@ -76,10 +76,10 @@ function marginfiProtocolInteraction(context, input) {
             isWritable: false,
             value: input.supplyPriceOracle ?? null,
         },
-        sourceSupplyTa: {
+        positionSupplyTa: {
             index: 11,
             isWritable: true,
-            value: input.sourceSupplyTa ?? null,
+            value: input.positionSupplyTa ?? null,
         },
         vaultSupplyTa: {
             index: 12,
@@ -101,10 +101,10 @@ function marginfiProtocolInteraction(context, input) {
             isWritable: false,
             value: input.debtPriceOracle ?? null,
         },
-        sourceDebtTa: {
+        positionDebtTa: {
             index: 16,
             isWritable: true,
-            value: input.sourceDebtTa ?? null,
+            value: input.positionDebtTa ?? null,
         },
         vaultDebtTa: {
             index: 17,

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

@@ -24,11 +24,13 @@ export type MarginfiRebalanceInstructionAccounts = {
     supplyBank: PublicKey | Pda;
     supplyPriceOracle?: PublicKey | Pda;
     positionSupplyTa: PublicKey | Pda;
+    signerSupplyTa?: PublicKey | Pda;
     vaultSupplyTa?: PublicKey | Pda;
     supplyVaultAuthority?: PublicKey | Pda;
     debtBank: PublicKey | Pda;
     debtPriceOracle?: PublicKey | Pda;
     positionDebtTa: PublicKey | Pda;
+    signerDebtTa?: PublicKey | Pda;
     vaultDebtTa?: PublicKey | Pda;
     debtVaultAuthority?: PublicKey | Pda;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAoBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CAmKpB"}
+{"version":3,"file":"marginfiRebalance.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/marginfiRebalance.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,OAAO,EACP,MAAM,EACN,gBAAgB,EAChB,GAAG,EACH,SAAS,EACT,MAAM,EACN,kBAAkB,EAEnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,UAAU,EAMX,MAAM,sCAAsC,CAAC;AAM9C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EAEzB,MAAM,UAAU,CAAC;AAGlB,MAAM,MAAM,oCAAoC,GAAG;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,SAAS,EAAE,SAAS,GAAG,GAAG,CAAC;IAC3B,mBAAmB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACtC,sBAAsB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACzC,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACrC,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,eAAe,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,UAAU,EAAE,SAAS,GAAG,GAAG,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACpC,gBAAgB,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACjC,aAAa,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,oBAAoB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IACvC,QAAQ,EAAE,SAAS,GAAG,GAAG,CAAC;IAC1B,eAAe,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAClC,cAAc,EAAE,SAAS,GAAG,GAAG,CAAC;IAChC,YAAY,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC/B,WAAW,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,GAAG,GAAG,CAAC;CACtC,CAAC;AAGF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,oBAAoB,CAAC;IACpC,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,aAAa,EAAE,wBAAwB,CAAC;IACxC,2BAA2B,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACtD,WAAW,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,wBAAgB,6CAA6C,IAAI,UAAU,CACzE,oCAAoC,EACpC,gCAAgC,CACjC,CAoBA;AAGD,MAAM,MAAM,gCAAgC,GAC1C,oCAAoC,CAAC;AAGvC,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,KAAK,EAAE,oCAAoC,GAAG,gCAAgC,GAC7E,kBAAkB,CA6KpB"}

package/dist/generated/instructions/marginfiRebalance.js

@@ -102,38 +102,48 @@ function marginfiRebalance(context, input) {
             isWritable: true,
             value: input.positionSupplyTa ?? null,
         },
-        vaultSupplyTa: {
+        signerSupplyTa: {
             index: 15,
             isWritable: true,
+            value: input.signerSupplyTa ?? null,
+        },
+        vaultSupplyTa: {
+            index: 16,
+            isWritable: true,
             value: input.vaultSupplyTa ?? null,
         },
         supplyVaultAuthority: {
-            index: 16,
+            index: 17,
             isWritable: true,
             value: input.supplyVaultAuthority ?? null,
         },
         debtBank: {
-            index: 17,
+            index: 18,
             isWritable: true,
             value: input.debtBank ?? null,
         },
         debtPriceOracle: {
-            index: 18,
+            index: 19,
             isWritable: false,
             value: input.debtPriceOracle ?? null,
         },
         positionDebtTa: {
-            index: 19,
+            index: 20,
             isWritable: true,
             value: input.positionDebtTa ?? null,
         },
+        signerDebtTa: {
+            index: 21,
+            isWritable: true,
+            value: input.signerDebtTa ?? null,
+        },
         vaultDebtTa: {
-            index: 20,
+            index: 22,
             isWritable: true,
             value: input.vaultDebtTa ?? null,
         },
         debtVaultAuthority: {
-            index: 21,
+            index: 23,
             isWritable: true,
             value: input.debtVaultAuthority ?? null,
         },

package/dist/transactions/transactionUtils.js

@@ -26,13 +26,13 @@ function getWSolUsage(client, solautoActions, initiatingDcaIn, cancellingDcaIn)
         cancellingDcaIn);
     if (supplyIsWsol && usingSupplyTaAction) {
         return {
-            wSolTokenAccount: client.signerSupplyLiquidityTa,
+            wSolTokenAccount: client.signerSupplyTa,
             solautoAction: usingSupplyTaAction,
         };
     }
     else if (debtIsWsol && usingDebtTaAction) {
         return {
-            wSolTokenAccount: client.signerDebtLiquidityTa,
+            wSolTokenAccount: client.signerDebtTa,
             solautoAction: usingDebtTaAction,
         };
     }
@@ -57,21 +57,21 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
     }
     const wSolUsage = getWSolUsage(client, solautoActions, initiatingDcaIn, undefined);
     if (wSolUsage !== undefined) {
-        if (!(0, generalUtils_1.getSolanaAccountCreated)(client.umi, wSolUsage.wSolTokenAccount)) {
+        if (await (0, generalUtils_1.getSolanaAccountCreated)(client.umi, wSolUsage.wSolTokenAccount)) {
             client.log(`Closing signer wSol TA`);
             chores = chores.add((0, solanaUtils_1.closeTokenAccountUmiIx)(client.signer, wSolUsage.wSolTokenAccount, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(client.signer.publicKey)));
         }
         let amountToTransfer = BigInt(0);
         if ((0, generated_1.isSolautoAction)("Deposit", wSolUsage.solautoAction)) {
-            amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0]);
+            amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0]);
         }
         else if ((0, generated_1.isSolautoAction)("Repay", wSolUsage.solautoAction) &&
             wSolUsage.solautoAction.fields[0].__kind === "Some") {
-            amountToTransfer += BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
+            amountToTransfer = BigInt(wSolUsage.solautoAction.fields[0].fields[0]);
         }
         else if (initiatingDcaIn &&
             client.debtMint.toString() === spl_token_1.NATIVE_MINT.toString()) {
-            amountToTransfer += initiatingDcaIn;
+            amountToTransfer = initiatingDcaIn;
         }
         if (amountToTransfer > 0) {
             const amount = amountToTransfer +
@@ -89,8 +89,8 @@ async function transactionChoresBefore(client, solautoActions, initiatingDcaIn)
             continue;
         }
         const tokenAccount = (0, generated_1.isSolautoAction)("Withdraw", solautoAction)
-            ? client.signerSupplyLiquidityTa
-            : client.signerDebtLiquidityTa;
+            ? client.signerSupplyTa
+            : client.signerDebtTa;
         if (accountsGettingCreated.includes(tokenAccount.toString())) {
             continue;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAqC/B,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CA8IX"}
+{"version":3,"file":"transactionsManager.d.ts","sourceRoot":"","sources":["../../src/transactions/transactionsManager.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,OAAO,EACL,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAqC/B,qBAAa,eAAe;IAKjB,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE;IACM,IAAI,CAAC;IATd,oBAAoB,EAAG,MAAM,EAAE,CAAC;IAChC,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAGf,OAAO,EAAE,CACd,UAAU,EAAE,MAAM,KACf,OAAO,CACV;QAAE,EAAE,EAAE,kBAAkB,CAAC;QAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAAG,SAAS,CACxE,EACM,IAAI,CAAC,oBAAQ;IAGhB,UAAU;IAIV,OAAO,CAAC,UAAU,EAAE,MAAM;IAMhC,cAAc,IAAI,MAAM,EAAE;CAY3B;AAgFD,oBAAY,iBAAiB;IAC3B,OAAO,YAAY;IACnB,UAAU,eAAe;IACzB,MAAM,WAAW;IACjB,UAAU,eAAe;CAC1B;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,cAAc,CAAC;IACvB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,aAAa,CAAC;IATxB,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,YAAY,CAAe;gBAGzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,eAAe,EAAE,EACxB,cAAc,CAAC,6CAA4C,IAAI,aAAA,EAC/D,YAAY,CAAC,qBAAS,EACtB,YAAY,CAAC,qBAAS,EACtB,aAAa,CAAC,2BAAe;YAKzB,uBAAuB;IAsCrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,CAAC,EAAE,MAAM;IAgB9D,IAAI;CAgJX"}