Merge branch 'fix/optimistic-rewards' into fix/service-update-on-start

valory-xyz · Dec 9, 2024 · cdedcf4 · cdedcf4
2 parents 680a338 + b63c99b
commit cdedcf4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/frontend/context/RewardProvider.tsx b/frontend/context/RewardProvider.tsx
@@ -68,15 +68,24 @@ const useStakingRewardsDetails = () => {
       token!,
     ),
     queryFn: async () => {
+      if (!multisig || !token || !selectedStakingProgramId) return;
       const response = await currentAgent.serviceApi.getAgentStakingRewardsInfo(
         {
-          agentMultisigAddress: multisig!,
-          serviceId: token!,
-          stakingProgramId: selectedStakingProgramId!,
+          agentMultisigAddress: multisig,
+          serviceId: token,
+          stakingProgramId: selectedStakingProgramId,
           chainId: currentChainId,
         },
       );
-      return StakingRewardsInfoSchema.parse(response);
+
+      if (!response) return;
+
+      try {
+        const parsed = StakingRewardsInfoSchema.parse(response);
+        return parsed;
+      } catch (e) {
+        console.error('Error parsing staking rewards info', e);
+      }
     },
     enabled:
       !!isOnline &&
@@ -133,6 +142,7 @@ export const RewardProvider = ({ children }: PropsWithChildren) => {
     refetch: refetchStakingRewardsDetails,
     isFetched: isStakingRewardsDetailsFetched,
   } = useStakingRewardsDetails();
+
   const {
     data: availableRewardsForEpoch,
     refetch: refetchAvailableRewardsForEpoch,

diff --git a/frontend/types/Autonolas.ts b/frontend/types/Autonolas.ts
@@ -1,11 +1,16 @@
 import { z } from 'zod';
 
+const zodBigNumber = z.object({
+  _isBigNumber: z.boolean(),
+  _hex: z.string().startsWith('0x'),
+});
+
 export const StakingRewardsInfoSchema = z.object({
   // mechRequestCount: z.number(),
   serviceInfo: z.array(z.unknown()),
-  livenessPeriod: z.number(),
-  livenessRatio: z.number(),
-  rewardsPerSecond: z.number(),
+  livenessPeriod: zodBigNumber,
+  livenessRatio: zodBigNumber,
+  rewardsPerSecond: zodBigNumber,
   isEligibleForRewards: z.boolean(),
   availableRewardsForEpoch: z.number(),
   accruedServiceStakingRewards: z.number(),