feedback

bitpay · Apr 4, 2024 · 46dab62 · 46dab62
1 parent 9be6ca2
commit 46dab62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/bitcore-lib-cash/lib/networks.js b/packages/bitcore-lib-cash/lib/networks.js
@@ -129,7 +129,8 @@ function addNetwork(data) {
     });
   }
 
-  for (const value of Object.values(network)) {
+  const indexBy = data.indexBy || Object.values(network); 
+  for (const value of indexBy) {
     if (value != null && typeof value !== 'object') {
       if (!networkMaps[value]) {
         networkMaps[value] = [];

diff --git a/packages/bitcore-wallet-service/src/lib/common/utils.ts b/packages/bitcore-wallet-service/src/lib/common/utils.ts
@@ -277,13 +277,14 @@ export class Utils {
   }
 
   static compareNetworks(network1, network2, chain) {
-    network1 = network1?.toLowerCase();
-    network2 = network2?.toLowerCase();
+    network1 = network1 ? this.getNetworkName(chain, network1.toLowerCase()) : null;
+    network2 = network2 ? this.getNetworkName(chain, network2.toLowerCase()) : null;
 
-    if (this.getNetworkName(chain, network1) == network2) return true;
-    if (Config.allowRegtest && ['testnet', 'regtest'].includes(Utils.getGenericName(network1)) && ['testnet', 'regtest'].includes(Utils.getGenericName(network2))) return true;
+    if (network1 == network2) return true;
+    if (Config.allowRegtest && ['testnet', 'regtest'].includes(network1) && ['testnet', 'regtest'].includes(network2)) return true;
     return false;
   }
+
   // Good for going from generic 'testnet' to specific 'testnet3', 'sepolia', etc
   static getNetworkName(chain, network) {
     const aliases = Constants.NETWORK_ALIASES[chain];