fix tokensRequested

ajna-finance · Jul 27, 2023 · caa1ade · caa1ade
1 parent 93cdff2
commit caa1ade
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/grant-fund.ts b/src/grant-fund.ts
@@ -26,7 +26,7 @@ import {
   DistributionPeriodVote
 } from "../generated/schema"
 
-import { ONE_BI, THREE_PERCENT_BI, ZERO_ADDRESS, ZERO_BD } from './utils/constants'
+import { EXP_18_BD, ONE_BI, THREE_PERCENT_BI, ZERO_ADDRESS, ZERO_BD, ZERO_BI } from './utils/constants'
 import { addressArrayToBytesArray, addressToBytes, bigIntToBytes, bytesToBigInt, wadToDecimal } from "./utils/convert"
 import { getProposalParamsId, getProposalsInSlate, loadOrCreateProposal, removeProposalFromList } from './utils/grants/proposal'
 import { getCurrentDistributionId, getCurrentStage, loadOrCreateDistributionPeriod } from './utils/grants/distribution'
@@ -165,7 +165,7 @@ export function handleProposalCreated(event: ProposalCreatedEvent): void {
   const proposal = loadOrCreateProposal(proposalId)
   proposal.description  = event.params.description
 
-  let totalTokensRequested = ZERO_BD
+  let totalTokensRequested = ZERO_BI
 
   // create ProposalParams entities for each separate proposal param
   for (let i = 0; i < event.params.targets.length; i++) {
@@ -178,18 +178,19 @@ export function handleProposalCreated(event: ProposalCreatedEvent): void {
     // decode the calldata to get the recipient and tokens requested
     const decoded = ethereum.decode('(address,uint256)', proposalParams.calldata)!
     proposalParams.recipient = decoded.toTuple()[0].toAddress()
-    const tokensRequested = decoded.toTuple()[1].toBigInt().toBigDecimal()
-    proposalParams.tokensRequested = tokensRequested
+    const tokensRequested = decoded.toTuple()[1].toBigInt()
+    proposalParams.tokensRequested = wadToDecimal(tokensRequested)
     totalTokensRequested = totalTokensRequested.plus(tokensRequested)
 
     // add proposalParams information to proposal
     proposal.params = proposal.params.concat([proposalParams.id])
-    proposal.totalTokensRequested = totalTokensRequested
 
     // save each proposalParams entity to the store
     proposalParams.save()
   }
 
+  proposal.totalTokensRequested = wadToDecimal(totalTokensRequested)
+
   proposalCreated.proposal = proposal.id
 
   // update distribution entity

diff --git a/tests/grant-fund.test.ts b/tests/grant-fund.test.ts
@@ -264,7 +264,7 @@ describe("Grant Fund assertions", () => {
       "Proposal",
       `${bigIntToBytes(proposalId).toHexString()}`,
       "totalTokensRequested",
-      `${BigInt.fromI32(2)}`
+      `${wadToDecimal(BigInt.fromI32(2))}`
     );
 
   });
@@ -367,7 +367,7 @@ describe("Grant Fund assertions", () => {
       "Proposal",
       `${bigIntToBytes(proposalId).toHexString()}`,
       "totalTokensRequested",
-      `${BigInt.fromI32(2)}`
+      `${wadToDecimal(BigInt.fromI32(2))}`
     );
 
     assert.fieldEquals(
@@ -822,7 +822,7 @@ describe("Grant Fund assertions", () => {
       "FundedSlate",
       `${fundedSlateHash.toHexString()}`,
       "totalTokensRequested",
-      `${BigInt.fromI32(2)}`
+      `${wadToDecimal(BigInt.fromI32(2))}`
     );
   });
 });