minor fixes to cabanalytics tvl stats

Author: Ncookiez

apps/analytics/src/components/Charts/TVLOverTimeChart.tsx

@@ -21,8 +21,6 @@ export const TVLOverTimeChart = (props: TVLOverTimeChartProps) => {
   const vaultAddresses = Object.keys(vaultTVLs ?? {}).map(getAddressFromVaultId)
   const { data: tokens } = useTokens(prizePool.chainId, vaultAddresses)
 
-  const { data: prizeToken } = usePrizeTokenData(prizePool)
-
   const chartData = useMemo(() => {
     const data: AreaChartProps['data'] = []
 
@@ -49,7 +47,7 @@ export const TVLOverTimeChart = (props: TVLOverTimeChartProps) => {
     return data
   }, [vaultTVLs])
 
-  const isReady = !!chartData?.length && !!tokens && !!prizeToken
+  const isReady = !!chartData?.length && !!tokens
 
   const lastDrawData = chartData[chartData.length - 1]
   const vaultIds = Object.keys(vaultTVLs ?? {})
@@ -79,7 +77,7 @@ export const TVLOverTimeChart = (props: TVLOverTimeChartProps) => {
 
               const formattedValue = `${formatNumberForDisplay(value, {
                 maximumFractionDigits: 3
-              })} ${prizeToken.symbol}`
+              })} ETH`
               const formattedName =
                 name === 'total'
                   ? 'Total TVL'

apps/analytics/src/components/Stats/TVLStats.tsx

@@ -31,7 +31,7 @@ export const TVLStats = (props: TVLStatsProps) => {
             title: 'Median Deposit Transaction',
             value:
               deposits !== undefined
-                ? formatNumberForDisplay(deposits.medianValue, { maximumFractionDigits: 4 })
+                ? formatNumberForDisplay(deposits.medianValue, { maximumFractionDigits: 5 })
                 : undefined,
             unit: 'ETH'
           },
@@ -40,7 +40,7 @@ export const TVLStats = (props: TVLStatsProps) => {
             title: 'Average Deposit Transaction',
             value:
               deposits !== undefined
-                ? formatNumberForDisplay(deposits.avgValue, { maximumFractionDigits: 4 })
+                ? formatNumberForDisplay(deposits.avgValue, { maximumFractionDigits: 5 })
                 : undefined,
             unit: 'ETH'
           }

apps/analytics/src/hooks/useDeployedVaultAddresses.ts

@@ -40,6 +40,10 @@ export const useDeployedVaultAddresses = (prizePool: PrizePool) => {
             ]
           }))
         )
+      } else if (prizePool.chainId === NETWORK.world) {
+        vaultAddresses.push('0x8ad5959c9245b64173d4c0c3cd3ff66dac3cab0e')
+
+        vaultAddresses.push(...(await getVaultAddressesFromFactories(prizePool.publicClient)))
       } else {
         vaultAddresses.push(...(await getVaultAddressesFromFactories(prizePool.publicClient)))
       }

packages/hyperstructure-client-js/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-client-js",
   "description": "Lightweight library for interacting with PoolTogether contracts",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

packages/hyperstructure-react-hooks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@generationsoftware/hyperstructure-react-hooks",
   "description": "React hooks library for interacting with PoolTogether contracts",
-  "version": "1.27.0",
+  "version": "1.27.1",
   "license": "MIT",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

shared/utilities/utils/events.ts

@@ -1,12 +1,23 @@
 import { DSKit } from 'dskit-eth'
-import { Address, PublicClient } from 'viem'
+import { Address, GetLogsReturnType, PublicClient } from 'viem'
 import {
   LIQUIDATION_ROUTER_ADDRESSES,
   POOL_WIDE_TWAB_REWARDS_ADDRESSES,
   TWAB_REWARDS_ADDRESSES
 } from '../constants'
 import { getLiquidationPairAddresses } from './liquidations'
 
+const depositEventABI = {
+  inputs: [
+    { indexed: true, internalType: 'address', name: 'sender', type: 'address' },
+    { indexed: true, internalType: 'address', name: 'owner', type: 'address' },
+    { indexed: false, internalType: 'uint256', name: 'assets', type: 'uint256' },
+    { indexed: false, internalType: 'uint256', name: 'shares', type: 'uint256' }
+  ],
+  name: 'Deposit',
+  type: 'event'
+} as const
+
 /**
  * Returns `Deposit` events
  * @param publicClient a public Viem client to query through
@@ -18,23 +29,16 @@ export const getDepositEvents = async (
   publicClient: PublicClient,
   vaultAddresses: Address[],
   options?: { sender?: Address[]; owner?: Address[]; fromBlock?: bigint; toBlock?: bigint }
-) => {
-  return await publicClient.getLogs({
+): Promise<GetLogsReturnType<typeof depositEventABI, [typeof depositEventABI], true>> => {
+  // @ts-ignore
+  const dskit = new DSKit({ viemPublicClient: publicClient })
+
+  return await dskit.event.query({
     address: vaultAddresses,
-    event: {
-      inputs: [
-        { indexed: true, internalType: 'address', name: 'sender', type: 'address' },
-        { indexed: true, internalType: 'address', name: 'owner', type: 'address' },
-        { indexed: false, internalType: 'uint256', name: 'assets', type: 'uint256' },
-        { indexed: false, internalType: 'uint256', name: 'shares', type: 'uint256' }
-      ],
-      name: 'Deposit',
-      type: 'event'
-    },
+    event: depositEventABI,
     args: { sender: options?.sender ?? null, owner: options?.owner ?? null },
-    fromBlock: options?.fromBlock,
-    toBlock: options?.toBlock ?? 'latest',
-    strict: true
+    fromBlock: options?.fromBlock ?? 1n,
+    toBlock: options?.toBlock ?? 'latest'
   })
 }
 
@@ -245,7 +249,7 @@ export const getLiquidationEvents = async (
     args: { ...lpEvent.args, liquidationPair: lpEvent.address }
   }))
 
-  const routerEvents = await publicClient.getLogs({
+  const routerEvents = await dskit.event.query({
     address: liqRouterContractAddress,
     event: {
       inputs: [
@@ -265,9 +269,8 @@ export const getLiquidationEvents = async (
       name: 'SwappedExactAmountOut',
       type: 'event'
     },
-    fromBlock: options?.fromBlock,
-    toBlock: options?.toBlock ?? 'latest',
-    strict: true
+    fromBlock: options?.fromBlock ?? 1n,
+    toBlock: options?.toBlock ?? 'latest'
   })
 
   return [...routerEvents, ...formattedLpEvents].sort((a, b) =>