@1delta/margin-fetcher 0.0.28 → 0.0.30

package/src/prices/main-prices/fetchOracleData.ts

@@ -439,11 +439,14 @@ const parseMorphoResults = (
 
     const oracleId =
       ASSET_META[chainId][loanAsset]?.assetGroup ?? chainId + '-' + loanAsset
-    const debtPrice = donePrices[oracleId]
+    // get price from map or just computed ones
+    const debtPrice = donePrices[oracleId] ?? prices[oracleId]
     const oracleIdCollateral =
       ASSET_META[chainId][collateralAsset]?.assetGroup ??
       chainId + '-' + collateralAsset
-    const collateralPrice = donePrices[oracleIdCollateral]
+    // get price from map or just computed ones
+    const collateralPrice =
+      donePrices[oracleIdCollateral] ?? prices[oracleIdCollateral]
     const priceDebtToCollateral = formatMorphoPrice(
       d.toString(),
       loanAssetDecimals,

package/src/yields/index.ts

@@ -10,8 +10,8 @@ const osETH = 'StakeWise Staked ETH::OSETH'
 // const ethPlus = 'ETHPlus::ETH+'
 const ethX = 'Stader ETHx::ETHx'
 const pufEth = 'PUFETH'
-const stUSD = 'Angle Staked USDA::STUSD'
-const stEur = 'Angle Staked EURA::STEUR'
+const stUSD = 'Angle Staked USDA::stUSD'
+const stEur = 'Angle Staked EURA::stEUR'
 const sUsds = 'sUSDS::SUSDS'
 const srUsd = 'Reservoir srUSD::SRUSD'
 const yusd = 'YieldFi yUSD::yUSD'
@@ -28,7 +28,9 @@ const rsweth = 'Restaked Swell ETH::RSWETH'
 const ynethx = 'ynETH MAX::YNETHX'
 const usdZeroPlus = 'Staked USD0::USD0++'
 const ethZero = 'ETH0::ETH0'
-const usdThree = "Web 3 Dollar::USD3"
+const usdThree = 'Web 3 Dollar::USD3'
+const jitoSol = 'Jito Staked SOL::JitoSOL'
+const thBill = 'Theo Short Duration US Treasury Fund::THBILL'
 const FeedData = {
   WSTETH: 'https://eth-api.lido.fi/v1/protocol/steth/apr/sma',
   STMATIC: 'https://polygon.lido.fi/api/stats',
@@ -61,6 +63,8 @@ const FeedData = {
   YNETHX: 'https://gateway.yieldnest.finance/api/v1/graphql',
   USDZEROPLUS: 'https://app.usual.money/api/rewards/rates/USD0++',
   ETHZERO: 'https://app.usual.money/api/rewards/rates/ETH0',
+  JITOSOL: 'https://www.jito.network/api/getJitoPoolStats/',
+  THBILL: 'https://thbill-api.theo.xyz/snapshots',
 }
 
 const LenderAPIs = {
@@ -68,6 +72,15 @@ const LenderAPIs = {
     'https://omnidex.bmaa3ajd1gjri.eu-west-2.cs.amazonlightsail.com/lending_yields',
 }
 
+function averageDataLastN<T extends { data: number }>(
+  arr: readonly T[],
+  n = 7,
+): number {
+  const last = arr.slice(-n)
+  if (last.length === 0) return 0
+  return last.reduce((sum, x) => sum + x.data, 0) / last.length
+}
+
 enum MeridainNetwork {
   TAIKO = 'taiko',
 }
@@ -176,6 +189,31 @@ export const fetchGeneralYields = async () => {
     return apyToAprPercent(res.apy)
   })
 
+  const thbillPromise = safeFetch('THBILL', async () => {
+    const res = await fetch(FeedData.THBILL).then((r) => r.json())
+    // the entries are nested as
+    //  "cash": {
+    //       "USDC": 0.0
+    //     },
+    //     "money_market": {
+    //       "ULTRA": 30364810.9557616
+    //     },
+    //     "pending": {
+    //       "tULTRA": 16220629.251993446
+    //     }
+    //   },
+
+    // we read the keys and assign the approx rate of 4.5% to ULTRA
+    const entrs = Object.values(res.history[0]?.composition ?? {}).flatMap(
+      (a: any) => Object.entries(a),
+    )
+    const total = entrs.reduce((acc, b) => acc + Number(b[1]), 0)
+    const val = entrs
+      .filter((a) => a[0] === 'ULTRA')
+      .reduce((acc, b) => acc + Number(b[1]), 0)
+    return (val / total) * 4.5
+  })
+
   const ethxPromise = safeFetch('ETHX', async () => {
     const res = await fetch(FeedData.ETHX).then((r) => r.json())
     return apyToAprPercent(res.value)
@@ -233,6 +271,15 @@ export const fetchGeneralYields = async () => {
     return Number(res?.rewards[0]?.apr ?? 0) * 100
   })
 
+  const jitoSolPromise = safeFetch('JITOSOL', async () => {
+    const res = await fetch(FeedData.JITOSOL, {
+      method: 'GET',
+      headers: { Accept: 'application/json' },
+    }).then((r) => r.json())
+    const val = averageDataLastN(res?.getStakePoolStats?.apy, 7)
+    return apyToApr(val) * 100
+  })
+
   const ethZeroPromise = safeFetch('ETHZERO', async () => {
     const res = await fetch(FeedData.ETHZERO, {
       method: 'GET',
@@ -246,7 +293,7 @@ export const fetchGeneralYields = async () => {
       method: 'GET',
       headers: { Accept: 'application/json' },
     }).then((r) => r.json())
-    return apyToAprPercent(Number(res?.[0]?.sky_savings_rate_apy ?? 0) * 100)
+    return apyToApr(Number(res?.[0]?.sky_savings_rate_apy ?? 0)) * 100
   })
 
   const srusdPromise = safeFetch('SRUSD', async () => {
@@ -268,7 +315,11 @@ export const fetchGeneralYields = async () => {
   const rlpPromise = safeFetch('RLP', async () => {
     const res = await fetch(FeedData.RLP, {
       method: 'GET',
-      headers: { Accept: 'application/json' },
+      headers: {
+        Accept: 'application/json',
+
+        'User-Agent': '1delta/yields',
+      },
     }).then((r) => r.json())
     return Number(res?.value ?? 0) * 100
   })
@@ -276,7 +327,10 @@ export const fetchGeneralYields = async () => {
   const wstusrPromise = safeFetch('WSTUSR', async () => {
     const res = await fetch(FeedData.WSTUSR, {
       method: 'GET',
-      headers: { Accept: 'application/json' },
+      headers: {
+        Accept: 'application/json',
+        'User-Agent': '1delta/yields',
+      },
     }).then((r) => r.json())
     return Number(res?.value ?? 0) * 100
   })
@@ -292,7 +346,7 @@ export const fetchGeneralYields = async () => {
   const rswethPromise = safeFetch('RSWETH', async () => {
     const res = await fetch(FeedData.RSWETH, {
       method: 'GET',
-      headers: { Accept: 'application/json' },
+      headers: { Accept: 'application/json', 'User-Agent': '1delta/yields' },
     }).then((r) => r.text())
     return Number(res) ?? 0
   })
@@ -413,6 +467,8 @@ export const fetchGeneralYields = async () => {
     ynethxData,
     ethZeroData,
     usdZeroPlusData,
+    jitoSolData,
+    thBillData,
   ] = await Promise.all([
     wstethPromise,
     ezethPromise,
@@ -444,6 +500,8 @@ export const fetchGeneralYields = async () => {
     ynethxPromise,
     ethZeroPromise,
     usdZeroPlusPromise,
+    jitoSolPromise,
+    thbillPromise,
   ])
 
   const data: YieldDataWithTimestamp = {
@@ -477,6 +535,8 @@ export const fetchGeneralYields = async () => {
       [ynethx]: ynethxData,
       [tETH]: wstethData,
       [pufEth]: pufEthData,
+      [jitoSol]: jitoSolData,
+      [thBill]: thBillData,
       ...rtokensData,
       ...hypeData,
       ...angleData,

package/test/mainPriceMB.test.ts

@@ -1,7 +1,6 @@
 import { describe, it } from 'vitest'
 import { Chain } from '@1delta/asset-registry'
 import { fetchMainPrices } from '../src'
-import { getEvmClient } from '@1delta/providers'
 
 const chainIds =
   // [ Chain.BASE]
@@ -23,7 +22,7 @@ describe(
   'find prices',
   () => {
     it('should return prices for valid tokens', async () => {
-      const prices = await fetchMainPrices(chainIds, getEvmClient)
+      const prices = await fetchMainPrices(chainIds)
 
       prettyPrint(prices)
     })

package/test/mainPrices.test.ts

@@ -1,7 +1,6 @@
 import { describe, it } from 'vitest'
 import { fetchMainPrices } from '../src'
 import { Chain } from '@1delta/asset-registry'
-import { getEvmClient } from '@1delta/providers'
 import { prettyPrint } from './utils'
 
 describe(
@@ -20,6 +19,7 @@ describe(
           Chain.ETHEREUM_MAINNET,
         ],
       )
+      console.log(mainPrices["SOL"])
       prettyPrint(mainPrices)
     })
   },

package/test/morphoPrice.test.ts

@@ -2,7 +2,7 @@ import { describe, it } from 'vitest'
 import { fetchMorphoPriceMeta } from './morpho'
 import { Chain } from '@1delta/asset-registry'
 
-const chainId = Chain.ETHEREUM_MAINNET
+const chainId = Chain.BASE
 describe(
   'find prices',
   () => {

package/test/userDataAll.test.ts

@@ -1,13 +1,10 @@
-import { describe, it, expect, beforeAll } from 'vitest'
+import { describe, it, expect } from 'vitest'
 import {
   getLenderUserDataResult,
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
-import { fetchGeneralYields, fetchMainPrices } from '../src'
 import { getEvmClient } from '@1delta/providers'
 import { Chain, Lender } from '@1delta/asset-registry'
-import { LenderUserQuery } from '../src/lending/user-data/types'
-import { fetchMorphoPublicData } from '../src/lending/morpho/publicCallBuild'
 import { prettyPrint } from './utils'
 import { TestData } from './data'
 // random user with ETH

package/test/userDataMorpho.test.ts

@@ -240,7 +240,7 @@ describe(
   () => {
     beforeAll(async () => {
       ;[prices, yields] = await Promise.all([
-        fetchMainPrices([Chain.ETHEREUM_MAINNET], getEvmClient),
+        fetchMainPrices([Chain.ETHEREUM_MAINNET]),
         fetchGeneralYields(),
       ])
     }, 30000)

package/test/userDataMorphoEthereum.test.ts

@@ -0,0 +1,77 @@
+import { describe, it, expect } from 'vitest'
+import {
+  getLenderUserDataResult,
+  convertLenderUserDataResult,
+} from '../src/lending/user-data/fetchUserData'
+import { getEvmClient } from '@1delta/providers'
+import { Chain, Lender } from '@1delta/asset-registry'
+import { LenderUserQuery } from '../src/lending/user-data/types'
+import { prettyPrint } from './utils'
+
+// random user with ETH
+const TEST_ADDRESS = '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5'
+let prices
+
+async function getUserData(chainId: Chain, publicData: any) {
+  // Define user queries
+  const queries: LenderUserQuery[] = Object.keys(publicData.data).map((m) => ({
+    lender: m,
+    account: TEST_ADDRESS.toLowerCase(),
+    // params: lenders,
+  }))
+
+// console.log("queries", queries)
+
+  // Fetch raw user data
+  const rawUserData = await getLenderUserDataResult(
+    chainId,
+    queries,
+    getEvmClient,
+  )
+  // Convert raw data to structured format
+  const userData = convertLenderUserDataResult(
+    chainId,
+    queries,
+    rawUserData,
+    prices as any,
+    prices as any,
+    { [chainId]: publicData },
+  )
+
+  return { userData, rawUserData, publicData, queries }
+}
+
+describe(
+  'user data fetching',
+  () => {
+    it(
+      'should fetch user data for Morpho on KATANA',
+      async () => {
+        try {
+          const chainId = Chain.ETHEREUM_MAINNET
+          const all = await fetch(
+            `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
+          ).then((a) => a.json())
+          prices = all.prices
+
+          const publicData = all.data[chainId]
+          const { userData } = await getUserData(chainId, publicData)
+
+          prettyPrint(
+            userData[
+              'MORPHO_BLUE_C4E18EB6D0E9B0FA90A15BC0A98190CBF3D5BA763AF410346F5174B014CEFD8D'
+            ],
+          )
+
+          // Basic validation
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
+        } catch (error) {
+          console.log('Error fetching Morpho KATANA data:', error)
+        }
+      },
+      { timeout: 30000 },
+    )
+  },
+  { timeout: 90000 },
+)

package/test/userDataMorphoKatana.test.ts

@@ -0,0 +1,75 @@
+import { describe, it, expect } from 'vitest'
+import {
+  getLenderUserDataResult,
+  convertLenderUserDataResult,
+} from '../src/lending/user-data/fetchUserData'
+import { getEvmClient } from '@1delta/providers'
+import { Chain, Lender } from '@1delta/asset-registry'
+import { LenderUserQuery } from '../src/lending/user-data/types'
+import { prettyPrint } from './utils'
+
+// random user with ETH
+const TEST_ADDRESS = '0xaffe73AA5EBd0CD95D89ab9fa2512Fc9e2d3289b'
+let prices, yields
+
+async function getUserData(chainId: Chain, publicData: any) {
+  // Define user queries
+  const queries: LenderUserQuery[] = Object.keys(publicData.data).map((m) => ({
+    lender: m,
+    account: TEST_ADDRESS.toLowerCase(),
+    // params: lenders,
+  }))
+
+  // Fetch raw user data
+  const rawUserData = await getLenderUserDataResult(
+    chainId,
+    queries,
+    getEvmClient,
+  )
+  // Convert raw data to structured format
+  const userData = convertLenderUserDataResult(
+    chainId,
+    queries,
+    rawUserData,
+    prices as any,
+    prices as any,
+    { [chainId]: publicData },
+  )
+
+  return { userData, rawUserData, publicData, queries }
+}
+
+describe(
+  'user data fetching',
+  () => {
+    it(
+      'should fetch user data for Morpho on KATANA',
+      async () => {
+        try {
+          const chainId = Chain.KATANA
+          const all = await fetch(
+            `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
+          ).then((a) => a.json())
+          prices = all.prices
+          yields = all.yields
+          const publicData = all.data[chainId]
+          const { userData } = await getUserData(chainId, publicData)
+
+          prettyPrint(
+            userData[
+              'MORPHO_BLUE_16DED80178992B02F7C467C373CFC9F4EEE7F0356DF672F6A768EC92B2FFDEFF'
+            ],
+          )
+
+          // Basic validation
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
+        } catch (error) {
+          console.log('Error fetching Morpho KATANA data:', error)
+        }
+      },
+      { timeout: 30000 },
+    )
+  },
+  { timeout: 90000 },
+)