@reality.eth/graph 0.4.12 → 0.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/graph",
-  "version": "0.4.12",
+  "version": "0.4.15",
   "scripts": {
     "create-local": "graph create realityeth/realityeth --node http://127.0.0.1:8020",
     "remove-local": "graph remove realityeth/realityeth --node http://127.0.0.1:8020",
@@ -12,6 +12,7 @@
     "deploy:ava": "yarn prepare:ava && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-ava",
     "deploy:bsc": "yarn prepare:bsc && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-bsc",
     "deploy:kovan": "yarn prepare:kovan && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-kovan",
+    "deploy:goerli": "yarn prepare:goerli && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-goerli",
     "deploy:mainnet": "yarn prepare:mainnet && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth",
     "deploy:optimism": "yarn prepare:optimism && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-optimism",
     "deploy:polygon": "yarn prepare:polygon && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-polygon",
@@ -24,6 +25,7 @@
     "prepare:ava": "yarn clean && node render-templates.js 43114 && graph codegen",
     "prepare:bsc": "yarn clean && node render-templates.js 56 && graph codegen",
     "prepare:kovan": "yarn clean && node render-templates.js 42 && graph codegen",
+    "prepare:goerli": "yarn clean && node render-templates.js 5 && graph codegen",
     "prepare:mainnet": "yarn clean && node render-templates.js 1 && graph codegen",
     "prepare:optimism": "yarn clean && node render-templates.js 10 && graph codegen",
     "prepare:polygon": "yarn clean && node render-templates.js 137 && graph codegen",
@@ -42,11 +44,11 @@
     "@graphprotocol/graph-ts": "^0.20.0"
   },
   "dependencies": {
-    "@reality.eth/contracts": "^3.0.11",
+    "@reality.eth/contracts": "^3.0.14",
     "babel-polyfill": "^6.26.0",
     "babel-register": "^6.26.0",
     "mustache": "^4.2.0",
     "truffle-hdwallet-provider": "^1.0.4"
   },
-  "gitHead": "2a849ecdec07e90265aa2fc84765cd4339bbaf2e"
+  "gitHead": "a6967162fe1addfaa727cb3d3bac37fcabb2c7bb"
 }

package/render-templates.js

@@ -9,9 +9,12 @@ const net_config = rc_contracts.chainData(net_id);
 const network = net_config.network_name;
 
 const token_list = rc_contracts.chainTokenList(net_id)
+const factory_list = rc_contracts.factoryList(net_id)
 
 const template = fs.readFileSync('subgraph.template.yaml').toString();
 const ds_template = fs.readFileSync('subgraph.datasource.template.yaml').toString();
+const factory_template = fs.readFileSync('subgraph.factory.template.yaml').toString();
+const template_template = fs.readFileSync('subgraph.template.template.yaml').toString();
 
 let dses = [];
 
@@ -19,6 +22,10 @@ for(var token in token_list) {
     const configs = rc_contracts.realityETHConfigs(net_id, token);
     for (var config_addr in configs) {
         const config = configs[config_addr];
+        if ('factory_address' in config && config.factory_address) {
+            // console.log('skipping config that was deployed by a factory')
+            continue;
+        }
         const dsData = {
             "network": network,
             "address": config.address,
@@ -31,8 +38,35 @@ for(var token in token_list) {
     }
 }
 
+let facs = [];
+
+let found = false;
+for(var ver in factory_list) {
+    const f = factory_list[ver];
+    const fData = {
+        "network": network,
+        "address": f.address,
+        "block": f.block,
+        "contract-name-with-version": ver
+    }
+    const f_section = mustache.render(factory_template, fData);
+    facs.push(f_section);
+    found = true;
+}
+
+let templates = [];
+if (found) {
+    const tData = {
+        "network": network
+    }
+    const t_section = mustache.render(template_template, tData);
+    templates.push(t_section);
+}
+
 const templateData = {
-    "datasources": dses.join("\n")
+    "datasources": dses.join("\n"),
+    "factories": facs.join("\n"),
+    "templates": templates.join("\n")
 }
 
 fs.writeFileSync(

package/src/mapping.ts

@@ -32,6 +32,14 @@ import {
   LogReopenQuestion
 } from '../generated/RealityETH/RealityETH'
 
+import {
+  RealityETH_ERC20_deployed
+} from '../generated/RealityETH_ERC20_Factory/RealityETH_ERC20_Factory'
+
+import {
+  FactoryCreatedRealityETH,
+} from '../generated/templates'
+
 export function handleNewTemplate(event: LogNewTemplate): void {
   let contractTemplateId = event.address.toHexString() + '-' + event.params.template_id.toHexString();
   let tmpl = new Template(contractTemplateId);
@@ -420,3 +428,6 @@ function saveAnswer(contractQuestionId: string, answer: Bytes, bond: BigInt, ts:
   }
 }
 
+export function handleFactoryRealityETHDeploy(event: RealityETH_ERC20_deployed): void {
+    FactoryCreatedRealityETH.create(event.params.reality_eth)
+}

package/subgraph.factory.template.yaml

@@ -0,0 +1,20 @@
+  - kind: ethereum/contract
+    name: RealityETH_ERC20_Factory
+    network: {{network}}
+    source:
+      startBlock: {{block}}
+      address: '{{address}}'
+      abi: RealityETH_ERC20_Factory
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      entities:
+        - Directory
+      abis:
+        - name: RealityETH_ERC20_Factory
+          file: ./node_modules/@reality.eth/contracts/abi/solc-0.8.10/RealityETH_ERC20_Factory.abi.json
+      eventHandlers:
+        - event: RealityETH_ERC20_deployed(address,address,uint8,string)
+          handler: handleFactoryRealityETHDeploy
+      file: ./src/mapping.ts

package/subgraph.template.template.yaml

@@ -0,0 +1,39 @@
+templates:
+  - kind: ethereum/contract
+    name: FactoryCreatedRealityETH
+    network: {{network}}
+    source:
+      abi: FactoryCreatedRealityETH
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.4
+      language: wasm/assemblyscript
+      entities:
+        - Question
+      abis:
+        - name: FactoryCreatedRealityETH
+          file: ./node_modules/@reality.eth/contracts/abi/solc-0.8.6/RealityETH-all.abi.json
+      eventHandlers:
+        - event: LogNewTemplate(indexed uint256,indexed address,string)
+          handler: handleNewTemplate
+        - event: LogNewQuestion(indexed bytes32,indexed address,uint256,string,indexed bytes32,address,uint32,uint32,uint256,uint256)
+          handler: handleNewQuestion
+        - event: LogNewAnswer(bytes32,indexed bytes32,bytes32,indexed address,uint256,uint256,bool)
+          handler: handleNewAnswer
+        - event: LogAnswerReveal(indexed bytes32,indexed address,indexed bytes32,bytes32,uint256,uint256)
+          handler: handleAnswerReveal
+        - event: LogNotifyOfArbitrationRequest(indexed bytes32,indexed address)
+          handler: handleArbitrationRequest
+        - event: LogFinalize(indexed bytes32,indexed bytes32)
+          handler: handleFinalize
+        - event: LogFundAnswerBounty(indexed bytes32,uint256,uint256,indexed address)
+          handler: handleFundAnswerBounty
+        - event: LogClaim(indexed bytes32,indexed address,uint256)
+          handler: handleLogClaim
+        - event: LogWithdraw(indexed address,uint256)
+          handler: handleLogWithdraw
+        - event: LogMinimumBond(indexed bytes32,uint256)
+          handler: handleLogMinimumBond
+        - event: LogReopenQuestion(indexed bytes32,indexed bytes32)
+          handler: handleLogReopenQuestion
+      file: ./src/mapping.ts

package/subgraph.template.yaml

@@ -5,5 +5,7 @@ schema:
   file: ./schema.graphql
 dataSources:
 {{{datasources}}}
+{{{factories}}}
+{{{templates}}}
 features:
   - nonFatalErrors