Merge pull request #420 from kleros/feat/verification-started-event-handler

mani99brar · web-flow · commit 50a5f0a4b21e · 2025-04-28T17:49:11.000+05:30
Feat/verification started event handler &amp; renamed var taken
diff --git a/relayer-subgraph-inbox/package.json b/relayer-subgraph-inbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kleros/vea-relayer-subgraph-inbox",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "license": "MIT",
   "engines": {
     "node": ">=18.0.0"
diff --git a/relayer-subgraph-inbox/subgraph.yaml b/relayer-subgraph-inbox/subgraph.yaml
@@ -32,9 +32,9 @@ dataSources:
     name: VeaInboxArbToEthTestnet
     network: arbitrum-sepolia
     source:
-      address: "0xE12daFE59Bc3A996362d54b37DFd2BA9279cAd06"
+      address: "0xAA4F00c86bf956C0Fae603D030CBc2dA7f8B7C5B"
       abi: VeaInboxArbToEthTestnet
-      startBlock: 77452741
+      startBlock: 139057282
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -88,9 +88,9 @@ dataSources:
     name: VeaInboxArbToGnosisTestnet
     network: arbitrum-sepolia
     source:
-      address: "0x62403e9Fbac618301175C89fb21920e4FF235A6a"
+      address: "0xa0d410b202D69C36871d5135ce42fC7D379BBB1c"
       abi: VeaInboxArbToGnosisTestnet
-      startBlock: 129094170
+      startBlock: 139057386
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
diff --git a/veascan-subgraph-inbox/package.json b/veascan-subgraph-inbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kleros/veascan-subgraph-inbox",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "license": "MIT",
   "engines": {
     "node": ">=18.0.0"
diff --git a/veascan-subgraph-inbox/schema.graphql b/veascan-subgraph-inbox/schema.graphql
@@ -34,7 +34,7 @@ type Snapshot @entity {
   stateRootString: String
   messages: [Message!]! @derivedFrom(field: "snapshot")
   numberMessages: BigInt!
-  taken: Boolean!
+  saved: Boolean!
   resolving: Boolean!
   fallback: [Fallback!]! @derivedFrom(field: "snapshot")
 }
diff --git a/veascan-subgraph-inbox/src/VeaInbox.ts b/veascan-subgraph-inbox/src/VeaInbox.ts
@@ -61,7 +61,7 @@ function getCurrentSnapshot(inboxAddress: Address): Snapshot {
     const snapshot = new Snapshot(snapshotId);
     snapshot.inbox = inboxAddress;
     snapshot.numberMessages = BigInt.fromI32(0);
-    snapshot.taken = false;
+    snapshot.saved = false;
     snapshot.resolving = false;
     snapshot.epoch = BigInt.fromI32(0);
     snapshot.epochString = "0";
@@ -84,7 +84,7 @@ function getCurrentSnapshot(inboxAddress: Address): Snapshot {
     );
     snapshot.inbox = inboxAddress;
     snapshot.numberMessages = BigInt.fromI32(0);
-    snapshot.taken = false;
+    snapshot.saved = false;
     snapshot.resolving = false;
     snapshot.epoch = BigInt.fromI32(0);
     snapshot.epochString = "0";
@@ -127,7 +127,7 @@ export function handleSnapshotSaved(event: SnapshotSaved): void {
   const epoch = event.block.timestamp.div(epochPeriod);
   const stateRoot = contract.snapshots(epoch);
   const currentSnapshot = getCurrentSnapshot(event.address);
-  currentSnapshot.taken = true;
+  currentSnapshot.saved = true;
   currentSnapshot.caller = event.transaction.from;
   currentSnapshot.stateRoot = stateRoot;
   currentSnapshot.stateRootString = stateRoot.toHexString();
@@ -147,7 +147,7 @@ export function handleSnapshotSaved(event: SnapshotSaved): void {
   const newSnapshot = new Snapshot(snapshotId);
   newSnapshot.inbox = event.address;
   newSnapshot.numberMessages = BigInt.fromI32(0);
-  newSnapshot.taken = false;
+  newSnapshot.saved = false;
   newSnapshot.resolving = false;
   newSnapshot.save();
 
@@ -204,7 +204,7 @@ export function handleSnapshotSent(event: SnapshotSent): void {
     const inbox = VeaInboxArbToEthDevnet.bind(event.address);
 
     let currentSnapshot = getCurrentSnapshot(event.address);
-    currentSnapshot.taken = false;
+    currentSnapshot.saved = false;
     currentSnapshot.resolving = true;
     currentSnapshot.timestamp = epochSent.times(inbox.epochPeriod());
     currentSnapshot.stateRoot = Bytes.fromHexString(
@@ -225,7 +225,7 @@ export function handleSnapshotSent(event: SnapshotSent): void {
     const newSnapshot = new Snapshot(newSnapshotId);
     newSnapshot.inbox = event.address;
     newSnapshot.numberMessages = BigInt.fromI32(0);
-    newSnapshot.taken = false;
+    newSnapshot.saved = false;
     newSnapshot.resolving = false;
     // Initialize new snapshot fields with defaults.
     newSnapshot.epoch = BigInt.fromI32(0);
diff --git a/veascan-subgraph-inbox/subgraph.yaml b/veascan-subgraph-inbox/subgraph.yaml
@@ -8,9 +8,9 @@ dataSources:
     name: VeaInboxArbToEthTestnet
     network: arbitrum-sepolia
     source:
-      address: "0xE12daFE59Bc3A996362d54b37DFd2BA9279cAd06"
+      address: "0xAA4F00c86bf956C0Fae603D030CBc2dA7f8B7C5B"
       abi: VeaInboxArbToEthTestnet
-      startBlock: 77452741
+      startBlock: 139057282
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
diff --git a/veascan-subgraph-outbox/package.json b/veascan-subgraph-outbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kleros/veascan-subgraph-outbox",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "license": "MIT",
   "engines": {
     "node": ">=18.0.0"
diff --git a/veascan-subgraph-outbox/schema.graphql b/veascan-subgraph-outbox/schema.graphql
@@ -30,9 +30,12 @@ type Challenge @entity {
 type Verification @entity {
   id: ID!
   claim: Claim!
-  timestamp: BigInt!
-  caller: Bytes! # address
-  txHash: Bytes!
+  startTimestamp: BigInt
+  startCaller: Bytes # address
+  startTxHash: Bytes
+  verifiedTimestamp: BigInt
+  verifiedCaller: Bytes # address 
+  verifiedTxHash: Bytes
 }
 
 type Message @entity {
diff --git a/veascan-subgraph-outbox/src/VeaOutbox.ts b/veascan-subgraph-outbox/src/VeaOutbox.ts
@@ -4,6 +4,7 @@ import {
   Claimed,
   MessageRelayed,
   Verified,
+  VerificationStarted,
 } from "../generated/VeaOutboxArbToEthDevnet/VeaOutboxArbToEthDevnet";
 import {
   Challenge,
@@ -68,6 +69,27 @@ export function handleChallenged(event: Challenged): void {
   }
 }
 
+export function handleVerificationStarted(event: VerificationStarted): void {
+  const ref = getRef(event.address);
+  for (
+    let i = ref.totalClaims.minus(BigInt.fromI32(1));
+    i.ge(BigInt.fromI32(0));
+    i = i.minus(BigInt.fromI32(1))
+  ) {
+    const claimId = event.address.toHexString() + "-" + i.toString();
+    const claim = Claim.load(claimId);
+    if (claim?.epoch.equals(event.params._epoch)) {
+      const verification = new Verification(claim.id);
+      verification.claim = claim.id;
+      verification.startTimestamp = event.block.timestamp;
+      verification.startCaller = event.transaction.from;
+      verification.startTxHash = event.transaction.hash;
+      verification.save();
+      break;
+    }
+  }
+}
+
 export function handleVerified(event: Verified): void {
   const ref = getRef(event.address);
   for (
@@ -77,15 +99,18 @@ export function handleVerified(event: Verified): void {
   ) {
     const claimId = event.address.toHexString() + "-" + i.toString();
     const claim = Claim.load(claimId);
-    if (claim && claim.epoch.equals(event.params._epoch)) {
+    if (claim?.epoch.equals(event.params._epoch)) {
       claim.verified = true;
       claim.save();
 
-      const verification = new Verification(claim.id);
-      verification.claim = claim.id;
-      verification.timestamp = event.block.timestamp;
-      verification.caller = event.transaction.from;
-      verification.txHash = event.transaction.hash;
+      let verification = Verification.load(claim.id);
+      if (!verification) {
+        verification = new Verification(claim.id);
+        verification.claim = claim.id;
+      }
+      verification.verifiedTimestamp = event.block.timestamp;
+      verification.verifiedCaller = event.transaction.from;
+      verification.verifiedTxHash = event.transaction.hash;
       verification.save();
       break;
     }
diff --git a/veascan-subgraph-outbox/subgraph.yaml b/veascan-subgraph-outbox/subgraph.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: VeaOutboxArbToEthTestnet
     network: sepolia
     source:
-      address: "0x209BFdC6B7c66b63A8382196Ba3d06619d0F12c9"
+      address: "0xC0574e973059e727E5E4bEB2e04F1D69F627faab"
       abi: VeaOutboxArbToEthTestnet
-      startBlock: 6636625
+      startBlock: 8047848
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -18,6 +18,7 @@ dataSources:
         - Claimed
         - MessageRelayed
         - Verified
+        - VerificationStarted
       abis:
         - name: VeaOutboxArbToEthTestnet
           file: ../contracts/deployments/sepolia/VeaOutboxArbToEthTestnet.json
@@ -30,6 +31,8 @@ dataSources:
           handler: handleMessageRelayed
         - event: Verified(uint256)
           handler: handleVerified
+        - event: VerificationStarted(indexed uint256)
+          handler: handleVerificationStarted
       file: ./src/VeaOutbox.ts
   - kind: ethereum
     name: VeaOutboxArbToEthDevnet
@@ -47,6 +50,7 @@ dataSources:
         - Claimed
         - MessageRelayed
         - Verified
+        - VerificationStarted
       abis:
         - name: VeaOutboxArbToEthDevnet
           file: ../contracts/deployments/sepolia/VeaOutboxArbToEthDevnet.json
@@ -59,4 +63,6 @@ dataSources:
           handler: handleMessageRelayed
         - event: Verified(uint256)
           handler: handleVerified
+        - event: VerificationStarted(indexed uint256)
+          handler: handleVerificationStarted
       file: ./src/VeaOutbox.ts
diff --git a/veascan-web/src/App.tsx b/veascan-web/src/App.tsx
@@ -75,7 +75,7 @@ const App = () => {
         <>
           <SnapshotAccordion
             key={currentPage}
-            items={mapDataForAccordion(data.snapshots)}
+            items={mapDataForAccordion(data.snapshots, statusFilter)}
           />
           <StyledPagination>
             <StandardPagination
diff --git a/veascan-web/src/components/SnapshotAccordion/AccordionTitle/ColoredLabel.tsx b/veascan-web/src/components/SnapshotAccordion/AccordionTitle/ColoredLabel.tsx
@@ -9,7 +9,7 @@ interface IColoredLabel {
 
 export const variantColors = {
   Invalid: "lightRed",
-  Taken: "lightYellow",
+  Saved: "lightYellow",
   Claimed: "turquoise",
   Challenged: "lightPurple",
   Verified: "darkBlue",
diff --git a/veascan-web/src/components/SnapshotAccordion/AccordionTitle/index.tsx b/veascan-web/src/components/SnapshotAccordion/AccordionTitle/index.tsx
@@ -59,7 +59,7 @@ export interface SnapshotInboxDataType {
   numberMessages: string;
   resolving: boolean;
   stateRoot: string;
-  taken: boolean;
+  saved: boolean;
   timestamp: string;
   txHash: string;
 }
@@ -130,7 +130,7 @@ const parseStatus = ({
   if (challenged) return "Challenged";
   if (verified) return "Verified";
   if (claimed) return "Claimed";
-  return "Taken";
+  return "Saved";
 };
 
 export default SnapshotAccordionTitle;
diff --git a/veascan-web/src/components/TxFilterHeader/index.tsx b/veascan-web/src/components/TxFilterHeader/index.tsx
@@ -68,12 +68,17 @@ const EpochAndTimeTag = styled.div`
 `;
 
 const TxFilterHeader: React.FC = () => {
-  const { statusItems, statusFilter, setStatusFilter, debouncedSearch } =
-    useFiltersContext();
+  const {
+    statusItems,
+    statusFilter,
+    setStatusFilter,
+    debouncedSearch,
+    network,
+  } = useFiltersContext();
   const isSearchEmpty = debouncedSearch === "";
   return (
     <SnapshotHeader>
-      <HeaderText>Latest Snapshots</HeaderText>
+      <HeaderText>Latest {network} Snapshots</HeaderText>
       <FilterHeader>
         <EpochAndTimeTag>
           <small>Epoch ID</small>
diff --git a/veascan-web/src/gql/gql.ts b/veascan-web/src/gql/gql.ts
diff --git a/veascan-web/src/gql/graphql.ts b/veascan-web/src/gql/graphql.ts
diff --git a/veascan-web/src/hooks/queries/getInboxData.ts b/veascan-web/src/hooks/queries/getInboxData.ts
diff --git a/veascan-web/src/hooks/queries/getOutboxData.ts b/veascan-web/src/hooks/queries/getOutboxData.ts
diff --git a/veascan-web/src/utils/mapDataForAccordion.tsx b/veascan-web/src/utils/mapDataForAccordion.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kleros/vea-relayer-subgraph-inbox",`
`3`		`- "version": "0.2.3",`
	`3`	`+ "version": "0.2.4",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=18.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kleros/veascan-subgraph-inbox",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.2.3",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=18.0.0"`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type Snapshot @entity {`
`34`	`34`	`stateRootString: String`
`35`	`35`	`messages: [Message!]! @derivedFrom(field: "snapshot")`
`36`	`36`	`numberMessages: BigInt!`
`37`		`- taken: Boolean!`
	`37`	`+ saved: Boolean!`
`38`	`38`	`resolving: Boolean!`
`39`	`39`	`fallback: [Fallback!]! @derivedFrom(field: "snapshot")`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@kleros/veascan-subgraph-outbox",`
`3`		`- "version": "0.2.3",`
	`3`	`+ "version": "0.2.4",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=18.0.0"`