Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 10 commits into from
Jul 27, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
9 changes: 8 additions & 1 deletion src/middleware/validate/validateAddressMiddleware.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
{
Expand All @@ -97,7 +104,7 @@ describe('validateAddressMiddleware', () => {
address: 'y9EMHt34JJo4rWLSaxoLGdYXvjgSXEd4zHUnQgfNzwES8b',
},
} as unknown as Request,
new BadRequest('Invalid decoded address length')
new BadRequest('Invalid encoded address length')
);

errorsWith(
Expand Down
14 changes: 12 additions & 2 deletions src/middleware/validate/validateAddressMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ 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.
crystalin marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -35,11 +35,21 @@ function checkAddress(address: string): [boolean, string | undefined] {
try {
decoded = base58Decode(address);
crystalin marked this conversation as resolved.
Show resolved Hide resolved
} catch (error) {
// If ss58 doesn't pass, we try H160 address.
if (address.startsWith('0x')) {
decoded = Uint8Array.from(Buffer.from(address.slice(2), 'hex'));
crystalin marked this conversation as resolved.
Show resolved Hide resolved

if (decoded.length != 20) {
return [false, `Invalid decoded address length ${decoded.length} for H160 account`];
}
crystalin marked this conversation as resolved.
Show resolved Hide resolved

return [true, undefined];
}
return [false, (error as Error).message];
}

if (!defaults.allowedEncodedLengths.includes(decoded.length)) {
return [false, 'Invalid decoded address length'];
return [false, `Invalid encoded address length`];
}

const [isValid] = checkAddressChecksum(decoded);
Expand Down