Fix rewards fetching test

Author: welldan97

packages/ethereum/src/lib/connector.ts

@@ -41,7 +41,7 @@ export class StakewiseConnector {
         })
 
         this.baseAPI = 'https://holesky-api.stakewise.io/graphql'
-        this.baseGraph = 'https://holesky-graph.stakewise.io/subgraphs/name/stakewise/stakewise'
+        this.baseGraph = 'https://graphs.stakewise.io/holesky/subgraphs/name/stakewise/prod'
         // Stakewise keeper contract
         this.keeper = '0xB580799Bf7d62721D1a523f0FDF2f5Ed7BA4e259'
         this.priceOracle = '0xe31FAf135A6047Cbe595F91B4b6802cDB9B46E2b'
@@ -56,7 +56,7 @@ export class StakewiseConnector {
         })
 
         this.baseAPI = 'https://mainnet-api.stakewise.io/graphql'
-        this.baseGraph = 'https://mainnet-graph.stakewise.io/subgraphs/name/stakewise/stakewise'
+        this.baseGraph = 'https://graphs.stakewise.io/mainnet-b/subgraphs/name/stakewise/prod'
         // Stakewise keeper contract
         this.keeper = '0x6B5815467da09DaA7DC83Db21c9239d98Bb487b5'
         this.priceOracle = '0x8023518b2192FB5384DAdc596765B3dD1cdFe471'
@@ -75,6 +75,7 @@ export class StakewiseConnector {
       query: request.query.trim(),
       variables: request.variables
     })
+
     const params: RequestInit = {
       method: 'POST',
       headers: {

packages/ethereum/src/lib/methods/getRewardsHistory.ts

@@ -1,58 +1,61 @@
 import { Hex } from 'viem'
 import { StakewiseConnector } from '../connector'
-import { RewardsDataPoint } from '../types/rewards'
-
-async function extractVaultUserRewards (
-  connector: StakewiseConnector,
-  vault: Hex,
-  allocatorAddress: string,
-  dateFrom: Date,
-  dateTo: Date
-): Promise<RewardsDataPoint[]> {
-  const vars_getRewards = {
-    vaultAddress: vault,
-    user: allocatorAddress.toLowerCase(),
-    dateFrom: Math.floor(dateFrom.getTime() / 1000).toString()
-  }
-
-  const rewardsData = await connector.graphqlRequest({
-    type: 'api',
-    op: 'UserRewards',
-    query: `query UserRewards($user: String!, $vaultAddress: String!, $dateFrom: DateAsTimestamp!) { userRewards(user: $user, vaultAddress: $vaultAddress, dateFrom: $dateFrom) { date, sumRewards, }}`,
-    variables: vars_getRewards
-  })
-
-  if (!rewardsData.data.userRewards) {
-    throw new Error(`Rewards data is missing the userRewards field`)
-  }
-  const dataPoints: RewardsDataPoint[] = []
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  rewardsData.data.userRewards.forEach((reward: any) => {
-    const when: Date = new Date(parseInt(reward.date) * 1000)
-    if (when <= dateTo) {
-      const sumRewards: string = reward.sumRewards
-      dataPoints.push({
-        when: when,
-        amount: BigInt(sumRewards),
-        vault: vault
-      })
-    }
-  })
-
-  return dataPoints
-}
 
 export async function getRewardsHistory (params: {
   connector: StakewiseConnector
-  from: Date
-  to: Date
+  from: number
+  to: number
   vault: Hex
   userAccount: Hex
-}): Promise<Array<RewardsDataPoint>> {
+}) {
   const { connector, from, to, vault, userAccount } = params
-  let vaultRewards: RewardsDataPoint[] = []
+  const rewardsData = await connector.graphqlRequest({
+    type: 'graph',
+    op: 'UserRewards',
+    query:
+      'query UserRewards( $where: AllocatorStats_filter $limit: Int) { allocator: allocatorStats_collection( interval: day first: $limit where: $where ) { apy timestamp earnedAssets totalAssets }}',
+    // variables: vars_getRewards
+    variables: {
+      limit: 365,
+      where: {
+        timestamp_gte: (from * 1000).toString(),
+        allocator_: {
+          address: userAccount.toLowerCase(),
+          vault: vault.toLowerCase()
+        }
+      }
+    }
+  })
+
+  if (!rewardsData.data.allocator) {
+    throw new Error(`Rewards data is missing the allocator field`)
+  }
 
-  vaultRewards = await extractVaultUserRewards(connector, vault, userAccount, from, to)
+  const data = rewardsData.data.allocator as {
+    timestamp: string
+    earnedAssets: string
+    totalAssets: string
+  }[]
 
-  return vaultRewards
+  return data
+    .reduce(
+      (acc, reward) => {
+        const timestamp = Math.floor(parseInt(reward.timestamp) / 1000)
+        if (timestamp > to) return acc
+        return [
+          ...acc,
+          {
+            timestamp,
+            totalRewards: BigInt(reward.totalAssets),
+            dailyRewards: BigInt(reward.earnedAssets)
+          }
+        ]
+      },
+      [] as {
+        timestamp: number
+        totalRewards: bigint
+        dailyRewards: bigint
+      }[]
+    )
+    .sort((a, b) => a.timestamp - b.timestamp)
 }

packages/ethereum/src/lib/types/rewards.ts

@@ -279,15 +279,20 @@ export class EthereumStaker {
   }) {
     const rewards = await getRewardsHistory({
       connector: this.connector,
-      from: new Date(params.startTime),
-      to: new Date(params.endTime),
+      from: params.startTime,
+      to: params.endTime,
       vault: params.validatorAddress,
       userAccount: params.delegatorAddress
     })
 
     return rewards.map((item) => ({
-      timestamp: item.when.getTime(),
-      amount: formatEther(item.amount)
+      timestamp: item.timestamp,
+      /**
+       * @deprecated Use `totalRewards` instead.
+       */
+      amount: formatEther(item.totalRewards),
+      totalRewards: formatEther(item.totalRewards),
+      dailyRewards: formatEther(item.dailyRewards)
     }))
   }