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

Add Strings.toString for signed integers #3773

Merged
merged 19 commits into from
Dec 28, 2022
Merged

Add Strings.toString for signed integers #3773

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f5f64e3
Add toString(int256) function (OpenZeppelin#3758)
galadd Oct 19, 2022
411d984
Add test for toString(int256) (OpenZeppelin#3758)
galadd Oct 19, 2022
8f58df2
Add test for toString(int256) (OpenZeppelin#3758)
galadd Oct 19, 2022
4d2dfab
Add toString(int256) function (OpenZeppelin#3758)
galadd Oct 21, 2022
49abefd
Add toString(int256) function (OpenZeppelin#3758)
galadd Oct 21, 2022
c966e04
Add toString(int256) function (OpenZeppelin#3758)
galadd Oct 23, 2022
85cae54
Update Strings.sol
Amxx Oct 24, 2022
9470ada
Update Strings.sol
Amxx Oct 24, 2022
e2e2451
Merge branch 'OpenZeppelin:master' into feature/String-operation-for-…
galadd Oct 26, 2022
256306f
Update Strings.test.js
Amxx Oct 26, 2022
da80fa2
Update Strings.test.js
Amxx Oct 26, 2022
d73194e
Update Strings.test.js
Amxx Oct 26, 2022
df938d5
Update Strings.test.js
Amxx Oct 26, 2022
a947a64
Update Strings.test.js
Amxx Oct 26, 2022
6a2bfca
fix tests
frangio Dec 28, 2022
227d807
simplify tests
frangio Dec 28, 2022
36ffbbe
Merge remote-tracking branch 'upstream/master' into feature/String-op…
frangio Dec 28, 2022
2fc8b4f
update changelog
frangio Dec 28, 2022
0499b2f
reorder tests
frangio Dec 28, 2022
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
8 changes: 8 additions & 0 deletions contracts/utils/Strings.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
pragma solidity ^0.8.0;

import "./math/Math.sol";
import "./math/SignedMath.sol";

/**
* @dev String operations.
Expand Down Expand Up @@ -37,6 +38,13 @@ library Strings {
}
}

/**
* @dev Converts a `int256` to its ASCII `string` decimal representation.
*/
function toString(int256 value) internal pure returns (string memory) {
return string(abi.encodePacked(value < 0 ? "-" : "", toString(SignedMath.abs(value))));
}

/**
* @dev Converts a `uint256` to its ASCII `string` hexadecimal representation.
*/
Expand Down
22 changes: 17 additions & 5 deletions test/utils/Strings.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,24 @@ contract('Strings', function (accounts) {
'12345678901234567890123456789012345678901234567890',
'123456789012345678901234567890123456789012345678901234567890',
'1234567890123456789012345678901234567890123456789012345678901234567890',
].reduce((acc, value) => Object.assign(acc, { [value]: new BN(value) }), {
MAX_UINT256: constants.MAX_UINT256.toString(),
].reduce((acc, value) => Object.assign(acc, { [value]: new BN(value), [-value]: new BN(-value) }), {
frangio marked this conversation as resolved.
Show resolved Hide resolved
MIN_INT256: constants.MIN_INT256,
MAX_INT256: constants.MAX_INT256,
MAX_UINT256: constants.MAX_UINT256,
}))) {
it(`converts ${key}`, async function () {
expect(await this.strings.methods['toString(uint256)'](value)).to.equal(value.toString(10));
});
// only numbers in the [0, 2**256-1] range
if (value.gten(0) && value.lte(constants.MAX_UINT256)) {
it(`converts ${key} as uint256`, async function () {
expect(await this.strings.methods['toString(uint256)'](value)).to.equal(value.toString(10));
});
}

// only numbers in the [-2**255, 2**255-1] range
if (value.gte(constants.MIN_INT256) && value.lte(constants.MAX_INT256)) {
it(`convert ${key} as int256`, async function () {
expect(await this.strings.methods['toString(int256)'](value)).to.equal(value.toString(10));
});
}
}
});

Expand Down