Merge branch 'master' of https://github.com/swswsw/predictionmkt

README.md

@@ -7,7 +7,7 @@ prediction market
 3. someone bets (record them)
 4. market closes (by time)
 
-## resolve phase
+## oracle phase
 
 condition to enter phase: time
 
@@ -56,9 +56,6 @@ phase start and stop block can be next to each other.  in other ledger that
 lacks finality, we should reserve more time (several blocks) between each phase.  
 
 
-the distribute algorithm is not yet implemented correctly.
-
-
 
 run
 > node app.js
@@ -73,10 +70,10 @@ for example of test invocation, please see test/testIntegrate2.js
 
 --------
 
-if you need to use curl to send a tx, you need to supply from.pubkey, from.signature, from.sequence, and to.  the format is as follows.
+if you need to use curl to send a tx, you need to supply `from.pubkey`, `from.signature`, `from.sequence`, and `to`.  the format is as follows.
 > curl -X POST http://localhost:3000/txs -d '{"type": "verifySig", "from": { "pubkey": "rewlkjrlw", "signature": "rewlkajrlewk", "sequence": 0 }, "to": {} }'
 
-all of the tx will need from and to.  however, for brevity purpose, they are omitted in the following calls:
+all of the tx will need `from` and `to`.  however, for brevity purpose, they are omitted in the following calls:
 
 > curl -X POST http://localhost:3000/txs -d '{"type": "start", "marketId": "market2", "startInfo": ...}'