Escrow states: edits per reviews

This commit is contained in:
mDuo13
2019-03-12 19:31:43 -07:00
parent bc290e7f08
commit ab2814a1a3
3 changed files with 46 additions and 11 deletions

View File

@@ -357,12 +357,12 @@ style=wordwrap</panel_attributes>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>110</x> <x>110</x>
<y>40</y> <y>50</y>
<w>30</w> <w>30</w>
<h>560</h> <h>550</h>
</coordinates> </coordinates>
<panel_attributes>lt=&lt;-</panel_attributes> <panel_attributes>lt=&lt;-</panel_attributes>
<additional_attributes>10.0;540.0;10.0;10.0</additional_attributes> <additional_attributes>10.0;530.0;10.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>UMLClass</id> <id>UMLClass</id>
@@ -382,22 +382,22 @@ style=wordwrap</panel_attributes>
<coordinates> <coordinates>
<x>90</x> <x>90</x>
<y>380</y> <y>380</y>
<w>1230</w> <w>860</w>
<h>30</h> <h>30</h>
</coordinates> </coordinates>
<panel_attributes>lt=.</panel_attributes> <panel_attributes>lt=..</panel_attributes>
<additional_attributes>10.0;10.0;1210.0;10.0</additional_attributes> <additional_attributes>10.0;10.0;840.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>Relation</id> <id>Relation</id>
<coordinates> <coordinates>
<x>90</x> <x>90</x>
<y>230</y> <y>230</y>
<w>840</w> <w>860</w>
<h>30</h> <h>30</h>
</coordinates> </coordinates>
<panel_attributes>lt=.</panel_attributes> <panel_attributes>lt=.</panel_attributes>
<additional_attributes>10.0;10.0;820.0;10.0</additional_attributes> <additional_attributes>10.0;10.0;840.0;10.0</additional_attributes>
</element> </element>
<element> <element>
<id>Text</id> <id>Text</id>
@@ -420,7 +420,6 @@ style=wordwrap</panel_attributes>
<h>70</h> <h>70</h>
</coordinates> </coordinates>
<panel_attributes>CancelAfter time <panel_attributes>CancelAfter time
(if specified)
style=wordwrap</panel_attributes> style=wordwrap</panel_attributes>
<additional_attributes/> <additional_attributes/>
</element> </element>
@@ -484,4 +483,40 @@ transaction</panel_attributes>
style=wordwrap</panel_attributes> style=wordwrap</panel_attributes>
<additional_attributes/> <additional_attributes/>
</element> </element>
<element>
<id>Relation</id>
<coordinates>
<x>920</x>
<y>380</y>
<w>380</w>
<h>30</h>
</coordinates>
<panel_attributes>lt=.</panel_attributes>
<additional_attributes>10.0;10.0;360.0;10.0</additional_attributes>
</element>
<element>
<id>Text</id>
<coordinates>
<x>380</x>
<y>370</y>
<w>170</w>
<h>30</h>
</coordinates>
<panel_attributes>(if CancelAfter specified)
fontsize=12</panel_attributes>
<additional_attributes/>
</element>
<element>
<id>Text</id>
<coordinates>
<x>1020</x>
<y>370</y>
<w>160</w>
<h>30</h>
</coordinates>
<panel_attributes>(CancelAfter required)
fontsize=12
</panel_attributes>
<additional_attributes/>
</element>
</diagram> </diagram>

View File

@@ -51,9 +51,9 @@ The following diagram shows the states an Escrow can progress through:
The diagram shows three different cases for three possible combinations of the escrow's "finish-after" time (`FinishAfter` field), crypto-condition (`Condition` field), and expiration time (`CancelAfter` field): The diagram shows three different cases for three possible combinations of the escrow's "finish-after" time (`FinishAfter` field), crypto-condition (`Condition` field), and expiration time (`CancelAfter` field):
- **Time-based Escrow (left):** With only a finish-after time, the escrow is created in the **Held** state. After the specified time has passed, it becomes **Ready** and anyone can finish it. If the escrow has an expiration time and no one finishes it before that time passes, then the escrow becomes **Expired**. In the expired state, an escrow cannot be finished, and anyone can cancel it. - **Time-based Escrow (left):** With only a finish-after time, the escrow is created in the **Held** state. After the specified time has passed, it becomes **Ready** and anyone can finish it. If the escrow has an expiration time and no one finishes it before that time passes, then the escrow becomes **Expired**. In the expired state, an escrow cannot be finished, and anyone can cancel it. If the escrow does not have a `CancelAfter` field, it never expires and cannot be canceled.
- **Combination Escrow (center):** If the escrow specifies both a crypto-condition (`Condition` field) _and_ a "finish-after" time (`FinishAfter` field), the escrow is **Held** until its finish-after time has passed. Then it becomes **Conditionally Ready**, and can finish it if they supply the correct fulfillment to the crypto-condition. If the escrow has an expiration time (`CancelAfter` field), and no one finishes it before that time passes, then the escrow becomes **Expired**. In the expired state, an escrow cannot be finished, and anyone can cancel it. - **Combination Escrow (center):** If the escrow specifies both a crypto-condition (`Condition` field) _and_ a "finish-after" time (`FinishAfter` field), the escrow is **Held** until its finish-after time has passed. Then it becomes **Conditionally Ready**, and can finish it if they supply the correct fulfillment to the crypto-condition. If the escrow has an expiration time (`CancelAfter` field), and no one finishes it before that time passes, then the escrow becomes **Expired**. In the expired state, an escrow cannot be finished, and anyone can cancel it. If the escrow does not have a `CancelAfter` field, it never expires and cannot be canceled.
- **Conditional Escrow (right):** If the escrow specifies a crypto-condition (`Condition` field) and not a finish-after time, the escrow becomes **Conditionally Ready** immediately when it is created. During this time, anyone can finish the escrow, but only if they supply the correct fulfillment to the crypto-condition. If no one finishes the escrow before its expiration time (`CancelAfter` field), the escrow becomes **Expired**. (An escrow without a finish-after time _must_ have an expiration time.) In the expired state, the escrow can no longer be finished, and anyone can cancel it. - **Conditional Escrow (right):** If the escrow specifies a crypto-condition (`Condition` field) and not a finish-after time, the escrow becomes **Conditionally Ready** immediately when it is created. During this time, anyone can finish the escrow, but only if they supply the correct fulfillment to the crypto-condition. If no one finishes the escrow before its expiration time (`CancelAfter` field), the escrow becomes **Expired**. (An escrow without a finish-after time _must_ have an expiration time.) In the expired state, the escrow can no longer be finished, and anyone can cancel it.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB