Merge branch 'main' of https://github.com/OpenZeppelin/openzeppelin-s…

…ubgraphs into OpenZeppelin-main
wanderers-nft · Jul 13, 2022 · c18948e · c18948e
2 parents af4e58a + 8a36db8
commit c18948e
Show file tree

Hide file tree

Showing 26 changed files with 156 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@
 * Fix "could not find ABI for contract `IERC721` in `naut`"
 * Implement `Planet` module
 * Implement `Delegation` module
+* `Governor`: improve indexing of proposal queeing ([#29](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/29))
+* `Governor`: track total vote weight in `ProposalSupport` ([#31](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/31))
+* `Governor`: add handler for `VoteCastWithParams` events ([#31](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/31))
+* `ERC721`: reset approval on `Transfer` ([#33](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/33))
+* `AccessControl`: fix bug caused by duplicate write of immutable entity `Role` ([#36](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/36))
+* `ERC1155`: fix bug caused by duplicate write of immutable entity `ERC1155` ([#36](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/36))
+* `AccessControl`: fix bug caused by duplicate write of immutable entity `AccessControl` ([#38](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/38))
 
 ### 0.1.9
 * Implement `Naut` module
@@ -16,16 +23,16 @@
  * Update dependency to @graphprotocol/graph-cli version 0.29.x
  * Update dependency to @graphprotocol/graph-ts version 0.26.x
  * Update dependency to @amxx/graphprotocol-utils version 1.1.0
- * Use Bytes for some entities ID
+ * Use Bytes for some entities ID ([#25](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/25))
  * Make events and some other entites immutable
  * `Governor`: index the "counting mode" for OZ governors
 
-### 0.1.7-1 (2021-01-27)
+### 0.1.7-1 (2022-01-27)
  * `Governor`: fix vulnerability to ill-formed ProposalCreated events
 
-### 0.1.7 (2021-01-27)
- * `ERC1155`: fetch token uri on minting.
- * `ERC1155`: fix vulnerability to ill-formed TransferBatch events
+### 0.1.7 (2022-01-27)
+ * `ERC1155`: fetch token uri on minting. ([#14](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/14))
+ * `ERC1155`: fix vulnerability to ill-formed TransferBatch events ([#16](https://github.com/OpenZeppelin/openzeppelin-subgraphs/pull/16))
 
 ### 0.1.6 (2021-11-23)
  * Include emmiter address (Account) to all Event objects

diff --git a/configs/live/bsc/admin.json b/configs/live/bsc/admin.json
@@ -6,5 +6,7 @@
     { "startBlock": 0, "module": "erc1967upgrade" },
     { "startBlock": 0, "module": "accesscontrol"  }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/access-control-bsc"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/access-control-bsc" }
+  ]
 }
diff --git a/configs/live/bsc/nfts.json b/configs/live/bsc/nfts.json
@@ -5,5 +5,7 @@
     { "startBlock": 0, "module": "erc721"  },
     { "startBlock": 0, "module": "erc1155" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/nft-bsc"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/nft-bsc" }
+  ]
 }
diff --git a/configs/live/mainnet/admin.json b/configs/live/mainnet/admin.json
@@ -6,5 +6,7 @@
     { "startBlock": 5375569, "module": "erc1967upgrade" },
     { "startBlock": 9857098, "module": "accesscontrol"  }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/access-control"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/access-control" }
+  ]
 }
diff --git a/configs/live/mainnet/eip1155.json b/configs/live/mainnet/eip1155.json
@@ -4,5 +4,7 @@
   "datasources": [
     { "startBlock": 6930510, "module": "erc1155" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/eip1155-subgraph"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/eip1155-subgraph" }
+  ]
 }
diff --git a/configs/live/mainnet/eip721.json b/configs/live/mainnet/eip721.json
@@ -4,5 +4,7 @@
   "datasources": [
     { "startBlock": 5806610, "module": "erc721" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/eip721-subgraph"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/eip721-subgraph" }
+  ]
 }
diff --git a/configs/live/mainnet/nfts.json b/configs/live/mainnet/nfts.json
@@ -5,5 +5,7 @@
     { "startBlock": 5806610, "module": "erc721"  },
     { "startBlock": 6930510, "module": "erc1155" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/nft-mainnet"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/nft-mainnet" }
+  ]
 }
diff --git a/configs/live/matic/admin.json b/configs/live/matic/admin.json
@@ -6,5 +6,7 @@
     { "startBlock": 0, "module": "erc1967upgrade" },
     { "startBlock": 0, "module": "accesscontrol"  }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/access-control-matic"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/access-control-matic" }
+  ]
 }
diff --git a/configs/live/matic/nfts.json b/configs/live/matic/nfts.json
@@ -5,5 +5,7 @@
     { "startBlock": 0, "module": "erc721"  },
     { "startBlock": 0, "module": "erc1155" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/nft-matic"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/nft-matic" }
+  ]
 }
diff --git a/configs/live/xdai/admin.json b/configs/live/xdai/admin.json
@@ -6,5 +6,7 @@
     { "startBlock": 0, "module": "erc1967upgrade" },
     { "startBlock": 0, "module": "accesscontrol"  }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/access-control-xdai"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/access-control-xdai" }
+  ]
 }
diff --git a/configs/live/xdai/nfts.json b/configs/live/xdai/nfts.json
@@ -5,5 +5,7 @@
     { "startBlock": 0, "module": "erc721"  },
     { "startBlock": 0, "module": "erc1155" }
   ],
-  "__endpoint": "https://api.thegraph.com/subgraphs/name/amxx/nft-xdai"
+  "deploy": [
+    { "type": "hosted-service", "name": "amxx/nft-xdai" }
+  ]
 }
diff --git a/generated/all.schema.graphql b/generated/all.schema.graphql
@@ -311,6 +311,7 @@ type ProposalSupport @entity(immutable: true) {
 	id: ID!
 	proposal: Proposal!
 	support: Int!
+	weight: BigInt!
 	votes: [VoteReceipt!]! @derivedFrom(field: "support")
 }
 type VoteReceipt @entity(immutable: true) {
@@ -320,6 +321,7 @@ type VoteReceipt @entity(immutable: true) {
 	support: ProposalSupport!
 	weight: BigInt!
 	reason: String!
+	params: Bytes
 }
 type ProposalCreated implements Event @entity(immutable: true) {
 	id: ID!

diff --git a/generated/governor.schema.graphql b/generated/governor.schema.graphql
@@ -51,6 +51,7 @@ type ProposalSupport @entity(immutable: true) {
 	id: ID!
 	proposal: Proposal!
 	support: Int!
+	weight: BigInt!
 	votes: [VoteReceipt!]! @derivedFrom(field: "support")
 }
 type VoteReceipt @entity(immutable: true) {
@@ -60,6 +61,7 @@ type VoteReceipt @entity(immutable: true) {
 	support: ProposalSupport!
 	weight: BigInt!
 	reason: String!
+	params: Bytes
 }
 type ProposalCreated implements Event @entity(immutable: true) {
 	id: ID!

diff --git a/package.json b/package.json
@@ -13,9 +13,9 @@
     "generated/*.graphql",
     "generated/**/*.ts",
     "src",
-    "CHANGELOG",
+    "CHANGELOG.md",
     "LICENCE",
-    "README"
+    "README.md"
   ],
   "repository": {
     "type": "git",

diff --git a/scripts/deploy-all.sh b/scripts/deploy-all.sh
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -1,22 +1,19 @@
 #!/usr/bin/env bash
 
-set -o errexit
+set -xo errexit
 
-npx graph-compiler                                      \
-  --config ${CONFIG:-configs/sample.json}               \
-  --include src/datasources                             \
-  --export-subgraph                                     \
-  --export-schema                                       &&
+# Default is to deploy all live configs
+configs=$@
+: ${configs:=configs/live/**/*.json}
 
-npx graph codegen                                       \
-  ${SUBGRAPH:-generated/sample.subgraph.yaml}           &&
+for config in $configs;
+do
+  subgraph=$(jq -r '.output' $config)
+  npx graph-compiler --config ${config} --include src/datasources --export-schema --export-subgraph
+  npx graph codegen ${subgraph}subgraph.yaml
 
-npx graph build                                         \
-  ${SUBGRAPH:-generated/sample.subgraph.yaml}           &&
-
-npx graph deploy                                        \
-  --product hosted-service                              \
-  ${NAME:-amxx/sandbox}                                 \
-  ${SUBGRAPH:-generated/sample.subgraph.yaml}           &&
-
-echo 'done.'
+  jq -cr '.deploy[].type+" "+.deploy[].name' $config | while read endpoint;
+  do
+    npx graph deploy --product ${endpoint} ${subgraph}subgraph.yaml
+  done
+done
diff --git a/src/datasources/erc1155.ts b/src/datasources/erc1155.ts
@@ -1,5 +1,6 @@
 import {
 	ethereum,
+	Address,
 	BigInt,
 } from '@graphprotocol/graph-ts'
 
@@ -17,7 +18,6 @@ import {
 } from '../../generated/erc1155/IERC1155'
 
 import {
-	constants,
 	decimals,
 	events,
 	transactions,
@@ -57,7 +57,7 @@ function registerTransfer(
 	ev.value       = decimals.toDecimals(value)
 	ev.valueExact  = value
 
-	if (from.id == constants.ADDRESS_ZERO) {
+	if (from.id == Address.zero()) {
 		let totalSupply        = fetchERC1155Balance(token, null)
 		totalSupply.valueExact = totalSupply.valueExact.plus(value)
 		totalSupply.value      = decimals.toDecimals(totalSupply.valueExact)
@@ -72,7 +72,7 @@ function registerTransfer(
 		ev.fromBalance         = balance.id
 	}
 
-	if (to.id == constants.ADDRESS_ZERO) {
+	if (to.id == Address.zero()) {
 		let totalSupply        = fetchERC1155Balance(token, null)
 		totalSupply.valueExact = totalSupply.valueExact.minus(value)
 		totalSupply.value      = decimals.toDecimals(totalSupply.valueExact)

diff --git a/src/datasources/erc20.ts b/src/datasources/erc20.ts
@@ -1,3 +1,7 @@
+import {
+	Address,
+} from '@graphprotocol/graph-ts'
+
 import {
 	ERC20Transfer,
 } from '../../generated/schema'
@@ -8,7 +12,6 @@ import {
 } from '../../generated/erc20/IERC20'
 
 import {
-	constants,
 	decimals,
 	events,
 	transactions,
@@ -34,7 +37,7 @@ export function handleTransfer(event: TransferEvent): void {
 	ev.value       = decimals.toDecimals(event.params.value, contract.decimals)
 	ev.valueExact  = event.params.value
 
-	if (event.params.from == constants.ADDRESS_ZERO) {
+	if (event.params.from == Address.zero()) {
 		let totalSupply        = fetchERC20Balance(contract, null)
 		totalSupply.valueExact = totalSupply.valueExact.plus(event.params.value)
 		totalSupply.value      = decimals.toDecimals(totalSupply.valueExact, contract.decimals)
@@ -50,7 +53,7 @@ export function handleTransfer(event: TransferEvent): void {
 		ev.fromBalance         = balance.id
 	}
 
-	if (event.params.to == constants.ADDRESS_ZERO) {
+	if (event.params.to == Address.zero()) {
 		let totalSupply        = fetchERC20Balance(contract, null)
 		totalSupply.valueExact = totalSupply.valueExact.minus(event.params.value)
 		totalSupply.value      = decimals.toDecimals(totalSupply.valueExact, contract.decimals)

diff --git a/src/datasources/erc721.ts b/src/datasources/erc721.ts
@@ -1,3 +1,7 @@
+import {
+	Address,
+} from '@graphprotocol/graph-ts'
+
 import {
 	ERC721Transfer,
 } from '../../generated/schema'
@@ -30,7 +34,8 @@ export function handleTransfer(event: TransferEvent): void {
 		let from  = fetchAccount(event.params.from)
 		let to    = fetchAccount(event.params.to)
 
-		token.owner = to.id
+		token.owner    = to.id
+		token.approval = fetchAccount(Address.zero()).id // implicit approval reset on transfer
 
 		contract.save()
 		token.save()
@@ -54,7 +59,7 @@ export function handleApproval(event: ApprovalEvent): void {
 		let owner    = fetchAccount(event.params.owner)
 		let approved = fetchAccount(event.params.approved)
 
-		token.owner    = owner.id
+		token.owner    = owner.id // this should not be necessary, owner changed is signaled by a transfer event
 		token.approval = approved.id
 
 		token.save()

diff --git a/src/datasources/governor.gql.json b/src/datasources/governor.gql.json
@@ -60,6 +60,7 @@
   "fields": [
     { "name": "proposal",             "type": "Proposal!"                                           },
     { "name": "support",              "type": "Int!"                                                },
+    { "name": "weight",               "type": "BigInt!"                                             },
     { "name": "votes",                "type": "VoteReceipt!",                "derived": "support"   }
   ]
 },{
@@ -70,7 +71,8 @@
     { "name": "voter",                "type": "Account!"                                            },
     { "name": "support",              "type": "ProposalSupport!"                                    },
     { "name": "weight",               "type": "BigInt!"                                             },
-    { "name": "reason",               "type": "String!"                                             }
+    { "name": "reason",               "type": "String!"                                             },
+    { "name": "params",               "type": "Bytes"                                               }
   ]
 },{
   "name": "ProposalCreated",