Skip to content
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

Documentation for Concent Settlement Algorithm #1109

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Documentation for Concent Settlement Algorithm #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c021152
Concent Settlement Algorithm blueprint and diagrams (specification ve…
cameel Dec 3, 2018
e26f25a
docs/invalid-settlement-requests: Fix duplicate S1 on the diagram
cameel Dec 18, 2018
af95d18
docs/invalid-settlement-requests: Replace +4 settlement with +16
cameel Dec 18, 2018
9fe82df
docs/settlement-algorithm: Settlement requests with payment_ts older …
cameel Feb 13, 2019
65385d0
docs/settlement-algorithm: Say explicitly that LAO and LAU are determ…
cameel Feb 13, 2019
1f4eddb
docs/regular-and-forced-payments: Fix 100 GNT for subtask S7 - should…
cameel Dec 21, 2018
cd28987
docs/cases-common: Fix wrong amount in CC6
cameel Dec 21, 2018
15ec474
Settlement algorithm spec rewritten to actually match Golem's expecta…
cameel Dec 18, 2018
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
533 changes: 533 additions & 0 deletions ...ce/diagrams/concent-settlement-algorithm/blockchain-and-settlement-timeline.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,748 changes: 1,748 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/blockchain-and-settlement-timeline.xml
View file
Open in desktop

Large diffs are not rendered by default.

953 changes: 953 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-abnormal.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
768 changes: 768 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-abnormal.xml
View file
Open in desktop

Large diffs are not rendered by default.

1,087 changes: 1,087 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-common.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
867 changes: 867 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-common.xml
View file
Open in desktop

Large diffs are not rendered by default.

336 changes: 336 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-empty-lists.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
284 changes: 284 additions & 0 deletions docs/source/diagrams/concent-settlement-algorithm/cases-empty-lists.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
<?xml version="1.0"?>
<mxGraphModel arrows="1"
connect="1"
dx="815"
dy="471"
fold="1"
grid="1"
gridSize="10"
guides="1"
math="0"
page="1"
pageHeight="1100"
pageScale="1"
pageWidth="850"
shadow="0"
tooltips="1">
<root>
<mxCell id="0" />
<mxCell id="1"
parent="0" />
<mxCell id="12"
parent="1"
style="rounded=1;whiteSpace=wrap;html=1;dashed=1;fillColor=#666666;dashPattern=1 4;strokeColor=none;opacity=10;gradientColor=none;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontColor=#CCCCCC;gradientDirection=east;"
value="CC15&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="264"
width="410"
x="220"
y="395" />
</mxCell>
<mxCell id="15"
parent="1"
style="shape=partialRectangle;html=1;bottom=1;right=1;top=0;bottom=1;fillColor=#f8cecc;routingCenterX=-0.5;fontSize=12;align=center;flipV=1;strokeColor=#b85450;opacity=25;labelPosition=center;verticalLabelPosition=top;verticalAlign=bottom;"
value="LAR&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="75"
width="386"
x="230"
y="443" />
</mxCell>
<mxCell edge="1"
id="17"
parent="1"
style="shape=flexArrow;endArrow=classic;html=1;fillColor=#ffffff;labelPosition=right;verticalLabelPosition=middle;align=center;verticalAlign=middle;labelBorderColor=none;"
value="time&lt;br&gt;">
<mxGeometry as="geometry"
height="50"
relative="1"
width="50"
x="1"
y="20">
<mxPoint as="sourcePoint"
y="522" />
<mxPoint as="targetPoint"
x="700"
y="522" />
<mxPoint as="offset"
y="1" />
</mxGeometry>
</mxCell>
<mxCell id="19"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ea6b66;verticalAlign=bottom;labelPosition=center;verticalLabelPosition=top;align=center;fontSize=6;"
value="-20 GNT&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="230"
y="463" />
</mxCell>
<mxCell id="21"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ea6b66;base=20;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=6;"
value="-11 GNT"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="392"
y="463" />
</mxCell>
<mxCell id="26"
parent="1"
style="ellipse;html=1;aspect=fixed;fillColor=#a20025;fontSize=12;align=center;strokeColor=#a20025;fontColor=#000000;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;"
value="T0 = T1&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="5"
width="5"
x="234.70000000000005"
y="520" />
</mxCell>
<mxCell id="29"
parent="1"
style="ellipse;html=1;aspect=fixed;fillColor=#a20025;fontSize=12;align=center;strokeColor=#a20025;fontColor=#000000;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;"
value="T2&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="5"
width="5"
x="603.7"
y="520" />
</mxCell>
<mxCell id="33"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S154&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="231"
y="463" />
</mxCell>
<mxCell id="36"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S155&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="393"
y="463" />
</mxCell>
<mxCell id="38"
parent="1"
style="shape=callout;perimeter=calloutPerimeter;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#97d077;verticalAlign=top;align=center;labelPosition=center;verticalLabelPosition=bottom;fontSize=6;flipV=1;dashed=1;opacity=50;html=1;"
value="+1&amp;nbsp;GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="53"
y="530" />
</mxCell>
<mxCell id="39"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ea6b66;verticalAlign=bottom;align=center;labelPosition=center;verticalLabelPosition=top;fontSize=6;dashed=1;opacity=50;"
value="-4 GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="21"
y="463" />
</mxCell>
<mxCell id="40"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S151&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="22"
y="463" />
</mxCell>
<mxCell id="45"
parent="1"
style="rounded=0;html=1;fillColor=#dae8fc;fontSize=6;align=center;strokeColor=#6c8ebf;gradientColor=#7ea6e0;labelPosition=center;verticalLabelPosition=bottom;verticalAlign=top;dashed=1;opacity=50;"
value="+2 GNT"
vertex="1">
<mxGeometry as="geometry"
height="60"
width="10"
x="27"
y="527" />
</mxCell>
<mxCell id="54"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#dae8fc;strokeColor=#6c8ebf;verticalAlign=top;align=center;labelPosition=center;verticalLabelPosition=bottom;fontSize=6;flipV=1;gradientColor=#7ea6e0;dashed=1;opacity=50;"
value="+3 GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="148.10000000000002"
y="530" />
</mxCell>
<mxCell id="55"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S153&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="150.10000000000002"
y="563" />
</mxCell>
<mxCell id="56"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#d5e8d4;strokeColor=#82b366;gradientColor=#97d077;verticalAlign=top;align=center;labelPosition=center;verticalLabelPosition=bottom;fontSize=6;flipV=1;dashed=1;opacity=50;"
value="+7&amp;nbsp;GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="105"
y="530" />
</mxCell>
<mxCell id="57"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#fff2cc;strokeColor=#d6b656;gradientColor=#ffd966;verticalAlign=bottom;align=center;labelPosition=center;verticalLabelPosition=top;fontSize=6;dashed=1;opacity=50;"
value="-10 GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="139.5"
y="463" />
</mxCell>
<mxCell id="58"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S153&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="140.5"
y="463" />
</mxCell>
<mxCell id="59"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ea6b66;base=20;labelPosition=center;verticalLabelPosition=top;align=center;verticalAlign=bottom;fontSize=6;"
value="-30 GNT"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="596"
y="463" />
</mxCell>
<mxCell id="60"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S156&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="598"
y="463" />
</mxCell>
<mxCell id="61"
parent="1"
style="shape=callout;html=1;perimeter=calloutPerimeter;fillColor=#f8cecc;strokeColor=#b85450;gradientColor=#ea6b66;verticalAlign=bottom;align=center;labelPosition=center;verticalLabelPosition=top;fontSize=6;dashed=1;opacity=50;"
value="-10 GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="50"
width="20"
x="95"
y="465" />
</mxCell>
<mxCell id="62"
parent="1"
style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;rounded=0;fontSize=8;fontColor=#000000;opacity=25;"
value="S152&lt;br&gt;"
vertex="1">
<mxGeometry as="geometry"
height="17"
width="17"
x="96"
y="465" />
</mxCell>
<mxCell id="HPw4tpz80ybu8kOcPE1g-62"
parent="1"
style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;fontSize=6;fontColor=#7393FF;align=center;horizontal=1;verticalAlign=middle;labelPosition=center;verticalLabelPosition=middle;strokeColor=#7393FF;"
value="61&lt;br&gt;GNT&lt;br style=&quot;font-size: 6px&quot;&gt;"
vertex="1">
<mxGeometry as="geometry"
height="15"
width="20"
x="645"
y="514" />
</mxCell>
</root>
</mxGraphModel>
Loading