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

Fix towei scientific notation #6908

Merged
merged 28 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from 22 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
7 changes: 6 additions & 1 deletion packages/web3-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,10 @@ Documentation:

### Fixed

- `toWei` support numbers in scientific notation (#6908)
- fixed toHex incorrectly hexing Uint8Arrays and Buffer (#6957)
- fixed isUint8Array not returning true for Buffer
- fixed isUint8Array not returning true for Buffer (#6957)

### Added

- `toWei` add warning when using large numbers or large decimals that may cause precision loss (#6908)
20 changes: 18 additions & 2 deletions packages/web3-utils/src/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export const ethUnitMap = {
tether: BigInt('1000000000000000000000000000000'),
};

const PrecisionLossWarning = 'Warning: Using type `number` with values that are large or contain many decimals may cause loss of precision, it is recommended to use type `string` or `BigInt` when using conversion methods';

export type EtherUnits = keyof typeof ethUnitMap;
/**
* Convert a value from bytes to Uint8Array
Expand Down Expand Up @@ -415,7 +417,8 @@ export const toHex = (
*/
export const toNumber = (value: Numbers): number | bigint => {
if (typeof value === 'number') {
if (value > 1e+20) {
if (value > 1e+20) {
console.warn(PrecisionLossWarning)
// JavaScript converts numbers >= 10^21 to scientific notation when coerced to strings,
// leading to potential parsing errors and incorrect representations.
// For instance, String(10000000000000000000000) yields '1e+22'.
Expand Down Expand Up @@ -555,17 +558,30 @@ export const toWei = (number: Numbers, unit: EtherUnits): string => {
if (!denomination) {
throw new InvalidUnitError(unit);
}
let parsedNumber = number;
if (typeof parsedNumber === 'number'){
if (parsedNumber < 1e-15){
console.warn(PrecisionLossWarning)
}
Comment on lines +563 to +565
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wondering, why this is no need to call parsedNumber = BigInt(parsedNumber); here similar to the logic for parsedNumber < 1e-15?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Large decimal numbers values become scientific notation (for example 1e-15) and scientific notation is not accepted by BigInt. On line 573 we will convert the number to a string, so there is no need to convert to a bigint

if (parsedNumber > 1e+20) {
console.warn(PrecisionLossWarning)

parsedNumber = BigInt(parsedNumber);
}
}

parsedNumber = typeof number === 'number' ? number.toLocaleString('fullwide', {useGrouping: false, maximumFractionDigits: 20}) : number;
luu-alex marked this conversation as resolved.
Show resolved Hide resolved
// if value is decimal e.g. 24.56 extract `integer` and `fraction` part
// to avoid `fraction` to be null use `concat` with empty string
const [integer, fraction] = String(
typeof number === 'string' && !isHexStrict(number) ? number : toNumber(number),
typeof parsedNumber === 'string' && !isHexStrict(parsedNumber) ? parsedNumber : toNumber(parsedNumber),
)
.split('.')
.concat('');

// join the value removing `.` from
// 24.56 -> 2456

const value = BigInt(`${integer}${fraction}`);

// multiply value with denomination
Expand Down
14 changes: 13 additions & 1 deletion packages/web3-utils/test/fixtures/converters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,21 @@ export const fromWeiValidData: [[Numbers, EtherUnits], string][] = [
[[1.9999999999999991611392e+22, 'ether'], '19999.999999999991611392'],
];

export const toWeiValidData: [[Numbers, EtherUnits], string][] = [
export const toWeiValidData: [[Numbers, EtherUnits], Numbers][] = [
...conversionBaseData,
[['255', 'wei'], '0xFF'],
[['255', 'wei'], '0xFF'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is doublicate. Was it meant to have differnt values? Or, should this be deleted?

[['100000000000', 'ether'], 0.0000001],
[['1000000000', 'ether'], 0.000000001],
[['1000000', 'ether'], 0.000000000001]

];

export const toWeiValidDataWarnings: [[Numbers, EtherUnits], string][] = [
[[0.0000000000000000000001, 'ether'], 'Warning: Using type `number` with values that are large or contain many decimals may cause loss of precision, it is recommended to use type `string` or `BigInt` when using conversion methods'],
[[0.0000000000000000000001, 'ether'], 'Warning: Using type `number` with values that are large or contain many decimals may cause loss of precision, it is recommended to use type `string` or `BigInt` when using conversion methods'],
[[1999999000000009900000, 'kwei'], 'Warning: Using type `number` with values that are large or contain many decimals may cause loss of precision, it is recommended to use type `string` or `BigInt` when using conversion methods'],

];

export const fromWeiInvalidData: [[any, any], string][] = [
Expand Down
14 changes: 14 additions & 0 deletions packages/web3-utils/test/unit/converters.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import {
toHexInvalidData,
toWeiInvalidData,
toWeiValidData,
toWeiValidDataWarnings,
utf8ToHexInvalidData,
utf8ToHexValidData,
toCheckSumValidData,
Expand Down Expand Up @@ -365,6 +366,19 @@ describe('converters', () => {
expect(() => toWei(input[0], input[1])).toThrow(output);
});
});
describe('test console warnings', () => {
beforeEach(() => {
jest.spyOn(console, 'warn').mockImplementation(() => {
// do nothing
});
});
it.each(toWeiValidDataWarnings)('%s', (input, output) => {
toWei(input[0], input[1]);
// expect(() => toWei(input[0], input[1])).toThrow(output);
expect(console.warn).toHaveBeenCalledWith(output)
});

})
});
describe('toChecksumAddress', () => {
describe('valid cases', () => {
Expand Down
Loading