@haven-fi/solauto-sdk 1.0.400 → 1.0.401

package/dist/utils/solanaUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAkBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoEjC"}
+{"version":3,"file":"solanaUtils.d.ts","sourceRoot":"","sources":["../../src/utils/solanaUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,uBAAuB,EACvB,MAAM,EACN,kBAAkB,EAClB,GAAG,EACH,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAOlC,OAAO,EAIL,UAAU,EACV,SAAS,EAKT,sBAAsB,EAEvB,MAAM,iBAAiB,CAAC;AAgBzB,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAIlE,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,UAErD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,UAE3D;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,SAAS,GAAE,SAAgC,GAC1C,CAAC,UAAU,EAAE,GAAG,CAAC,CAQnB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,sBAAsB,GACzB,kBAAkB,CAMpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,GACtB,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,kBAAkB,CAOpB;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,GACd,kBAAkB,CAUpB;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,MAAM,GACf,kBAAkB,CASpB;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,SAAS,EAAE,SAAS,GACnB,kBAAkB,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,GACb,kBAAkB,CAKpB;AAED,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,GAAG,EACR,oBAAoB,EAAE,MAAM,EAAE,GAC7B,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAmBpC;AAED,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBAa1B;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,kBAAkB,EAC/B,gBAAgB,CAAC,EAAE,MAAM,EACzB,gBAAgB,CAAC,EAAE,MAAM,sBA2D1B;AAuBD,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,EAAE,EAAE,kBAAkB,EACtB,eAAe,EAAE,kBAAkB,EACnC,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwC7B;AAiDD,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,kBAAkB,EACtB,MAAM,CAAC,EAAE,kBAAkB,EAC3B,eAAe,GAAE,kBAA2C,EAC5D,cAAc,CAAC,EAAE,MAAM,IAAI,GAC1B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAoEjC"}

package/dist/utils/solanaUtils.js

@@ -79,7 +79,7 @@ function splTokenTransferUmiIx(signer, fromTa, toTa, authority, amount) {
     return getWrappedInstruction(signer, (0, spl_token_1.createTransferInstruction)(fromTa, toTa, authority, amount));
 }
 async function getAddressLookupInputs(umi, lookupTableAddresses) {
-    const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)));
+    const addressLookupTableAccountInfos = await umi.rpc.getAccounts(lookupTableAddresses.map((key) => (0, umi_1.publicKey)(key)), { commitment: "confirmed" });
     return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {
         const addressLookupTableAddress = lookupTableAddresses[index];
         if (accountInfo.exists) {

package/local/.env

@@ -0,0 +1 @@
+ADDRESS_WHITELIST=5UqsR2PGzbP8pGPbXEeXx86Gjz2N2UFBAuFZUSVydAEe,E5BBsR1sUToPc3jXVwhrK5ttSiy6xhWJDMdQLvkgNppe,DRP5cgM1JpnMySvwg3jqRP2VA2DXSWUjo6VGLkNZ2etb,5qbTgNHBo5kedvDCseLbn5vJCtjrpUyNWwZzRnx72rPT

package/local/logPositions.ts

@@ -1,21 +1,225 @@
+import { publicKey } from "@metaplex-foundation/umi";
 import {
   buildHeliusApiUrl,
+  fetchTokenPrices,
   getSolanaRpcConnection,
   getSolautoManagedPositions,
+  PositionState,
+  positionStateWithLatestPrices,
+  PRICES,
+  retryWithExponentialBackoff,
+  safeFetchAllSolautoPosition,
+  safeGetPrice,
   SOLAUTO_PROD_PROGRAM,
+  TOKEN_INFO,
+  USD_DECIMALS,
 } from "../src";
+import { PublicKey } from "@solana/web3.js";
+import { NATIVE_MINT } from "@solana/spl-token";
+import { toWeb3JsPublicKey } from "@metaplex-foundation/umi-web3js-adapters";
+import { fromBaseUnit } from "../dist";
+import path from 'path';
+import { config } from 'dotenv';
 
-async function main() {
+config({ path: path.join(__dirname, '.env') });
+
+function getBatches<T>(items: T[], batchSize: number): T[][] {
+  const batches: T[][] = [];
+  for (let i = 0; i < items.length; i += batchSize) {
+    batches.push(items.slice(i, i + batchSize));
+  }
+  return batches;
+}
+
+export function tokenInfo(mint?: PublicKey) {
+  return TOKEN_INFO[mint ? mint.toString() : PublicKey.default.toString()];
+}
+
+type StrategyType = "Long" | "Short";
+
+function solautoStrategyName(supplyMint?: PublicKey, debtMint?: PublicKey) {
+  const supplyInfo = tokenInfo(supplyMint);
+  const debtInfo = tokenInfo(debtMint);
+  const strat = strategyType(
+    supplyMint ?? PublicKey.default,
+    debtMint ?? PublicKey.default
+  );
+
+  if (strat === "Long") {
+    return debtInfo.isStableCoin
+      ? `${supplyInfo.ticker} Long`
+      : supplyInfo.ticker
+        ? `${supplyInfo.ticker}/${debtInfo.ticker} Long`
+        : "";
+  } else {
+    return `${debtInfo.ticker} Short`;
+  }
+}
+
+function strategyType(
+  supplyMint: PublicKey,
+  debtMint: PublicKey
+): StrategyType {
+  const supplyInfo = tokenInfo(supplyMint);
+  const debtInfo = tokenInfo(debtMint);
+
+  if (supplyInfo.isLST && debtMint.equals(NATIVE_MINT)) {
+    // Yield
+    throw new Error("Not yet supported");
+  } else if (debtInfo.isStableCoin) {
+    return "Long";
+  } else if (supplyInfo.isStableCoin) {
+    return "Short";
+  } else {
+    return "Long";
+  }
+}
+
+export function roundToDecimals(value: number, decimals: number = 2): number {
+  if (!value || isNaN(value)) {
+    return value;
+  }
+
+  let roundedValue: number | undefined;
+  do {
+    const factor = Math.pow(10, decimals ?? 2);
+    roundedValue = Math.round(value * factor) / factor;
+    decimals += 1;
+  } while (!roundedValue || decimals >= 10);
+
+  return roundedValue;
+}
+
+export function formatNumberToShortForm(
+  num: number,
+  decimals?: number
+): string {
+  if (decimals === undefined) {
+    decimals = 1;
+  }
+  if (num >= 1_000_000_000) {
+    return (
+      (num / 1_000_000_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "B"
+    );
+  }
+  if (num >= 1_000_000) {
+    return (
+      (num / 1_000_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "M"
+    );
+  }
+  if (num >= 1_000) {
+    return (
+      (num / 1_000)
+        .toFixed(decimals)
+        .replace(new RegExp(`\\.0{${decimals}}$`), "") + "K"
+    );
+  }
+  return num.toFixed(decimals).replace(new RegExp(`\\.0{${decimals}}$`), "");
+}
+
+export function formatNumber(
+  num: number,
+  decimals?: number,
+  shortFormAtThreshold?: number,
+  decimalsAtShortform?: number
+): string {
+  if (shortFormAtThreshold !== undefined && num > shortFormAtThreshold) {
+    return formatNumberToShortForm(num, decimalsAtShortform);
+  } else {
+    return num < 1
+      ? roundToDecimals(num, decimals).toString()
+      : new Intl.NumberFormat("en-US").format(
+          decimals !== undefined ? roundToDecimals(num, decimals) : num
+        );
+  }
+}
+
+async function main(filterWhitelist: boolean) {
   const [_, umi] = getSolanaRpcConnection(
     buildHeliusApiUrl(process.env.HELIUS_API_KEY!),
     SOLAUTO_PROD_PROGRAM
   );
-  const positions = await getSolautoManagedPositions(umi);
-  // TODO: filter out certain wallet authorities using an env variable
+  let positions = await getSolautoManagedPositions(umi);
+
+  if (filterWhitelist) {
+    const addressWhitelist = process.env.ADDRESS_WHITELIST?.split(",") ?? [];
+    positions = positions.filter(
+      (x) => !addressWhitelist.includes(x.authority.toString())
+    );
+  }
+
+  const batches = getBatches(positions, 30);
+
+  const solautoPositionsData = (
+    await Promise.all(
+      batches.map(async (pubkeys) => {
+        return retryWithExponentialBackoff(
+          async () =>
+            await safeFetchAllSolautoPosition(
+              umi,
+              pubkeys.map((x) => publicKey(x.publicKey!))
+            )
+        );
+      })
+    )
+  ).flat();
+
+  const tokensUsed = Array.from(
+    new Set(
+      positions.flatMap((x) => [
+        x.supplyMint!.toString(),
+        x.debtMint!.toString(),
+      ])
+    )
+  );
+
+  const tokenBatches = getBatches(tokensUsed, 15);
+  await Promise.all(
+    tokenBatches.map(async (batch) => {
+      await fetchTokenPrices(batch.map((x) => new PublicKey(x)));
+    })
+  );
+
+  console.log("\n\n");
+
+  const latestStates: PositionState[] = [];
+  for (const pos of solautoPositionsData) {
+    const latestState = await positionStateWithLatestPrices(
+      pos.state,
+      safeGetPrice(pos.state.supply.mint),
+      safeGetPrice(pos.state.debt.mint)
+    );
+    latestStates.push(latestState);
+
+    const strategy = solautoStrategyName(
+      toWeb3JsPublicKey(pos.state.supply.mint),
+      toWeb3JsPublicKey(pos.state.debt.mint)
+    );
+
+    console.log("Position:", pos.publicKey.toString());
+    console.log("Authority:", pos.authority.toString());
+    console.log(
+      `${strategy}: $${formatNumber(fromBaseUnit(latestState.netWorth.baseAmountUsdValue, USD_DECIMALS), 2, 10000, 2)}`
+    );
+    console.log("\n");
+  }
+
+  console.log("Total positions:", solautoPositionsData.length);
+  console.log(
+    "Total users:",
+    Array.from(new Set(solautoPositionsData.map((x) => x.authority.toString())))
+      .length
+  );
 
-  console.log(positions);
-  console.log("Total positions:", positions.length);
-  // TODO: log net worth / balances
+  const tvl = latestStates
+    .map((x) => fromBaseUnit(x.netWorth.baseAmountUsdValue, USD_DECIMALS))
+    .reduce((acc, curr) => acc + curr, 0);
+  console.log(`Total TVL: $${formatNumber(tvl, 2, 10000, 2)}`);
 }
 
-main().then((x) => x);
+const filterWhitelist = true;
+main(filterWhitelist).then((x) => x);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haven-fi/solauto-sdk",
-  "version": "1.0.400",
+  "version": "1.0.401",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "description": "Typescript SDK for the Solauto program on the Solana blockchain",
@@ -27,6 +27,7 @@
     "axios": "^1.7.8",
     "bs58": "^5.0.0",
     "cross-fetch": "^4.0.0",
+    "dotenv": "^16.4.7",
     "rpc-websockets": "7.11.0"
   },
   "devDependencies": {

package/src/utils/solanaUtils.ts

@@ -162,7 +162,8 @@ export async function getAddressLookupInputs(
   lookupTableAddresses: string[]
 ): Promise<AddressLookupTableInput[]> {
   const addressLookupTableAccountInfos = await umi.rpc.getAccounts(
-    lookupTableAddresses.map((key) => publicKey(key))
+    lookupTableAddresses.map((key) => publicKey(key)),
+    { commitment: "confirmed" }
   );
 
   return addressLookupTableAccountInfos.reduce((acc, accountInfo, index) => {