merge master into ETH

Author: Justin Kook

packages/bitcore-lib/lib/address.js

@@ -181,6 +181,9 @@ Address._classifyFromVersion = function(buffer) {
 
   if (buffer.length > 21) {
     var info = Bech32.decode(buffer.toString('utf8'));
+    if (info.version !== 0) {
+      throw new TypeError('Only witness v0 addresses are supported.');
+    }
     if (info.data.length === 20) {
       version.type = Address.PayToWitnessPublicKeyHash;
     } else if (info.data.length === 32) {

packages/bitcore-lib/test/address_witness.js

@@ -64,6 +64,12 @@ describe('Witness Address', function() {
     'bc1q9225rawdn2dlwsk3dd8phudsap6vjp7fgwh455'
   ];
 
+  //livenet incorrect witness version
+  var incorrectWitnessVersions = [
+    'bc1p9225pawdj2dlwsk3dd8phudsap6vjp7fr0y9q5',
+    'bc1p9225pawdn2dlwsk3dd8phudsap6vjp7fhqj5wnrpg457qjq0ycvsjzekl8'
+  ];
+
   //testnet valid
   var P2WPKHTestnet = [
     'tb1q5lrlddcjejvu0qyx0f5fg59zj89danlxtt058g',
@@ -132,6 +138,14 @@ describe('Witness Address', function() {
       }
     });
 
+    it('should not validate if witness version is not 0', function() {
+      for (var i = 0; i < incorrectWitnessVersions.length; i++) {
+        var error = Address.getValidationError(incorrectWitnessVersions[i], 'livenet', 'witnesspubkeyhash');
+        should.exist(error);
+        error.message.should.equal('Only witness v0 addresses are supported.');
+      }
+    });
+
     it('should not validate on a network mismatch', function() {
       var error, i;
       for (i = 0; i < P2WPKHLivenet.length; i++) {

packages/bitcore-node/test/verification/db-repair.ts

@@ -88,6 +88,8 @@ import { BitcoinP2PWorker } from "../../src/modules/bitcoin/p2p";
         }
         break;
       case 'COIN_HEIGHT_MISMATCH':
+
+      case 'CORRUPTED_BLOCK':
       case 'MISSING_BLOCK':
       case 'MISSING_TX':
       case 'MISSING_COIN_FOR_TXID':

packages/bitcore-node/test/verification/db-verify.ts

@@ -20,16 +20,42 @@ type ErrorType = {
 
 export async function validateDataForBlock(blockNum: number, log = false) {
   let success = true;
-  const blockTxs = await TransactionStorage.collection.find({ chain, network, blockHeight: blockNum }).toArray();
+  const [block, blockTxs, blocksForHeight] = await Promise.all([
+    BitcoinBlockStorage.collection.findOne({ chain, network, height: blockNum, processed: true }),
+    TransactionStorage.collection.find({ chain, network, blockHeight: blockNum }).toArray(),
+    BitcoinBlockStorage.collection.countDocuments({
+      chain,
+      network,
+      height: blockNum,
+      processed: true
+    })
+  ]);
   const blockTxids = blockTxs.map(t => t.txid);
-  const coinsForTx = await CoinStorage.collection.find({ chain, network, mintTxid: { $in: blockTxids } }).toArray();
-  const mempoolTxs = await TransactionStorage.collection
-    .find({ chain, network, blockHeight: -1, txid: { $in: blockTxids } })
-    .toArray();
+  const firstHash = blockTxs[0].blockHash;
+  const [coinsForTx, mempoolTxs, blocksForHash] = await Promise.all([
+    CoinStorage.collection.find({ chain, network, mintTxid: { $in: blockTxids } }).toArray(),
+    TransactionStorage.collection.find({ chain, network, blockHeight: -1, txid: { $in: blockTxids } }).toArray(),
+    BitcoinBlockStorage.collection.countDocuments({ chain, network, hash: firstHash })
+  ]);
 
   const seenTxs = {} as { [txid: string]: ITransaction };
   const errors = new Array<ErrorType>();
 
+  if (!block || block.transactionCount != blockTxs.length) {
+    const error = {
+      model: 'block',
+      err: true,
+      type: 'CORRUPTED_BLOCK',
+      payload: { blockNum }
+    };
+
+    errors.push(error);
+
+    if (log) {
+      console.log(JSON.stringify(error));
+    }
+  }
+
   for (const tx of mempoolTxs) {
     success = false;
     const error = { model: 'transaction', err: true, type: 'DUPE_TRANSACTION', payload: { tx, blockNum } };
@@ -125,12 +151,6 @@ export async function validateDataForBlock(blockNum: number, log = false) {
     }
   }
 
-  const blocksForHeight = await BitcoinBlockStorage.collection.countDocuments({
-    chain,
-    network,
-    height: blockNum,
-    processed: true
-  });
   if (blocksForHeight === 0) {
     success = false;
     const error = {
@@ -161,7 +181,6 @@ export async function validateDataForBlock(blockNum: number, log = false) {
   //blocks with same hash
   if (blockTxs.length > 0) {
     const hashFromTx = blockTxs[0].blockHash;
-    const blocksForHash = await BitcoinBlockStorage.collection.countDocuments({ chain, network, hash: hashFromTx });
     if (blocksForHash > 1) {
       success = false;
       const error = { model: 'block', err: true, type: 'DUPE_BLOCKHASH', payload: { hash: hashFromTx, blockNum } };

packages/bitcore-wallet-client/src/lib/api.ts

@@ -49,6 +49,8 @@ export class API extends EventEmitter {
   keyDerivationOk: boolean;
   noSign: any;
   password: any;
+  bp_partner: string;
+  bp_partner_version: string;
 
   static PayPro = PayPro;
   static Key = Key;
@@ -71,6 +73,9 @@ export class API extends EventEmitter {
     this.logLevel = opts.logLevel || 'silent';
     this.supportStaffWalletId = opts.supportStaffWalletId;
 
+    this.bp_partner = opts.bp_partner;
+    this.bp_partner_version = opts.bp_partner_version;
+
     this.request = new Request(opts.baseUrl || BASE_URL, { r: opts.request });
     log.setLevel(this.logLevel);
   }
@@ -1731,6 +1736,9 @@ export class API extends EventEmitter {
             coin: txp.coin || 'btc',
             network: txp.network || 'livenet',
 
+            bp_partner: this.bp_partner,
+            bp_partner_version: this.bp_partner_version,
+
             // for testing
             request: this.request
           },

packages/bitcore-wallet-client/src/lib/paypro.ts

@@ -280,9 +280,16 @@ export class PayPro {
 
       opts.headers = {
         'Content-Type': JSON_PAYMENT_CONTENT_TYPE,
-        'Accept': JSON_PAYMENT_ACK_CONTENT_TYPE,
+        'Accept': JSON_PAYMENT_ACK_CONTENT_TYPE
       };
 
+      if (opts.bp_partner){
+        opts.headers['BP_PARTNER'] =  opts.bp_partner;
+        if (opts.bp_partner_version){
+          opts.headers['BP_PARTNER_VERSION'] =  opts.bp_partner_version;
+        }
+      }
+
       opts.body = JSON.stringify({
         currency: COIN,
         transactions: [

packages/bitcore-wallet-client/test/api.test.js

@@ -48,6 +48,8 @@ helpers.newClient = (app) => {
   return new Client({
     baseUrl: '/bws/api',
     request: request(app),
+    bp_partner: 'xxx',
+    bp_partner_version: 'yyy',
     //    logLevel: 'debug',
   });
 };
@@ -3327,6 +3329,32 @@ describe('client API', () => {
           });
         });
       });
+
+      it('Should set bp_partner', (done) => {
+        clients[0].getTxProposals({}, (err, txps) => {
+          should.not.exist(err);
+          var changeAddress = txps[0].changeAddress.address;
+          let signatures = keys[0].sign(clients[0].getRootPath(), txps[0]);
+          clients[0].pushSignatures(txps[0], signatures, (err, xx, paypro) => {
+            should.not.exist(err);
+            let signatures = keys[1].sign(clients[1].getRootPath(), txps[0]);
+            clients[1].pushSignatures(xx, signatures, (err, yy, paypro) => {
+              should.not.exist(err);
+
+              yy.status.should.equal('accepted');
+              let spy = sinon.spy(Client.PayPro, 'request');
+              clients[1].broadcastTxProposal(yy, (err, zz, memo) => {
+                should.not.exist(err);
+                var args = spy.lastCall.args[0];
+                var data = args.headers;
+                data.BP_PARTNER.should.equal('xxx');
+                data.BP_PARTNER_VERSION.should.equal('yyy');
+                done();
+              });
+            });
+          });
+        });
+      });
     });