Merge pull request #611 from valory-xyz/mohan/flickering-debug

fix: flickering debug for agents.fun
valory-xyz · Dec 18, 2024 · 18f5b2b · 18f5b2b
2 parents dc3e708 + 0c4281c
commit 18f5b2b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/frontend/components/MainPage/sections/RewardsSection/StakingRewardsThisEpoch.tsx b/frontend/components/MainPage/sections/RewardsSection/StakingRewardsThisEpoch.tsx
@@ -38,6 +38,9 @@ const useEpochEndTime = () => {
   return { data, isLoading };
 };
 
+/**
+ * Staking rewards for the current epoch
+ */
 export const StakingRewardsThisEpoch = () => {
   const { data: epochEndTimeInMs } = useEpochEndTime();
 

diff --git a/frontend/components/MainPage/sections/RewardsSection/index.tsx b/frontend/components/MainPage/sections/RewardsSection/index.tsx
@@ -35,8 +35,9 @@ const DisplayRewards = () => {
   const reward = getFormattedReward(availableRewardsForEpochEth);
 
   const earnedTag = useMemo(() => {
-    if (isStakingRewardsDetailsLoading && !isStakingRewardsDetailsError)
+    if (isStakingRewardsDetailsLoading && !isStakingRewardsDetailsError) {
       return <Skeleton.Input size="small" />;
+    }
     if (isEligibleForRewards) {
       return <Tag color="success">Earned</Tag>;
     }

diff --git a/frontend/context/RewardProvider.tsx b/frontend/context/RewardProvider.tsx
@@ -63,23 +63,24 @@ const useStakingRewardsDetails = () => {
       token!,
     ),
     queryFn: async () => {
-      if (!multisig || !token || !selectedStakingProgramId) return null;
-      const response =
-        await selectedAgentConfig.serviceApi.getAgentStakingRewardsInfo({
-          agentMultisigAddress: multisig,
-          serviceId: token,
-          stakingProgramId: selectedStakingProgramId,
-          chainId: currentChainId,
-        });
+      try {
+        const response =
+          await selectedAgentConfig.serviceApi.getAgentStakingRewardsInfo({
+            agentMultisigAddress: multisig!,
+            serviceId: token!,
+            stakingProgramId: selectedStakingProgramId!,
+            chainId: currentChainId,
+          });
 
-      if (!response) return null;
+        if (!response) return null;
 
-      try {
         const parsed = StakingRewardsInfoSchema.parse(response);
         return parsed;
       } catch (e) {
         console.error('Error parsing staking rewards info', e);
       }
+
+      return null;
     },
     enabled:
       !!isOnline &&

diff --git a/frontend/service/agents/Memeooor.ts b/frontend/service/agents/Memeooor.ts
@@ -48,7 +48,7 @@ export abstract class MemeooorBaseService extends StakedAgentService {
       stakingTokenProxyContract.minStakingDeposit(),
       stakingTokenProxyContract.tsCheckpoint(),
       activityChecker.livenessRatio(),
-      activityChecker.getMultisigNonces(),
+      activityChecker.getMultisigNonces(agentMultisigAddress),
     ];
     const multicallResponse = await provider.all(contractCalls);
 
@@ -82,13 +82,17 @@ export abstract class MemeooorBaseService extends StakedAgentService {
     const lastMultisigNonces = serviceInfo[2];
     const nowInSeconds = Math.floor(Date.now() / 1000);
 
-    const [isEligibleForRewards] = await provider.all([
-      activityChecker.isRatioPass(
-        currentMultisigNonces,
-        lastMultisigNonces,
-        Math.ceil(nowInSeconds - tsCheckpoint),
-      ),
-    ]);
+    const isServiceStaked = serviceInfo[2].length > 0;
+
+    const [isEligibleForRewards] = isServiceStaked
+      ? await provider.all([
+          activityChecker.isRatioPass(
+            currentMultisigNonces,
+            lastMultisigNonces,
+            Math.ceil(nowInSeconds - tsCheckpoint),
+          ),
+        ])
+      : [false];
 
     const availableRewardsForEpoch = Math.max(
       rewardsPerSecond * livenessPeriod, // expected rewards for the epoch