Merge pull request #381 from unknownunknown1/feat/sortition-modularity

Feat/sortition modularity

Author: unknownunknown1

.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.1
  with:
  node-version: 16.x 
 
  - uses: actions/checkout@v3
 
  - name: Cache node modules
- uses: actions/cache@v3.0.7
+ uses: actions/cache@v3.0.11
  env:
  cache-name: cache-node-modules
  with:
@@ -52,7 +52,7 @@ jobs:
  working-directory: contracts
 
  - name: Upload a build artifact
- uses: actions/upload-artifact@v3.1.0
+ uses: actions/upload-artifact@v3.1.1
  with: 
  name: code-coverage-report 
  path: contracts/coverage

.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 }}

bot-pinner/package.json

@@ -19,6 +19,6 @@
  "node": ">=16.13.0"
  },
  "devDependencies": {
- "@dappnode/dappnodesdk": "^0.2.65"
+ "@dappnode/dappnodesdk": "^0.2.68"
  }
 }

contracts/package.json

@@ -25,39 +25,39 @@
  "publish": "yarn npm publish --access public --tag $(cat package.json | jq .version)"
  },
  "devDependencies": {
- "@nomicfoundation/hardhat-chai-matchers": "^1.0.3",
+ "@nomicfoundation/hardhat-chai-matchers": "^1.0.4",
  "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@0.3.0-beta.13",
  "@nomiclabs/hardhat-waffle": "^2.0.3",
  "@openzeppelin/contracts": "^4.7.3",
  "@tenderly/hardhat-tenderly": "^1.1.6",
  "@typechain/ethers-v5": "^10.0.0",
- "@typechain/hardhat": "^6.1.2",
+ "@typechain/hardhat": "^6.1.4",
  "@types/chai": "^4.3.3",
- "@types/mocha": "^9.1.1",
+ "@types/mocha": "^10.0.0",
  "@types/node": "^16",
- "@typescript-eslint/eslint-plugin": "^5.33.1",
- "@typescript-eslint/parser": "^5.33.1",
+ "@typescript-eslint/eslint-plugin": "^5.41.0",
+ "@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.10.1",
+ "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.8",
- "hardhat-watcher": "^2.3.0",
+ "hardhat-gas-reporter": "^1.0.9",
+ "hardhat-watcher": "^2.5.0",
  "json-schema": "^0.4.0",
- "mocha": "^10.0.0",
+ "mocha": "^10.1.0",
  "node-fetch": "^3.2.10",
  "npm-run-all": "^4.1.5",
  "shelljs": "^0.8.5",
  "solhint": "^3.3.7",
- "solidity-coverage": "^0.7.21",
+ "solidity-coverage": "^0.8.2",
  "ts-node": "^10.8.0",
  "typechain": "^8.0.0",
  "typescript": "^4.6.4"

contracts/src/arbitration/KlerosCore.sol

@@ -598,9 +598,7 @@ 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);
  }
  }

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

@@ -630,7 +630,8 @@ contract DisputeKitClassic is BaseDisputeKit, IEvidence {
  _coreDisputeID,
  core.getNumberOfRounds(_coreDisputeID) - 1
  );
- (uint256 stakedTokens, uint256 lockedTokens, ) = core.getJurorBalance(_juror, subcourtID);
- return stakedTokens >= lockedTokens + lockedAmountPerJuror;
+ (uint256 stakedTokens, uint256 lockedTokens) = core.getJurorBalance(_juror, subcourtID);
+ (, , uint256 minStake, , , ) = core.courts(subcourtID);
+ return stakedTokens >= lockedTokens + lockedAmountPerJuror && stakedTokens >= minStake;
  }
 }

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

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

package.json

@@ -31,7 +31,7 @@
  "node": "16.15.1"
  },
  "devDependencies": {
- "@commitlint/cli": "^14.1.0",
+ "@commitlint/cli": "^17.2.0",
  "@commitlint/config-conventional": "^14.1.0",
  "conventional-changelog-cli": "^2.1.1",
  "depcheck": "^1.4.2",
@@ -41,7 +41,7 @@
  "eslint-import-resolver-parcel": "^1.10.5",
  "eslint-plugin-import": "^2.25.3",
  "eslint-plugin-node": "^11.1.0",
- "eslint-plugin-prettier": "^3.4.1",
+ "eslint-plugin-prettier": "^4.2.1",
  "eslint-plugin-promise": "^5.1.1",
  "eslint-utils": "^3.0.0",
  "husky": "^7.0.0",

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"
  }
 }