From a8b39237add51c91075097f689d248ba7f2d2546 Mon Sep 17 00:00:00 2001 From: Peter Limbach Date: Wed, 7 May 2014 14:45:44 +0200 Subject: [PATCH] update bitcore lib to 0.1.18 --- app/models/Address.js | 11 ++++++----- app/models/Status.js | 3 ++- lib/BlockExtractor.js | 15 ++++++++------- lib/HistoricSync.js | 11 ++++++++--- lib/PeerSync.js | 9 +++++---- lib/Rpc.js | 16 ++++++++-------- lib/Sync.js | 3 ++- lib/TransactionDb.js | 32 +++++++++++++++++--------------- package.json | 2 +- 9 files changed, 57 insertions(+), 45 deletions(-) diff --git a/app/models/Address.js b/app/models/Address.js index 98942203..676dc660 100644 --- a/app/models/Address.js +++ b/app/models/Address.js @@ -2,11 +2,12 @@ var imports = require('soop').imports(); var async = require('async'); -var BitcoreAddress = require('bitcore/Address'); -var BitcoreTransaction = require('bitcore/Transaction'); -var BitcoreUtil = require('bitcore/util/util'); -var Parser = require('bitcore/util/BinaryParser'); -var Buffer = require('buffer').Buffer; +var bitcore = require('bitcore'); +var BitcoreAddress = bitcore.Address; +var BitcoreTransaction = bitcore.Transaction; +var BitcoreUtil = bitcore.util; +var Parser = bitcore.util.BinaryParser; +var Buffer = bitcore.Buffer; var TransactionDb = imports.TransactionDb || require('../../lib/TransactionDb').default(); var CONCURRENCY = 5; diff --git a/app/models/Status.js b/app/models/Status.js index 69b4edf7..ffb744ad 100644 --- a/app/models/Status.js +++ b/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(); diff --git a/lib/BlockExtractor.js b/lib/BlockExtractor.js index 967492dc..29af77db 100644 --- a/lib/BlockExtractor.js +++ b/lib/BlockExtractor.js @@ -1,11 +1,12 @@ 'use strict'; -var Block = require('bitcore/Block'), - networks = require('bitcore/networks'), - Parser = require('bitcore/util/BinaryParser'), - fs = require('fs'), - Buffer = require('buffer').Buffer, - glob = require('glob'), - async = require('async'); +var bitcore = require('bitcore'), + Block = bitcore.Block, + networks = bitcore.networks, + Parser = bitcore.util.Parser, + fs = require('fs'), + Buffer = bitcore.Buffer, + glob = require('glob'), + async = require('async'); function BlockExtractor(dataDir, network) { diff --git a/lib/HistoricSync.js b/lib/HistoricSync.js index e40baec5..1229305c 100644 --- a/lib/HistoricSync.js +++ b/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 networks = require('bitcore/networks'); + +var bitcore = require('bitcore'); +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); } diff --git a/lib/PeerSync.js b/lib/PeerSync.js index 7558e7b8..846478c7 100644 --- a/lib/PeerSync.js +++ b/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(); diff --git a/lib/Rpc.js b/lib/Rpc.js index 5af328f9..47ce37a6 100644 --- a/lib/Rpc.js +++ b/lib/Rpc.js @@ -2,11 +2,11 @@ var imports = require('soop').imports(); -var RpcClient = require('bitcore/RpcClient'), - BitcoreBlock = require('bitcore/Block'), - bitcoreUtil = require('bitcore/util/util'), - util = require('util'), - config = require('../config/config'); +var bitcore = require('bitcore'), + RpcClient = bitcore.RpcClient, + BitcoreBlock = bitcore.Block, + util = require('util'), + 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); }); diff --git a/lib/Sync.js b/lib/Sync.js index af8de3a5..c3b1ccd7 100644 --- a/lib/Sync.js +++ b/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; diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js index 3f38d60f..821ec997 100644 --- a/lib/TransactionDb.js +++ b/lib/TransactionDb.js @@ -24,16 +24,17 @@ 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 Rpc = imports.rpc || require('./Rpc'), + bitcore = require('bitcore'), + util = bitcore.util, + 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 Script = require('bitcore/Script'); +var db = imports.db || levelup(config.leveldb + '/txs',{maxOpenFiles: MAX_OPEN_FILES} ); +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 +43,11 @@ 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 bitutil = bitcore.util.util; +var networks = bitcore.networks; var TransactionDb = function() { TransactionDb.super(this, arguments); @@ -289,6 +290,7 @@ TransactionDb.prototype.fromIdWithInfo = function(txid, cb) { TransactionDb.prototype.fromTxIdN = function(txid, n, confirmations, cb) { var self = this; var k = OUTS_PREFIX + txid + '-' + n; +505 db.get(k, function(err, val) { if (!val || (err && err.notFound)) { @@ -465,22 +467,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, bitutil.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, bitutil.sha256ripe160(chunk)); addrStrs.push(a.toString()); } }); diff --git a/package.json b/package.json index 1d8cf2ba..f7b2404a 100644 --- a/package.json +++ b/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": "*",