aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/federation.md25
1 files changed, 17 insertions, 8 deletions
diff --git a/docs/federation.md b/docs/federation.md
index c385360..37d819c 100644
--- a/docs/federation.md
+++ b/docs/federation.md
@@ -72,8 +72,9 @@ Not promised:
behind, or joins) may be shown either first;
* that honest nodes stay together where a node commits two changes under one writer
and number: they are apart until a fork (Where Automerge sets limits);
-* that a remake reaches every node: one that can't build it itself stays where it is
- (Remakes);
+* that a remake reaches every node: one that can't build it itself stays where it is;
+ nor that nodes follow one remake where two were decided for one epoch: each follows
+ the one it holds, until operators name one (Remakes);
* that a node taken off its party's list can't still commit at a history from before:
from the next remake's base on, it can't;
* anything to a node with an empty document: it takes the epoch its peers give it, or
@@ -205,8 +206,8 @@ only the proposal.
A federated swarm has no user registry, and of `_continuum` takes only these writes:
* at `_continuum/federation`, as the table says;
-* by a member: its own entry, its own acks, a remake's record and proposal, and the
- abort of a remake that expired; by a remake's coordinator only: its decision;
+* by a member: its own entry, its own acks, a remake's record and proposal; by a
+ remake's coordinator only: its decision, or its abort;
* by an epoch's first change (the genesis change, a remake's snapshot): epochs and the
swarm's ID.
@@ -471,9 +472,16 @@ snapshot is a function of its base. What a federated node asks of a remake:
its peers' word, however it hears of the new epoch: a node that lacks some of the base
(it was away) syncs it from peers that keep the old epoch, each change judged there,
and builds then; where it can't build it, it stays where it is, says so, and never
- rejoins an epoch it refused. A remake's decision is its coordinator's alone. How long
- a node keeps the old document is its own setting, not the remake's, and while it keeps
- it, it syncs it with nodes still on that epoch.
+ rejoins an epoch it refused. A remake's decision is its coordinator's alone, and so is
+ its abort: whether one expired is no node's to say, and one its coordinator leaves
+ undecided binds nobody. How long a node keeps the old document is its own setting,
+ not the remake's, and while it keeps it, it syncs it with nodes still on that epoch.
+* **Two decisions for one epoch** come from a coordinator that wrote two, or from
+ remakes decided at once. A node that holds both follows neither, says so, and leaves
+ it to its operator. On its operator's word, a node builds the remake named of the
+ epoch before its own, from the old document it keeps, as it builds any, and switches,
+ what it wrote since replayed: so nodes that followed different decisions come
+ together where their operators choose.
* **The snapshot** holds what the old document read as at the base, but for what counts
no more by the version current there and is or names a version before it, a party's
`null` naming a version before it, and the member entry of a node its party doesn't
@@ -603,7 +611,7 @@ What an attacker does, and what happens. *Unit*: the judging, with crafted chang
| 29 | A remake whose snapshot isn't the one a node builds, whose base it lacks, or where it isn't a member | It stays, and never rejoins it | sim |
| 30 | A coordinator records an old base, before the version nodes read | They stay | sim |
| 31 | Two members advertise an epoch ahead, or offer a rejoin | Not taken: a node leaves its epoch only for one it built | sim |
-| 32 | A remake's decision written by a node not its coordinator | Refused | unit |
+| 32 | A remake's decision or abort written by a node not its coordinator | Refused | unit |
| 33 | Two envelopes at one place beyond a remake's base | The chain to the one read is replayed | unit |
| 34 | A version taken while a node builds a remake's snapshot | It stays, as with one taken before | sim |
| 35 | Two envelopes of one version and `seq` at a base, a write after it on the one not kept | Quarantined; its party writes again | unit |
@@ -639,6 +647,7 @@ What an attacker does, and what happens. *Unit*: the judging, with crafted chang
| 65 | A fork at heads holding a change sent to nobody (a version written without votes, say) | A node holding the old document takes the fork only where it holds the heads' history, each change judged | sim |
| 66 | A node away while the others switch | It syncs the rest of the base from a peer that keeps the old epoch, builds, and switches; it stays where none keeps it | sim |
| 67 | A key its party dropped writes, from a history before the drop, ahead of what the party signed | Counts no more, and takes out nothing the party signed again after the drop | unit |
+| 68 | A coordinator shows one of two decisions for an epoch to some nodes, the other to the rest | Each follows the one it holds; a node holding both follows neither; their operators bring them together | sim |
## Roads not taken