@haven-fi/solauto-sdk 1.0.622 → 1.0.624

package/dist/services/flashLoans/marginfiFlProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA2CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IAyG3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}
+{"version":3,"file":"marginfiFlProvider.d.ts","sourceRoot":"","sources":["../../../src/services/flashLoans/marginfiFlProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAalC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AAexE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQ/C,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,yBAAyB,CAAQ;IACzC,OAAO,CAAC,uBAAuB,CAAQ;IACvC,OAAO,CAAC,iBAAiB,CAAe;IACxC,OAAO,CAAC,eAAe,CAAe;IAEhC,UAAU;YAiBF,iBAAiB;IA2C/B,OAAO,CAAC,sBAAsB;IA2CxB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAyC3D,gBAAgB,IAAI,SAAS,EAAE;IAY/B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,WAAW;IAMnB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IAI7C,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM;IAc9D,WAAW,CACT,SAAS,EAAE,gBAAgB,EAC3B,gBAAgB,EAAE,SAAS,GAC1B,kBAAkB;IAoCrB,UAAU,CAAC,SAAS,EAAE,gBAAgB,GAAG,kBAAkB;IA2E3D,YAAY,CACV,eAAe,EAAE,SAAS,EAC1B,IAAI,EAAE,SAAS,EACf,aAAa,EAAE,SAAS;CAW3B"}

package/dist/services/flashLoans/marginfiFlProvider.js

@@ -173,12 +173,12 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
         const marginfiGroup = (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.liquidityBank(flashLoan.liquiditySource).group);
         const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource);
         const remainingAccounts = [];
-        let includedFlashLoanToken = false;
+        let flBankHadPrevBalance = false;
         if (iMfiAccount?.accountData) {
             iMfiAccount.accountData.lendingAccount.balances.forEach(async (x) => {
                 if (x.active) {
                     if (x.bankPk.toString() === bank.publicKey.toString()) {
-                        includedFlashLoanToken = true;
+                        flBankHadPrevBalance = true;
                     }
                     // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
                     // const bankData = await safeFetchBank(this.umi, publicKey(accounts.data.bank));
@@ -199,27 +199,10 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
                 }
             });
         }
-        if (!includedFlashLoanToken) {
-            remainingAccounts.push(...[
-                {
-                    pubkey: bank.publicKey,
-                    isSigner: false,
-                    isWritable: false,
-                },
-                {
-                    pubkey: (0, umi_1.publicKey)(associatedBankAccs.priceOracle),
-                    isSigner: false,
-                    isWritable: false,
-                },
-            ]);
-        }
-        const closeBalances = remainingAccounts
-            .filter((x, index) => index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString())
-            .map((x) => (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.pubkey));
         return (0, umi_1.transactionBuilder)()
             .add((0, marginfi_sdk_1.lendingAccountRepay)(this.umi, {
             amount: flashLoan.baseUnitAmount,
-            repayAll: true,
+            repayAll: !flBankHadPrevBalance,
             bank: bank.publicKey,
             bankLiquidityVault: (0, umi_1.publicKey)(associatedBankAccs.liquidityVault),
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
@@ -227,9 +210,6 @@ class MarginfiFlProvider extends flProviderBase_1.FlProviderBase {
             signer: this.signer,
             signerTokenAccount: (0, umi_1.publicKey)((0, utils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoan.mint)),
         }))
-            .add(closeBalances.length
-            ? closeBalances.map((bank) => this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup))
-            : [])
             .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(iMfiAccount.accountPk),
             signer: this.signer,

package/dist/services/solauto/solautoMarginfiClient.js

@@ -261,7 +261,6 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             (postSwapRebalance &&
                 data.rebalanceType === generated_1.SolautoRebalanceType.FLSwapThenRebalance);
         const addAuthorityTas = this.selfManaged || data.values.tokenBalanceChange !== undefined;
-        console.log("TARGET LIQ UTILIZATION RATE:", data.targetLiqUtilizationRateBps);
         return (0, generated_1.marginfiRebalance)(this.umi, {
             signer: this.signer,
             marginfiProgram: (0, umi_1.publicKey)(marginfi_sdk_1.MARGINFI_PROGRAM_ID),

package/package.json

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

package/src/services/flashLoans/marginfiFlProvider.ts

@@ -291,13 +291,13 @@ export class MarginfiFlProvider extends FlProviderBase {
     const iMfiAccount = this.iMfiAccount(flashLoan.liquiditySource)!;
 
     const remainingAccounts: AccountMeta[] = [];
-    let includedFlashLoanToken = false;
+    let flBankHadPrevBalance = false;
 
     if (iMfiAccount?.accountData) {
       iMfiAccount.accountData.lendingAccount.balances.forEach(async (x) => {
         if (x.active) {
           if (x.bankPk.toString() === bank.publicKey.toString()) {
-            includedFlashLoanToken = true;
+            flBankHadPrevBalance = true;
           }
 
           // TODO: Don't dynamically pull from bank until Marginfi sorts out their price oracle issues.
@@ -324,35 +324,12 @@ export class MarginfiFlProvider extends FlProviderBase {
         }
       });
     }
-    if (!includedFlashLoanToken) {
-      remainingAccounts.push(
-        ...[
-          {
-            pubkey: bank.publicKey,
-            isSigner: false,
-            isWritable: false,
-          },
-          {
-            pubkey: publicKey(associatedBankAccs.priceOracle),
-            isSigner: false,
-            isWritable: false,
-          },
-        ]
-      );
-    }
-
-    const closeBalances = remainingAccounts
-      .filter(
-        (x, index) =>
-          index % 2 === 0 && x.pubkey.toString() !== bank.publicKey.toString()
-      )
-      .map((x) => toWeb3JsPublicKey(x.pubkey));
 
     return transactionBuilder()
       .add(
         lendingAccountRepay(this.umi, {
           amount: flashLoan.baseUnitAmount,
-          repayAll: true,
+          repayAll: !flBankHadPrevBalance,
           bank: bank.publicKey,
           bankLiquidityVault: publicKey(associatedBankAccs.liquidityVault),
           marginfiAccount: publicKey(iMfiAccount.accountPk),
@@ -366,13 +343,6 @@ export class MarginfiFlProvider extends FlProviderBase {
           ),
         })
       )
-      .add(
-        closeBalances.length
-          ? closeBalances.map((bank) =>
-              this.closeBalance(iMfiAccount.accountPk, bank, marginfiGroup)
-            )
-          : []
-      )
       .add(
         lendingAccountEndFlashloan(this.umi, {
           marginfiAccount: publicKey(iMfiAccount.accountPk),

package/src/services/solauto/solautoMarginfiClient.ts

@@ -391,10 +391,6 @@ export class SolautoMarginfiClient extends SolautoClient {
     const addAuthorityTas =
       this.selfManaged || data.values.tokenBalanceChange !== undefined;
 
-    console.log(
-      "TARGET LIQ UTILIZATION RATE:",
-      data.targetLiqUtilizationRateBps
-    );
     return marginfiRebalance(this.umi, {
       signer: this.signer,
       marginfiProgram: publicKey(MARGINFI_PROGRAM_ID),
@@ -429,7 +425,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       supplyPriceOracle: publicKey(this.supplyPriceOracle),
       positionSupplyTa: publicKey(this.positionSupplyTa),
       authoritySupplyTa: addAuthorityTas
-        ? publicKey(getTokenAccount(this.authority, this.pos.supplyMint()))
+        ? publicKey(
+            getTokenAccount(this.authority, this.pos.supplyMint())
+          )
         : undefined,
       vaultSupplyTa: needSupplyAccounts
         ? publicKey(this.marginfiSupplyAccounts.liquidityVault)
@@ -441,7 +439,9 @@ export class SolautoMarginfiClient extends SolautoClient {
       debtPriceOracle: publicKey(this.debtPriceOracle),
       positionDebtTa: publicKey(this.positionDebtTa),
       authorityDebtTa: addAuthorityTas
-        ? publicKey(getTokenAccount(this.authority, this.pos.debtMint()))
+        ? publicKey(
+            getTokenAccount(this.authority, this.pos.debtMint())
+          )
         : undefined,
       vaultDebtTa: needDebtAccounts
         ? publicKey(this.marginfiDebtAccounts.liquidityVault)