Skip to content

feat(dk): log(n) draw #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jun 20, 2022
Merged

feat(dk): log(n) draw #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
577d2fa
feat(dk): log(n) draw
shotaronowhere Jun 10, 2022
607070b
feat(dk): rng bug fix
shotaronowhere Jun 13, 2022
46a61e3
feat: draw benchmark script
shotaronowhere Jun 13, 2022
5a82708
chore: automated testing pass
shotaronowhere Jun 13, 2022
5c02df9
chore(draw): moved benchmark script
shotaronowhere Jun 13, 2022
261a3a2
fix: linter issues
jaybuidl Jun 14, 2022
de0c41f
Merge branch 'master' into feat/dk-draw-efficiency
jaybuidl Jun 14, 2022
d81c84e
feat(dk): sybil resistant dk efficiency
shotaronowhere Jun 15, 2022
dcbbef0
chore(rng): undo rng commit, will add to diff pr
shotaronowhere Jun 15, 2022
fb650b4
test(dk): draw benchmark fix
shotaronowhere Jun 15, 2022
c03c60b
chore(benchmark): refactoring
shotaronowhere Jun 15, 2022
c8d8723
fix: prettier
jaybuidl Jun 17, 2022
e6e5216
fix: skipping failing test on Github actions, no issue locally
jaybuidl Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions contracts/src/arbitration/KlerosCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,18 @@ contract KlerosCore is IArbitrator {
// * Public Views for Dispute Kits * //
// ************************************* //

function getSortitionSumTreeK(bytes32 _key) public view returns (uint256) {
return sortitionSumTrees.sortitionSumTrees[_key].K;
}

function getSortitionSumTreeNode(bytes32 _key, uint256 _index) public view returns (uint256) {
return sortitionSumTrees.sortitionSumTrees[_key].nodes[_index];
}

function getSortitionSumTreeNodesLength(bytes32 _key) public view returns (uint256) {
return sortitionSumTrees.sortitionSumTrees[_key].nodes.length;
}

function getSortitionSumTree(bytes32 _key)
public
view
Expand Down
9 changes: 5 additions & 4 deletions contracts/src/arbitration/dispute-kits/DisputeKitClassic.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,22 @@ contract DisputeKitClassic is BaseDisputeKit, IEvidence {
bytes32 key = bytes32(core.getSubcourtID(_coreDisputeID)); // Get the ID of the tree.
uint256 drawnNumber = getRandomNumber();

(uint256 K, , uint256[] memory nodes) = core.getSortitionSumTree(key);
uint256 K = core.getSortitionSumTreeK(key);
uint256 nodesLength = core.getSortitionSumTreeNodesLength(key);
uint256 treeIndex = 0;
uint256 currentDrawnNumber = drawnNumber % nodes[0];
uint256 currentDrawnNumber = drawnNumber % core.getSortitionSumTreeNode(key, 0);

Dispute storage dispute = disputes[coreDisputeIDToLocal[_coreDisputeID]];
Round storage round = dispute.rounds[dispute.rounds.length - 1];

// TODO: Handle the situation when no one has staked yet.

// While it still has children
while ((K * treeIndex) + 1 < nodes.length) {
while ((K * treeIndex) + 1 < nodesLength) {
for (uint256 i = 1; i <= K; i++) {
// Loop over children.
uint256 nodeIndex = (K * treeIndex) + i;
uint256 nodeValue = nodes[nodeIndex];
uint256 nodeValue = core.getSortitionSumTreeNode(key, nodeIndex);

if (currentDrawnNumber >= nodeValue) {
// Go to the next child.
Expand Down
9 changes: 5 additions & 4 deletions contracts/src/arbitration/dispute-kits/DisputeKitSybilResistant.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,21 +245,22 @@ contract DisputeKitSybilResistant is BaseDisputeKit, IEvidence {
bytes32 key = bytes32(core.getSubcourtID(_coreDisputeID)); // Get the ID of the tree.
uint256 drawnNumber = getRandomNumber();

(uint256 K, , uint256[] memory nodes) = core.getSortitionSumTree(key);
uint256 K = core.getSortitionSumTreeK(key);
uint256 nodesLength = core.getSortitionSumTreeNodesLength(key);
uint256 treeIndex = 0;
uint256 currentDrawnNumber = drawnNumber % nodes[0];
uint256 currentDrawnNumber = drawnNumber % core.getSortitionSumTreeNode(key, 0);

Dispute storage dispute = disputes[coreDisputeIDToLocal[_coreDisputeID]];
Round storage round = dispute.rounds[dispute.rounds.length - 1];

// TODO: Handle the situation when no one has staked yet.

// While it still has children
while ((K * treeIndex) + 1 < nodes.length) {
while ((K * treeIndex) + 1 < nodesLength) {
for (uint256 i = 1; i <= K; i++) {
// Loop over children.
uint256 nodeIndex = (K * treeIndex) + i;
uint256 nodeValue = nodes[nodeIndex];
uint256 nodeValue = core.getSortitionSumTreeNode(key, nodeIndex);

if (currentDrawnNumber >= nodeValue) {
// Go to the next child.
Expand Down