SerafinTech · SerafinTech · Feb 23, 2015 · Aug 30, 2014 · Aug 30, 2014 · Aug 30, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-node_modules
-bitcoinjs-min.js
+bitcoin.js
 coverage
+node_modules
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,4 @@
+.gitignore
+.travis.yml
+jshint.json
+test/
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,21 @@
-Copyright (c) 2011 Stefan Thomas
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2011-2015 Bitcoinjs-lib contributors
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # BitcoinJS (bitcoinjs-lib)
 
-[![Build Status](https://travis-ci.org/bitcoinjs/bitcoinjs-lib.png?branch=master)](https://travis-ci.org/bitcoinjs/bitcoinjs-lib) [![Coverage Status](https://coveralls.io/repos/bitcoinjs/bitcoinjs-lib/badge.png)](https://coveralls.io/r/bitcoinjs/bitcoinjs-lib)
+[![Build Status](https://travis-ci.org/bitcoinjs/bitcoinjs-lib.png?branch=master)](https://travis-ci.org/bitcoinjs/bitcoinjs-lib)
+[![Coverage Status](https://coveralls.io/repos/bitcoinjs/bitcoinjs-lib/badge.png)](https://coveralls.io/r/bitcoinjs/bitcoinjs-lib)
+[![tip for next commit](http://tip4commit.com/projects/735.svg)](http://tip4commit.com/projects/735)
 
 [![NPM](https://nodei.co/npm/bitcoinjs-lib.png)](https://nodei.co/npm/bitcoinjs-lib/)
 
-[![Browser Support](https://ci.testling.com/bitcoinjs/bitcoinjs-lib.png)](https://ci.testling.com/bitcoinjs/bitcoinjs-lib)
-
 The pure JavaScript Bitcoin library for node.js and browsers.
 A continued implementation of the original `0.1.3` version used by over a million wallet users; the backbone for almost all Bitcoin web wallets in production today.
 
@@ -26,6 +26,7 @@ A continued implementation of the original `0.1.3` version used by over a millio
 
 
 ## Should I use this in production?
+
 If you are thinking of using the master branch of this library in production, *stop*.
 Master is not stable; it is our development branch, and only tagged releases may be classified as stable.
 
@@ -43,99 +44,76 @@ If you are looking for the original, it is tagged as `0.1.3`. Unless you need it
 
     var bitcoin = require('bitcoinjs-lib')
 
-From the repo:
-
-    var bitcoin = require('./src/index.js')
-
 
 ### Browser
 
-From the repository: Compile `bitcoinjs-min.js` with the following command:
-
-    $ npm run-script compile
-
-From NPM:
-
-    $ npm -g install bitcoinjs-lib browserify uglify-js
-    $ browserify -r bitcoinjs-lib -s Bitcoin | uglifyjs > bitcoinjs.min.js
-
-After loading this file in your browser, you will be able to use the global `bitcoin` object.
+If you're familiar with how to use browserify, ignore this and proceed normally.
+These steps are advisory only and allow you to use the API to its full extent.
 
+[Browserify](https://github.com/substack/node-browserify) is assumed to be installed for these steps.
 
-## Usage
+From your repository, create a `foobar.js` file
 
-These examples assume you are running bitcoinjs-lib in the browser.
-
-
-### Generating a Bitcoin address
-
-```javascript
-
-key = bitcoin.ECKey.makeRandom()
-
-// Print your private key (in WIF format)
-console.log(key.toWIF())
-// => 8c112cf628362ecf4d482f68af2dbb50c8a2cb90d226215de925417aa9336a48
-
-// Print your public key (toString defaults to a Bitcoin address)
-console.log(key.pub.getAddress().toString())
-// => 14bZ7YWde4KdRb5YN7GYkToz3EHVCvRxkF
+``` javascript
+var foobar = {
+  base58: require('bs58'),
+  bitcoin: require('bitcoinjs-lib'),
+  ecurve: require('ecurve'),
+  BigInteger: require('bigi'),
+  Buffer: require('buffer')
+}
+
+module.exports = foobar
 ```
 
-### Creating a Transaction
+Each of these included packages are seperate to `bitcoinjs-lib`, and must be installed separately.
+They are however used in the bitcoinjs-lib public API.
 
-```javascript
-tx = new bitcoin.Transaction()
+Using browserify, compile `foobar.js` for use in the browser:
 
-// Add the input (who is paying) of the form [previous transaction hash, index of the output to use]
-tx.addInput("aa94ab02c182214f090e99a0d57021caffd0f195a81c24602b1028b130b63e31", 0)
+    $ browserify foobar.js -s foobar > foobar.js
 
-// Add the output (who to pay to) of the form [payee's address, amount in satoshis]
-tx.addOutput("1Gokm82v6DmtwKEB8AiVhm82hyFSsEvBDK", 15000)
+You will then be able to load `foobar.js` into your browser, with each of the dependencies above accessible from the global `foobar` object.
 
-// Initialize a private key using WIF
-key = bitcoin.ECKey.fromWIF("L1uyy5qTuGrVXrmrsvHWHgVzW9kKdrp27wBC7Vs6nZDTF2BRUVwy")
+**NOTE**: See our package.json for the currently supported version of browserify used by this repository.
 
-// Sign the first input with the new key
-tx.sign(0, key)
 
-// Print transaction serialized as hex
-console.log(tx.toHex())
-// => 0100000001313eb630b128102b60241ca895f1d0ffca2170d5a0990e094f2182c102ab94aa000000008a47304402200169f1f844936dc60df54e812345f5dd3e6681fea52e33c25154ad9cc23a330402204381ed8e73d74a95b15f312f33d5a0072c7a12dd6c3294df6e8efbe4aff27426014104e75628573696aed32d7656fb35e9c71ea08eb6492837e13d2662b9a36821d0fff992692fd14d74fdec20fae29128ba12653249cbeef521fc5eba84dde0689f27ffffffff01983a0000000000001976a914ad618cf4333b3b248f9744e8e81db2964d0ae39788ac00000000
+## Examples
 
-// You could now push the transaction onto the Bitcoin network manually (see https://blockchain.info/pushtx)
-```
-
-### Creating a P2SH Multsig Address
-
-``` javascript
-var bitcoin = require('bitcoinjs-lib')
-
-var privKeys = [bitcoin.ECKey.makeRandom(), bitcoin.ECKey.makeRandom(), bitcoin.ECKey.makeRandom()]
-var pubKeys = privKeys.map(function(x) { return x.pub })
-
-var redeemScript = bitcoin.scripts.multisigOutput(2, pubKeys) // 2 of 3
-var scriptPubKey = bitcoin.scripts.scriptHashOutput(redeemScript.getHash())
-
-var multisigAddress = bitcoin.Address.fromOutputScript(scriptPubKey).toString()
-
-console.log("multisigP2SH:", multisigAddress)
-```
+The below examples are implemented as integration tests, they should be very easy to understand.  Otherwise, pull requests are appreciated.
 
+- [Generate a random address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L8)
+- [Generate a address from a SHA256 hash](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L20)
+- [Import an address via WIF](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L29)
+- [Create a Transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/basic.js#L36)
+- [Sign a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L9)
+- [Verify a Bitcoin message](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L17)
+- [Create an OP RETURN transaction](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/advanced.js#L24)
+- [Create a 2-of-3 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/multisig.js#L8)
+- [Spend from a 2-of-2 multisig P2SH address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/multisig.js#L22)
+- [Generate a single-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/crypto.js#L7)
+- [Generate a dual-key stealth address](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/crypto.js#L42)
+- [Recover a BIP32 parent private key from the parent public key and a derived non-hardened child private key](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/crypto.js#L44)
+- [Recover a Private key from duplicate R values in a signature](https://github.com/bitcoinjs/bitcoinjs-lib/blob/master/test/integration/crypto.js#L90)
 
 
 ## Projects utilizing BitcoinJS
 
-- [Coinpunk](https://coinpunk.com)
-- [Hive Wallet](https://www.hivewallet.com)
-- [Justchain Exchange](https://justcoin.com)
-- [Skyhook ATM](http://projectskyhook.com)
 - [BitAddress](https://www.bitaddress.org)
 - [Blockchain.info](https://blockchain.info/wallet)
 - [Brainwallet](https://brainwallet.github.io)
+- [Coinkite](https://coinkite.com)
+- [Coinpunk](https://coinpunk.com)
 - [Dark Wallet](https://darkwallet.unsystem.net)
+- [DecentralBank](http://decentralbank.co)
 - [Dogechain Wallet](https://dogechain.info)
 - [GreenAddress](https://greenaddress.it)
+- [Hive Wallet](https://www.hivewallet.com)
+- [Justchain Exchange](https://justcoin.com)
+- [QuickCoin](https://wallet.quickcoin.co)
+- [Robocoin](https://wallet.robocoin.com)
+- [Skyhook ATM](http://projectskyhook.com)
+
 
 ## Contributors
 
@@ -145,6 +123,7 @@ Since then, many people have contributed. [Click here](https://github.com/bitcoi
 
 Daniel Cousens, Wei Lu, JP Richardson and Kyle Drake lead the major refactor of the library from 0.1.3 to 1.0.0.
 
+
 ## Contributing
 
 Join the ongoing IRC development channel at `#bitcoinjs-dev` on Freenode.
@@ -161,9 +140,9 @@ Please make your best effort to adhere to these when contributing to save on tri
 
 ## Complementing Libraries
 
-- [bip39](https://github.com/weilu/bip39) - Wei Lu's Mnemonic code generator
+- [BIP39](https://github.com/weilu/bip39) - Mnemonic code for generating deterministic keys
+- [BIP38](https://github.com/cryptocoinjs/bip38) - Passphrase-protected private keys
 - [BCoin](https://github.com/indutny/bcoin) - BIP37 / Bloom Filters / SPV client
-- [scryptsy](https://github.com/cryptocoinjs/scryptsy) - Private key encryption (BIP38)
 - [insight](https://github.com/bitpay/insight) - A bitcoin blockchain API for web wallets.
 
 
@@ -172,12 +151,13 @@ Please make your best effort to adhere to these when contributing to save on tri
 - [Bitcore](https://github.com/bitpay/bitcore)
 - [Cryptocoin](https://github.com/cryptocoinjs/cryptocoin)
 
+
 ## License
 
 This library is free and open-source software released under the MIT license.
 
 
 ## Copyright
 
-BitcoinJS (c) 2011-2012 Stefan Thomas
+BitcoinJS (c) 2011-2014 Bitcoinjs-lib contributors
 Released under MIT license
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bitcoinjs-lib",
-  "version": "1.0.0",
+  "version": "1.4.5",
   "description": "Client-side Bitcoin JavaScript library",
   "main": "./src/index.js",
   "keywords": [
@@ -31,53 +31,35 @@
       "url": "http://www.justmoon.net"
     }
   ],
+  "scripts": {
+    "compile": "browserify ./src/index.js -s bitcoin > bitcoin.js",
+    "coverage": "istanbul cover _mocha -- test/*.js",
+    "coveralls": "npm run-script coverage && coveralls < coverage/lcov.info",
+    "integration": "mocha --reporter list test/integration/*.js",
+    "jshint": "jshint --config jshint.json src/*.js ; true",
+    "test": "npm run-script unit",
+    "unit": "istanbul test mocha -- --reporter list test/*.js"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/bitcoinjs/bitcoinjs-lib.git"
   },
+  "dependencies": {
+    "bigi": "^1.4.0",
+    "bs58check": "^1.0.4",
+    "ecurve": "^1.0.0",
+    "typeforce": "^0.1.0"
+  },
   "devDependencies": {
-    "browserify": "4.1.11",
-    "coveralls": "~2.10.0",
-    "helloblock-js": "^0.2.1",
-    "istanbul": "0.1.30",
-    "jshint": "2.5.1",
-    "mocha": "1.18.2",
+    "async": "^0.9.0",
+    "browserify": "^9.0.3",
+    "bs58": "^2.0.1",
+    "cb-helloblock": "^0.4.10",
+    "coveralls": "^2.11.2",
+    "istanbul": "^0.3.5",
+    "jshint": "^2.5.11",
+    "mocha": "^2.1.0",
     "mocha-lcov-reporter": "0.0.1",
-    "sinon": "1.9.0",
-    "uglify-js": "2.4.13"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/20..latest",
-      "firefox/21..latest",
-      "ipad/6..latest",
-      "iphone/6..latest",
-      "opera/15..latest",
-      "safari/latest"
-    ],
-    "harness": "mocha-bdd",
-    "files": "test/*.js"
-  },
-  "scripts": {
-    "compile": "./node_modules/.bin/browserify ./src/index.js -s Bitcoin | ./node_modules/.bin/uglifyjs > bitcoinjs-min.js",
-    "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter list test/*.js",
-    "coveralls": "npm run-script coverage && node ./node_modules/.bin/coveralls < coverage/lcov.info",
-    "integration": "./node_modules/.bin/_mocha --reporter list test/integration/*.js",
-    "jshint": "./node_modules/.bin/jshint --config jshint.json src/*.js ; true",
-    "test": "npm run-script unit",
-    "unit": "./node_modules/.bin/istanbul test ./node_modules/.bin/_mocha -- --reporter list `find test -maxdepth 1 -not -type d`"
-  },
-  "browser": {
-    "crypto": "crypto-browserify"
-  },
-  "dependencies": {
-    "bigi": "1.1.0",
-    "bs58": "1.1.0",
-    "bs58check": "1.0.0",
-    "crypto-js": "3.1.2-3",
-    "crypto-browserify": "2.1.8",
-    "ecurve": "0.10.0",
-    "secure-random": "1.1.1"
+    "sinon": "^1.12.2"
   }
 }
diff --git a/src/address.js b/src/address.js
@@ -1,5 +1,6 @@
 var assert = require('assert')
 var base58check = require('bs58check')
+var typeForce = require('typeforce')
 var networks = require('./networks')
 var scripts = require('./scripts')
 
@@ -13,15 +14,15 @@ function findScriptTypeByVersion(version) {
 }
 
 function Address(hash, version) {
-  assert(Buffer.isBuffer(hash), 'Expected Buffer, got ' + hash)
+  typeForce('Buffer', hash)
+
   assert.strictEqual(hash.length, 20, 'Invalid hash length')
   assert.strictEqual(version & 0xff, version, 'Invalid version byte')
 
   this.hash = hash
   this.version = version
 }
 
-// Import functions
 Address.fromBase58Check = function(string) {
   var payload = base58check.decode(string)
   var version = payload.readUInt8(0)
@@ -33,15 +34,12 @@ Address.fromBase58Check = function(string) {
 Address.fromOutputScript = function(script, network) {
   network = network || networks.bitcoin
 
-  var type = scripts.classifyOutput(script)
-
-  if (type === 'pubkeyhash') return new Address(script.chunks[2], network.pubKeyHash)
-  if (type === 'scripthash') return new Address(script.chunks[1], network.scriptHash)
+  if (scripts.isPubKeyHashOutput(script)) return new Address(script.chunks[2], network.pubKeyHash)
+  if (scripts.isScriptHashOutput(script)) return new Address(script.chunks[1], network.scriptHash)
 
-  assert(false, type + ' has no matching Address')
+  assert(false, script.toASM() + ' has no matching Address')
 }
 
-// Export functions
 Address.prototype.toBase58Check = function () {
   var payload = new Buffer(21)
   payload.writeUInt8(this.version, 0)

diff --git a/src/base58check.js b/src/base58check.js
@@ -0,0 +1,18 @@
+var bs58check = require('bs58check')
+
+function decode() {
+  console.warn('bs58check will be removed in 2.0.0. require("bs58check") instead.');
+
+  return bs58check.decode.apply(undefined, arguments)
+}
+
+function encode() {
+  console.warn('bs58check will be removed in 2.0.0. require("bs58check") instead.');
+
+  return bs58check.encode.apply(undefined, arguments)
+}
+
+module.exports = {
+  decode: decode,
+  encode: encode
+}