merge from karel-3d

.npmignore

@@ -0,0 +1,9 @@
+# Dev directories
+.gitignore
+.travis.yml
+.nyc_output
+coverage
+
+# Dependency directory
+node_modules
+yarn.lock

CHANGELOG.md

@@ -1,3 +1,16 @@
+# 3.6.1
+__added__
+- Added `Transaction.getExtraData` method
+- Added/replaced `network` parameter to `Transaction.fromBuffer` and `Transaction.fromHex` methods
+
+__fixed__
+- Dash special transaction support
+- Zcash version 1 extra data
+
+# 3.6.0
+__added__
+- Added timestamp to `Transaction` object (Capricoin)
+
 # 3.2.0
 __added__
 - Added `address.fromBech32/toBech32` (#846)

README.md

@@ -1,11 +1,6 @@
-This is a fork of https://github.com/bitcoinjs/bitcoinjs-lib with very simple support for zcash (parsing transactions + multibyte addresses).
+Deprecation
+===
 
-You should not use this if you don't have to support zcash, since it's not as well maintained and tested as bitcoin.js.
+Do not use this
 
-Read README at original bitcoinjs-lib
-
-## versions
-
-Version 3.3.2 is rebased on upstream 3.3.2
-
-## LICENSE [MIT](LICENSE)
+Use https://github.com/BitGo/bitgo-utxo-lib/

package.json

@@ -1,14 +1,16 @@
 {
   "name": "bitcoinjs-lib-zcash",
-  "version": "3.4.2",
-  "description": "Client-side Bitcoin JavaScript library with simple zcash support",
+  "version": "3.6.1",
+  "description": "Client-side Bitcoin JavaScript library with simple zcash and capricoin support",
   "main": "./src/index.js",
   "engines": {
     "node": ">=4.0.0"
   },
   "keywords": [
     "bitcoinjs",
     "bitcoin",
+    "zcash",
+    "capricoin",
     "browserify",
     "javascript",
     "bitcoinjs"
@@ -44,7 +46,7 @@
     "pushdata-bitcoin": "^1.0.1",
     "randombytes": "^2.0.1",
     "safe-buffer": "^5.0.1",
-    "typeforce": "^1.11.3",
+    "typeforce": "1.11.3",
     "varuint-bitcoin": "^1.0.4",
     "wif": "^2.0.1"
   },

src/coins.js

@@ -0,0 +1,62 @@
+// Coins supported by bitgo-bitcoinjs-lib
+const typeforce = require('typeforce')
+
+const coins = {
+  BCH: 'bch',
+  BSV: 'bsv',
+  BTC: 'btc',
+  BTG: 'btg',
+  LTC: 'ltc',
+  ZEC: 'zec',
+  DASH: 'dash',
+  DIGIBYTE: 'dgb',
+  DOGECOIN: 'doge',
+  NAMECOIN: 'nmc',
+  VERTCOIN: 'vtc',
+  CAPRICOIN: 'cpc'
+}
+
+coins.isBitcoin = function (network) {
+  return typeforce.value(coins.BTC)(network.coin)
+}
+
+coins.isBitcoinCash = function (network) {
+  return typeforce.value(coins.BCH)(network.coin)
+}
+
+coins.isBitcoinSV = function (network) {
+  return typeforce.value(coins.BSV)(network.coin)
+}
+
+coins.isBitcoinGold = function (network) {
+  return typeforce.value(coins.BTG)(network.coin)
+}
+
+coins.isLitecoin = function (network) {
+  return typeforce.value(coins.LTC)(network.coin)
+}
+
+coins.isZcash = function (network) {
+  return typeforce.value(coins.ZEC)(network.coin)
+}
+
+coins.isDash = function (network) {
+  return typeforce.value(coins.DASH)(network.coin)
+}
+
+coins.isCapricoin = function (network) {
+  return typeforce.value(coins.CAPRICOIN)(network.coin)
+}
+
+coins.isValidCoin = typeforce.oneOf(
+  coins.isBitcoin,
+  coins.isBitcoinCash,
+  coins.isBitcoinSV,
+  coins.isBitcoinGold,
+  coins.isLitecoin,
+  coins.isZcash,
+  coins.isDash,
+  coins.isCapricoin
+)
+
+module.exports = coins

src/networks.js

@@ -1,5 +1,6 @@
 // https://en.bitcoin.it/wiki/List_of_address_prefixes
 // Dogecoin BIP32 is a proposed standard: https://bitcointalk.org/index.php?topic=409731
+var coins = require('./coins')
 
 module.exports = {
   bitcoin: {
@@ -11,7 +12,8 @@ module.exports = {
     },
     pubKeyHash: 0x00,
     scriptHash: 0x05,
-    wif: 0x80
+    wif: 0x80,
+    coin: coins.BTC
   },
   testnet: {
     messagePrefix: '\x18Bitcoin Signed Message:\n',
@@ -22,7 +24,8 @@ module.exports = {
     },
     pubKeyHash: 0x6f,
     scriptHash: 0xc4,
-    wif: 0xef
+    wif: 0xef,
+    coin: coins.BTC
   },
   litecoin: {
     messagePrefix: '\x19Litecoin Signed Message:\n',
@@ -32,6 +35,79 @@ module.exports = {
     },
     pubKeyHash: 0x30,
     scriptHash: 0x32,
-    wif: 0xb0
+    wif: 0xb0,
+    coin: coins.LTC
+  },
+  dash: {
+    messagePrefix: '\x19DarkCoin Signed Message:\n',
+    bip32: {
+      public: 0x0488b21e,
+      private: 0x0488ade4
+    },
+    pubKeyHash: 0x4c, // https://dash-docs.github.io/en/developer-reference#opcodes
+    scriptHash: 0x10,
+    wif: 0xcc,
+    coin: coins.DASH
+  },
+  dashTest: {
+    messagePrefix: '\x19DarkCoin Signed Message:\n',
+    bip32: {
+      public: 0x043587cf,
+      private: 0x04358394
+    },
+    pubKeyHash: 0x8c, // https://dash-docs.github.io/en/developer-reference#opcodes
+    scriptHash: 0x13,
+    wif: 0xef, // https://github.com/dashpay/godashutil/blob/master/wif.go#L72
+    coin: coins.DASH
+  },
+  zcash: {
+    messagePrefix: '\x18ZCash Signed Message:\n',
+    bech32: 'bc',
+    bip32: {
+      public: 0x0488b21e,
+      private: 0x0488ade4
+    },
+    pubKeyHash: 0x1cb8,
+    scriptHash: 0x1cbd,
+    wif: 0x80,
+    // This parameter was introduced in version 3 to allow soft forks, for version 1 and 2 transactions we add a
+    // dummy value.
+    consensusBranchId: {
+      1: 0x00,
+      2: 0x00,
+      3: 0x5ba81b19,
+      4: 0x76b809bb
+    },
+    coin: coins.ZEC
+  },
+  zcashTest: {
+    messagePrefix: '\x18ZCash Signed Message:\n',
+    bech32: 'tb',
+    bip32: {
+      public: 0x043587cf,
+      private: 0x04358394
+    },
+    pubKeyHash: 0x1d25,
+    scriptHash: 0x1cba,
+    wif: 0xef,
+    consensusBranchId: {
+      1: 0x00,
+      2: 0x00,
+      3: 0x5ba81b19,
+      4: 0x76b809bb
+    },
+    coin: coins.ZEC
+  },
+  capricoin: {
+    messagePrefix: '\x18Capricoin Signed Message:\n',
+    bech32: null,
+    bip32: {
+      public: 76067358,
+      private: 76066276
+    },
+    pubKeyHash: 28,
+    scriptHash: 35,
+    wif: 0xef,
+    coin: coins.CAPRICOIN
   }
 }