From e55d371024fb3edf804d258b4b01ecd083027d1c Mon Sep 17 00:00:00 2001 From: Gabe Gattis Date: Tue, 26 Sep 2017 14:05:20 -0400 Subject: [PATCH] use bitcore-lib-cash --- index.js | 2 +- integration/bitcoind.js | 2 +- lib/bloomfilter.js | 2 +- lib/errors.js | 2 +- lib/inventory.js | 2 +- lib/messages/builder.js | 2 +- lib/messages/commands/addr.js | 2 +- lib/messages/commands/alert.js | 2 +- lib/messages/commands/block.js | 2 +- lib/messages/commands/filteradd.js | 2 +- lib/messages/commands/filterclear.js | 2 +- lib/messages/commands/filterload.js | 2 +- lib/messages/commands/getaddr.js | 2 +- lib/messages/commands/getblocks.js | 2 +- lib/messages/commands/getdata.js | 2 +- lib/messages/commands/getheaders.js | 2 +- lib/messages/commands/headers.js | 2 +- lib/messages/commands/inv.js | 2 +- lib/messages/commands/mempool.js | 2 +- lib/messages/commands/merkleblock.js | 2 +- lib/messages/commands/notfound.js | 2 +- lib/messages/commands/ping.js | 2 +- lib/messages/commands/pong.js | 2 +- lib/messages/commands/reject.js | 2 +- lib/messages/commands/tx.js | 2 +- lib/messages/commands/verack.js | 2 +- lib/messages/commands/version.js | 2 +- lib/messages/index.js | 2 +- lib/messages/message.js | 2 +- lib/messages/utils.js | 2 +- lib/peer.js | 2 +- lib/pool.js | 2 +- package.json | 2 +- test/bloomfilter.js | 2 +- test/inventory.js | 2 +- test/messages/builder.js | 2 +- test/messages/commands/index.js | 2 +- test/messages/index.js | 2 +- test/messages/message.js | 2 +- test/messages/util.js | 2 +- test/peer.js | 2 +- test/pool.js | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/index.js b/index.js index de16179..a0d4302 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); bitcore.P2P = require('./lib'); module.exports = bitcore.P2P; diff --git a/integration/bitcoind.js b/integration/bitcoind.js index e24ed01..67cad80 100644 --- a/integration/bitcoind.js +++ b/integration/bitcoind.js @@ -6,7 +6,7 @@ var chai = require('chai'); var should = chai.should(); var sinon = require('sinon'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var _ = bitcore.deps._; var Random = bitcore.crypto.Random; var BN = bitcore.crypto.BN; diff --git a/lib/bloomfilter.js b/lib/bloomfilter.js index 42d45a9..0323c8f 100644 --- a/lib/bloomfilter.js +++ b/lib/bloomfilter.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BloomFilter = require('bloom-filter'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/errors.js b/lib/errors.js index d387bee..1e135cd 100644 --- a/lib/errors.js +++ b/lib/errors.js @@ -5,4 +5,4 @@ var spec = { message: 'Internal Error on bitcore-p2p Module {0}' }; -module.exports = require('bitcore-lib').errors.extend(spec); +module.exports = require('bitcore-lib-cash').errors.extend(spec); diff --git a/lib/inventory.js b/lib/inventory.js index dd21d60..337bbed 100644 --- a/lib/inventory.js +++ b/lib/inventory.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var $ = bitcore.util.preconditions; var BufferUtil = bitcore.util.buffer; var BufferReader = bitcore.encoding.BufferReader; diff --git a/lib/messages/builder.js b/lib/messages/builder.js index 8db52df..91534df 100644 --- a/lib/messages/builder.js +++ b/lib/messages/builder.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var Inventory = require('../inventory'); function builder(options) { diff --git a/lib/messages/commands/addr.js b/lib/messages/commands/addr.js index 19ba1aa..3b3a1c8 100644 --- a/lib/messages/commands/addr.js +++ b/lib/messages/commands/addr.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/alert.js b/lib/messages/commands/alert.js index 6c0301c..6f9efa7 100644 --- a/lib/messages/commands/alert.js +++ b/lib/messages/commands/alert.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/block.js b/lib/messages/commands/block.js index 7eee962..13debc9 100644 --- a/lib/messages/commands/block.js +++ b/lib/messages/commands/block.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/filteradd.js b/lib/messages/commands/filteradd.js index 7012ce7..48fde0f 100644 --- a/lib/messages/commands/filteradd.js +++ b/lib/messages/commands/filteradd.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferUtil = bitcore.util.buffer; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/filterclear.js b/lib/messages/commands/filterclear.js index d68693f..e6e88d5 100644 --- a/lib/messages/commands/filterclear.js +++ b/lib/messages/commands/filterclear.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/filterload.js b/lib/messages/commands/filterload.js index b8dbcae..bf93e91 100644 --- a/lib/messages/commands/filterload.js +++ b/lib/messages/commands/filterload.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; var BloomFilter = require('../../bloomfilter'); var $ = bitcore.util.preconditions; diff --git a/lib/messages/commands/getaddr.js b/lib/messages/commands/getaddr.js index 9d6b2ee..9e78f8c 100644 --- a/lib/messages/commands/getaddr.js +++ b/lib/messages/commands/getaddr.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/getblocks.js b/lib/messages/commands/getblocks.js index 266dec2..7b2374d 100644 --- a/lib/messages/commands/getblocks.js +++ b/lib/messages/commands/getblocks.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/getdata.js b/lib/messages/commands/getdata.js index 6108854..1811504 100644 --- a/lib/messages/commands/getdata.js +++ b/lib/messages/commands/getdata.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/getheaders.js b/lib/messages/commands/getheaders.js index 79dec4b..f42ac61 100644 --- a/lib/messages/commands/getheaders.js +++ b/lib/messages/commands/getheaders.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/headers.js b/lib/messages/commands/headers.js index 5fbd54c..b1b8339 100644 --- a/lib/messages/commands/headers.js +++ b/lib/messages/commands/headers.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/inv.js b/lib/messages/commands/inv.js index 7ebf919..0b244e3 100644 --- a/lib/messages/commands/inv.js +++ b/lib/messages/commands/inv.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/mempool.js b/lib/messages/commands/mempool.js index 8a0ee79..140568e 100644 --- a/lib/messages/commands/mempool.js +++ b/lib/messages/commands/mempool.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/merkleblock.js b/lib/messages/commands/merkleblock.js index e04e58e..ca523ce 100644 --- a/lib/messages/commands/merkleblock.js +++ b/lib/messages/commands/merkleblock.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/notfound.js b/lib/messages/commands/notfound.js index fd99c24..ea3f1cd 100644 --- a/lib/messages/commands/notfound.js +++ b/lib/messages/commands/notfound.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/ping.js b/lib/messages/commands/ping.js index c616522..2cbb37e 100644 --- a/lib/messages/commands/ping.js +++ b/lib/messages/commands/ping.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/pong.js b/lib/messages/commands/pong.js index 57af37c..9ccac6f 100644 --- a/lib/messages/commands/pong.js +++ b/lib/messages/commands/pong.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/reject.js b/lib/messages/commands/reject.js index f9c7cf1..25ec839 100644 --- a/lib/messages/commands/reject.js +++ b/lib/messages/commands/reject.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var utils = require('../utils'); var BufferReader = bitcore.encoding.BufferReader; var BufferWriter = bitcore.encoding.BufferWriter; diff --git a/lib/messages/commands/tx.js b/lib/messages/commands/tx.js index 1d4c46b..630f6f7 100644 --- a/lib/messages/commands/tx.js +++ b/lib/messages/commands/tx.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/messages/commands/verack.js b/lib/messages/commands/verack.js index 95836d5..8ed4ae4 100644 --- a/lib/messages/commands/verack.js +++ b/lib/messages/commands/verack.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; /** diff --git a/lib/messages/commands/version.js b/lib/messages/commands/version.js index bffe8ee..0d12e62 100644 --- a/lib/messages/commands/version.js +++ b/lib/messages/commands/version.js @@ -2,7 +2,7 @@ var Message = require('../message'); var inherits = require('util').inherits; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferWriter = bitcore.encoding.BufferWriter; var BufferReader = bitcore.encoding.BufferReader; var BN = bitcore.crypto.BN; diff --git a/lib/messages/index.js b/lib/messages/index.js index 6e3bfdd..7843a9d 100644 --- a/lib/messages/index.js +++ b/lib/messages/index.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; var Hash = bitcore.crypto.Hash; var $ = bitcore.util.preconditions; diff --git a/lib/messages/message.js b/lib/messages/message.js index 3e38c7e..be3485f 100644 --- a/lib/messages/message.js +++ b/lib/messages/message.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var $ = bitcore.util.preconditions; var BufferWriter = bitcore.encoding.BufferWriter; var Hash = bitcore.crypto.Hash; diff --git a/lib/messages/utils.js b/lib/messages/utils.js index 9c27cf6..08dc8ac 100644 --- a/lib/messages/utils.js +++ b/lib/messages/utils.js @@ -1,6 +1,6 @@ 'use strict'; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferUtil = bitcore.util.buffer; var $ = bitcore.util.preconditions; var _ = bitcore.deps._; diff --git a/lib/peer.js b/lib/peer.js index 01c0168..1b55f61 100644 --- a/lib/peer.js +++ b/lib/peer.js @@ -4,7 +4,7 @@ var Buffers = require('./buffers'); var EventEmitter = require('events').EventEmitter; var Net = require('net'); var Socks5Client = require('socks5-client'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var Networks = bitcore.Networks; var Messages = require('./messages'); var $ = bitcore.util.preconditions; diff --git a/lib/pool.js b/lib/pool.js index fd3383c..4c7d709 100644 --- a/lib/pool.js +++ b/lib/pool.js @@ -2,7 +2,7 @@ var dns = require('dns'); var EventEmitter = require('events').EventEmitter; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var sha256 = bitcore.crypto.Hash.sha256; var Peer = require('./peer'); var Networks = bitcore.Networks; diff --git a/package.json b/package.json index 53e1ba0..48e2c80 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "url": "https://github.com/bitpay/bitcore-p2p.git" }, "dependencies": { - "bitcore-lib": "^0.14", + "bitcore-lib-cash": "git+ssh://git@github.com:bitpay/bitcore-lib.git#a98f1874a6c0930f91ddd3082ff66c5ff612d45b", "bloom-filter": "^0.2.0", "buffers": "bitpay/node-buffers#v0.1.2-bitpay", "socks5-client": "^0.3.6" diff --git a/test/bloomfilter.js b/test/bloomfilter.js index 56a86d0..5b49e44 100644 --- a/test/bloomfilter.js +++ b/test/bloomfilter.js @@ -4,7 +4,7 @@ var chai = require('chai'); var should = chai.should(); var assert = require('assert'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var Data = require('./data/messages'); var P2P = require('../'); var BloomFilter = P2P.BloomFilter; diff --git a/test/inventory.js b/test/inventory.js index 7c22f4c..af28a4f 100644 --- a/test/inventory.js +++ b/test/inventory.js @@ -4,7 +4,7 @@ var should = require('chai').should(); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var P2P = require('../'); var Inventory = P2P.Inventory; var BufferUtils = bitcore.util.buffer; diff --git a/test/messages/builder.js b/test/messages/builder.js index f076f5c..59c9411 100644 --- a/test/messages/builder.js +++ b/test/messages/builder.js @@ -3,7 +3,7 @@ var should = require('chai').should(); var P2P = require('../../'); var builder = P2P.Messages.builder; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); describe('Messages Builder', function() { diff --git a/test/messages/commands/index.js b/test/messages/commands/index.js index e298d45..42aeec4 100644 --- a/test/messages/commands/index.js +++ b/test/messages/commands/index.js @@ -5,7 +5,7 @@ var expect = require('chai').expect; var P2P = require('../../../'); var Messages = P2P.Messages; var sinon = require('sinon'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); describe('Command Messages', function() { diff --git a/test/messages/index.js b/test/messages/index.js index f452727..ee23174 100644 --- a/test/messages/index.js +++ b/test/messages/index.js @@ -7,7 +7,7 @@ var Buffers = require('buffers'); var P2P = require('../../'); var Messages = P2P.Messages; var messages = new Messages(); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var Data = require('../data/messages'); //todo merge with commandData var commandData = require('../data/messages.json'); diff --git a/test/messages/message.js b/test/messages/message.js index ed1e632..4297461 100644 --- a/test/messages/message.js +++ b/test/messages/message.js @@ -3,7 +3,7 @@ var should = require('chai').should(); var P2P = require('../../'); var Message = P2P.Messages.Message; -var Networks = require('bitcore-lib').Networks; +var Networks = require('bitcore-lib-cash').Networks; describe('Message', function() { diff --git a/test/messages/util.js b/test/messages/util.js index 451fc17..828b100 100644 --- a/test/messages/util.js +++ b/test/messages/util.js @@ -4,7 +4,7 @@ var should = require('chai').should(); var utils = require('../../lib/messages/utils'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var BufferReader = bitcore.encoding.BufferReader; describe('Message Utils', function() { diff --git a/test/peer.js b/test/peer.js index 406eab6..6cc8145 100644 --- a/test/peer.js +++ b/test/peer.js @@ -10,7 +10,7 @@ var expect = chai.expect; var sinon = require('sinon'); var fs = require('fs'); -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var _ = bitcore.deps._; var P2P = require('../'); var Peer = P2P.Peer; diff --git a/test/pool.js b/test/pool.js index c3f128a..912bb75 100644 --- a/test/pool.js +++ b/test/pool.js @@ -6,7 +6,7 @@ var chai = require('chai'); var should = chai.should(); var expect = chai.expect; -var bitcore = require('bitcore-lib'); +var bitcore = require('bitcore-lib-cash'); var P2P = require('../'); var Peer = P2P.Peer; var MessagesData = require('./data/messages');