@reality.eth/graph 0.4.2 → 0.4.3

package/changelog.txt

@@ -0,0 +1,3 @@
+Breaking changes
+
+2022-01-29: Question templateId replaced with template

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/graph",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "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",
@@ -13,16 +13,18 @@
     "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: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",
     "deploy:rinkeby": "yarn prepare:rinkeby && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-rinkeby",
     "deploy:sokol": "yarn prepare:sokol && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-sokol",
     "deploy:xdai": "yarn prepare:xdai && graph deploy --ipfs https://api.thegraph.com/ipfs/ --node https://api.thegraph.com/deploy/ realityeth/realityeth-xdai",
-    "deploy:all": "yarn deploy:ava && yarn deploy:bsc && yarn deploy:kovan && yarn deploy::mainnet && yarn deploy:mainnet && yarn deploy:polygon && yarn deploy:rinkeby && yarn deploy:sokol && yarn deploy:xdai",
+    "deploy:all": "yarn deploy:arbitrum && yarn deploy:ava && yarn deploy:bsc && yarn deploy:kovan && yarn deploy:mainnet && yarn deploy:mainnet && yarn deploy:optimism && yarn deploy:polygon && yarn deploy:rinkeby && yarn deploy:sokol && yarn deploy:xdai",
     "prepare:arbitrum": "yarn clean && node render-templates.js 42161 && graph codegen",
     "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: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",
     "prepare:rinkeby": "yarn clean && node render-templates.js 4 && graph codegen",
     "prepare:sokol": "yarn clean && node render-templates.js 77 && graph codegen",
@@ -38,11 +40,11 @@
     "@graphprotocol/graph-ts": "^0.20.0"
   },
   "dependencies": {
-    "@reality.eth/contracts": "^3.0.2",
+    "@reality.eth/contracts": "^3.0.3",
     "babel-polyfill": "^6.26.0",
     "babel-register": "^6.26.0",
     "mustache": "^4.2.0",
     "truffle-hdwallet-provider": "^1.0.4"
   },
-  "gitHead": "48b58e830b19c65a8695da37861d6d49f0f7ec26"
+  "gitHead": "b9fcb24ff3274a58c4f98c0c97b58c4d5c5b0fcd"
 }

package/schema.graphql

@@ -7,8 +7,8 @@ type _Schema_
       {
         entity: "Question",
         fields: [
-          { name: "q_title" },
-          { name: "q_category" }
+          { name: "qTitle" },
+          { name: "qCategory" }
         ]
       }
     ]
@@ -21,16 +21,20 @@ type Question @entity {
 
   createdBlock: BigInt!
   createdTimestamp: BigInt!
+  updatedBlock: BigInt!
+  updatedTimestamp: BigInt!
+
+  template: Template
 
-  templateId: BigInt!
   data: String!
-  json_str: String
 
-  q_title: String
-  q_category: String
-  q_lang: String
-  q_type: String
+  qJsonStr: String
+  qTitle: String
+  qCategory: String
+  qLang: String
+  qType: String
 
+  user: Bytes!
   arbitrator: Bytes!
   openingTimestamp: BigInt!
   timeout: BigInt!
@@ -41,6 +45,10 @@ type Question @entity {
   currentAnswerBond: BigInt!
   currentAnswerTimestamp: BigInt
 
+  contentHash: Bytes
+  historyHash: Bytes
+
+  minBond: BigInt!
   lastBond: BigInt!
   cumulativeBonds: BigInt!
 
@@ -51,6 +59,8 @@ type Question @entity {
   answerFinalizedTimestamp: BigInt
 
   currentScheduledFinalizationTimestamp: BigInt!
+  reopens: Question
+  reopenedBy: Question
 
   outcomes: [Outcome!] @derivedFrom(field: "question")
   answers: [Answer!] @derivedFrom(field: "question")
@@ -71,8 +81,11 @@ type Response @entity {
   isCommitment: Boolean!
   commitmentId: Bytes
   bond: BigInt!
-  answerer: Bytes!
+  user: Bytes!
+  historyHash: Bytes!
   question: Question!
+  createdBlock: BigInt!
+  revealedBlock: BigInt
 }
 
 type Answer @entity {
@@ -82,6 +95,7 @@ type Answer @entity {
   lastBond: BigInt!
   bondAggregate: BigInt!
   question: Question!
+  createdBlock: BigInt!
 }
 
 type Category @entity {
@@ -93,6 +107,46 @@ type Category @entity {
 
 type Template @entity {
   id: ID!
+  templateId: BigInt!
+  contract: Bytes!
   user: Bytes!
-  question_text: String 
+  questionText: String 
+  createdBlock: BigInt!
+}
+
+type Claim @entity {
+  id: ID!
+  question: Question!
+  user: Bytes!
+  amount: BigInt!
+  createdBlock: BigInt!
+}
+
+type Fund @entity {
+  id: ID!
+  question: Question!
+  user: Bytes!
+  amount: BigInt!
+  createdBlock: BigInt!
+}
+
+type Withdrawal @entity {
+  id: ID!
+  user: Bytes!
+  amount: BigInt!
+  createdBlock: BigInt!
+}
+
+type UserAction @entity {
+  id: ID!
+  actionType: String!
+  user: Bytes!
+  question: Question
+  response: Response
+  claim: Claim
+  withdrawal: Withdrawal
+  fund: Fund
+  template: Template
+  createdBlock: BigInt!
+  createdTimestamp: BigInt!
 }

package/src/mapping.ts

@@ -11,23 +11,44 @@ import {
     Answer,
     Category,
     Template,
+    Claim,
+    Withdrawal,
+    Fund,
+    UserAction,
 } from '../generated/schema'
 
 import {
+  RealityETH,
   LogNewTemplate,
   LogNewQuestion,
   LogNewAnswer,
   LogNotifyOfArbitrationRequest,
   LogFinalize,
   LogAnswerReveal,
-  LogFundAnswerBounty
+  LogFundAnswerBounty,
+  LogClaim,
+  LogWithdraw,
+  LogMinimumBond,
+  LogReopenQuestion
 } from '../generated/RealityETH/RealityETH'
 
 export function handleNewTemplate(event: LogNewTemplate): void {
-  let tmpl = new Template(event.params.template_id.toHexString());
+  let contractTemplateId = event.address.toHexString() + '-' + event.params.template_id.toHexString();
+  let tmpl = new Template(contractTemplateId);
+  tmpl.templateId = event.params.template_id;
+  tmpl.contract = event.address;
   tmpl.user = event.params.user;
-  tmpl.question_text = event.params.question_text;
+  tmpl.questionText = event.params.question_text;
+  tmpl.createdBlock = event.block.number;
   tmpl.save()
+
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'CreateTemplate';
+  ua.user = event.params.user;
+  ua.template = contractTemplateId;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.save();
 }
 
 export function handleNewQuestion(event: LogNewQuestion): void {
@@ -36,41 +57,39 @@ export function handleNewQuestion(event: LogNewQuestion): void {
   let question = new Question(contractQuestionId);
   question.questionId = event.params.question_id;  
 
-  let templateId = event.params.template_id
-  let templateIdI32 = templateId.toI32();
+  let contractTemplateId = event.address.toHexString() + '-' + event.params.template_id.toHexString();
+  let tmpl = Template.load(contractTemplateId);
+  question.template = contractTemplateId;
 
-  let tmpl = Template.load(templateId.toHexString());
-  let question_text = tmpl.question_text;
+  let questionText = tmpl.questionText;
 
   let data = event.params.question;
   let fields = data.split('\u241f');
 
-  let json_str = sprintf(question_text, fields)  
-
-  question.templateId = templateId;
+  let qJsonStr = sprintf(questionText, fields)  
 
-  let tryData = json.try_fromBytes(ByteArray.fromUTF8(json_str) as Bytes)
+  let tryData = json.try_fromBytes(ByteArray.fromUTF8(qJsonStr) as Bytes)
   if (tryData.isOk) {
     let json_dict = tryData.value.toObject()
 
-    let q_title = json_dict.get('title')
-    if (q_title != null && q_title.kind === JSONValueKind.STRING) {
-      question.q_title = q_title.toString()
+    let qTitle = json_dict.get('title')
+    if (qTitle != null && qTitle.kind === JSONValueKind.STRING) {
+      question.qTitle = qTitle.toString()
     }
 
-    let q_category = json_dict.get('category')
-    if (q_category != null && q_category.kind == JSONValueKind.STRING) {
-        question.q_category = q_category.toString();
+    let qCategory = json_dict.get('category')
+    if (qCategory != null && qCategory.kind == JSONValueKind.STRING) {
+        question.qCategory = qCategory.toString();
     }
 
-    let q_lang = json_dict.get('lang')
-    if (q_lang != null && q_lang.kind == JSONValueKind.STRING) {
-        question.q_lang = q_lang.toString();
+    let qLang = json_dict.get('lang')
+    if (qLang != null && qLang.kind == JSONValueKind.STRING) {
+        question.qLang = qLang.toString();
     }
 
-    let q_type = json_dict.get('type')
-    if (q_type != null && q_type.kind == JSONValueKind.STRING) {
-        question.q_type = q_type.toString();
+    let qType = json_dict.get('type')
+    if (qType != null && qType.kind == JSONValueKind.STRING) {
+        question.qType = qType.toString();
     }
 
     let q_outcomes_val = json_dict.get('outcomes')
@@ -91,11 +110,16 @@ export function handleNewQuestion(event: LogNewQuestion): void {
   question.contract = contract;
 
   question.data = data
-  question.json_str = json_str
+  question.contentHash = event.params.content_hash;
+
+  question.qJsonStr = qJsonStr
 
   question.createdBlock = event.block.number;
   question.createdTimestamp = event.params.created;
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
 
+  question.user = event.params.user;
   question.arbitrator = event.params.arbitrator;
   question.openingTimestamp = event.params.opening_ts;
   question.timeout = event.params.timeout;
@@ -107,12 +131,23 @@ export function handleNewQuestion(event: LogNewQuestion): void {
   question.lastBond = new BigInt(0);
   question.cumulativeBonds = new BigInt(0);
 
+  question.minBond = new BigInt(0);
+
   question.currentScheduledFinalizationTimestamp = BigInt.fromI32(I32.MAX_VALUE);
 
   // TODO: This may theoretically be wrong if the arbitrator snaffled part of the transaction value
   question.bounty = event.transaction.value;
 
   question.save();
+
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'AskQuestion';
+  ua.user = event.params.user;
+  ua.question = contractQuestionId;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.save();
+
 }
 
 export function handleNewAnswer(event: LogNewAnswer): void {
@@ -130,6 +165,7 @@ export function handleNewAnswer(event: LogNewAnswer): void {
   let responseId = contractQuestionId + '-' + event.params.bond.toHexString();
   let response = new Response(responseId);
   response.question = contractQuestionId;
+  response.createdBlock = event.block.number;
   if (isCommitment) {
     response.commitmentId = event.params.answer;
     response.isUnrevealed = true;
@@ -138,13 +174,19 @@ export function handleNewAnswer(event: LogNewAnswer): void {
     response.isUnrevealed = false;
   }
   response.bond = event.params.bond;
-  response.answerer = event.params.user;
+  response.user = event.params.user;
   response.timestamp = event.params.ts;
   response.isCommitment = isCommitment;
+  response.historyHash = event.params.history_hash;
   response.save();
 
   if (!isCommitment) {
-    saveAnswer(contractQuestionId, event.params.answer, event.params.bond, event.params.ts);
+    saveAnswer(contractQuestionId, event.params.answer, event.params.bond, event.params.ts, event.block.number);
+    if (event.params.bond > question.lastBond) {
+      question.currentAnswer = event.params.answer;
+      question.currentAnswerBond = event.params.bond;
+      question.currentAnswerTimestamp = event.params.ts;
+    }
   }
   // response.bondAggregate = response.bondAggregate.plus(bond);
 
@@ -156,11 +198,24 @@ export function handleNewAnswer(event: LogNewAnswer): void {
   question.answerFinalizedTimestamp = question.arbitrationOccurred ? ts : ts.plus(question.timeout);
   question.currentScheduledFinalizationTimestamp = question.arbitrationOccurred ? ts : ts.plus(question.timeout);
 
+  question.historyHash = event.params.history_hash;
   question.lastBond = event.params.bond;
   question.cumulativeBonds = question.cumulativeBonds.plus(event.params.bond);
 
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
+
   question.save();
 
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'AnswerQuestion';
+  ua.user = event.params.user;
+  ua.question = contractQuestionId;
+  ua.response = responseId;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.save();
+
 }
 
 export function handleAnswerReveal(event: LogAnswerReveal): void {
@@ -174,9 +229,34 @@ export function handleAnswerReveal(event: LogAnswerReveal): void {
   }
   response.answer = event.params.answer;
   response.isUnrevealed = false;
-  // TODO: Handle question updates etc
+  response.revealedBlock = event.block.number;
   response.save()
 
+  let question = Question.load(contractQuestionId);
+  if (question == null) {
+    log.info('cannot find question {} to answer', [contractQuestionId]);
+    return;
+  }
+  saveAnswer(contractQuestionId, event.params.answer, event.params.bond, response.timestamp, event.block.number);
+
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
+
+  // Update the question to the current answer, unless someone has posted a higher bond since you made the commitment
+  if (event.params.bond == question.lastBond) {
+    question.currentAnswer = event.params.answer;
+  }
+  question.save()
+
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'RevealAnswer';
+  ua.user = event.params.user;
+  ua.question = contractQuestionId;
+  ua.response = responseId;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.save();
+
     //saveAnswer(question, questionId, event.params.answer, event.params.bond, event.params.ts);
 
 }
@@ -196,8 +276,18 @@ export function handleArbitrationRequest(event: LogNotifyOfArbitrationRequest):
 
   question.currentScheduledFinalizationTimestamp = BigInt.fromI32(I32.MAX_VALUE);
 
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
   question.save();
 
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'RequestArbitration';
+  ua.user = event.params.user;
+  ua.question = contractQuestionId;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.save();
+
 }
 
 export function handleFinalize(event: LogFinalize): void {
@@ -212,6 +302,8 @@ export function handleFinalize(event: LogFinalize): void {
   question.arbitrationOccurred = true;
   question.currentAnswer = event.params.answer;
 
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
   question.save();
 
 }
@@ -224,11 +316,83 @@ export function handleFundAnswerBounty(event: LogFundAnswerBounty): void {
     return;
   }
   question.bounty = event.params.bounty;
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
   question.save()
+
+  let fundId = event.transaction.hash.toHex() + "-" + event.logIndex.toString()
+  let fund = new Fund(fundId);
+  fund.question = contractQuestionId;
+  fund.user = event.params.user;
+  fund.amount = event.params.bounty_added;
+  fund.createdBlock = event.block.number;
+  fund.save()
+
+  let ua = new UserAction(event.transaction.hash.toHex() + "-" + event.logIndex.toString());
+  ua.actionType = 'FundAnswerBounty';
+  ua.user = event.params.user;
+  ua.createdBlock = event.block.number;
+  ua.createdTimestamp = event.block.timestamp;
+  ua.fund = fundId;
+  ua.question = contractQuestionId;
+  ua.save();
 }
 
-function saveAnswer(contractQuestionId: string, answer: Bytes, bond: BigInt, ts: BigInt): void {
+export function handleLogClaim(event: LogClaim): void {
+   let claimId = event.transaction.hash.toHex() + "-" + event.logIndex.toString()
+   let claim = new Claim(claimId)
 
+   let contractQuestionId = event.address.toHexString() + '-' + event.params.question_id.toHexString();
+   claim.question = contractQuestionId;
+   claim.user = event.params.user;
+   claim.amount = event.params.amount;
+   claim.createdBlock = event.block.number;
+   claim.save();
+
+   let question = Question.load(contractQuestionId);
+   let contract = RealityETH.bind(event.address)
+   question.historyHash = contract.getHistoryHash(event.params.question_id);
+
+   question.updatedBlock = event.block.number;
+   question.updatedTimestamp = event.block.timestamp;
+   question.save();
+}
+
+export function handleLogWithdraw(event: LogWithdraw): void {
+   let withdrawalId = event.transaction.hash.toHex() + "-" + event.logIndex.toString();
+   let withdrawal = new Withdrawal(withdrawalId);
+   withdrawal.user = event.params.user;
+   withdrawal.amount = event.params.amount;
+   withdrawal.createdBlock = event.block.number;
+   withdrawal.save();
+}
+
+// This is done on question creation.
+// To preserve the old event signatures it adds a new event
+export function handleLogMinimumBond(event: LogMinimumBond): void {
+  let contractQuestionId = event.address.toHexString() + '-' + event.params.question_id.toHexString();
+  let question = Question.load(contractQuestionId);
+  question.minBond = event.params.min_bond;
+  question.save();
+}
+
+export function handleLogReopenQuestion(event: LogReopenQuestion): void {
+  // We'll save this in both directions for easy querying
+  let contractQuestionId = event.address.toHexString() + '-' + event.params.question_id.toHexString();
+  let reopenedContractQuestionId = event.address.toHexString() + '-' + event.params.reopened_question_id.toHexString();
+  let question = Question.load(contractQuestionId);
+  let reopenedQuestion = Question.load(reopenedContractQuestionId);
+  question.reopens = reopenedContractQuestionId;
+  question.updatedBlock = event.block.number;
+  question.updatedTimestamp = event.block.timestamp;
+  question.save();
+  reopenedQuestion.reopenedBy = contractQuestionId;
+  reopenedQuestion.updatedBlock = event.block.number;
+  reopenedQuestion.updatedTimestamp = event.block.timestamp;
+  reopenedQuestion.save();
+}
+
+function saveAnswer(contractQuestionId: string, answer: Bytes, bond: BigInt, ts: BigInt, createdBlock: BigInt): void {
   let question = Question.load(contractQuestionId);
 
   let answerId = contractQuestionId + '-' + answer.toHexString();
@@ -240,6 +404,7 @@ function saveAnswer(contractQuestionId: string, answer: Bytes, bond: BigInt, ts:
     answerEntity.bondAggregate = bond;
     answerEntity.lastBond = bond;
     answerEntity.timestamp = ts;
+    answerEntity.createdBlock = createdBlock;
     answerEntity.save();
   } else {
     answerEntity.bondAggregate = answerEntity.bondAggregate.plus(bond);
@@ -249,16 +414,5 @@ function saveAnswer(contractQuestionId: string, answer: Bytes, bond: BigInt, ts:
     }
     answerEntity.save();
   }
-
-  let answerFinalizedTimestamp = question.arbitrationOccurred ? ts : ts.plus(question.timeout);
-
-  if (bond > question.lastBond) {
-    question.currentAnswer = answer;
-    question.currentAnswerBond = bond;
-    question.currentAnswerTimestamp = ts;
-    question.answerFinalizedTimestamp = answerFinalizedTimestamp;
-  }
-
-  question.save();
 }
 

package/subgraph.datasource.template.yaml

@@ -13,7 +13,7 @@
         - Question
       abis:
         - name: RealityETH
-          file: ./node_modules/@reality.eth/contracts/abi/solc-0.4.25/RealityETH-all.abi.json
+          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
@@ -29,4 +29,12 @@
           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