Another avenue to fix the error in regards to the weird testnet/regte…

…st bitcore confusion
phllcblockchain · Dec 20, 2018 · b226969 · b226969
1 parent d4fbdd7
commit b226969
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/js/components/wallet.js b/src/js/components/wallet.js
@@ -65,7 +65,11 @@ function WalletViewModel() {
 
       // m : masterkery / 0' : first private derivation / 0 : external account / i : index
       var key = self.BITCOIN_WALLET.getAddressKey(i);
-      var address = bitcoinjs.payments.p2wpkh({ pubkey: key.priv.publicKey.toBuffer(), network: bitcoinjs.networks[key.priv.network.alias] }).address;
+      var networkName = key.priv.network.alias
+      if (USE_TESTNET && ! USE_REGTEST) {
+        networkName = key.priv.network.name
+      }
+      var address = bitcoinjs.payments.p2wpkh({ pubkey: key.priv.publicKey.toBuffer(), network: bitcoinjs.networks[networkName] }).address;
 
       //Make sure this address doesn't already exist in the wallet (sanity check)
       assert(!self.getAddressObj(address), "Cannot addAddress: address already exists in wallet!");

diff --git a/src/js/util.bitcore.js b/src/js/util.bitcore.js
@@ -6,10 +6,6 @@ var bitcoreMessage = require('bitcore-message'); // this also binds itself to bi
 // this 'global' is overwritten by tests!
 var NETWORK = (USE_TESTNET || USE_REGTEST) ? bitcore.Networks.testnet : bitcore.Networks.livenet;
 
-if (USE_TESTNET && ! USE_REGTEST) {
-  NETWORK.alias = NETWORK.name;
-}
-
 var CWHierarchicalKey = function(passphrase, password) {
   checkArgType(passphrase, "string");
   if (password) {