aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/federation.md30
1 files changed, 16 insertions, 14 deletions
diff --git a/docs/federation.md b/docs/federation.md
index 5b4046a..1efe562 100644
--- a/docs/federation.md
+++ b/docs/federation.md
@@ -100,7 +100,7 @@ What it asks of the store:
before, and an operator having its node drop what it took.
* **Checkpoints**: the store starting anew from what counts at heads the parties name,
forgetting the rest.
-* **Forks**: a store whose root is a checkpoint at another's heads.
+* **Forks**: a store whose root is a checkpoint at heads of another store, or of several.
* **Members**: the nodes that carry the store, which the federation names.
### Events
@@ -478,11 +478,12 @@ store of its own from the federation's ([`store.md`](store.md), Forks).
1. One of the group makes the fork's root, a checkpoint at the heads it forks at, which
no party signs, so that one version and one set of heads make one fork (Checkpoints).
- Its version changes the version current at those heads, is numbered one past it,
- names anew the node lists of the parties that start it, and the keys of any party
- whose keys it changes; a root whose version doesn't is no fork. It keeps the events
- that count at those heads with that version current. Every proposal is a chance to
- fork: the version is usually one that didn't pass.
+ Its version changes the version current at those heads, is numbered one past it, and
+ names anew the keys of any party whose keys it changes; a root whose version doesn't
+ is no fork. Its founders name their own node lists anew in it, so that their nodes
+ are members there. It keeps the events that count at those heads with that version
+ current. Every proposal is a chance to fork: the version is usually one that didn't
+ pass.
2. A fork is named by its root's ID, which nobody can steer to a given name, the
federation it came from least of all. It takes only events with its root in their
history: what the stayers sign after it isn't taken there, nor what the fork's
@@ -514,13 +515,14 @@ Groups that parted come together the same way: a fork at heads of several stores
its party's keys there (Keys), so that what a key one side dropped signed counts only
where the party lists that key again.
-Where a party wrote one place on two sides, the lower ID counts until it writes there
-again; where the sides gave an identifier to different parties, the merge's rules say
-whose values count. What a side writes after those heads isn't taken in the merge, and
-its party signs it again. A node holding the history up to all those heads builds the
-root and checks it; one holding some of it says, side by side, what it holds that those
-heads lack, and party by party what keys the merge gives; one holding none takes the
-root on its operator's word.
+The events a merge's root keeps are in none of each other's histories: where a party
+wrote one place on two sides, the lower ID counts until it writes there again, whatever
+either side's history held; where the sides gave an identifier to different parties, the
+merge's rules say whose values count. What a side writes after those heads isn't taken
+in the merge, and its party signs it again. A node holding the history up to all those
+heads builds the root and checks it; one holding some of it says, side by side, what it
+holds that those heads lack, and party by party what keys the merge gives; one holding
+none takes the root on its operator's word.
What a party's nodes do of themselves is their operators' business, written nowhere:
join a fork their operator follows, vote by rules their operator set (Votes a node casts
@@ -653,7 +655,7 @@ crafted events. *Sim*: a simulation. *Bench*: measured, not judged.
| 61 | A key a version names, kept on a node that votes by itself, stolen with it | As 23: it counts while that version is current | unit |
| 62 | A merge whose version doesn't name every party's keys and node list anew, or whose `changes` doesn't list the versions current at its heads | No merge | unit |
| 63 | A key one side dropped, still in the party's set on the other, then a merge | What it signed counts only where the party lists it again | unit |
-| 64 | A party wrote one place on two sides, then a merge | The lower ID counts until it writes there again | unit |
+| 64 | A party wrote one place on two sides, one write built on the other before they parted, then a merge | The lower ID counts until it writes there again: a merge's kept events are in none of each other's histories | unit |
| 65 | An identifier given to different parties on two sides, then a merge | The merge's rules say whose values count; the others' aren't kept | unit |
| 66 | A merge's root keeping a value that didn't count on its side, or at a place its version gives another | Nodes holding that side build the root, find it differs, and don't join; others take it on their operator's word | sim |
| 67 | Events a side writes after a merge's heads, brought to the merge | Never taken: their history lacks its root; their party signs them again | unit |