V8.0.0 Diff V6.0.0

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 config.json
-.bcoin
+*bitcore.config.*
+.bcoin
+*.vscode

README.md

@@ -8,103 +8,120 @@ _Requirements_:
 
 ```
 {
-  "pruneSpentScripts": true,
-  "chains": {
-    "BTC": {
-      "mainnet": {
-        "trustedPeers": [
-          {
+  "bitcoreNode": {
+    "pruneSpentScripts": true,
+    "chains": {
+      "BTC": {
+        "regtest": {
+          "chainSource": "p2p",
+          "trustedPeers": [
+            {
+              "host": "127.0.0.1",
+              "port": 30000
+            }
+          ],
+          "rpc": {
             "host": "127.0.0.1",
-            "port": 8333
+            "port": 30001,
+            "username": "bitpaytest",
+            "password": "local321"
           }
-        ]
-      }
-    },
-    "BCH": {
-      "mainnet": {
-        "parentChain": "BTC",
-        "forkHeight": 478558,
-        "trustedPeers": [
-          {
+        },
+        "testnet": {
+          "chainSource": "p2p",
+          "trustedPeers": [
+            {
+              "host": "127.0.0.1",
+              "port": 20000
+            }
+          ],
+          "rpc": {
             "host": "127.0.0.1",
-            "port": 9333
+            "port": 30001
           }
-        ]
+        }
       }
     }
   }
-}
 
 ```
 
-# Wallet
 
-## Add Wallet:
+# Transactions
 
-POST `/api/wallet`
+## Get Transactions by block
 
-BODY:
-```
-{
-	"name": "WalletName"
-}
-```
+GET `/api/BTC/mainnet/tx/?blockHeight=123456`
 
-## Get Wallet:
+GET `/api/BTC/mainnet/tx/?blockHash=0000000000002917ed80650c6174aac8dfc46f5fe36480aaef682ff6cd83c3ca`
 
-GET `/api/wallet/:walletId`
+## Get Transaction by txid
 
-## Import Addresses:
+GET `/api/BTC/mainnet/tx/5c8a63e695caf95c28a0155beaa22b84a7adb18b8693ba90f04d94891d122afe`
 
-POST `/api/wallet/:walletId`
+# Address
 
-BODY: raw jsonl wallet file of the form
-```
-{"address": "bItCoInAddReSSHeRe"}
-```
+## Get Transaction Outputs by Address
 
-## Get Wallet Addresses
+GET `/api/BTC/mainnet/address/mmEsgUprBEQkGDKowPQSLEYDbMtGRKxaF4/?unspent=true`
 
-GET `/api/wallet/:walletId/addresses`
+## Get Balance for an Address
 
-## Get Wallet Transactions:
+GET `/api/BTC/mainnet/address/mmEsgUprBEQkGDKowPQSLEYDbMtGRKxaF4/balance`
 
-GET `/api/wallet/:walletId/transactions`
+# Block
 
-## Get Balance:
+## Get Block
 
-GET `/api/wallet/:walletId/balance`
+GET `/api/BTC/mainnet/block/0000000000002917ed80650c6174aac8dfc46f5fe36480aaef682ff6cd83c3ca`
 
-## Get Wallet UTXOS
+GET `/api/BTC/mainnet/block/123456`
 
-GET `/api/wallet/:walletId/utxos`
 
-# Transactions
+# Authenticated Methods
+## Wallet
 
-## Get Transactions by block
+### Add Wallet:
 
-GET `/api/BTC/mainnet/tx/?blockHeight=123456`
+POST `/api/BTC/mainnet/wallet`
 
-GET `/api/BTC/mainnet/tx/?blockHash=0000000000002917ed80650c6174aac8dfc46f5fe36480aaef682ff6cd83c3ca`
+BODY:
+```
+{
+  "name": "WalletName",
+  "chain": "BTC",
+  "network": "mainnet",
+  "pubKey": "03bdb94afdc7e5c4811bf9b160ac475b82156ea42c8659c8358b68c828df9a1c3d",
+  "path": "m/44'/0'/0'"
+}
+```
 
-## Get Transaction by txid
+### Get Wallet:
 
-GET `/api/BTC/mainnet/tx/5c8a63e695caf95c28a0155beaa22b84a7adb18b8693ba90f04d94891d122afe`
+GET `/api/BTC/mainnet/wallet/:pubKey`
 
-# Address
+### Import Addresses:
 
-## Get Transaction Outputs by Address
+POST `/api/BTC/mainnet/wallet/:pubKey`
 
-GET `/api/BTC/mainnet/address/mmEsgUprBEQkGDKowPQSLEYDbMtGRKxaF4/?unspent=true`
+BODY: raw jsonl wallet file of the form
+```
+{"address": "bItCoInAddReSSHeRe"}
+```
 
-## Get Balance for an Address
+### Get Wallet Addresses
 
-GET `/api/BTC/mainnet/address/mmEsgUprBEQkGDKowPQSLEYDbMtGRKxaF4/balance`
+GET `/api/BTC/mainnet/wallet/:pubKey/addresses`
 
-# Block
+### Get Wallet Transactions:
 
-## Get Block
+GET `/api/BTC/mainnet/wallet/:pubKey/transactions`
 
-GET `/api/BTC/mainnet/block/0000000000002917ed80650c6174aac8dfc46f5fe36480aaef682ff6cd83c3ca`
+### Get Balance:
+
+GET `/api/BTC/mainnet/wallet/:pubKey/balance`
+
+### Get Wallet UTXOS
+
+GET `/api/BTC/mainnet/wallet/:pubKey/utxos`
 
-GET `/api/BTC/mainnet/block/123456`

bin/start

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../server.js');

bitcore-node.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Bitcore Node
+After=network.target
+
+[Service]
+User=bitcore
+Group=bitcore
+ExecStart=/usr/bin/node /home/bitcore/bitcore/packages/bitcore-node/server.js
+
+[Install]
+WantedBy=multi-user.target

lib/config.js

@@ -1,33 +1,84 @@
-const Config = function(){
+const os = require('os');
+const program = require('commander');
+
+program
+  .version('8.0.0')
+  .option('-c, --config <path>', 'The path to bitcore config')
+  .parse(process.argv);
+
+function findConfig() {
+  let foundConfig;
+  const envConfigPath = process.env.BITCORE_CONFIG_PATH;
+  const argConfigPath = program.config;
+  const configFileName = 'bitcore.config.json';
+  let bitcoreConfigPaths = [
+    `${os.homedir()}/${configFileName}`,
+    `../../../${configFileName}`,
+    `../${configFileName}`
+  ];
+  const overrideConfig = argConfigPath || envConfigPath;
+  if (overrideConfig) {
+    bitcoreConfigPaths.unshift(overrideConfig);
+  }
+  // No config specified. Search home, bitcore and cur directory
+  for (let path of bitcoreConfigPaths) {
+    if (!foundConfig) {
+      try {
+        const bitcoreConfig = require(path);
+        foundConfig = bitcoreConfig.bitcoreNode;
+      } catch (e) {
+        foundConfig = undefined;
+      }
+    }
+  }
+  return foundConfig;
+}
+
+function setTrustedPeers(config) {
+  for (let [chain, chainObj] of Object.entries(config.chains)) {
+    for (let network of Object.keys(chainObj)) {
+      let env = process.env;
+      const envString = `TRUSTED_${chain.toUpperCase()}_${network.toUpperCase()}_PEER`;
+      if (env[envString]) {
+        let peers = config.chains[chain][network].trustedPeers || [];
+        peers.push({
+          host: env[envString],
+          port: env[`${envString}_PORT`]
+        });
+        config.chains[chain][network].trustedPeers = peers;
+      }
+    }
+  }
+  return config;
+}
+const Config = function() {
   let config = {
     maxPoolSize: 20,
     port: 3000,
-    dbHost: '127.0.0.1',
-    dbName: 'bitcore',
-    numWorkers: require('os').cpus().length,
+    dbHost: process.env.DB_HOST || '127.0.0.1',
+    dbName: process.env.DB_NAME || 'bitcore',
+    numWorkers: os.cpus().length,
     chains: {}
   };
 
-  let options;
-  try {
-    options = require('../config.json');
-  } catch(e) {
-    options = {};
-  }
-
-  Object.assign(config, options);
-  if (!Object.keys(config.chains).length){
+  let foundConfig = findConfig();
+  Object.assign(config, foundConfig, {});
+  if (!Object.keys(config.chains).length) {
     config.chains.BTC = {
       mainnet: {
         chainSource: 'p2p',
-          trustedPeers: [
-            { host: '127.0.0.1', port: 8333 }
-          ]
+        trustedPeers: [{ host: '127.0.0.1', port: 8333 }],
+        rpc: {
+          host: '127.0.0.1',
+          port: 8332,
+          username: 'bitcoin',
+          password: 'bitcoin'
+        }
       }
     };
   }
-
+  config = setTrustedPeers(config);
   return config;
 };
 
-module.exports = new Config();
+module.exports = new Config();

lib/models/block.js

@@ -139,7 +139,7 @@ BlockSchema.statics.handleReorg = async function(params, callback) {
   if (localTip.height === 0) {
     return callback();
   }
-  logger.info(`Resetting tip to ${localTip.previousBlockHash}`);
+  logger.info(`Resetting tip to ${localTip.previousBlockHash}`, { chain, network });
   async.series([
     function (cb) {
       Block.remove({ chain, network, height: { $gte: localTip.height } }, cb);

lib/models/transaction.js

@@ -219,7 +219,7 @@ TransactionSchema.statics.mintCoins = async function(params) {
     try {
       let wallets = await WalletAddress.collection
         .find(
-          { chain, network, address: { $in: mintOpsAddresses } },
+          { address: { $in: mintOpsAddresses }, chain, network },
           { batchSize: 100 }
         )
         .toArray();
@@ -253,7 +253,7 @@ TransactionSchema.statics.spendCoins = function(params) {
     let txid = tx._hash;
     for (let input of tx.inputs) {
       input = input.toObject();
-      spendOps.push({
+      const updateQuery = {
         updateOne: {
           filter: {
             mintTxid: input.prevTxId,
@@ -263,16 +263,17 @@ TransactionSchema.statics.spendCoins = function(params) {
             network
           },
           update: {
-            ...(config.pruneSpentScripts && height > 0
-              ? { $unset: { script: null } }
-              : {}),
             $set: {
               spentTxid: txid,
               spentHeight: height
             }
           }
         }
-      });
+      };
+      if (config.pruneSpentScripts && height > 0) {
+        updateQuery.updateOne.update.$unset = { script: null };
+      }
+      spendOps.push(updateQuery);
     }
   }
   return spendOps;

lib/models/wallet.js

@@ -10,6 +10,8 @@ const WalletSchema = new Schema({
   path: String
 });
 
+WalletSchema.index({ pubKey: 1 });
+
 WalletSchema.statics._apiTransform = function (wallet, options) {
   let transform = {
     name: wallet.name,
@@ -24,7 +26,7 @@ WalletSchema.statics._apiTransform = function (wallet, options) {
 WalletSchema.statics.updateCoins = async function (wallet) {
   const WalletAddress = mongoose.model('WalletAddress');
   let addresses = await WalletAddress.find({wallet: wallet._id});
-  return WalletAddress.updateCoins(wallet, addresses);
+  return WalletAddress.updateCoins({wallet, addresses});
 };
 
 module.exports = mongoose.model('Wallet', WalletSchema);