Skip to content

Commit 90cca0d

Browse files
author
andraz maier
committed
feat: update address validity response statuses to use INVALID_ADDRESS_VERSION
1 parent 63a5037 commit 90cca0d

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed

src/verification/address-validity/address-validity-btc.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ export function verifyAddressBTC(
284284
// wrong prefix
285285
} else if (!(decodedAddress[0] == 111 || decodedAddress[0] == 196))
286286
return {
287-
status: AttestationResponseStatus.INVALID_ADDRESS_PREFIX,
287+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
288288
response: INVALID_ADDRESS_RESPONSE,
289289
};
290290
else {
@@ -313,7 +313,7 @@ export function verifyAddressBTC(
313313
// invalid address / unsupported version
314314
else
315315
return {
316-
status: AttestationResponseStatus.UNSUPPORTED_ADDRESS_VERSION,
316+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
317317
response: INVALID_ADDRESS_RESPONSE,
318318
};
319319
}
@@ -363,7 +363,7 @@ export function verifyAddressBTC(
363363
// wrong prefix
364364
} else if (!(decodedAddress[0] == 0 || decodedAddress[0] == 5))
365365
return {
366-
status: AttestationResponseStatus.INVALID_ADDRESS_PREFIX,
366+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
367367
response: INVALID_ADDRESS_RESPONSE,
368368
};
369369
else {
@@ -392,7 +392,7 @@ export function verifyAddressBTC(
392392
// invalid address / unsupported version
393393
else
394394
return {
395-
status: AttestationResponseStatus.UNSUPPORTED_ADDRESS_VERSION,
395+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
396396
response: INVALID_ADDRESS_RESPONSE,
397397
};
398398
}

src/verification/address-validity/address-validity-doge.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export function verifyAddressDOGE(
3838
}
3939

4040
//length is base58
41-
const shortLen = 25 > address.length || address.length > 34;
42-
if (shortLen)
41+
if (25 > address.length || address.length > 34)
4342
return {
4443
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
4544
response: INVALID_ADDRESS_RESPONSE,
@@ -57,7 +56,7 @@ export function verifyAddressDOGE(
5756
const prefix = validPrefix.includes(address[0]);
5857
if (!prefix)
5958
return {
60-
status: AttestationResponseStatus.INVALID_ADDRESS_PREFIX,
59+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
6160
response: INVALID_ADDRESS_RESPONSE,
6261
};
6362

@@ -81,7 +80,7 @@ export function verifyAddressDOGE(
8180
//prefix in hex
8281
if (!validPrefixDecodedDec.includes(decodedAddress[0]))
8382
return {
84-
status: AttestationResponseStatus.INVALID_ADDRESS_PREFIX,
83+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
8584
response: INVALID_ADDRESS_RESPONSE,
8685
};
8786
else {

src/verification/address-validity/address-validity-xrp.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
const R_B58_DICT = 'rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz';
1616
const base58 = base(R_B58_DICT);
1717
const classicAddressRegex =
18-
/r[rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz]{24,34}/;
18+
/[rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz]{24,34}/;
1919
const invalidCharacters =
2020
/[^rpshnaf39wBUDNEGHJKLM4PQRST7VWXYZ2bcdeCg65jkm8oFqi1tuvAxyz]/;
2121

@@ -48,15 +48,15 @@ export function verifyAddressXRP(
4848

4949
const checksum = base58Checksum(decodedAddress);
5050

51-
if (!checksum)
51+
if (decodedAddress[0] != 0)
5252
return {
53-
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
53+
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
5454
response: INVALID_ADDRESS_RESPONSE,
5555
};
5656

57-
if (decodedAddress[0] != 0)
57+
if (!checksum)
5858
return {
59-
status: AttestationResponseStatus.INVALID_ADDRESS_PREFIX,
59+
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
6060
response: INVALID_ADDRESS_RESPONSE,
6161
};
6262

src/verification/response-status.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ export enum AttestationResponseStatus {
3838
REFERENCED_TRANSACTION_EXISTS = 'INVALID: REFERENCED TRANSACTION EXISTS',
3939
MORE_THAN_ONE_OUTPUT = 'INVALID: MORE_THAN_ONE_OUTPUT',
4040
INVALID_ADDRESS_CHARACTER = 'INVALID: INVALID ADDRESS CHARACTER',
41+
INVALID_ADDRESS_VERSION = 'INVALID: INVALID ADDRESS VERSION',
4142
INVALID_ADDRESS_LENGTH = 'INVALID: INVALID ADDRESS LENGTH',
4243
INVALID_DECODED_ADDRESS_LENGTH = 'INVALID: INVALID DECODED ADDRESS LENGTH',
4344
INVALID_ADDRESS_CHECKSUM = 'INVALID: INVALID ADDRESS CHECKSUM',
44-
UNSUPPORTED_ADDRESS_VERSION = 'INVALID: UNSUPPORTED ADDRESS VERSION',
4545
INVALID_ADDRESS_TYPE = 'INVALID: INVALID ADDRESS TYPE',
46-
INVALID_ADDRESS_PREFIX = 'INVALID: INVALID_ADDRESS_PREFIX',
4746

4847
// TEMPORARY STATUS
4948
// Temporary status during checks

0 commit comments

Comments
 (0)