Merge branch 'dev' into refactor(web)/extract-calc-to-ResponsiveSize-function

Author: alcercu

contracts/src/arbitration/KlerosCore.sol

@@ -18,7 +18,6 @@ describe("DisputeKitClassic", async () => {
     expect(events.length).to.equal(1);
     expect(events[0].args._disputeKitID).to.equal(1);
     expect(events[0].args._disputeKitAddress).to.equal(disputeKit.address);
-    expect(events[0].args._parent).to.equal(0);
 
     // Reminder: the Forking court will be added which will break these expectations.
     events = await core.queryFilter(core.filters.CourtCreated());

contracts/src/arbitration/arbitrables/Escrow.sol

@@ -198,10 +198,7 @@ type Draw @entity(immutable: true) {
 type DisputeKit @entity {
   id: ID!
   address: Bytes
-  parent: DisputeKit
-  children: [DisputeKit!]! @derivedFrom(field: "parent")
   needsFreezing: Boolean!
-  depthLevel: BigInt!
   rounds: [Round!]! @derivedFrom(field: "disputeKit")
   courts: [Court!]! @derivedFrom(field: "supportedDisputeKits")
 }

contracts/test/arbitration/index.ts

@@ -4,21 +4,14 @@ import { ZERO, ONE } from "../utils";
 
 export function createDisputeKitFromEvent(event: DisputeKitCreated): void {
   const disputeKit = new DisputeKit(event.params._disputeKitID.toString());
-  disputeKit.parent = event.params._parent.toString();
   disputeKit.address = event.params._disputeKitAddress;
   disputeKit.needsFreezing = false;
-  const parent = DisputeKit.load(event.params._parent.toString());
-  disputeKit.depthLevel = parent ? parent.depthLevel.plus(ONE) : ZERO;
   disputeKit.save();
 }
 
-export function filterSupportedDisputeKits(
-  supportedDisputeKits: string[],
-  disputeKitID: string
-): string[] {
+export function filterSupportedDisputeKits(supportedDisputeKits: string[], disputeKitID: string): string[] {
   let result: string[] = [];
   for (let i = 0; i < supportedDisputeKits.length; i++)
-    if (supportedDisputeKits[i] !== disputeKitID)
-      result = result.concat([supportedDisputeKits[i]]);
+    if (supportedDisputeKits[i] !== disputeKitID) result = result.concat([supportedDisputeKits[i]]);
   return result;
 }

subgraph/schema.graphql

@@ -42,7 +42,7 @@ dataSources:
           handler: handleCourtCreated
         - event: CourtModified(indexed uint96,bool,uint256,uint256,uint256,uint256,uint256[4])
           handler: handleCourtModified
-        - event: DisputeKitCreated(indexed uint256,indexed address,indexed uint256)
+        - event: DisputeKitCreated(indexed uint256,indexed address)
           handler: handleDisputeKitCreated
         - event: DisputeKitEnabled(indexed uint96,indexed uint256,indexed bool)
           handler: handleDisputeKitEnabled

subgraph/src/entities/DisputeKit.ts

@@ -2,3 +2,4 @@
 export REACT_APP_DEPLOYMENT=devnet
 export REACT_APP_KLEROS_CORE_SUBGRAPH_DEVNET=https://api.thegraph.com/subgraphs/name/kleros/kleros-v2-core-devnet
 export REACT_APP_DISPUTE_TEMPLATE_ARBGOERLI_SUBGRAPH_DEVNET=https://api.thegraph.com/subgraphs/name/kleros/kleros-v2-dr-devnet
+export REACT_APP_STATUS_URL=https://kleros-v2-devnet.betteruptime.com/badge

subgraph/subgraph.yaml

@@ -2,3 +2,4 @@
 export REACT_APP_DEPLOYMENT=testnet
 export REACT_APP_KLEROS_CORE_SUBGRAPH_TESTNET=https://api.thegraph.com/subgraphs/name/kleros/kleros-v2-core-testnet-2
 export REACT_APP_DISPUTE_TEMPLATE_ARBGOERLI_SUBGRAPH_TESTNET=https://api.thegraph.com/subgraphs/name/kleros/kleros-v2-dr-testnet-2
+export REACT_APP_STATUS_URL=https://kleros-v2.betteruptime.com/badge

web/.env.devnet.public

@@ -1,9 +1,14 @@
-import React from "react";
+import React, { useMemo } from "react";
 import styled from "styled-components";
 import { useSortitionModulePhase } from "hooks/contracts/generated";
+import { useToggleTheme } from "hooks/useToggleThemeContext";
 import { GIT_BRANCH, GIT_DIRTY, GIT_HASH, GIT_TAGS, GIT_URL, RELEASE_VERSION } from "consts/index";
 
 const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+
   label,
   a {
     font-family: "Roboto Mono", monospace;
@@ -13,6 +18,13 @@ const Container = styled.div`
   }
 `;
 
+const StyledIframe = styled.iframe`
+  border: none;
+  width: 100%;
+  height: 30px;
+  border-radius: 300px;
+`;
+
 const Version = () => (
   <label>
     v{RELEASE_VERSION}{" "}
@@ -25,6 +37,13 @@ const Version = () => (
   </label>
 );
 
+const ServicesStatus = () => {
+  const [theme] = useToggleTheme();
+  const statusUrlParameters = useMemo(() => (theme === "light" ? "?theme=light" : "?theme=dark"), [theme]);
+  const statusUrl = process.env.REACT_APP_STATUS_URL;
+  return <label>{statusUrl && <StyledIframe src={`${statusUrl + statusUrlParameters}`} />}</label>;
+};
+
 enum Phases {
   staking,
   generating,
@@ -35,21 +54,13 @@ const Phase = () => {
   const { data: phase } = useSortitionModulePhase({
     watch: true,
   });
-  return (
-    <>
-      {phase !== undefined && (
-        <label>
-          <br />
-          phase: {Phases[phase]}
-        </label>
-      )}
-    </>
-  );
+  return <>{phase !== undefined && <label>Phase: {Phases[phase]}</label>}</>;
 };
 
 const Debug: React.FC = () => {
   return (
     <Container>
+      <ServicesStatus />
       <Version />
       <Phase />
     </Container>