Merge bitcore2 into bitcore, prepare branch.

.gitignore

@@ -1,5 +1,5 @@
 *.swp
 coverage
 node_modules
-browser/fullnode.js
+browser/bitcore.js
 browser/tests.js

browser/build

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-browserify index.js -o browser/fullnode.js
+browserify index.js -o browser/bitcore.js
 ls test/*.js | xargs browserify -o browser/tests.js

index.js

@@ -1,56 +1,56 @@
-var fullnode = module.exports;
+var bitcore = module.exports;
 
 //main bitcoin library
-fullnode.Address = require('./lib/address');
-fullnode.Base58 = require('./lib/base58');
-fullnode.Base58Check = require('./lib/base58check');
-fullnode.BIP32 = require('./lib/bip32');
-fullnode.Block = require('./lib/block');
-fullnode.Blockheader = require('./lib/blockheader');
-fullnode.BN = require('./lib/bn');
-fullnode.BufferReader = require('./lib/bufferreader');
-fullnode.BufferWriter = require('./lib/bufferwriter');
-fullnode.Constants = require('./lib/constants');
-fullnode.ECDSA = require('./lib/ecdsa');
-fullnode.Hash = require('./lib/hash');
-fullnode.KDF = require('./lib/kdf');
-fullnode.Keypair = require('./lib/keypair');
-fullnode.Message = require('./lib/message');
-fullnode.Opcode = require('./lib/opcode');
-fullnode.Point = require('./lib/point');
-fullnode.Privkey = require('./lib/privkey');
-fullnode.Pubkey = require('./lib/pubkey');
-fullnode.Random = require('./lib/random');
-fullnode.Script = require('./lib/script');
-fullnode.Signature = require('./lib/signature');
-fullnode.Transaction = require('./lib/transaction');
-fullnode.Txin = require('./lib/txin');
-fullnode.Txout = require('./lib/txout');
-fullnode.Varint = require('./lib/varint');
+bitcore.Address = require('./lib/address');
+bitcore.Base58 = require('./lib/base58');
+bitcore.Base58Check = require('./lib/base58check');
+bitcore.BIP32 = require('./lib/bip32');
+bitcore.Block = require('./lib/block');
+bitcore.Blockheader = require('./lib/blockheader');
+bitcore.BN = require('./lib/bn');
+bitcore.BufferReader = require('./lib/bufferreader');
+bitcore.BufferWriter = require('./lib/bufferwriter');
+bitcore.Constants = require('./lib/constants');
+bitcore.ECDSA = require('./lib/ecdsa');
+bitcore.Hash = require('./lib/hash');
+bitcore.KDF = require('./lib/kdf');
+bitcore.Keypair = require('./lib/keypair');
+bitcore.Message = require('./lib/message');
+bitcore.Opcode = require('./lib/opcode');
+bitcore.Point = require('./lib/point');
+bitcore.Privkey = require('./lib/privkey');
+bitcore.Pubkey = require('./lib/pubkey');
+bitcore.Random = require('./lib/random');
+bitcore.Script = require('./lib/script');
+bitcore.Signature = require('./lib/signature');
+bitcore.Transaction = require('./lib/transaction');
+bitcore.Txin = require('./lib/txin');
+bitcore.Txout = require('./lib/txout');
+bitcore.Varint = require('./lib/varint');
 
 //experimental, nonstandard, or unstable features
-fullnode.expmt = {};
-fullnode.expmt.AES = require('./lib/expmt/aes');
-fullnode.expmt.AESCBC = require('./lib/expmt/aescbc');
-fullnode.expmt.CBC = require('./lib/expmt/cbc');
-fullnode.expmt.ECIES = require('./lib/expmt/ecies');
-fullnode.expmt.StealthAddress = require('./lib/expmt/stealthaddress');
-fullnode.expmt.Stealthkey = require('./lib/expmt/stealthkey');
-fullnode.expmt.StealthMessage = require('./lib/expmt/stealthmessage');
-fullnode.expmt.StealthTx = require('./lib/expmt/stealthtx');
+bitcore.expmt = {};
+bitcore.expmt.AES = require('./lib/expmt/aes');
+bitcore.expmt.AESCBC = require('./lib/expmt/aescbc');
+bitcore.expmt.CBC = require('./lib/expmt/cbc');
+bitcore.expmt.ECIES = require('./lib/expmt/ecies');
+bitcore.expmt.StealthAddress = require('./lib/expmt/stealthaddress');
+bitcore.expmt.Stealthkey = require('./lib/expmt/stealthkey');
+bitcore.expmt.StealthMessage = require('./lib/expmt/stealthmessage');
+bitcore.expmt.StealthTx = require('./lib/expmt/stealthtx');
 
 //dependencies, subject to change
-fullnode.deps = {};
-fullnode.deps.aes = require('aes');
-fullnode.deps.bnjs = require('bn.js');
-fullnode.deps.bs58 = require('bs58');
-fullnode.deps.Buffer = Buffer;
-fullnode.deps.elliptic = require('elliptic');
-fullnode.deps.hashjs = require('hash.js');
-fullnode.deps.sha512 = require('sha512');
+bitcore.deps = {};
+bitcore.deps.aes = require('aes');
+bitcore.deps.bnjs = require('bn.js');
+bitcore.deps.bs58 = require('bs58');
+bitcore.deps.Buffer = Buffer;
+bitcore.deps.elliptic = require('elliptic');
+bitcore.deps.hashjs = require('hash.js');
+bitcore.deps.sha512 = require('sha512');
 
-//fullnode.scriptexec = require('lib/scriptexec');
-//fullnode.tx = require('lib/tx');
-//fullnode.txpartial = require('lib/txpartial');
+//bitcore.scriptexec = require('lib/scriptexec');
+//bitcore.tx = require('lib/tx');
+//bitcore.txpartial = require('lib/txpartial');
 
-//fullnode.bip70 = require('lib/bip70');
+//bitcore.bip70 = require('lib/bip70');

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "fullnode",
-  "version": "0.0.0",
+  "name": "bitcore",
+  "version": "0.8.0",
   "description": "Bitcoin library, CLI and API.",
-  "author": "Ryan X. Charles <ryanxcharles@gmail.com>",
+  "author": "BitPay <dev@bitpay.com>",
   "main": "index.js",
   "scripts": {
     "test": "mocha"
@@ -60,7 +60,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/ryanxcharles/fullnode.git"
+    "url": "https://github.com/bitpay/bitcore.git"
   },
   "dependencies": {
     "aes": "=0.1.0",