fix: adjust verifier formulas to epoch 3

epoch-verifier/src/data/context.ts

@@ -56,5 +56,8 @@ export function individualDonationsByProposals(context: Context): Map<Address, b
 }
 
 export function rewardsByProject(context: Context): Map<Address, Reward> {
-  return new Map(context.rewards.map((r) => [r.proposal, r] as const))
+  return new Map(context.rewards
+    .filter(r => r.matched !== BigInt(0))
+    .map((r) => [r.proposal, r] as const)
+  );
 }

epoch-verifier/src/data/fetcher.ts

@@ -57,7 +57,7 @@ export class HttpFetcher {
   }
 
   async apiGetAllocations(epoch: number): Promise<AllocationRecord[] | null> {
-    return this._get_array(`/allocations/epoch/${epoch}`, "users' allocations", AllocationImpl, (data: ApiAllocations) => data.allocations)
+    return this._get_array(`/allocations/epoch/${epoch}?includeZeroAllocations=true`, "users' allocations", AllocationImpl, (data: ApiAllocations) => data.allocations)
   }
 
   async apiGetRewards(epoch: number): Promise<Reward[] | null>{

epoch-verifier/src/verifications/donations.ts

@@ -65,8 +65,8 @@ export function verifyMatchingFundFromEpochInfo(context: Context): VerificationR
 }
 
 export function verifyAllEpochRewards(context: Context): VerificationResult {
-  const allBudgets = context.epochInfo.individualRewards + context.epochInfo.ppf + context.epochInfo.matchedRewards + context.epochInfo.communityFund + context.epochInfo.operationalCost
-  return assertEq(allBudgets, context.epochInfo.stakingProceeds)
+  const allBudgets = context.epochInfo.individualRewards + context.epochInfo.ppf - context.epochInfo.patronsRewards + context.epochInfo.matchedRewards + context.epochInfo.communityFund + context.epochInfo.operationalCost
+  return assertEq(allBudgets, context.epochInfo.stakingProceeds, BigInt(100))
 }
 
 export function verifyTotalWithdrawals(context: Context): VerificationResult {
@@ -77,6 +77,9 @@ export function verifyTotalWithdrawals(context: Context): VerificationResult {
     .map(([user, donationsSum]) => context.budgets.get(user)! - donationsSum)
     .reduce((acc, user_claimed) => acc + user_claimed, BigInt(0))
 
-  const rewards = context.rewards.reduce((acc, reward) => acc + reward.allocated + reward.matched, BigInt(0))
+  const rewards = context.rewards
+    .filter((reward) => reward.matched !== BigInt(0))
+    .reduce((acc, reward) => acc + reward.allocated + reward.matched, BigInt(0))
+
   return assertEq(claimed + rewards, context.epochInfo.totalWithdrawals)
 }