feat: dispute kit in progress

Author: jaybuidl

.yarn/cache/typescript-patch-d95d140154-bd629ad0da.zip renamed to .yarn/cache/typescript-patch-7a081096b0-bd629ad0da.zip

@@ -1,7 +1,8 @@
-## 0.1.0 (2021-11-30)
+## 0.1.0 (2021-12-13)
 
 - fix(Arbitrator): memory to calldata ([4770b1f](https://github.com/kleros/kleros-v2/commit/4770b1f))
 - fix(IArbitrator): appeals removed from the standard ([02c20ce](https://github.com/kleros/kleros-v2/commit/02c20ce))
+- fix(IArbitrator): change name to arbitration cost ([0ba4f29](https://github.com/kleros/kleros-v2/commit/0ba4f29))
 - fix(IArbitrator): interface simplification ([e81fb8b](https://github.com/kleros/kleros-v2/commit/e81fb8b))
 - fix(IArbitrator): replaced appealCost with fundingStatus ([f189dd9](https://github.com/kleros/kleros-v2/commit/f189dd9))
 - feat: modern toolchain setup and simple RNG smart contracts ([17f6a76](https://github.com/kleros/kleros-v2/commit/17f6a76))

CHANGELOG.md

@@ -6,7 +6,7 @@ import "./IArbitrable.sol";
 
 /**
  * @title ArbitrableExample
- * An example of the arbitrable contract which connects to the arbitator that implements IArbitrator interface.
+ * An example of an arbitrable contract which connects to the arbitator that implements the updated interface.
  */
 contract ArbitrableExample is IArbitrable {
  struct DisputeStruct {

contracts/src/arbitration/ArbitrableExample.sol

@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8;
+
+import "./IArbitrator.sol";
+import "../rng/RNG.sol";
+import "../data-structures/SortitionSumTreeFactory.sol";
+
+contract DisputeKitPlurality {
+ // Core --> IN
+ // createDispute
+
+ // OUT -> Core
+ // report drawn jurors
+ // report ruling
+
+ // Jurors -> IN
+ // vote
+
+ // Anyone -> IN
+ // requestAppeal
+
+ // INTERNAL
+ // draw jurors <-> RNG
+ // receive evidence
+ // aggregate votes
+ // incentive (who earns how much PNK and ETH)
+ // appeal crowdfunding
+ // redistribution when ruling is final
+
+ IArbitrator public immutable core;
+ RNG public immutable rng;
+
+ using SortitionSumTreeFactory for SortitionSumTreeFactory.SortitionSumTrees; // Use library functions for sortition sum trees.
+
+ // SortitionSumTreeFactory.SortitionSumTrees internal sortitionSumTrees; // The sortition sum trees.
+
+ constructor(IArbitrator _core, RNG _rng) {
+ core = _core;
+ rng = _rng;
+ }
+
+ /**
+ * Note: disputeID is maintained by Kleros Core, not the dispute kit
+ * Note: the dispute kit does not receive any payment, Kleros Core does
+ * Note: Permissioned
+ */
+ function createDispute(
+ uint256 _disputeID,
+ uint256 _minJuror,
+ uint256 _choices,
+ bytes calldata _extraData
+ ) external {
+ require(msg.sender == address(core), "Not allowed: sender is not core");
+
+ // -- dispute specific --
+ //
+
+ // -- subcourt specific --
+ // uint minStake: min tokens required to stake on this subcourt
+ // bool hiddenVotes:
+ // uint alpha: bps of tokens lost when incoherent
+ // uint feeForJuror: paid per juror
+ // uint jurorsForCourtJump: evaluated by the appeal logic
+
+ // PROBLEM: have an interface that works for and "1 human 1 vote"
+
+ // votes = msg.value / subcourt.feeForJuror
+ // tokenAtStakePerJuror = (subcourt.minStake * subcourt.alpha) / ALPHA_DIVISOR
+ // ALPHA_DIVISOR = 10000
+ }
+
+ function drawJurors(SortitionSumTreeFactory.SortitionSumTrees calldata tree) public {}
+}

contracts/src/arbitration/DisputeKitPlurality.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8;
+
+import {SortitionSumTreeFactory} from "../../data-structures/SortitionSumTreeFactory.sol";
+import {DisputeKitPlurality} from "../DisputeKitPlurality.sol";
+
+contract MockKlerosCore {
+ using SortitionSumTreeFactory for SortitionSumTreeFactory.SortitionSumTrees; // Use library functions for sortition sum trees.
+ SortitionSumTreeFactory.SortitionSumTrees internal sortitionSumTrees; // The sortition sum trees.
+
+ DisputeKitPlurality disputeKit;
+
+ constructor() {
+ sortitionSumTrees.createTree(bytes32(0), 3);
+ }
+
+ // function getSortitionSumTrees() view public returns(SortitionSumTreeFactory.SortitionSumTrees calldata) {
+ // return sortitionSumTrees;
+ // }
+
+ function drawJurors(uint256 _disputeID, uint256 _iterations) public {
+ disputeKit.draw(sortitionSumTrees);
+ }
+}

contracts/src/arbitration/Mock/MockKlerosCore.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8;
+
+library SortitionSumTreeFactory {
+ /* Structs */
+
+ struct SortitionSumTree {
+ uint256 K; // The maximum number of childs per node.
+ // We use this to keep track of vacant positions in the tree after removing a leaf. This is for keeping the tree as balanced as possible without spending gas on moving nodes around.
+ uint256[] stack;
+ uint256[] nodes;
+ // Two-way mapping of IDs to node indexes. Note that node index 0 is reserved for the root node, and means the ID does not have a node.
+ mapping(bytes32 => uint256) IDsToNodeIndexes;
+ mapping(uint256 => bytes32) nodeIndexesToIDs;
+ }
+
+ /* Storage */
+
+ struct SortitionSumTrees {
+ mapping(bytes32 => SortitionSumTree) sortitionSumTrees;
+ }
+
+ function createTree(
+ SortitionSumTrees storage self,
+ bytes32 _key,
+ uint256 _K
+ ) public {
+ SortitionSumTree storage tree = self.sortitionSumTrees[_key];
+ require(tree.K == 0, "Tree already exists.");
+ require(_K > 1, "K must be greater than one.");
+ tree.K = _K;
+ // tree.stack.length = 0;
+ // tree.nodes.length = 0;
+ tree.nodes.push(0);
+ }
+}

contracts/src/data-structures/SortitionSumTreeFactory.sol

@@ -1,10 +1,22 @@
 /* Autogenerated file. Do not edit manually. */
 /* tslint:disable */
 /* eslint-disable */
+export type { ArbitrableExample } from "./ArbitrableExample";
+export type { CentralizedArbitrator } from "./CentralizedArbitrator";
+export type { DiputeKitPlurality } from "./DiputeKitPlurality";
+export type { IArbitrable } from "./IArbitrable";
+export type { IArbitrator } from "./IArbitrator";
+export type { MockKlerosCore } from "./MockKlerosCore";
 export type { ConstantNG } from "./ConstantNG";
 export type { IncrementalNG } from "./IncrementalNG";
 export type { RNG } from "./RNG";
 
+export { ArbitrableExample__factory } from "./factories/ArbitrableExample__factory";
+export { CentralizedArbitrator__factory } from "./factories/CentralizedArbitrator__factory";
+export { DiputeKitPlurality__factory } from "./factories/DiputeKitPlurality__factory";
+export { IArbitrable__factory } from "./factories/IArbitrable__factory";
+export { IArbitrator__factory } from "./factories/IArbitrator__factory";
+export { MockKlerosCore__factory } from "./factories/MockKlerosCore__factory";
 export { ConstantNG__factory } from "./factories/ConstantNG__factory";
 export { IncrementalNG__factory } from "./factories/IncrementalNG__factory";
 export { RNG__factory } from "./factories/RNG__factory";

contracts/typechain/index.ts

@@ -14414,7 +14414,7 @@ __metadata:
 
 "typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.4.4#~builtin<compat/typescript>":
  version: 4.4.4
- resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=ddd1e8"
+ resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=493e53"
  bin:
  tsc: bin/tsc
  tsserver: bin/tsserver