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.

Sign up for GitHub

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

util: check that hex to byte conversion is valid in hexToBytes #3185

Merged
merged 6 commits into from
Dec 12, 2023
Merged

util: check that hex to byte conversion is valid in hexToBytes #3185

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66e540c
util: check that hex to byte conversion is valid in hexToBytes
gabrocheleau Dec 9, 2023
796f316
util: add test case for invalid hex
gabrocheleau Dec 9, 2023
4ab83cc
Merge branch 'master' into util/validate-hex-in-hextobytes
acolytec3 Dec 10, 2023
3721fcc
util: add test case for invalid bytes (fails)
jochem-brouwer Dec 10, 2023
1d1749e
util: add regex
jochem-brouwer Dec 10, 2023
f2afa31
util: clarify error
jochem-brouwer Dec 10, 2023
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
3 changes: 3 additions & 0 deletions packages/util/src/bytes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ export const hexToBytes = (hex: string): Uint8Array => {
const bytes = new Uint8Array(byteLen)
for (let i = 0; i < byteLen; i++) {
const byte = parseInt(hex.slice(i * 2, (i + 1) * 2), 16)
if (Number.isNaN(byte)) {
throw 'Invalid hex'
}
bytes[i] = byte
}
return bytes
Expand Down
7 changes: 7 additions & 0 deletions packages/util/test/bytes.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,13 @@ describe('hexToBytes', () => {
hexToBytes('aabbcc112233')
})
})

it('should throw on invalid hex', () => {
assert.throws(() => {
hexToBytes('0xinvalidhexstring')
})
})

it('should convert prefixed hex-strings', () => {
const converted = hexToBytes('0x1')
assert.deepEqual(converted, new Uint8Array([1]))
Expand Down
Loading