Skip to content

Commit e0080dd

Browse files
LukaAvbrehtLukaAvbreht
committed
fix: all address validity requests are top level valid
1 parent 55364b0 commit e0080dd

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,14 @@ export function verifyAddressBTC(
254254
//invalid length
255255
if (25 > address.length || address.length > 34) {
256256
return {
257-
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
257+
status: AttestationResponseStatus.VALID,
258258
response: INVALID_ADDRESS_RESPONSE,
259259
};
260260
}
261261
// contains invalid characters
262262
else if (BTC_BASE_58_DICT_regex.test(address)) {
263263
return {
264-
status: AttestationResponseStatus.INVALID_ADDRESS_CHARACTER,
264+
status: AttestationResponseStatus.VALID,
265265
response: INVALID_ADDRESS_RESPONSE,
266266
};
267267
}
@@ -272,19 +272,19 @@ export function verifyAddressBTC(
272272
// invalid length
273273
if (decodedAddress.length != 25)
274274
return {
275-
status: AttestationResponseStatus.INVALID_DECODED_ADDRESS_LENGTH,
275+
status: AttestationResponseStatus.VALID,
276276
response: INVALID_ADDRESS_RESPONSE,
277277
};
278278
// checksum fails
279279
else if (!base58Checksum(decodedAddress)) {
280280
return {
281-
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
281+
status: AttestationResponseStatus.VALID,
282282
response: INVALID_ADDRESS_RESPONSE,
283283
};
284284
// wrong prefix
285285
} else if (!(decodedAddress[0] == 111 || decodedAddress[0] == 196))
286286
return {
287-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
287+
status: AttestationResponseStatus.VALID,
288288
response: INVALID_ADDRESS_RESPONSE,
289289
};
290290
else {
@@ -301,7 +301,7 @@ export function verifyAddressBTC(
301301
return { status: AttestationResponseStatus.VALID, response };
302302
} else
303303
return {
304-
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
304+
status: AttestationResponseStatus.VALID,
305305
response: INVALID_ADDRESS_RESPONSE,
306306
};
307307

@@ -313,13 +313,13 @@ export function verifyAddressBTC(
313313
// invalid address / unsupported version
314314
else
315315
return {
316-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
316+
status: AttestationResponseStatus.VALID,
317317
response: INVALID_ADDRESS_RESPONSE,
318318
};
319319
}
320320
case BTCAddressTypes.INVALID: {
321321
return {
322-
status: AttestationResponseStatus.INVALID_ADDRESS_TYPE,
322+
status: AttestationResponseStatus.VALID,
323323
response: INVALID_ADDRESS_RESPONSE,
324324
};
325325
}
@@ -333,14 +333,14 @@ export function verifyAddressBTC(
333333
//invalid length
334334
if (25 > address.length || address.length > 34) {
335335
return {
336-
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
336+
status: AttestationResponseStatus.VALID,
337337
response: INVALID_ADDRESS_RESPONSE,
338338
};
339339
}
340340
// contains invalid characters
341341
else if (BTC_BASE_58_DICT_regex.test(address)) {
342342
return {
343-
status: AttestationResponseStatus.INVALID_ADDRESS_CHARACTER,
343+
status: AttestationResponseStatus.VALID,
344344
response: INVALID_ADDRESS_RESPONSE,
345345
};
346346
}
@@ -351,19 +351,19 @@ export function verifyAddressBTC(
351351
// invalid length
352352
if (decodedAddress.length != 25)
353353
return {
354-
status: AttestationResponseStatus.INVALID_DECODED_ADDRESS_LENGTH,
354+
status: AttestationResponseStatus.VALID,
355355
response: INVALID_ADDRESS_RESPONSE,
356356
};
357357
// checksum fails
358358
else if (!base58Checksum(decodedAddress)) {
359359
return {
360-
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
360+
status: AttestationResponseStatus.VALID,
361361
response: INVALID_ADDRESS_RESPONSE,
362362
};
363363
// wrong prefix
364364
} else if (!(decodedAddress[0] == 0 || decodedAddress[0] == 5))
365365
return {
366-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
366+
status: AttestationResponseStatus.VALID,
367367
response: INVALID_ADDRESS_RESPONSE,
368368
};
369369
else {
@@ -380,7 +380,7 @@ export function verifyAddressBTC(
380380
return { status: AttestationResponseStatus.VALID, response };
381381
} else
382382
return {
383-
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
383+
status: AttestationResponseStatus.VALID,
384384
response: INVALID_ADDRESS_RESPONSE,
385385
};
386386

@@ -392,13 +392,13 @@ export function verifyAddressBTC(
392392
// invalid address / unsupported version
393393
else
394394
return {
395-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
395+
status: AttestationResponseStatus.VALID,
396396
response: INVALID_ADDRESS_RESPONSE,
397397
};
398398
}
399399
case BTCAddressTypes.INVALID: {
400400
return {
401-
status: AttestationResponseStatus.INVALID_ADDRESS_TYPE,
401+
status: AttestationResponseStatus.VALID,
402402
response: INVALID_ADDRESS_RESPONSE,
403403
};
404404
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ export function verifyAddressDOGE(
4040
//length is base58
4141
if (25 > address.length || address.length > 34)
4242
return {
43-
status: AttestationResponseStatus.INVALID_ADDRESS_LENGTH,
43+
status: AttestationResponseStatus.VALID,
4444
response: INVALID_ADDRESS_RESPONSE,
4545
};
4646

4747
//contains only characters from the alphabet
4848
const invalidChar = DOGE_BASE_58_DICT_regex.test(address);
4949
if (invalidChar)
5050
return {
51-
status: AttestationResponseStatus.INVALID_ADDRESS_CHARACTER,
51+
status: AttestationResponseStatus.VALID,
5252
response: INVALID_ADDRESS_RESPONSE,
5353
};
5454

5555
//prefix in base58
5656
const prefix = validPrefix.includes(address[0]);
5757
if (!prefix)
5858
return {
59-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
59+
status: AttestationResponseStatus.VALID,
6060
response: INVALID_ADDRESS_RESPONSE,
6161
};
6262

@@ -65,22 +65,22 @@ export function verifyAddressDOGE(
6565
//decoded length
6666
if (decodedAddress.length != 25)
6767
return {
68-
status: AttestationResponseStatus.INVALID_DECODED_ADDRESS_LENGTH,
68+
status: AttestationResponseStatus.VALID,
6969
response: INVALID_ADDRESS_RESPONSE,
7070
};
7171

7272
//checksum
7373
const checksum = base58Checksum(decodedAddress);
7474
if (!checksum)
7575
return {
76-
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
76+
status: AttestationResponseStatus.VALID,
7777
response: INVALID_ADDRESS_RESPONSE,
7878
};
7979

8080
//prefix in hex
8181
if (!validPrefixDecodedDec.includes(decodedAddress[0]))
8282
return {
83-
status: AttestationResponseStatus.INVALID_ADDRESS_VERSION,
83+
status: AttestationResponseStatus.VALID,
8484
response: INVALID_ADDRESS_RESPONSE,
8585
};
8686
else {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,28 @@ export function verifyAddressXRP(
3535
const char = validCharacters(address);
3636
if (!char)
3737
return {
38-
status: AttestationResponseStatus.INVALID_ADDRESS_CHARACTER,
38+
status: AttestationResponseStatus.VALID,
3939
response: INVALID_ADDRESS_RESPONSE,
4040
};
4141

4242
const decodedAddress = Buffer.from(base58.decode(address));
4343
if (decodedAddress.length != 25)
4444
return {
45-
status: AttestationResponseStatus.INVALID_DECODED_ADDRESS_LENGTH,
45+
status: AttestationResponseStatus.VALID,
4646
response: INVALID_ADDRESS_RESPONSE,
4747
};
4848

4949
const checksum = base58Checksum(decodedAddress);
5050

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

5757
if (!checksum)
5858
return {
59-
status: AttestationResponseStatus.INVALID_ADDRESS_CHECKSUM,
59+
status: AttestationResponseStatus.VALID,
6060
response: INVALID_ADDRESS_RESPONSE,
6161
};
6262

0 commit comments

Comments
 (0)