Accept 'mainnet' as well as 'bitcoincash' for network configs.

Bitcoin-com · Feb 14, 2019 · 80b4778 · 80b4778
1 parent bb40566
commit 80b4778
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 63 deletions.
diff --git a/index.js b/index.js
@@ -13,7 +13,7 @@ const repl = require("repl")
 const BITBOXSDK = require("./lib/bitbox-sdk").default
 const clone = require("git-clone")
 
-program.version("3.0.11 ", "-v, --version")
+program.version("3.1.0 ", "-v, --version")
 
 program
   .command("new <name>")

diff --git a/lib/Address.js b/lib/Address.js
@@ -323,10 +323,10 @@ var Address = function () {
   }, {
     key: "fromOutputScript",
     value: function fromOutputScript(scriptPubKey) {
-      var network = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "bitcoincash";
+      var network = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "mainnet";
 
       var netParam = void 0;
-      if (network !== "bitcoincash") netParam = _bitcoincashjsLib2.default.networks.testnet;
+      if (network !== "bitcoincash" && network !== "mainnet") netParam = _bitcoincashjsLib2.default.networks.testnet;
 
       var regtest = network === "bchreg";
 

diff --git a/lib/BitcoinCash.js b/lib/BitcoinCash.js
@@ -107,9 +107,9 @@ var BitcoinCash = function () {
   }, {
     key: "signMessageWithPrivKey",
     value: function signMessageWithPrivKey(privateKeyWIF, message) {
-      var network = privateKeyWIF.charAt(0) === "c" ? "testnet" : "bitcoincash";
+      var network = privateKeyWIF.charAt(0) === "c" ? "testnet" : "mainnet";
       var bitcoincash = void 0;
-      if (network === "bitcoincash") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
+      if (network === "mainnet") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
 
       var bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS();
       var keyPair = _bitcoincashjsLib2.default.ECPair.fromWIF(privateKeyWIF, bitcoincashBitcoinJSLib);

diff --git a/lib/ECPair.js b/lib/ECPair.js
@@ -32,10 +32,10 @@ var ECPair = function () {
     key: "fromWIF",
     value: function fromWIF(privateKeyWIF) {
       var network = void 0;
-      if (privateKeyWIF[0] === "L" || privateKeyWIF[0] === "K") network = "bitcoincash";else if (privateKeyWIF[0] === "c") network = "testnet";
+      if (privateKeyWIF[0] === "L" || privateKeyWIF[0] === "K") network = "mainnet";else if (privateKeyWIF[0] === "c") network = "testnet";
 
       var bitcoincash = void 0;
-      if (network === "bitcoincash") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
+      if (network === "mainnet") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
 
       var bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS();
 

diff --git a/lib/HDNode.js b/lib/HDNode.js
@@ -32,10 +32,10 @@ var HDNode = function () {
   _createClass(HDNode, [{
     key: "fromSeed",
     value: function fromSeed(rootSeedBuffer) {
-      var network = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "bitcoincash";
+      var network = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "mainnet";
 
       var bitcoincash = void 0;
-      if (network === "bitcoincash") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
+      if (network === "bitcoincash" || network === "mainnet") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
 
       var bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS();
       return _bitcoincashjsLib2.default.HDNode.fromSeedBuffer(rootSeedBuffer, bitcoincashBitcoinJSLib);

diff --git a/lib/Transaction.js b/lib/Transaction.js
@@ -26,28 +26,6 @@ var Transaction = function () {
   }
 
   _createClass(Transaction, [{
-    key: "transaction",
-    value: function transaction() {
-      return new _bitcoincashjsLib2.default.Transaction();
-    }
-  }, {
-    key: "fromHex",
-    value: function fromHex(hex) {
-      return _bitcoincashjsLib2.default.Transaction.fromHex(hex);
-    }
-  }, {
-    key: "transactionBuilder",
-    value: function transactionBuilder() {
-      var network = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "bitcoin";
-
-      return new _bitcoincashjsLib2.default.TransactionBuilder(_bitcoincashjsLib2.default.networks[network]);
-    }
-  }, {
-    key: "fromTransaction",
-    value: function fromTransaction(tx) {
-      return _bitcoincashjsLib2.default.TransactionBuilder.fromTransaction(tx);
-    }
-  }, {
     key: "details",
     value: async function details(txid) {
       try {

diff --git a/lib/TransactionBuilder.js b/lib/TransactionBuilder.js
@@ -35,12 +35,12 @@ var TransactionBuilder = function () {
   }]);
 
   function TransactionBuilder() {
-    var network = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "bitcoincash";
+    var network = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "mainnet";
 
     _classCallCheck(this, TransactionBuilder);
 
     var bitcoincash = void 0;
-    if (network === "bitcoincash") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
+    if (network === "bitcoincash" || network === "mainnet") bitcoincash = _coininfo2.default.bitcoincash.main;else bitcoincash = _coininfo2.default.bitcoincash.test;
 
     var bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS();
     this.transaction = new _bitcoincashjsLib2.default.TransactionBuilder(bitcoincashBitcoinJSLib);

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "bitbox-sdk",
-  "version": "3.0.11",
+  "version": "3.1.0",
   "description": "BITBOX Javascript SDK for Bitcoin Cash",
-  "author": "Gabriel Cardona @ Bitcoin.com",
+  "author": "Gabriel Cardona <gabriel@bitcoin.com>",
   "contributors": [
     "Chris Troutner <[email protected]>"
   ],

diff --git a/src/Address.js b/src/Address.js
@@ -253,9 +253,10 @@ class Address {
     return this.toCashAddress(address.getAddress())
   }
 
-  fromOutputScript(scriptPubKey, network = "bitcoincash") {
+  fromOutputScript(scriptPubKey, network = "mainnet") {
     let netParam
-    if (network !== "bitcoincash") netParam = Bitcoin.networks.testnet
+    if (network !== "bitcoincash" && network !== "mainnet")
+      netParam = Bitcoin.networks.testnet
 
     const regtest = network === "bchreg"
 

diff --git a/src/BitcoinCash.js b/src/BitcoinCash.js
@@ -54,9 +54,9 @@ class BitcoinCash {
 
   // sign message
   signMessageWithPrivKey(privateKeyWIF, message) {
-    const network = privateKeyWIF.charAt(0) === "c" ? "testnet" : "bitcoincash"
+    const network = privateKeyWIF.charAt(0) === "c" ? "testnet" : "mainnet"
     let bitcoincash
-    if (network === "bitcoincash") bitcoincash = coininfo.bitcoincash.main
+    if (network === "mainnet") bitcoincash = coininfo.bitcoincash.main
     else bitcoincash = coininfo.bitcoincash.test
 
     const bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS()

diff --git a/src/ECPair.js b/src/ECPair.js
@@ -9,11 +9,11 @@ class ECPair {
   static fromWIF(privateKeyWIF) {
     let network
     if (privateKeyWIF[0] === "L" || privateKeyWIF[0] === "K")
-      network = "bitcoincash"
+      network = "mainnet"
     else if (privateKeyWIF[0] === "c") network = "testnet"
 
     let bitcoincash
-    if (network === "bitcoincash") bitcoincash = coininfo.bitcoincash.main
+    if (network === "mainnet") bitcoincash = coininfo.bitcoincash.main
     else bitcoincash = coininfo.bitcoincash.test
 
     const bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS()

diff --git a/src/HDNode.js b/src/HDNode.js
@@ -7,9 +7,10 @@ class HDNode {
     this._address = address
   }
 
-  fromSeed(rootSeedBuffer, network = "bitcoincash") {
+  fromSeed(rootSeedBuffer, network = "mainnet") {
     let bitcoincash
-    if (network === "bitcoincash") bitcoincash = coininfo.bitcoincash.main
+    if (network === "bitcoincash" || network === "mainnet")
+      bitcoincash = coininfo.bitcoincash.main
     else bitcoincash = coininfo.bitcoincash.test
 
     const bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS()

diff --git a/src/Transaction.js b/src/Transaction.js
@@ -6,22 +6,6 @@ class Transaction {
     this.restURL = restURL
   }
 
-  transaction() {
-    return new Bitcoin.Transaction()
-  }
-
-  fromHex(hex) {
-    return Bitcoin.Transaction.fromHex(hex)
-  }
-
-  transactionBuilder(network = "bitcoin") {
-    return new Bitcoin.TransactionBuilder(Bitcoin.networks[network])
-  }
-
-  fromTransaction(tx) {
-    return Bitcoin.TransactionBuilder.fromTransaction(tx)
-  }
-
   async details(txid) {
     try {
       // Handle single address.

diff --git a/src/TransactionBuilder.js b/src/TransactionBuilder.js
@@ -8,9 +8,10 @@ class TransactionBuilder {
     TransactionBuilder._address = address
   }
 
-  constructor(network = "bitcoincash") {
+  constructor(network = "mainnet") {
     let bitcoincash
-    if (network === "bitcoincash") bitcoincash = coininfo.bitcoincash.main
+    if (network === "bitcoincash" || network === "mainnet")
+      bitcoincash = coininfo.bitcoincash.main
     else bitcoincash = coininfo.bitcoincash.test
 
     const bitcoincashBitcoinJSLib = bitcoincash.toBitcoinJS()
@@ -53,7 +54,7 @@ class TransactionBuilder {
   }
 
   setLockTime(locktime) {
-    this.transaction.setLockTime(locktime);
+    this.transaction.setLockTime(locktime)
   }
 
   sign(

diff --git a/test/unit/TransactionBuilder.js b/test/unit/TransactionBuilder.js
@@ -7,7 +7,7 @@ const Buffer = require("safe-buffer").Buffer
 
 describe("#TransactionBuilder", () => {
   describe("#hashTypes", () => {
-    const transactionBuilder = new BITBOX.TransactionBuilder("bitcoincash")
+    const transactionBuilder = new BITBOX.TransactionBuilder("mainnet")
     fixtures.hashTypes.forEach(fixture => {
       it(`should match hash type`, () => {
         assert.equal(