feat: Basic support for H160 and H256 accounts. (#596)

src/middleware/validate/validateAddressMiddleware.spec.ts

@@ -78,6 +78,13 @@ describe('validateAddressMiddleware', () => {
 		},
 	} as unknown as Request);
 
+	doesNotErrorWith('a valid H160 address', {
+		params: {
+			number: '1',
+			address: '0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac',
+		},
+	} as unknown as Request);
+
 	errorsWith(
 		'an address containing an invalid base58 char',
 		{
@@ -97,7 +104,7 @@ describe('validateAddressMiddleware', () => {
 				address: 'y9EMHt34JJo4rWLSaxoLGdYXvjgSXEd4zHUnQgfNzwES8b',
 			},
 		} as unknown as Request,
-		new BadRequest('Invalid decoded address length')
+		new BadRequest('Invalid address format')
 	);
 
 	errorsWith(

src/middleware/validate/validateAddressMiddleware.ts

@@ -1,5 +1,9 @@
-import { checkAddressChecksum } from '@polkadot/util-crypto';
-import { base58Decode } from '@polkadot/util-crypto';
+import { isHex } from '@polkadot/util';
+import {
+	base58Decode,
+	checkAddressChecksum,
+	isEthereumAddress,
+} from '@polkadot/util-crypto';
 import { defaults } from '@polkadot/util-crypto/address/defaults';
 import { RequestHandler } from 'express';
 import { BadRequest } from 'http-errors';
@@ -22,27 +26,35 @@ export const validateAddressMiddleware: RequestHandler = (req, _res, next) => {
 };
 
 /**
- * Verify that an address is a valid substrate ss58 address.
+ * Verify that an address is a valid substrate address.
  *
  * Note: this is very similar '@polkadot/util-crypto/address/checkAddress,
- * except it does not check the prefix.
+ * except it does not check the ss58 prefix and supports H256/H160 raw address.
  *
- * @param address potential ss58 address
+ * @param address potential ss58 or raw address
  */
 function checkAddress(address: string): [boolean, string | undefined] {
-	let decoded;
-
-	try {
-		decoded = base58Decode(address);
-	} catch (error) {
-		return [false, (error as Error).message];
+	let u8Address;
+
+	if (isHex(address)) {
+		u8Address = Uint8Array.from(Buffer.from(address.slice(2), 'hex'));
+	} else {
+		try {
+			u8Address = base58Decode(address);
+		} catch (error) {
+			return [false, (error as Error).message];
+		}
 	}
 
-	if (!defaults.allowedEncodedLengths.includes(decoded.length)) {
-		return [false, 'Invalid decoded address length'];
+	if (defaults.allowedEncodedLengths.includes(u8Address.length)) {
+		const [isValid] = checkAddressChecksum(u8Address);
+
+		return [isValid, isValid ? undefined : 'Invalid decoded address checksum'];
 	}
 
-	const [isValid] = checkAddressChecksum(decoded);
+	if (isEthereumAddress(address)) {
+		return [true, undefined];
+	}
 
-	return [isValid, isValid ? undefined : 'Invalid decoded address checksum'];
+	return [false, 'Invalid address format'];
 }