Skip to content
Permalink
Browse files
Update OSX MIME type for .bitcoinpaymentrequest files, rename identif…
…iers

Summary:
The OSX property list MIME type application/x-bitcoin-payment-request
is renamed to application/bitcoincash-paymentrequest in line with previous
changes in the wallet. This type is associated with .bitcoinpaymentrequest
files.

The identifiers used in the property list and payment protocol definition
file are updated to 'bitcoincash' to differentiate, and a few comments are
modified to reflect Bitcoin Cash.

No extensions of the existing payment protocol seem to have been
registered at the indicated Wiki URL, so the registration point has
been made into a TODO pending a decision on where such registrations
could occur.

This issue is marked as WIP pending review and confirmation of successful
tests.

Test Plan:
  make check (on wallet build)
  ../qa/pull-tester/rpc-tests.py -extended
Gitian builds
Travis builds

Reviewers: #bitcoin_abc, deadalnix, CCulianu

Reviewed By: #bitcoin_abc, CCulianu

Subscribers: CCulianu

Differential Revision: https://reviews.bitcoinabc.org/D508
  • Loading branch information
ftrader committed Aug 30, 2017
1 parent 1e1aa16 commit 1b983a1986dc863ee47c3c57d19f4955d5d8d099
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
@@ -38,18 +38,18 @@
<true/>

<key>CFBundleIdentifier</key>
<string>org.bitcoinfoundation.Bitcoin-Qt</string>
<string>org.bitcoincash.Bitcoin-Qt</string>

<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLName</key>
<string>org.bitcoin.BitcoinPayment</string>
<string>org.bitcoincash.BitcoinPayment</string>
<key>CFBundleURLSchemes</key>
<array>
<string>bitcoin</string>
<string>bitcoincash</string>
</array>
</dict>
</array>
@@ -58,20 +58,20 @@
<array>
<dict>
<key>UTTypeIdentifier</key>
<string>org.bitcoin.paymentrequest</string>
<string>org.bitcoincash.paymentrequest</string>
<key>UTTypeDescription</key>
<string>Bitcoin payment request</string>
<string>Bitcoin Cash payment request</string>
<key>UTTypeConformsTo</key>
<array>
<string>public.data</string>
</array>
<key>UTTypeTagSpecification</key>
<dict>
<key>public.mime-type</key>
<string>application/x-bitcoin-payment-request</string>
<string>application/bitcoincash-paymentrequest</string>
<key>public.filename-extension</key>
<array>
<string>bitcoinpaymentrequest</string>
<string>bitcoincashpaymentrequest</string>
</array>
</dict>
</dict>
@@ -84,7 +84,7 @@
<string>Editor</string>
<key>LSItemContentTypes</key>
<array>
<string>org.bitcoin.paymentrequest</string>
<string>org.bitcoincash.paymentrequest</string>
</array>
<key>LSHandlerRank</key>
<string>Owner</string>
@@ -1,18 +1,19 @@
//
// Simple Bitcoin Payment Protocol messages
// Simple Bitcoin Cash Payment Protocol messages
// based on Simple Bitcoin Payment Protocol
//
// Use fields 100+ for extensions;
// to avoid conflicts, register extensions at:
// https://en.bitcoin.it/wiki/Payment_Request
// TODO (was: https://en.bitcoin.it/wiki/Payment_Request)
//

syntax = "proto2";

package payments;
option java_package = "org.bitcoin.protocols.payments";
option java_package = "org.bitcoincash.protocols.payments";
option java_outer_classname = "Protos";

// Generalized form of "send payment to this/these bitcoin addresses"
// Generalized form of "send payment to this/these bitcoin cash addresses"
message Output {
optional uint64 amount = 1 [default = 0]; // amount is integer-number-of-satoshis
required bytes script = 2; // usually one of the standard Script forms

0 comments on commit 1b983a1

Please sign in to comment.