[export]: add export logic

stakewise · Jan 16, 2024 · 38d632c · 38d632c
1 parent 0aa66f0
commit 38d632c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -251,11 +251,12 @@ Daily rewards for the user who has made a deposit in the vault. With the help of
 
 #### Arguments:
 
-| Name | Type     | Type | Description |
+| Name | Type     | Type        | Description |
 |------|----------|-------------|---------|
-| dateFrom | `number` | **Require** | Time to start |
 | vaultAddress | `string` | **Require** | - |
 | userAddress | `string` | **Require** | - |
+| dateFrom | `number` | **Require** | Time to start |
+| dateTo | `number` | Time to end |
 
 #### Returns:
 

diff --git a/src/graphql/backend/vault/userRewardsQuery.graphql b/src/graphql/backend/vault/userRewardsQuery.graphql
@@ -1,7 +1,10 @@
-query UserRewards($user: String!, $vaultAddress: String!, $dateFrom: DateAsTimestamp!) {
-  userRewards(user: $user, vaultAddress: $vaultAddress, dateFrom: $dateFrom) {
+query UserRewards($user: String!, $vaultAddress: String!, $dateFrom: DateAsTimestamp!, $dateTo: DateAsTimestamp) {
+  userRewards(user: $user, vaultAddress: $vaultAddress, dateFrom: $dateFrom, dateTo: $dateTo) {
     date
     sumRewards
     dailyRewards
+    dailyRewardsEur
+    dailyRewardsGbp
+    dailyRewardsUsd
   }
 }
diff --git a/src/methods/vault/requests/getUserRewards/index.ts b/src/methods/vault/requests/getUserRewards/index.ts
@@ -10,20 +10,26 @@ type GetUserRewardsInput = {
   userAddress: UserRewardsQueryVariables['user']
   vaultAddress: UserRewardsQueryVariables['vaultAddress']
   dateFrom: number
+  dateTo?: number
 }
 
 const getUserRewards = async (input: GetUserRewardsInput) => {
-  const { options, vaultAddress, userAddress, dateFrom } = input
+  const { options, vaultAddress, userAddress, dateFrom, dateTo } = input
 
   validateArgs.address({ vaultAddress, userAddress })
   validateArgs.number({ dateFrom })
 
+  if (dateTo) {
+    validateArgs.number({ dateTo })
+  }
+
   const data = await graphql.backend.vault.fetchUserRewardsQuery<ModifyUserReward>({
     url: apiUrls.getBackendUrl(options),
     variables: {
       vaultAddress: vaultAddress.toLowerCase(),
       user: userAddress.toLowerCase(),
       dateFrom: String(dateFrom),
+      dateTo: dateTo ? String(dateTo) : null,
     } as UserRewardsQueryVariables,
     modifyResult: modifyUserRewards,
   })

diff --git a/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts b/src/methods/vault/requests/getUserRewards/modifyUserRewards.spec.ts
@@ -9,11 +9,17 @@ describe('modifyUserReward and modifyUserRewards functions', () => {
         date: '1694908800',
         sumRewards: '344379922475148628745',
         dailyRewards: '344379922475148628745',
+        dailyRewardsEur: "0.10",
+        dailyRewardsGbp: "0.09",
+        dailyRewardsUsd: "0.11",
       },
       {
         date: '1694995200',
         sumRewards: '344382187878289278175',
         dailyRewards: '0',
+        dailyRewardsEur: "0.10",
+        dailyRewardsGbp: "0.09",
+        dailyRewardsUsd: "0.11",
       },
     ],
   }
@@ -24,21 +30,33 @@ describe('modifyUserReward and modifyUserRewards functions', () => {
     const result = modifyUserReward(userReward)
 
     expect(result).toEqual({
+      date: 1694908800,
       sumRewards: 344.37992247514865,
       dailyRewards: 344.37992247514865,
+      dailyRewardsEur: 0.10,
+      dailyRewardsGbp: 0.09,
+      dailyRewardsUsd: 0.11,
     })
   })
 
   it('should correctly modify multiple rewards', () => {
     const expectedResult = {
       days: {
         1694908800: {
+          date: 1694908800,
           sumRewards: 344.37992247514865,
           dailyRewards: 344.37992247514865,
+          dailyRewardsEur: 0.10,
+          dailyRewardsGbp: 0.09,
+          dailyRewardsUsd: 0.11,
         },
         1694995200: {
+          date: 1694995200,
           sumRewards: 344.3821878782893,
           dailyRewards: 0,
+          dailyRewardsEur: 0.10,
+          dailyRewardsGbp: 0.09,
+          dailyRewardsUsd: 0.11,
         },
       },
     }

diff --git a/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts b/src/methods/vault/requests/getUserRewards/modifyUserRewards.ts
@@ -4,19 +4,23 @@ import { ModifyUserReward } from './types'
 import type { UserRewardsQueryPayload } from '../../../../graphql/backend/vault'
 
 
-export const modifyUserReward = (reward: Omit<UserRewardsQueryPayload['userRewards'][number], 'date'>) => {
+export const modifyUserReward = (reward: UserRewardsQueryPayload['userRewards'][number]) => {
   const sumRewards = String(reward.sumRewards) || '0'
   const dailyRewards = String(reward.dailyRewards) || '0'
 
   return {
+    date: Number(reward.date),
     sumRewards: Number(formatEther(sumRewards)),
     dailyRewards: Number(formatEther(dailyRewards)),
+    dailyRewardsEur: Number(reward.dailyRewardsEur) || 0,
+    dailyRewardsGbp: Number(reward.dailyRewardsGbp) || 0,
+    dailyRewardsUsd: Number(reward.dailyRewardsUsd) || 0,
   }
 }
 
 const modifyUserRewards = (input: UserRewardsQueryPayload): ModifyUserReward => {
   const days = input.userRewards.reduce((acc, { date, ...rest }) => {
-    acc[Number(date)] = modifyUserReward(rest)
+    acc[Number(date)] = modifyUserReward({ date, ...rest })
 
     return acc
   }, {} as ModifyUserReward['days'])

diff --git a/src/methods/vault/requests/getUserRewards/types.ts b/src/methods/vault/requests/getUserRewards/types.ts
@@ -1,6 +1,10 @@
 type UserReward = {
+  date: number
   sumRewards: number
   dailyRewards: number
+  dailyRewardsEur: number
+  dailyRewardsGbp: number
+  dailyRewardsUsd: number
 }
 
 export type ModifyUserReward = {