Merge pull request #100 from nitsujlangston/bitcoreLibCash17

updating bitcore-lib-cash version

index.js

@@ -1,4 +1,4 @@
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 bitcore.P2P = require('./lib');
 
 module.exports = bitcore.P2P;

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;

lib/bloomfilter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BloomFilter = require('bloom-filter');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/errors.js

@@ -5,4 +5,4 @@ var spec = {
   message: 'Internal Error on bitcore-p2p Module {0}'
 };
 
-module.exports = require('flocore-lib').errors.extend(spec);
+module.exports = require('bitcore-lib-cash').errors.extend(spec);

lib/inventory.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var $ = bitcore.util.preconditions;
 var BufferUtil = bitcore.util.buffer;
 var BufferReader = bitcore.encoding.BufferReader;

lib/messages/builder.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
-var fcoin = require('fcoin');
 var Inventory = require('../inventory');
 
 function builder(options) {
@@ -16,9 +15,9 @@ function builder(options) {
     options.network = bitcore.Networks.defaultNetwork;
   }
 
-  options.Block = options.Block || fcoin.Block;
+  options.Block = options.Block || bitcore.Block;
   options.BlockHeader = options.BlockHeader || bitcore.BlockHeader;
-  options.Transaction = options.Transaction || fcoin.TX;
+  options.Transaction = options.Transaction || bitcore.Transaction;
   options.MerkleBlock = options.MerkleBlock || bitcore.MerkleBlock;
   options.protocolVersion = options.protocolVersion || 70001;
 

lib/messages/commands/addr.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;

lib/messages/commands/alert.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/block.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;
 
@@ -26,17 +26,10 @@ function BlockMessage(arg, options) {
 inherits(BlockMessage, Message);
 
 BlockMessage.prototype.setPayload = function(payload) {
-  if (typeof this.Block.fromRaw === 'function') {
+  this.block = this.Block.fromBuffer(payload);
-    this.block = this.Block.fromRaw(payload);
-  } else {
-    this.block = this.Block.fromBuffer(payload);
-  }
 };
 
 BlockMessage.prototype.getPayload = function() {
-  if (typeof this.Block.fromRaw === 'function') {
-    return this.block.toRaw();
-  }
   return this.block.toBuffer();
 };
 

lib/messages/commands/filteradd.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferUtil = bitcore.util.buffer;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/filterclear.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 
 /**

lib/messages/commands/filterload.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 var BloomFilter = require('../../bloomfilter');
 var $ = bitcore.util.preconditions;

lib/messages/commands/getaddr.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 
 /**

lib/messages/commands/getblocks.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/getdata.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/getheaders.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/headers.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/inv.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/mempool.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 
 /**

lib/messages/commands/merkleblock.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;

lib/messages/commands/notfound.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/ping.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;

lib/messages/commands/pong.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;

lib/messages/commands/reject.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var utils = require('../utils');
 var BufferReader = bitcore.encoding.BufferReader;
 var BufferWriter = bitcore.encoding.BufferWriter;

lib/messages/commands/tx.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;
 
@@ -28,9 +28,7 @@ function TransactionMessage(arg, options) {
 inherits(TransactionMessage, Message);
 
 TransactionMessage.prototype.setPayload = function(payload) {
-  if (typeof this.Transaction.fromRaw === 'function') {
+  if (this.Transaction.prototype.fromBuffer) {
-    this.transaction = this.Transaction.fromRaw(payload);
-  } else if (this.Transaction.prototype.fromBuffer) {
     this.transaction = new this.Transaction().fromBuffer(payload);
   } else {
     this.transaction = this.Transaction.fromBuffer(payload);
@@ -38,9 +36,6 @@ TransactionMessage.prototype.setPayload = function(payload) {
 };
 
 TransactionMessage.prototype.getPayload = function() {
-  if (typeof this.Transaction.fromRaw === 'function') {
-    return this.transaction.toRaw();
-  }
   return this.transaction.toBuffer();
 };
 

lib/messages/commands/verack.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 
 /**

lib/messages/commands/version.js

@@ -2,7 +2,7 @@
 
 var Message = require('../message');
 var inherits = require('util').inherits;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferWriter = bitcore.encoding.BufferWriter;
 var BufferReader = bitcore.encoding.BufferReader;
 var BN = bitcore.crypto.BN;

lib/messages/index.js

@@ -1,6 +1,6 @@
  'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 var Hash = bitcore.crypto.Hash;
 var $ = bitcore.util.preconditions;

lib/messages/message.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var $ = bitcore.util.preconditions;
 var BufferWriter = bitcore.encoding.BufferWriter;
 var Hash = bitcore.crypto.Hash;

lib/messages/utils.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var BufferUtil = bitcore.util.buffer;
 var $ = bitcore.util.preconditions;
 var _ = bitcore.deps._;

lib/peer.js

@@ -4,8 +4,7 @@ var Buffers = require('./buffers');
 var EventEmitter = require('events').EventEmitter;
 var Net = require('net');
 var Socks5Client = require('socks5-client');
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
-var bcoin = require('fcoin');
 var Networks = bitcore.Networks;
 var Messages = require('./messages');
 var $ = bitcore.util.preconditions;
@@ -66,8 +65,8 @@ function Peer(options) {
 
   this.messages = options.messages || new Messages({
     network: this.network,
-    Block: bcoin.block,
+    Block: bitcore.Block,
-    Transaction: bcoin.tx
+    Transaction: bitcore.Transaction
   });
 
   this.dataBuffer = new Buffers();

lib/pool.js

@@ -2,7 +2,7 @@
 
 var dns = require('dns');
 var EventEmitter = require('events').EventEmitter;
-var bitcore = require('flocore-lib');
+var bitcore = require('bitcore-lib-cash');
 var sha256 = bitcore.crypto.Hash.sha256;
 var Peer = require('./peer');
 var Networks = bitcore.Networks;

package.json

@@ -1,7 +1,8 @@
 {
-  "name": "flocore-p2p",
+  "name": "bitcore-p2p-cash",
-  "version": "5.0.0-beta.8",
+  "version": "1.2.1",
-  "description": "Interface to the Flo P2P network for flocore",
+  "description": "Interface to the bitcoin P2P network for bitcore",
+  "author": "BitPay <dev@bitpay.com>",
   "main": "index.js",
   "scripts": {
     "lint": "gulp lint",
@@ -9,6 +10,47 @@
     "coverage": "gulp coverage",
     "build": "gulp"
   },
+  "contributors": [
+    {
+      "name": "Justin Langston",
+      "email": "justin@bitpay.com"
+    },
+    {
+      "name": "Yemel Jardi",
+      "email": "yemel@bitpay.com"
+    },
+    {
+      "name": "Braydon Fuller",
+      "email": "braydon@bitpay.com"
+    },
+    {
+      "name": "Ryan X. Charles",
+      "email": "ryan@bitpay.com"
+    },
+    {
+      "name": "Eric Martindale",
+      "email": "eric@bitpay.com"
+    },
+    {
+      "name": "Philip Hutchins",
+      "email": "philip@bitpay.com"
+    },
+    {
+      "name": "Manuel Araoz",
+      "email": "maraoz@bitpay.com"
+    },
+    {
+      "name": "Esteban Ordano",
+      "email": "eordano@gmail.com"
+    },
+    {
+      "name": "Elichai Turkel"
+    },
+    {
+      "name": "Chris Kleeschulte",
+      "email": "chrisk@bitpay.com"
+    }
+  ],
   "keywords": [
     "bitcoin",
     "bitcore"
@@ -18,10 +60,9 @@
     "url": "https://github.com/bitpay/bitcore-p2p.git"
   },
   "dependencies": {
+    "bitcore-lib-cash": "^0.17.0",
     "bloom-filter": "^0.2.0",
     "buffers": "bitpay/node-buffers#v0.1.2-bitpay",
-    "fcoin": "^1.1.0",
-    "flocore-lib": "^0.15.2",
     "socks5-client": "^0.3.6"
   },
   "devDependencies": {

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;

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;

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() {
 

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() {
 

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');
 

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() {
 

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() {

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;

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');