summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke-Jr <luke_github1@dashjr.org>2015-10-27 20:52:12 +0000
committerLuke-Jr <luke_github1@dashjr.org>2015-10-27 20:52:12 +0000
commit766cf86dac9d6e15ac27a38c66963feae4579feb (patch)
tree607a2c92395a69d0672dc9591f5c0a381bdd369d
parent914702e39c468c6e93cf851662c6ce02b905fbb1 (diff)
parenta429841781725fa5da54649aa836bb34868bab52 (diff)
downloadbips-766cf86dac9d6e15ac27a38c66963feae4579feb.tar.xz
Merge pull request #231 from kallerosenbaum/bip121-fixes
Bip121 fixes
-rw-r--r--bip-0121.mediawiki10
1 files changed, 5 insertions, 5 deletions
diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index 716f3c9..bafe856 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -68,11 +68,11 @@ following table:
{|
| <tt>btcpop:</tt> URI parameter || <tt>bitcoin:</tt> URI parameter || BIP70 PaymentDetails data
|-
-| <tt>label</tt> || <tt>label</tt> || <tt>merchant_data</tt>
+| <tt>label</tt> || <tt>label</tt> || <tt>memo</tt>
|-
| <tt>amount</tt> || <tt>amount</tt> || <tt>sum of outputs.amount</tt>
|-
-| <tt>message</tt> || <tt>message</tt> || <tt>memo</tt>
+| <tt>message</tt> || <tt>message</tt> || <tt>-</tt>
|}
The <tt>txid</tt> parameter value must match the transaction hash of
@@ -104,9 +104,9 @@ not make their <tt>p</tt> parameter unnecessarily long.
Wallet implementations must support the <tt>http:</tt> and
<tt>https:</tt> schemes in which case <tt>POST</tt> method must be
-used. The content type of the POST request must be set to
-
- application/bitcoin-pop
+used. The PoP is sent as a binary serialized transaction. The content
+type of the POST request must be set to
+<tt>application/bitcoin-pop</tt>
== Examples ==