Merge pull request #5 from marlowe-lang/develop

v0.2.0 & v0.3.0 of the spec

Author: paluh

CIP XXX Marlowe Oracle Protocol/diagrams/marlowe-multiple-choices.dot

@@ -0,0 +1,19 @@
+digraph MarloweRequest {
+  rankdir=TD;
+  graph [pad="0.02", nodesep="0.6", ranksep="0.5", splines="line"];
+  node [shape="rect", pad="0.1", style="filled, rounded", fillcolor="#f9f9f9", fontname="Courier New", fontsize="10"];
+  edge [tailport="s", headport="n", color="#aaa", fontname="Courier New", fontsize="10"];
+
+  OracleChoiceStep [label=<<b>WHEN CHOICE</b> <i>x</i> <b>BY</b> <i>oracle pubKeyHash</i>> color="#aaa" ];
+
+  OracleChoiceStep2 [label=<<b>WHEN CHOICE</b> <i>y</i> <b>BY</b> <i>oracle pubKeyHash</i>> color="#aaa" ];
+
+  PayStep [label=<<b>PAY </b><i>fee</i> <b>TO</b> <i>oracle pubKeyHash</i>> color="#aaa" ];
+
+  OracleChoiceStep -> OracleChoiceStep2;
+  OracleChoiceStep2 -> PayStep;
+
+  ContinuationStep [label=<<b>post oracle choice contract</b>> color="#aaa" ];
+
+  PayStep -> ContinuationStep;
+}

CIP XXX Marlowe Oracle Protocol/diagrams/marlowe-multiple-choices.svg

@@ -11,7 +11,7 @@ digraph MarloweRequestDelay {
 
   OracleChoiceStep -> PayStep;
 
-  DelayStep [label=<<b>WHEN TX_INTERVAL_START</b> &gt; <i>delay timestamp</i> > color="#aaa" ];
+  DelayStep [label=<<b>WHEN []</b> <i>delayTimestamp</i> > color="#aaa" ];
 
   PayStep -> DelayStep;
 

CIP XXX Marlowe Oracle Protocol/diagrams/marlowe-request-delay.dot

@@ -10,7 +10,7 @@ digraph MarloweRequest {
 
   OracleChoiceStep -> PayStep;
 
-  CloseStep [label=<<b>CLOSE</b>> color="#aaa" ];
+  ContinuationStep [label=<<b>post oracle choice contract</b>> color="#aaa" ];
 
-  PayStep -> CloseStep;
+  PayStep -> ContinuationStep;
 }

CIP XXX Marlowe Oracle Protocol/diagrams/marlowe-request-delay.svg

@@ -0,0 +1,20 @@
+digraph MarloweRequest {
+  rankdir=TD;
+  graph [pad="0.02", nodesep="0.6", ranksep="0.5", splines="line"];
+  node [shape="rect", pad="0.1", style="filled, rounded", fillcolor="#f9f9f9", fontname="Courier New", fontsize="10"];
+  edge [tailport="s", headport="n", color="#aaa", fontname="Courier New", fontsize="10"];
+
+  OracleChoiceStep [label=<<b>WHEN CHOICE</b> <i>x</i> <b>BY</b> <i>oracle pubKeyHash</i>> color="#aaa" ];
+
+  PayStep1 [label=<<b>PAY </b><i>1/2 * oracleFee</i> <b>TO</b> <i>oracle pubKeyHash</i> <b>BY</b> <i>party A</i>> color="#aaa" ];
+
+  OracleChoiceStep -> PayStep1;
+
+  PayStep2 [label=<<b>PAY </b><i>1/2 * oracleFee</i> <b>TO</b> <i>oracle pubKeyHash</i> <b>BY</b> <i>party B</i>> color="#aaa" ];
+
+  PayStep1 -> PayStep2;
+
+  ContinuationStep [label=<<b>post oracle choice contract</b>> color="#aaa" ];
+
+  PayStep2 -> ContinuationStep;
+}

CIP XXX Marlowe Oracle Protocol/diagrams/marlowe-request.dot

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
 
-inotifywait -m -e modify --quiet --format '%w%f' --include '.*\.md$' . | while read -r mdfile; do
+inotifywait -m -e close_write --quiet --format '%w%f' --include '.*\.md$' . | while read -r mdfile; do
+    echo ""
+    echo ""
+    echo ""
+    echo ""
     echo "Detected change in $mdfile"
     htmlfile="${mdfile%.md}.html"
     # Compile only the modified .dot to .svg
@@ -13,5 +17,5 @@ inotifywait -m -e modify --quiet --format '%w%f' --include '.*\.md$' . | while r
       "$mdfile" -o "$htmlfile"
     echo "Generated $htmlfile"
     # Open (or bring to front) only that single SVG
-    firefox "$htmlfile" &
+    # firefox "$htmlfile" &
 done