Fix #455 (#457)

* Fix #455 * Fix
daostack · Jan 29, 2020 · 07727d0 · 07727d0
1 parent 901d947
commit 07727d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/domain/proposal.ts b/src/domain/proposal.ts
@@ -215,6 +215,7 @@ export function setProposalState(proposal: Proposal, state: number, gpTimes: Big
     if (dao != null) {
       dao.numberOfExpiredInQueueProposals = dao.numberOfExpiredInQueueProposals.plus(BigInt.fromI32(1));
     }
+    proposal.accountsWithUnclaimedRewards = new Array<Bytes>();
   } else if (state === 2) {
     // Executed
     proposal.stage = 'Executed';

diff --git a/src/domain/reward.ts b/src/domain/reward.ts
@@ -141,6 +141,11 @@ export function insertGPRewards(
   state: number,
 ): void {
   let proposal = getProposal(proposalId.toHex());
+  if (equalStrings(proposal.stage, 'ExpiredInQueue')) {
+    proposal.accountsWithUnclaimedRewards = new Array<Bytes>();
+    proposal.save();
+    return;
+  }
   let genesisProtocol = GenesisProtocol.bind(gpAddress);
   let i = 0;
   let gpRewards: string[] = getGPRewardsHelper(proposalId.toHex()).gpRewards as string[];