ProposalSupport should not be immutable (#47)

* ProposalSupport should not be immutable * add Changelog entry
OpenZeppelin · Jan 30, 2023 · 11c9ffe · 11c9ffe
1 parent 0d6b77a
commit 11c9ffe
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+### Unreleased
+ * `Governor`: fix bug caused by duplicate write of immutable entity `ProposalSupport` ([#47](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/47))
+
 ### 0.1.8-5 (2022-07-29)
  * `AccessControl`: fix bug caused by duplicate write of immutable entity `AccessControl` ([#38](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/38))
 

diff --git a/generated/all.schema.graphql b/generated/all.schema.graphql
@@ -297,7 +297,7 @@ type ProposalCall @entity(immutable: true) {
 	signature: String!
 	calldata: Bytes!
 }
-type ProposalSupport @entity(immutable: true) {
+type ProposalSupport @entity {
 	id: ID!
 	proposal: Proposal!
 	support: Int!

diff --git a/generated/governor.schema.graphql b/generated/governor.schema.graphql
@@ -47,7 +47,7 @@ type ProposalCall @entity(immutable: true) {
 	signature: String!
 	calldata: Bytes!
 }
-type ProposalSupport @entity(immutable: true) {
+type ProposalSupport @entity {
 	id: ID!
 	proposal: Proposal!
 	support: Int!

diff --git a/src/datasources/governor.gql.json b/src/datasources/governor.gql.json
@@ -56,7 +56,6 @@
   ]
 },{
   "name": "ProposalSupport",
-  "immutable": true,
   "fields": [
     { "name": "proposal",             "type": "Proposal!"                                           },
     { "name": "support",              "type": "Int!"                                                },

diff --git a/src/datasources/governor.ts b/src/datasources/governor.ts
@@ -11,7 +11,6 @@ import {
 } from '../../generated/schema'
 
 import {
-	Governor           as GovernorContract,
 	ProposalCreated    as ProposalCreatedEvent,
 	ProposalQueued     as ProposalQueuedEvent,
 	ProposalExecuted   as ProposalExecutedEvent,

diff --git a/src/fetch/governor.ts b/src/fetch/governor.ts
@@ -50,12 +50,16 @@ export function fetchProposal(contract: Governor, proposalId: BigInt): Proposal
 	let proposal = Proposal.load(id)
 
 	if (proposal == null) {
-		proposal            = new Proposal(id)
-		proposal.governor   = contract.id
-		proposal.proposalId = proposalId
-		proposal.canceled   = false
-		proposal.queued     = false
-		proposal.executed   = false
+		proposal             = new Proposal(id)
+		proposal.governor    = contract.id
+		proposal.proposalId  = proposalId
+		proposal.proposer    = Address.zero()
+		proposal.startBlock  = BigInt.zero()
+		proposal.endBlock    = BigInt.zero()
+		proposal.description = ""
+		proposal.canceled    = false
+		proposal.queued      = false
+		proposal.executed    = false
 	}
 
 	return proposal as Proposal