@haven-fi/solauto-sdk 1.0.86 → 1.0.87

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,EAAyB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+D3B;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,CAqDA;AAgED,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,CA+IpC;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,EAAyB,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEtE,OAAO,EACL,IAAI,EAKL,MAAM,iBAAiB,CAAC;AAWzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAsB,MAAM,cAAc,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,SAAS,GAAG,qBAAqB,CAU3E;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,GAAG,EACR,MAAM,EAAE;IACN,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,IAAI,EAAE;IACJ,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,EACD,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+D3B;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;AAgED,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,CA+IpC;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

@@ -15,7 +15,6 @@ const solautoConstants_1 = require("../constants/solautoConstants");
 const marginfiAccounts_1 = require("../constants/marginfiAccounts");
 const generalAccounts_1 = require("../constants/generalAccounts");
 const solanaUtils_1 = require("./solanaUtils");
-const accountUtils_1 = require("./accountUtils");
 function findMarginfiAccounts(bank) {
     for (const key in marginfiAccounts_1.MARGINFI_ACCOUNTS) {
         const account = marginfiAccounts_1.MARGINFI_ACCOUNTS[key];
@@ -60,7 +59,7 @@ async function getMaxLtvAndLiqThreshold(umi, supply, debt, supplyPrice) {
     return [maxLtv, liqThreshold];
 }
 async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithSolauto) {
-    const getAccounts = async (authorityPk) => await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
+    const marginfiAccounts = await umi.rpc.getProgramAccounts(marginfi_sdk_1.MARGINFI_PROGRAM_ID, {
         commitment: "finalized",
         dataSlice: {
             offset: 0,
@@ -72,22 +71,14 @@ async function getAllMarginfiAccountsByAuthority(umi, authority, compatibleWithS
             },
             {
                 memcmp: {
-                    bytes: new Uint8Array(authorityPk.toBuffer()),
+                    bytes: new Uint8Array(authority.toBuffer()),
                     offset: 40, // Anchor account discriminator + group pubkey
                 },
             },
         ],
     });
-    let marginfiAccounts = [];
-    let selfManagedSolautoPositions = [];
     if (compatibleWithSolauto) {
-        [marginfiAccounts, selfManagedSolautoPositions] = await Promise.all([getAccounts(authority), getAccounts((0, accountUtils_1.getSolautoPositionAccount)(authority, 0))]);
-    }
-    else {
-        marginfiAccounts = await getAccounts(authority);
-    }
-    if (compatibleWithSolauto) {
-        const positionStates = await Promise.all([...selfManagedSolautoPositions, ...marginfiAccounts].map(async (x) => ({
+        const positionStates = await Promise.all(marginfiAccounts.map(async (x) => ({
             publicKey: x.publicKey,
             state: await getMarginfiAccountPositionState(umi, (0, umi_web3js_adapters_1.toWeb3JsPublicKey)(x.publicKey)),
         })));

package/package.json

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

package/src/utils/marginfiUtils.ts

@@ -120,7 +120,7 @@ export async function getAllMarginfiAccountsByAuthority(
 ): Promise<
   { marginfiAccount: PublicKey; supplyMint?: PublicKey; debtMint?: PublicKey }[]
 > {
-  const getAccounts = async (authorityPk: PublicKey) => await umi.rpc.getProgramAccounts(
+  const marginfiAccounts = await umi.rpc.getProgramAccounts(
     MARGINFI_PROGRAM_ID,
     {
       commitment: "finalized",
@@ -134,25 +134,17 @@ export async function getAllMarginfiAccountsByAuthority(
         },
         {
           memcmp: {
-            bytes: new Uint8Array(authorityPk.toBuffer()),
+            bytes: new Uint8Array(authority.toBuffer()),
             offset: 40, // Anchor account discriminator + group pubkey
           },
         },
       ],
     }
-  )
-
-  let marginfiAccounts: RpcAccount[] = [];
-  let selfManagedSolautoPositions: RpcAccount[] = [];
-  if (compatibleWithSolauto) {
-    [marginfiAccounts, selfManagedSolautoPositions] = await Promise.all([getAccounts(authority), getAccounts(getSolautoPositionAccount(authority, 0))]);
-  } else {
-    marginfiAccounts = await getAccounts(authority);
-  }
+  );
 
   if (compatibleWithSolauto) {
     const positionStates = await Promise.all(
-      [...selfManagedSolautoPositions, ...marginfiAccounts].map(async (x) => ({
+      marginfiAccounts.map(async (x) => ({
         publicKey: x.publicKey,
         state: await getMarginfiAccountPositionState(
           umi,