Merge pull request bitpay#2312 from micahriggan/fix/regtest-address

matiu · web-flow · commit cc8e090fe06f · 2019-08-05T15:41:53.000-03:00
Allow regtest
diff --git a/packages/bitcore-lib/lib/address.js b/packages/bitcore-lib/lib/address.js
@@ -233,7 +233,7 @@ Address._transformBuffer = function(buffer, network, type) {
     throw new TypeError('Unknown network');
   }
 
-  if (!bufferVersion.network || (networkObj && networkObj !== bufferVersion.network)) {
+  if (!bufferVersion.network || (networkObj && networkObj.xpubkey !== bufferVersion.network.xpubkey)) {
     throw new TypeError('Address has mismatched network type.');
   }
 
diff --git a/packages/bitcore-lib/test/address.js b/packages/bitcore-lib/test/address.js
@@ -219,6 +219,13 @@ describe('Address', function() {
       should.not.exist(error);
       Address.fromString(ws).toString().should.equal('1A6ut1tWnUq1SEQLMr4ttDh24wcbJ5o9TT');
     });
+
+    it('testnet addresses are also valid regtest addresses', function() {
+      for (var i = 0; i < P2SHTestnet.length; i++) {
+        var error = Address.getValidationError(P2SHTestnet[i], 'regtest');
+        should.not.exist(error);
+      }
+    });
   });
 
   describe('instantiation', function() {

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ Address._transformBuffer = function(buffer, network, type) {`
`233`	`233`	`throw new TypeError('Unknown network');`
`234`	`234`	`}`
`235`	`235`
`236`		`- if (!bufferVersion.network \|\| (networkObj && networkObj !== bufferVersion.network)) {`
	`236`	`+ if (!bufferVersion.network \|\| (networkObj && networkObj.xpubkey !== bufferVersion.network.xpubkey)) {`
`237`	`237`	`throw new TypeError('Address has mismatched network type.');`
`238`	`238`	`}`
`239`	`239`