Skip to content
This repository has been archived by the owner on Oct 30, 2024. It is now read-only.

fix segwit validation for both network type #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix segwit validation for both network type #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d42f9
fix segwit validaation for `both` network type
berdyshev Aug 11, 2023
406f347
update minified version
berdyshev Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 46 additions & 36 deletions dist/wallet-address-validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ function toByteArray (b64) {
? validLen - 4
: validLen

for (var i = 0; i < len; i += 4) {
var i
for (i = 0; i < len; i += 4) {
tmp =
(revLookup[b64.charCodeAt(i)] << 18) |
(revLookup[b64.charCodeAt(i + 1)] << 12) |
Expand Down Expand Up @@ -2564,6 +2565,7 @@ module.exports = BigNumber;

}).call(this,require("buffer").Buffer)
},{"buffer":5}],5:[function(require,module,exports){
(function (Buffer){
/*!
* The buffer module from node.js, for the browser.
*
Expand Down Expand Up @@ -4342,7 +4344,8 @@ function numberIsNaN (obj) {
return obj !== obj // eslint-disable-line no-self-compare
}

},{"base64-js":2,"ieee754":36}],6:[function(require,module,exports){
}).call(this,require("buffer").Buffer)
},{"base64-js":2,"buffer":5,"ieee754":36}],6:[function(require,module,exports){
/*
* The MIT License (MIT)
*
Expand Down Expand Up @@ -10190,22 +10193,25 @@ function isValidBech32Address(address, currency, networkType) {
if (!currency.segwitHrp) {
return false;
}
var hrp = currency.segwitHrp[networkType];
if (!hrp) {
return false;
}

try {
var dec = bech32.decode(address, networkType === 'prod' ? 103 : 108);
} catch (err) {
return false;
}
var hrps = currency.segwitHrp[networkType] ?
[currency.segwitHrp[networkType]] :
Object.values(currency.segwitHrp);

if (dec === null || dec.prefix !== hrp || dec.words.length < 1 || dec.words[0] > 16) {
return false;
}
for (var hrp in hrps) {
try {
var dec = bech32.decode(address, currency.segwitHrp.prod === hrp ? 103 : 108);
} catch (err) {
continue;
}

return true;
if (dec === null || dec.prefix !== hrp || dec.words.length < 1 || dec.words[0] > 16) {
continue;
}

return true;
}
return false;
}

module.exports = {
Expand Down Expand Up @@ -10503,33 +10509,37 @@ function isValidPayToScriptHashAddress(address, currency, networkType) {
return getOutputIndex(address, currency, networkType) > 0;
}

function isValidPayToWitnessScriptHashAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
const decoded = bech32.decode(hrp, address);
return decoded && decoded.version === 0 && decoded.program.length === 32;
} catch (err) {
return null;
function getHrp(currency, networkType) {
return currency.segwitHrp[networkType] ? [currency.segwitHrp[networkType]] : Object.values(currency.segwitHrp);
}

function validateHrp(hrps, address, condition, isBech32M) {
for (const hrp of hrps) {
try {
const decoded = bech32.decode(hrp, address, isBech32M);
if (decoded && condition(decoded)) {
return true;
}
} catch (err) {
continue;
}
}
return null;
}

function isValidPayToWitnessScriptHashAddress(address, currency, networkType) {
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 0 && decoded.program.length === 32);
}

function isValidPayToWitnessPublicKeyHashAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
const decoded = bech32.decode(hrp, address);
return decoded && decoded.version === 0 && decoded.program.length === 20;
} catch (err) {
return null;
}
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 0 && decoded.program.length === 20);
}

function isValidPayToTaprootAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
decoded = bech32.decode(hrp, address, true);
return decoded && decoded.version === 1 && decoded.program.length === 32;
} catch (err) {}
return null;
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 1 && decoded.program.length === 32, true);
}

function isValidSegwitAddress(address, currency, networkType) {
Expand Down Expand Up @@ -10560,7 +10570,7 @@ function isValidSegwitAddress(address, currency, networkType) {
}

module.exports = {
isValidAddress: function (address, currency, networkType) {
isValidAddress: function (address, currency, networkType) {
networkType = networkType || DEFAULT_NETWORK_TYPE;
const addrType = this.getAddressType(address, currency, networkType);
// Though WITNESS_UNKNOWN is a valid address, it's not spendable - so we mark it as invalid
Expand Down
2 changes: 1 addition & 1 deletion dist/wallet-address-validator.min.js
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 16 additions & 13 deletions src/ada_validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,25 @@ function isValidBech32Address(address, currency, networkType) {
if (!currency.segwitHrp) {
return false;
}
var hrp = currency.segwitHrp[networkType];
if (!hrp) {
return false;
}

try {
var dec = bech32.decode(address, networkType === 'prod' ? 103 : 108);
} catch (err) {
return false;
}
var hrps = currency.segwitHrp[networkType] ?
[currency.segwitHrp[networkType]] :
Object.values(currency.segwitHrp);

if (dec === null || dec.prefix !== hrp || dec.words.length < 1 || dec.words[0] > 16) {
return false;
}
for (var hrp in hrps) {
try {
var dec = bech32.decode(address, currency.segwitHrp.prod === hrp ? 103 : 108);
} catch (err) {
continue;
}

return true;
if (dec === null || dec.prefix !== hrp || dec.words.length < 1 || dec.words[0] > 16) {
continue;
}

return true;
}
return false;
}

module.exports = {
Expand Down
46 changes: 25 additions & 21 deletions src/bitcoin_validator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,33 +84,37 @@ function isValidPayToScriptHashAddress(address, currency, networkType) {
return getOutputIndex(address, currency, networkType) > 0;
}

function isValidPayToWitnessScriptHashAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
const decoded = bech32.decode(hrp, address);
return decoded && decoded.version === 0 && decoded.program.length === 32;
} catch (err) {
return null;
function getHrp(currency, networkType) {
return currency.segwitHrp[networkType] ? [currency.segwitHrp[networkType]] : Object.values(currency.segwitHrp);
}

function validateHrp(hrps, address, condition, isBech32M) {
for (const hrp of hrps) {
try {
const decoded = bech32.decode(hrp, address, isBech32M);
if (decoded && condition(decoded)) {
return true;
}
} catch (err) {
continue;
}
}
return null;
}

function isValidPayToWitnessScriptHashAddress(address, currency, networkType) {
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 0 && decoded.program.length === 32);
}

function isValidPayToWitnessPublicKeyHashAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
const decoded = bech32.decode(hrp, address);
return decoded && decoded.version === 0 && decoded.program.length === 20;
} catch (err) {
return null;
}
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 0 && decoded.program.length === 20);
}

function isValidPayToTaprootAddress(address, currency, networkType) {
try {
const hrp = currency.segwitHrp[networkType];
decoded = bech32.decode(hrp, address, true);
return decoded && decoded.version === 1 && decoded.program.length === 32;
} catch (err) {}
return null;
const hrps = getHrp(currency, networkType);
return validateHrp(hrps, address, decoded => decoded.version === 1 && decoded.program.length === 32, true);
}

function isValidSegwitAddress(address, currency, networkType) {
Expand Down Expand Up @@ -141,7 +145,7 @@ function isValidSegwitAddress(address, currency, networkType) {
}

module.exports = {
isValidAddress: function (address, currency, networkType) {
isValidAddress: function (address, currency, networkType) {
networkType = networkType || DEFAULT_NETWORK_TYPE;
const addrType = this.getAddressType(address, currency, networkType);
// Though WITNESS_UNKNOWN is a valid address, it's not spendable - so we mark it as invalid
Expand Down