Extended BIP70 fields, added BIP number

1 files changed, 11 insertions, 23 deletions

diff --git a/bip-0075.mediawiki b/bip-0075.mediawiki
index b7755b2..cdb2f63 100644
--- a/bip-0075.mediawiki
+++ b/bip-0075.mediawiki
@@ -1,6 +1,6 @@
 <pre>
   BIP:     75
-  Title:   Out of Band Address Exchange using Encrypted PaymentRequests
+  Title:   Out of Band Address Exchange using Payment Protocol Encryption
   Authors: Justin Newton <justin@netki.com>
            Matt David <mgd@mgddev.com>
            Aaron Voisine <voisine@gmail.com>
@@ -464,37 +464,25 @@ In this case, the Sender submits the transaction to the bitcoin network.
 
 ==Extending BIP70 PaymentDetails==
 
-To keep up with recent advancements in transaction type, two optional fields will be added to the BIP 70 PaymentDetails message. subtract_fee will be added to the current version 1 fields, making the complete list look like the following:
+To keep up with recent advancements in transaction type and common use cases, three version 1 fields will be added to the BIP 70 PaymentDetails message, as described in the BIP 70 section titled [[bip-0070.mediawiki#extensibility|Extensibilit]]y:
 
 <pre>
 message PaymentDetails {
-        optional string network = 1 [default = "main"];
-        repeated Output outputs = 2;
-        required uint64 time = 3;
-        optional uint64 expires = 4;
-        optional string memo = 5;
-        optional string payment_url = 6;
-        optional bytes merchant_data = 7;
-        optional bool subtract_fee = 1000;
-}
-</pre>
-
-<b>replace_by_fee</b> will be added as a version 2 field. It is only available if payment_details_version is set to 2 or higher in the PaymentRequest message:
-
-<pre>
-    // PaymentDetails v2
-    message PaymentDetails {
         ...
-        optional bool replace_by_fee = 1001;
-    }
+        optional uint64 subtractable_fee = 1000;
+        optional uint64 fee_per_kb = 1001;
+        optional bool replace_by_fee = 1002;
+}
 </pre>
 
 {| class="wikitable"
-! Field Name !! Field Number || Payment Details Version !! Description
+! Field Name !! Field Number !! Description
+|-
+| subtractable_fee      ||  1000   || In some situations the receiver may be willing to cover the cost of the transaction fee. If present, this field indicates how many Satoshis can be subtracted from the requested amount and instead applied towards the fee.
 |-
-| subtract_fee      ||  1000   || 1 || If "true," indicates the sender can subtract the transaction fee from the requested amount. Otherwise, the transaction fee must be included separately from the requested amount.
+| fee_per_kb            ||  1001   || This field allows the receiver (merchant) to specify the minimum transaction fee that must be included with the transaction in order for it to be accepted with zero confirmations.
 |-
-| replace_by_fee    ||  1001   || 2 || If "true," indicates the sender can enable the Replace By Fee flag for this transaction and the receiver will still consider it accepted with zero confirmations. Otherwise, RBF transactions will not be accepted by the receiver until they are confirmed.
+| replace_by_fee        ||  1002   || If "true," indicates the sender can enable the Replace By Fee flag for this transaction and the receiver will still consider it accepted with zero confirmations. Otherwise, RBF transactions will not be accepted by the receiver until they are confirmed.
 |}
 
 ==References==