Skip to content

Commit

Permalink
Merge pull request #35 from 0xProject/fix/utils/address-utils
Browse files Browse the repository at this point in the history
Fix `addressUtils.generatePseudoRandomAddress()
  • Loading branch information
dorothy-zbornak authored Apr 26, 2021
2 parents 431f685 + 003e498 commit 3234949
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
9 changes: 9 additions & 0 deletions utils/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "6.4.1",
"changes": [
{
"note": "Fix `addressUtils.generatePseudoRandomAddress()`",
"pr": 35
}
]
},
{
"version": "6.4.0",
"changes": [
Expand Down
11 changes: 3 additions & 8 deletions utils/src/address_utils.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { addHexPrefix, isValidChecksumAddress, keccak256, stripHexPrefix, toBuffer } from 'ethereumjs-util';
import { addHexPrefix, isValidChecksumAddress, stripHexPrefix } from 'ethereumjs-util';
import { hexUtils } from './hex_utils';
import * as _ from 'lodash';

import { generatePseudoRandom256BitNumber } from './random';

const BASIC_ADDRESS_REGEX = /^(0x)?[0-9a-f]{40}$/i;
const SAME_CASE_ADDRESS_REGEX = /^(0x)?([0-9a-f]{40}|[0-9A-F]{40})$/;
const ADDRESS_LENGTH = 40;
Expand All @@ -28,10 +27,6 @@ export const addressUtils = {
return addHexPrefix(_.padStart(stripHexPrefix(address), ADDRESS_LENGTH, '0'));
},
generatePseudoRandomAddress(): string {
const randomBigNum = generatePseudoRandom256BitNumber();
const randomBuff = keccak256(toBuffer(randomBigNum));
const addressLengthInBytes = 20;
const randomAddress = `0x${randomBuff.slice(0, addressLengthInBytes).toString('hex')}`;
return randomAddress;
return hexUtils.random(20);
},
};

0 comments on commit 3234949

Please sign in to comment.