From 05451a239e42bca4c813e51c869309d0d24efc78 Mon Sep 17 00:00:00 2001
From: Kalle Rosenbaum <kalle@rosenbaum.se>
Date: Tue, 27 Oct 2015 14:18:00 +0100
Subject: Removed mapping of merchant_data to btcpop-label since merchant data
 is a byte-array, Thanks Andreas Schildbach.  Instead map the memo field to
 btcpop-label and don't have any bip70 field mapped to btcpop-message.

---
 bip-0121.mediawiki | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'bip-0121.mediawiki')

diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index 716f3c9..38677e6 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
-- 
cgit v1.2.3


From a429841781725fa5da54649aa836bb34868bab52 Mon Sep 17 00:00:00 2001
From: Kalle Rosenbaum <kalle@rosenbaum.se>
Date: Tue, 27 Oct 2015 14:25:27 +0100
Subject: Clarified that the PoP is sent as binary over http

---
 bip-0121.mediawiki | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bip-0121.mediawiki')

diff --git a/bip-0121.mediawiki b/bip-0121.mediawiki
index 38677e6..bafe856 100644
--- a/bip-0121.mediawiki
+++ b/bip-0121.mediawiki
@@ -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 ==
 
-- 
cgit v1.2.3

