@haven-fi/solauto-sdk 1.0.570 → 1.0.572

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

@@ -1 +1 @@
-{"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,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EACL,kBAAkB,EAElB,aAAa,EAGb,iBAAiB,EACjB,oBAAoB,EACpB,wBAAwB,EACxB,gCAAgC,EAKjC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAGL,eAAe,EAWhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAUzC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG5C,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,cAAc,CAAC,CAAY;IAE5B,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,sBAAsB,EAAG,qBAAqB,CAAC;IAC/C,oBAAoB,EAAG,qBAAqB,CAAC;IAE7C,iBAAiB,EAAG,SAAS,CAAC;IAC9B,eAAe,EAAG,SAAS,CAAC;IAG5B,iCAAiC,CAAC,EAAE,MAAM,CAAC;IAC3C,6BAA6B,EAAG,SAAS,CAAC;IAC1C,2BAA2B,CAAC,EAAE,eAAe,CAAC;IAErD,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,QAAQ,CAAqB;IAE/B,UAAU,CAAC,IAAI,EAAE,yBAAyB;IAiG1C,8BAA8B;IAwCpC,eAAe,IAAI,SAAS;IAI5B,mBAAmB,IAAI,MAAM,EAAE;IAI/B,gBAAgB,IAAI,SAAS,EAAE;IAUzB,wBAAwB,IAAI,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IA0B3D,yBAAyB,CAAC,eAAe,EAAE,MAAM,GAAG,kBAAkB;IAStE,YAAY,CACV,aAAa,CAAC,EAAE,gCAAgC,EAChD,GAAG,CAAC,EAAE,kBAAkB,GACvB,kBAAkB;IAMrB,OAAO,CAAC,sBAAsB;IA6C9B,OAAO,IAAI,kBAAkB;IAc7B,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAUhE,OAAO,CAAC,6BAA6B;IAmErC,OAAO,CAAC,oCAAoC;IA0D5C,SAAS,CACP,aAAa,EAAE,GAAG,GAAG,GAAG,EACxB,QAAQ,EAAE,aAAa,EACvB,aAAa,EAAE,wBAAwB,EACvC,eAAe,EAAE,eAAe,EAChC,SAAS,CAAC,EAAE,gBAAgB,EAC5B,2BAA2B,CAAC,EAAE,MAAM,GACnC,kBAAkB;IA+ErB,WAAW,CACT,aAAa,EAAE,oBAAoB,EACnC,gBAAgB,EAAE,gBAAgB,EAClC,uBAAuB,EAAE,SAAS,GACjC,kBAAkB;IA8CrB,UAAU,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,kBAAkB;IAyGlE,YAAY,CAAC,eAAe,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAWlD,qBAAqB,IAAI,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAmDjE,wBAAwB,IAAI,MAAM;IAIlC,0BAA0B,IAAI,MAAM;IAIpC,sBAAsB,IAAI,MAAM;CAGjC"}
+{"version":3,"file":"solautoMarginfiClient.d.ts","sourceRoot":"","sources":["../../src/clients/solautoMarginfiClient.ts"],"names":[],"mappings":"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"}

package/dist/clients/solautoMarginfiClient.js

@@ -460,7 +460,12 @@ class SolautoMarginfiClient extends solautoClient_1.SolautoClient {
             signer: this.signer,
             signerTokenAccount: (0, umi_1.publicKey)((0, accountUtils_1.getTokenAccount)((0, umi_web3js_adapters_1.toWeb3JsPublicKey)(this.signer.publicKey), flashLoanDetails.mint)),
         }))
-            .add(banksRequiringBalanceClose.map((x) => this.closeBalance(this.intermediaryMarginfiAccountPk, new web3_js_1.PublicKey(x))))
+            .add(banksRequiringBalanceClose.map((x) => this.closeBalance(this.intermediaryMarginfiAccountPk, new web3_js_1.PublicKey(x)))
+        // this.closeBalance(
+        //   this.intermediaryMarginfiAccountPk,
+        //   new PublicKey(accounts.data.bank)
+        // )
+        )
             .add((0, marginfi_sdk_1.lendingAccountEndFlashloan)(this.umi, {
             marginfiAccount: (0, umi_1.publicKey)(this.intermediaryMarginfiAccountPk),
             signer: this.signer,

package/dist/utils/marginfiUtils.js

@@ -322,6 +322,6 @@ function getUpToDateShareValues(bank) {
 }
 function marginfiAccountEmpty(marginfiAccount) {
     return (marginfiAccount.lendingAccount.balances.find((x) => x.bankPk.toString() !== web3_js_1.PublicKey.default.toString() &&
-        (Math.round((0, numberUtils_1.bytesToI80F48)(x.assetShares.value)) != 0 ||
-            Math.round((0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value)) != 0)) === undefined);
+        ((0, numberUtils_1.bytesToI80F48)(x.assetShares.value) > 0 ||
+            (0, numberUtils_1.bytesToI80F48)(x.liabilityShares.value) > 0)) === undefined);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.570",
+  "version": "1.0.572",
   "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

@@ -721,6 +721,10 @@ export class SolautoMarginfiClient extends SolautoClient {
             new PublicKey(x)
           )
         )
+        // this.closeBalance(
+        //   this.intermediaryMarginfiAccountPk,
+        //   new PublicKey(accounts.data.bank)
+        // )
       )
       .add(
         lendingAccountEndFlashloan(this.umi, {

package/src/utils/marginfiUtils.ts

@@ -591,8 +591,8 @@ export function marginfiAccountEmpty(marginfiAccount: MarginfiAccount) {
     marginfiAccount.lendingAccount.balances.find(
       (x) =>
         x.bankPk.toString() !== PublicKey.default.toString() &&
-        (Math.round(bytesToI80F48(x.assetShares.value)) != 0 ||
-          Math.round(bytesToI80F48(x.liabilityShares.value)) != 0)
+        (bytesToI80F48(x.assetShares.value) > 0 ||
+          bytesToI80F48(x.liabilityShares.value) > 0)
     ) === undefined
   );
 }

package/tests/transactions/solautoMarginfi.ts

@@ -5,6 +5,7 @@ import {
   some,
   transactionBuilder,
   Umi,
+  UmiError,
 } from "@metaplex-foundation/umi";
 import { setupTest } from "../shared";
 import { SolautoMarginfiClient } from "../../src/clients/solautoMarginfiClient";
@@ -50,6 +51,7 @@ import {
   getQnComputeUnitPriceEstimate,
   getSolautoManagedPositions,
   getSolautoPositionAccount,
+  marginfiAccountEmpty,
   retryWithExponentialBackoff,
   safeGetPrice,
 } from "../../src/utils";
@@ -61,6 +63,7 @@ import {
   USD_DECIMALS,
 } from "../../dist";
 import {
+  lendingPoolAccrueBankInterest,
   safeFetchBank,
   safeFetchMarginfiAccount,
 } from "../../src/marginfi-sdk";
@@ -117,16 +120,16 @@ async function test(
   console.log(
     bytesToI80F48(
       imfiAccount.lendingAccount.balances[0].liabilityShares.value
-    ) *
-      bytesToI80F48(supplyBank.liabilityShareValue.value) *
-      safeGetPrice(supplyMint)
+    ) * bytesToI80F48(supplyBank.liabilityShareValue.value),
+    bytesToI80F48(imfiAccount.lendingAccount.balances[0].assetShares.value) *
+      bytesToI80F48(supplyBank.assetShareValue.value)
   );
   console.log(
     bytesToI80F48(
       imfiAccount.lendingAccount.balances[1].liabilityShares.value
-    ) *
-      bytesToI80F48(debtBank.liabilityShareValue.value) *
-      safeGetPrice(debtMint)
+    ) * bytesToI80F48(debtBank.liabilityShareValue.value),
+    bytesToI80F48(imfiAccount.lendingAccount.balances[1].assetShares.value) *
+      bytesToI80F48(debtBank.assetShareValue.value)
   );
 
   console.log(
@@ -183,16 +186,17 @@ describe("Solauto Marginfi tests", async () => {
       // debtMint: new PublicKey(USDC),
     });
 
-    // await test(
-    //   client.umi,
-    //   undefined,
-    //   new PublicKey(RETARDIO),
-    //   new PublicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"),
-    //   6,
-    //   new PublicKey(USDC),
-    //   new PublicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5"),
-    //   6
-    // );
+    await test(
+      client.umi,
+      // new PublicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18"),
+      undefined,
+      new PublicKey(RETARDIO),
+      new PublicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"),
+      6,
+      new PublicKey(USDC),
+      new PublicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5"),
+      6
+    );
     // await test(
     //   client.umi,
     //   new PublicKey("EcdfYZCtaePaDWVy9Cz6eiS5QbLbhThau1fHLhQTEZqs"),
@@ -208,7 +212,7 @@ describe("Solauto Marginfi tests", async () => {
     //   client.umi,
     //   publicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18")
     // );
-    // console.log(mfiAccount.lendingAccount.balances);
+    // // console.log(mfiAccount.lendingAccount.balances);
     // console.log(
     //   mfiAccount.lendingAccount.balances.map((x) =>
     //     bytesToI80F48(x.liabilityShares.value)
@@ -295,15 +299,41 @@ describe("Solauto Marginfi tests", async () => {
 
     const imfiAccount = await safeFetchMarginfiAccount(
       client.umi,
-      publicKey(client.intermediaryMarginfiAccountPk)
+      // publicKey(client.intermediaryMarginfiAccountPk)
+      publicKey("E8oukAkTMW4YsAPymMzWQHWb8egmGq9yjDtmMi6gfY18")
     );
 
     console.log(imfiAccount.lendingAccount.balances);
     console.log(
-      imfiAccount.lendingAccount.balances.map((x) => x.bankPk.toString())
+      imfiAccount.lendingAccount.balances.map((x) => [
+        x.bankPk.toString(),
+        x.liabilityShares.value,
+        bytesToI80F48(x.liabilityShares.value),
+      ])
     );
+
+    console.log(marginfiAccountEmpty(imfiAccount));
     return;
 
+    // transactionItems.push(
+    //   new TransactionItem(async () => ({
+    //     tx: transactionBuilder().add([
+    //       lendingPoolAccrueBankInterest(client.umi, {
+    //         bank: publicKey("3J5rKmCi7JXG6qmiobFJyAidVTnnNAMGj4jomfBxKGRM"),
+    //         marginfiGroup: publicKey(
+    //           "EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"
+    //         ),
+    //       }),
+    //       lendingPoolAccrueBankInterest(client.umi, {
+    //         bank: publicKey("6cgYhBFWCc5sNHxkvSRhd5H9AdAHR41zKwuF37HmLry5"),
+    //         marginfiGroup: publicKey(
+    //           "EpzY5EYF1A5eFDRfjtsPXSYMPmEx1FXKaXPnouTMF4dm"
+    //         ),
+    //       }),
+    //     ]),
+    //   }))
+    // );
+
     // transactionItems.push(
     //   new TransactionItem(async () => ({
     //     tx: transactionBuilder().add(