Merge remote-tracking branch 'origin/chore/patches' into dependabot/npm_and_yarn/solidity-coverage-0.8.2

Author: jaybuidl

.github/workflows/contracts-testing.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Setup Node.js environment
-      uses: actions/setup-node@v3.4.1
+      uses: actions/setup-node@v3.5.0
       with:
         node-version: 16.x   
 
     - uses: actions/checkout@v3
 
     - name: Cache node modules
-      uses: actions/[email protected].7
+      uses: actions/[email protected].11
       env:
         cache-name: cache-node-modules
       with:

.github/workflows/deploy-bots.yml

@@ -4,9 +4,9 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - uses: aws-actions/setup-sam@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - uses: aws-actions/setup-sam@v2
       - uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.STAGING_AWS_ACCESS_KEY }}

contracts/package.json

@@ -36,17 +36,17 @@
     "@types/mocha": "^9.1.1",
     "@types/node": "^16",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/parser": "^5.41.0",
     "chai": "^4.3.6",
     "chai-ethers": "^0.0.1",
-    "dotenv": "^16.0.1",
+    "dotenv": "^16.0.3",
     "ethereum-waffle": "^3.4.4",
     "ethereumjs-util": "^7.1.4",
     "ethers": "^5.6.7",
     "follow-redirects": "^1.15.0",
     "hardhat": "^2.11.2",
     "hardhat-contract-sizer": "^2.6.1",
-    "hardhat-deploy": "^0.11.12",
+    "hardhat-deploy": "^0.11.18",
     "hardhat-deploy-ethers": "^0.3.0-beta.13",
     "hardhat-docgen": "^1.3.0",
     "hardhat-gas-reporter": "^1.0.9",

contracts/src/arbitration/KlerosCore.sol

@@ -675,8 +675,8 @@ contract KlerosCore is IArbitrator {
             if (drawnAddress != address(0)) {
                 // In case no one has staked at the court yet.
                 jurors[drawnAddress].lockedTokens[dispute.subcourtID] += round.tokensAtStakePerJuror;
+                emit Draw(drawnAddress, _disputeID, currentRound, round.drawnJurors.length);
                 round.drawnJurors.push(drawnAddress);
-                emit Draw(drawnAddress, _disputeID, currentRound, i);
             }
         }
     }
@@ -706,7 +706,7 @@ contract KlerosCore is IArbitrator {
         // Warning: the extra round must be created before calling disputeKit.createDispute()
         Round storage extraRound = dispute.rounds.push();
 
-        if (round.nbVotes >= courts[newDisputeKitID].jurorsForCourtJump) {
+        if (round.nbVotes >= courts[newSubcourtID].jurorsForCourtJump) {
             // Jump to parent subcourt.
             newSubcourtID = courts[newSubcourtID].parent;
 

contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol

@@ -654,7 +654,8 @@ contract DisputeKitClassic is BaseDisputeKit, IEvidence {
             core.getNumberOfRounds(_coreDisputeID) - 1
         );
         (uint256 stakedTokens, uint256 lockedTokens) = core.getJurorBalance(_juror, subcourtID);
-        return stakedTokens >= lockedTokens + lockedAmountPerJuror;
+        (, , uint256 minStake, , , ) = core.courts(subcourtID);
+        return stakedTokens >= lockedTokens + lockedAmountPerJuror && stakedTokens >= minStake;
     }
 
     /** @dev Retrieves a juror's address from the stake path ID.

contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol

@@ -674,7 +674,8 @@ contract DisputeKitSybilResistant is BaseDisputeKit, IEvidence {
             core.getNumberOfRounds(_coreDisputeID) - 1
         );
         (uint256 stakedTokens, uint256 lockedTokens) = core.getJurorBalance(_juror, subcourtID);
-        if (stakedTokens < lockedTokens + lockedAmountPerJuror) {
+        (, , uint256 minStake, , , ) = core.courts(subcourtID);
+        if (stakedTokens < lockedTokens + lockedAmountPerJuror || stakedTokens < minStake) {
             return false;
         } else {
             return proofOfHumanity(_juror);

subgraph-fastbridge/package.json

@@ -10,8 +10,8 @@
     "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 kleros/fastbridge-arbitrum-rinkeby"
   },
   "dependencies": {
-    "@graphprotocol/graph-cli": "^0.33.0",
-    "@graphprotocol/graph-ts": "^0.27.0"
+    "@graphprotocol/graph-cli": "^0.34.0",
+    "@graphprotocol/graph-ts": "^0.28.1"
   },
   "volta": {
     "node": "16.17.0"

subgraph/package.json

@@ -10,7 +10,7 @@
     "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 KlerosCore"
   },
   "dependencies": {
-    "@graphprotocol/graph-cli": "^0.33.0",
-    "@graphprotocol/graph-ts": "^0.27.0"
+    "@graphprotocol/graph-cli": "^0.34.0",
+    "@graphprotocol/graph-ts": "^0.28.1"
   }
 }

web/package.json

@@ -35,16 +35,16 @@
     "@parcel/transformer-svg-react": "^2.7.0",
     "@types/react": "^18.0.14",
     "@types/react-dom": "^18.0.6",
-    "@types/styled-components": "^5.1.21",
-    "@typescript-eslint/eslint-plugin": "^5.33.1",
-    "@typescript-eslint/parser": "^5.33.1",
+    "@types/styled-components": "^5.1.26",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.41.0",
     "@typescript-eslint/utils": "^5.29.0",
     "eslint": "^8.16.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-parcel": "^1.10.6",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.30.1",
+    "eslint-plugin-react": "^7.31.8",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-security": "^1.4.0",
     "eslint-utils": "^3.0.0",
@@ -54,7 +54,7 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "@graphql-codegen/cli": "^2.11.6",
+    "@graphql-codegen/cli": "^2.13.7",
     "@graphql-codegen/typescript": "^2.7.3",
     "@graphql-codegen/typescript-operations": "^2.5.3",
     "@kleros/kleros-v2-contracts": "workspace:^",
@@ -68,7 +68,7 @@
     "core-js": "^3.21.1",
     "ethers": "^5.7.0",
     "graphql": "^16.4.0",
-    "graphql-request": "^4.2.0",
+    "graphql-request": "^5.0.0",
     "moment": "^2.29.4",
     "react": "^18.2.0",
     "react-chartjs-2": "^4.3.1",
@@ -78,7 +78,7 @@
     "react-jazzicon": "^1.0.4",
     "react-loading-skeleton": "^3.1.0",
     "react-modal": "^3.15.1",
-    "react-router-dom": "^6.4.0",
+    "react-router-dom": "^6.4.2",
     "styled-components": "^5.3.5",
     "swr": "^1.3.0"
   }