Vertcoin segwit addresses support

ognus · Nov 17, 2018 · e8e2f6c · e8e2f6c
1 parent 3866fa0
commit e8e2f6c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/dist/wallet-address-validator.js b/dist/wallet-address-validator.js
@@ -2388,7 +2388,7 @@ function isValidP2PKHandP2SHAddress(address, currency, networkType) {
 
 module.exports = {
     isValidAddress: function (address, currency, networkType) {
-        return isValidP2PKHandP2SHAddress(address, currency, networkType) || segwit.isValidAddress(address);
+        return isValidP2PKHandP2SHAddress(address, currency, networkType) || segwit.isValidAddress(address, currency.segwitHrp);
     }
 };
 
@@ -4500,8 +4500,8 @@ function encode (hrp, version, program) {
   return ret;
 }
 
-function isValidAddress(address) {
-    var hrp = 'bc';
+function isValidAddress(address, hrp) {
+    var hrp = hrp || 'bc';
     var ret = decode(hrp, address);
 
     if (ret === null) {
@@ -5291,6 +5291,7 @@ var CURRENCIES = [{
     name: 'vertcoin',
     symbol: 'vtc',
     addressTypes: {prod: ['0x', '47'], testnet: ['6f', 'c4']},
+    segwitHrp: 'vtc',
     validator: BTCValidator
 },{
     name: 'bitcoingold',

diff --git a/dist/wallet-address-validator.min.js b/dist/wallet-address-validator.min.js
diff --git a/package.json b/package.json
@@ -24,11 +24,12 @@
     "address",
     "wallet",
     "validator",
+    "vertcoin",
     "javascript",
     "browser",
     "nodejs"
   ],
-  "version": "0.2.2",
+  "version": "0.2.3",
   "author": "Tomek Kolasa <[email protected]>",
   "homepage": "https://github.com/ognus/wallet-address-validator",
   "license": "MIT",

diff --git a/src/bitcoin_validator.js b/src/bitcoin_validator.js
@@ -70,6 +70,6 @@ function isValidP2PKHandP2SHAddress(address, currency, networkType) {
 
 module.exports = {
     isValidAddress: function (address, currency, networkType) {
-        return isValidP2PKHandP2SHAddress(address, currency, networkType) || segwit.isValidAddress(address);
+        return isValidP2PKHandP2SHAddress(address, currency, networkType) || segwit.isValidAddress(address, currency.segwitHrp);
     }
 };
diff --git a/src/crypto/segwit_addr.js b/src/crypto/segwit_addr.js
@@ -70,8 +70,8 @@ function encode (hrp, version, program) {
   return ret;
 }
 
-function isValidAddress(address) {
-    var hrp = 'bc';
+function isValidAddress(address, hrp) {
+    var hrp = hrp || 'bc';
     var ret = decode(hrp, address);
 
     if (ret === null) {

diff --git a/src/currencies.js b/src/currencies.js
@@ -78,6 +78,7 @@ var CURRENCIES = [{
     name: 'vertcoin',
     symbol: 'vtc',
     addressTypes: {prod: ['0x', '47'], testnet: ['6f', 'c4']},
+    segwitHrp: 'vtc',
     validator: BTCValidator
 },{
     name: 'bitcoingold',

diff --git a/test/wallet_address_validator.js b/test/wallet_address_validator.js
@@ -216,6 +216,9 @@ describe('WAValidator.validate()', function () {
             valid('mvww6DEJ18dbyQUukpVQXvLgrNDJazZn1Y', 'vertcoin', 'testnet');
             valid('mn3mdEE6cf1snxVsknNz4GRTdSrWXqYp7c', 'VTC', 'testnet');
             valid('Vri6Q4GgNFfdtcpxD961TotJwaSaYQCaL5', 'VTC');
+            valid('vtc1qmzq3erafwvz23yfeu9tu45uz2kx3d7esk0rayg', 'VTC');
+            valid('vtc1qhy8eqwqxpyryz4wctus36yl2uu60t0z6ecrvtc', 'VTC');
+            valid('vtc1qh9y09s2crkp63mk26u3vrq9q4w3h8ee8gepjgw', 'VTC');
         });
 
         it('should return true for correct BitcoinGold addresses', function () {
@@ -439,6 +442,9 @@ describe('WAValidator.validate()', function () {
 
         it('should return false for incorrect vertcoin addresses', function () {
             commonTests('vertcoin');
+            invalid('vtc1qmzq3erafwvz23yabc9tu45uz2kx3d7esk0rayg', 'vertcoin');
+            invalid('vtc1qhy8eqwqxpyryz4wctus36yl2uu60t0z6ecrvt', 'vertcoin');
+            invalid('vtd1qhy8eqwqxpyryz4wctus36yl2uu60t0z6ecrvtc', 'vertcoin');
         });
 
         it('should return false for incorrect bitcoingold addresses', function () {