Merge pull request #71 from bitalo/update-bitcore

update bitcore = 0.1.18

app/controllers/socket.js

@@ -3,7 +3,7 @@
 // server-side socket behaviour
 // io is a variable already taken in express
 var ios = null;
-var util = require('bitcore/util/util');
+var util = require('bitcore').util;
 
 module.exports.init = function(app, io_ext) {
   ios = io_ext;

app/models/Address.js

@@ -2,11 +2,12 @@
 
 var imports            = require('soop').imports();
 var async              = require('async');
-var BitcoreAddress     = require('bitcore/Address');
+var bitcore            = require('bitcore');
-var BitcoreTransaction = require('bitcore/Transaction');
+var BitcoreAddress     = bitcore.Address;
-var BitcoreUtil        = require('bitcore/util/util');
+var BitcoreTransaction = bitcore.Transaction;
-var Parser             = require('bitcore/util/BinaryParser');
+var BitcoreUtil        = bitcore.util;
-var Buffer             = require('buffer').Buffer;
+var Parser             = bitcore.BinaryParser;
+var Buffer             = bitcore.Buffer;
 var TransactionDb      = imports.TransactionDb || require('../../lib/TransactionDb').default();
 var CONCURRENCY        = 5;
 
@@ -133,7 +134,7 @@ Address.prototype.update = function(next, notxlist) {
           var v = txItem.value_sat;
 
           if ( !seen[txItem.txid] ) {
-            if (!notxlist) { 
+            if (!notxlist) {
               txs.push({txid: txItem.txid, ts: txItem.ts});
             }
             seen[txItem.txid]=1;

app/models/Status.js

@@ -2,7 +2,8 @@
 //var imports       = require('soop').imports();
 
 var async     = require('async');
-var RpcClient = require('bitcore/RpcClient');
+var bitcore   = require('bitcore');
+var RpcClient = bitcore.RpcClient;
 var config    = require('../../config/config');
 var rpc       = new RpcClient(config.bitcoind);
 var bDb       = require('../../lib/BlockDb').default();

lib/BlockExtractor.js

@@ -1,11 +1,12 @@
 'use strict';
-var Block = require('bitcore/Block'),
+var  bitcore  = require('bitcore'),
-  networks = require('bitcore/networks'),
+     Block    = bitcore.Block,
-  Parser   = require('bitcore/util/BinaryParser'),
+     networks = bitcore.networks,
-  fs       = require('fs'),
+     Parser   = bitcore.BinaryParser,
-  Buffer   = require('buffer').Buffer,
+     fs       = require('fs'),
-  glob     = require('glob'),
+     Buffer   = bitcore.Buffer,
-  async    = require('async');
+     glob     = require('glob'),
+     async    = require('async');
 
 function BlockExtractor(dataDir, network) {
 

lib/HistoricSync.js

@@ -4,9 +4,11 @@ var imports        = require('soop').imports();
 var util           = require('util');
 var assert         = require('assert');
 var async          = require('async');
-var RpcClient      = require('bitcore/RpcClient');
+
-var Script         = require('bitcore/Script');
+var bitcore        = require('bitcore');
-var networks       = require('bitcore/networks');
+var RpcClient      = bitcore.RpcClient;
+var Script         = bitcore.Script;
+var networks       = bitcore.networks;
 var config         = imports.config || require('../config/config');
 var Sync           = require('./Sync');
 var sockets        = require('../app/controllers/socket.js');
@@ -31,6 +33,9 @@ function HistoricSync(opts) {
   buffertools.reverse(genesisHashReversed);
   this.genesis = genesisHashReversed.toString('hex');
 
+	var bitcore        = require('bitcore');
+	var RpcClient      = bitcore.RpcClient;
+
   this.rpc = new RpcClient(config.bitcoind);
   this.sync = new Sync(opts);
 }

lib/PeerSync.js

@@ -1,10 +1,11 @@
 'use strict';
 var fs          = require('fs');
-var bitcoreUtil = require('bitcore/util/util');
+var bitcore     = require('bitcore');
+var bitcoreUtil = bitcore.util;
 var Sync        = require('./Sync');
-var Peer        = require('bitcore/Peer');
+var Peer        = bitcore.Peer;
 var config      = require('../config/config');
-var networks    = require('bitcore/networks');
+var networks    = bitcore.networks;
 var sockets     = require('../app/controllers/socket.js');
 
 var peerdb_fn   = 'peerdb.json';
@@ -15,7 +16,7 @@ function PeerSync(opts) {
   this.connected = false;
   this.peerdb = undefined;
   this.allowReorgs = false;
-  this.PeerManager = require('soop').load('../node_modules/bitcore/PeerManager',{
+  this.PeerManager = require('soop').load('../node_modules/bitcore/lib/PeerManager',{
     network: (config.network === 'testnet' ? networks.testnet : networks.livenet)
   });
   this.peerman = new this.PeerManager();

lib/Rpc.js

@@ -2,11 +2,11 @@
 
 var imports     = require('soop').imports();
 
-var RpcClient       = require('bitcore/RpcClient'),
+var bitcore         = require('bitcore'),
-    BitcoreBlock    = require('bitcore/Block'),
+    RpcClient       = bitcore.RpcClient,
-    bitcoreUtil     = require('bitcore/util/util'),
+    BitcoreBlock    = bitcore.Block,
-    util         = require('util'),
+	util            = require('util'),
-    config       = require('../config/config');
+    config          = require('../config/config');
 
 var  bitcoreRpc  = imports.bitcoreRpc || new RpcClient(config.bitcoind);
 
@@ -30,10 +30,10 @@ Rpc._parseTxResult = function(info) {
   // Outputs => add total
   var valueOutSat = 0;
   info.vout.forEach( function(o) {
-    valueOutSat += o.value * bitcoreUtil.COIN;
+    valueOutSat += o.value * bitcore.util.COIN;
     delete o.scriptPubKey.hex;
   });
-  info.valueOut = parseInt(valueOutSat) / bitcoreUtil.COIN;
+  info.valueOut = parseInt(valueOutSat) / bitcore.util.COIN;
   info.size     = b.length;
 
   return info;
@@ -89,7 +89,7 @@ Rpc.getBlock = function(hash, cb) {
 
 
     if (info.result.height)
-      info.result.reward =  BitcoreBlock.getBlockValue(info.result.height) / bitcoreUtil.COIN ;
+      info.result.reward =  BitcoreBlock.getBlockValue(info.result.height) / bitcore.util.COIN ;
 
     return cb(err,info.result);
   });

lib/Sync.js

@@ -3,7 +3,8 @@
 var imports       = require('soop').imports();
 
 var config        = imports.config || require('../config/config');
-var networks      = require('bitcore/networks');
+var bitcore       = require('bitcore');
+var networks      = bitcore.networks;
 var async         = require('async');
 
 var syncId = 0;

lib/TransactionDb.js

@@ -24,16 +24,18 @@ var MAX_OPEN_FILES    = 500;
 /**
   * Module dependencies.
   */
-var Rpc   = imports.rpc || require('./Rpc'),
-  util    = require('bitcore/util/util'),
-  levelup = require('levelup'),
-  async   = require('async'),
-  config  = require('../config/config'),
-  assert  = require('assert');
 
+var bitcore  = require('bitcore'),
+    Rpc      = imports.rpc || require('./Rpc'),
+    util     = bitcore.util,
+    networks = bitcore.networks,
+    levelup  = require('levelup'),
+    async    = require('async'),
+    config   = require('../config/config'),
+    assert   = require('assert');
 
-var db    = imports.db || levelup(config.leveldb + '/txs',{maxOpenFiles: MAX_OPEN_FILES} );
+var db           = imports.db || levelup(config.leveldb + '/txs',{maxOpenFiles: MAX_OPEN_FILES} );
-var Script       = require('bitcore/Script');
+var Script       = bitcore.Script;
 // This is 0.1.2 = > c++ version of base57-native
 var base58       = require('base58-native').base58Check;
 var encodedData  = require('soop').load('bitcore/util/EncodedData',{
@@ -42,11 +44,9 @@ var encodedData  = require('soop').load('bitcore/util/EncodedData',{
 var versionedData= require('soop').load('bitcore/util/VersionedData',{
   parent: encodedData
 });
-var Address = require('soop').load('bitcore/Address',{
+var Address = require('soop').load('bitcore/lib/Address',{
   parent: versionedData
 });
-var bitutil = require('bitcore/util/util');
-var networks = require('bitcore/networks');
 
 var TransactionDb = function() {
   TransactionDb.super(this, arguments);
@@ -465,22 +465,22 @@ TransactionDb.prototype.getAddrStr = function(s) {
   switch (type) {
     case Script.TX_PUBKEY:
       var chunk = s.captureOne();
-      addr = new Address(self.network.addressPubkey, bitutil.sha256ripe160(chunk));
+      addr = new Address(self.network.addressVersion, bitcore.util.sha256ripe160(chunk));
       addrStrs.push(addr.toString());
       break;
     case Script.TX_PUBKEYHASH:
-      addr = new Address(self.network.addressPubkey, s.captureOne());
+      addr = new Address(self.network.addressVersion, s.captureOne());
       addrStrs.push(addr.toString());
       break;
     case Script.TX_SCRIPTHASH:
-      addr = new Address(self.network.addressScript, s.captureOne());
+      addr = new Address(self.network.addressVersion, s.captureOne());
       addrStrs.push(addr.toString());
       break;
     case Script.TX_MULTISIG:
       var chunks = s.capture();
       chunks.forEach(function(chunk) {
         if (chunk && Buffer.isBuffer(chunk)) {
-          var a = new Address(self.network.addressPubkey, bitutil.sha256ripe160(chunk));
+          var a = new Address(self.network.addressVersion, bitcore.util.sha256ripe160(chunk));
           addrStrs.push(a.toString());
         }
       });

package.json

@@ -50,7 +50,7 @@
     "start": "node node_modules/grunt-cli/bin/grunt"
   },
   "dependencies": {
-    "bitcore": "=0.1.8",
+    "bitcore": "=0.1.18",
     "base58-native": "0.1.2",
     "async": "*",
     "leveldown": "*",