Merge branch 'master' of github.com:bitpay/jsonPaymentProtocol into feature/verifyBeforeTransmit

Author: nitsujlangston

examples/fetchEccKeysAndVerify.js

@@ -104,7 +104,6 @@ Promise.all(keyRequests).then(() => {
         if (err) {
           return reject(err);
         }
-        // console.log(km.pgp.key(km.pgp.primary).get_fingerprint().toString('hex'));
         importedPgpKeys[km.pgp.key(km.pgp.primary).get_fingerprint().toString('hex')] = km;
         return resolve();
       });
@@ -170,7 +169,8 @@ Promise.all(keyRequests).then(() => {
     console.log('----\nValid keymap for use in bitcoinRpc example:');
 
     parsedEccPayload.publicKeys.forEach((pubkey) => {
-      // Here we are just generating the pubkey hash (btc address) of the
+      // Here we are just generating the pubkey hash (btc address) of each of the public keys received for easy lookup later
+      // as this is what will be provided by the x-identity header
       let a = crypto.createHash('sha256').update(pubkey, 'hex').digest();
       let b = crypto.createHash('rmd160').update(a).digest('hex');
       let c = '00' + b; // This is assuming livenet

package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-payment-protocol",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Simple interface for retrieving JSON payment requests and submitting payments",
   "main": "index.js",
   "dependencies": {

specification.md

@@ -142,7 +142,7 @@ and verifying against that. By only sending a hash of the public key the wallet
 
 ### Key Distribution
 The JSON payment protocol provider will make keys available via the route:
-* <paymentRequestDomain>/signingKeys/paymentProtocol.json
+* [paymentRequestDomain]/signingKeys/paymentProtocol.json
 
 This route will serve a JSON payload which conforms to the format:
 
@@ -177,7 +177,7 @@ An example of this fully completed:
 
 ### Key Signature Distribution
 The JSON payment protocol provider will distribute PGP signatures of the distributed keys available via:
-* <paymentRequestDomain>/signatures/<sha256HashOfKeyPayload>.json
+* [paymentRequestDomain]/signatures/[sha256HashOfKeyPayload].json
 
 The SHA256 should be performed on the raw body of the keys sent down by the server.