Improved isValidAddress Function and added tests

Author: tudorelu

src/packages/core/common.ts

@@ -1,6 +1,11 @@
 export const HASH_LENGTH = 34;
 export const ADDRESS_LENGTH = 23;
+export const DEFAULT_ADDRESS_TYPE = 1;
+export const CONTRACT_ADDRESS_TYPE = 2;
 export const P2SH_ADDRESS_TYPE = 3;
+
+export const MAIN_NET_VERSION = 1;
+
 export const CONSENSUS_LOCK_TIME = -1;
 
 export const BLACK_HOLE_ADDRESS = 'Nse5FeeiYk1opxdc5RqYpEWkiUDGNuLs';

src/packages/core/utils/__tests__/utils.test.ts

@@ -0,0 +1,26 @@
+import { isValidAddress } from '../crypto';
+
+jest.unmock('crypto');
+jest.unmock('secp256k1');
+
+describe('Address validation checks', () => {
+
+  beforeEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('check validity of different addresses', () => {
+
+    expect(isValidAddress("TTavFTDgdQNeYgVQBaNTF6SeK54nswH5")).toEqual(true);
+    expect(isValidAddress("Nsdwnd4auFisFJKU6iDvBxTdPkeg8qkB")).toEqual(true);
+    expect(isValidAddress("Nse3uLgeCBWP48GCGh8L54gnELfpnSG9")).toEqual(true);
+    expect(isValidAddress("NseBuUpi4iwbJsj1UrUb4eiAWav9UY4C")).toEqual(true);
+    expect(isValidAddress("Nse7MZAwVTbdWXxWwgN6vfcPwBYC1izz")).toEqual(true);
+
+
+    expect(isValidAddress("avFTDgdQNeYgVQBaNTF6SeK54nswH5")).toEqual(false);
+    expect(isValidAddress("TTavFTDgdQNeYgVQBaNTF6SeK54nswH5DXXD")).toEqual(false);
+    expect(isValidAddress("")).toEqual(false);
+
+  });
+});

src/packages/core/utils/crypto.ts

@@ -2,7 +2,13 @@ import * as bs58 from 'bs58';
 import RIPEMD160 from 'ripemd160';
 import * as secp256k1 from 'secp256k1';
 import * as shajs from 'sha.js';
-import { HASH_LENGTH } from '../common';
+import { 
+  HASH_LENGTH, 
+  ADDRESS_LENGTH, 
+  P2SH_ADDRESS_TYPE,
+  DEFAULT_ADDRESS_TYPE, 
+  CONTRACT_ADDRESS_TYPE,
+  } from '../common';
 import { isHex } from './serialize';
 
 export const PRIVATE_KEY_LENGTH = 64;
@@ -53,9 +59,50 @@ export function isValidPrivateKey(privateKey: string): boolean {
 
 }
 
+/*
+https://github.com/nuls-io/nuls/blob/b8e490a26eeec7b16d924d8398a67ede24ff86ca/core-module/kernel/src/main/java/io/nuls/kernel/utils/AddressTool.java#L77-L117
+*/
 export function isValidAddress(address: string): boolean {
 
-  return /^(Ns|TT)([a-zA-Z-0-9]{30})$/.test(address);
+  if(!/^(Ns|TT)([a-zA-Z-0-9]{30})$/.test(address))
+    return false;
+  
+  let bytes: Buffer;
+
+  try {
+    bytes = Buffer.from(bs58.decode(address));
+    if(bytes.length != ADDRESS_LENGTH + 1)
+      return false;
+  } catch {
+    return false;
+  }
+  
+  let chainId: Number;
+  let type: Number;
+
+  try {
+    chainId = bytes.readInt16LE(0);
+    //bytes.readInt16LE(0);
+    type = bytes.readInt8(2);
+    //console.log("Chain ID is ");
+    //console.log(chainId);
+    //console.log("Type is ");
+    //console.log(type);
+  } catch {
+    return false;
+  }
+  
+  if (DEFAULT_ADDRESS_TYPE != type && CONTRACT_ADDRESS_TYPE != type && P2SH_ADDRESS_TYPE != type) {
+      return false;
+  }
+
+  try {
+    checkXOR(bytes);
+  } catch {
+    return false;
+  } 
+
+  return true;
 
 }
 
@@ -89,6 +136,19 @@ export function getXOR(bytes: Buffer): number {
 
 }
 
+/* 
+https://github.com/nuls-io/nuls/blob/b8e490a26eeec7b16d924d8398a67ede24ff86ca/core-module/kernel/src/main/java/io/nuls/kernel/utils/AddressTool.java#L169-L183
+*/
+export function checkXOR(hashs: Buffer) {
+    
+    var body: Buffer = hashs.slice(0, ADDRESS_LENGTH);
+    let xor = getXOR(body);
+
+    if (xor != hashs[ADDRESS_LENGTH]) {
+        throw new Error('Nuls Runtime Exception: Data Error (10014)');
+    }
+}
+
 export function addressFromHash(hash: AddressHash): string {
 
   return bs58.encode(Buffer.concat([hash, Buffer.from([getXOR(hash)])]));