Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion .github/workflows/pr-assessment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ on:
pull_request:
types:
- closed

jobs:
assess-pr-size-on-merge:
uses: rainlanguage/github-chore/.github/workflows/pr-assessment.yml@main
Expand Down
6 changes: 3 additions & 3 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ evm_version = "cancun"
fuzz.runs = 1024

[dependencies]
forge-std = "1.16.1"
"@openzeppelin-contracts" = "5.6.1"
forge-std = "1.17.0"
"@openzeppelin-contracts" = "5.7.0"
"rain-math-saturating" = "0.1.10"
"rain-string" = "0.2.0"
"rain-string" = "0.3.9"

[soldeer]
recursive_deps = false
6 changes: 3 additions & 3 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.6.1/
forge-std-1.16.1/=dependencies/forge-std-1.16.1/
@openzeppelin-contracts-5.7.0/=dependencies/@openzeppelin-contracts-5.7.0/
forge-std-1.17.0/=dependencies/forge-std-1.17.0/
rain-math-saturating-0.1.10/=dependencies/rain-math-saturating-0.1.10/
rain-string-0.2.0/=dependencies/rain-string-0.2.0/
rain-string-0.3.9/=dependencies/rain-string-0.3.9/
24 changes: 12 additions & 12 deletions soldeer.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[[dependencies]]
name = "@openzeppelin-contracts"
version = "5.6.1"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_6_1_15-03-2026_09:19:50_contracts.zip"
checksum = "a3b6bc661be858c7c27f60a1708cbebe8c71034b4cc1e9fe270d0a05b069352f"
integrity = "bce03af7ada1eee21a7fff393f238bcd7cd75a022a4db55ffb6b0dbb32433d35"
version = "5.7.0"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_7_0_29-07-2026_19:34:46_contracts.zip"
checksum = "fe08a24bc34334b2976c6ad69a0d74bdfa63de8a5c8528579060f25a11fb5cd5"
integrity = "3e13bc4d96bdef6e35f6b1e0dc0e455843a958edc597750dff20ca50295b767d"

[[dependencies]]
name = "forge-std"
version = "1.16.1"
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_1_08-05-2026_08:51:16_forge-std-1.16.zip"
checksum = "839b61832925c7152c7b6dffbfa4998d9e606211179bd8f604733124e8a7cb57"
integrity = "60e55d10150354ca4a1e2985c5456c834b92b82ef85ab0e1d92a7786cddbd219"
version = "1.17.0"
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_17_0_01-10-2026_10:59:49_forge-std-1.17.zip"
checksum = "a77ad38d5fbef0ec10d1f4d191698e5fbaa2bffbee5d1aced91a39da5e9b908c"
integrity = "fa706c8a7caf3426c90f75e6aafa3224b0a6c899b490800cf6944e4ec42f9344"

[[dependencies]]
name = "rain-math-saturating"
Expand All @@ -21,7 +21,7 @@ integrity = "c45986d57624470fd89d5ceaab94f8a1ae575f159a50e21d66eef2eb755bfceb"

[[dependencies]]
name = "rain-string"
version = "0.2.0"
url = "https://soldeer-revisions.s3.amazonaws.com/rain-string/0_2_0_09-05-2026_21:16:31_rain.zip"
checksum = "847b9366128c5dcc5849c6938ae7ac92561ed8185bf304f1b1eb9ef59d77954e"
integrity = "7cb6ee638b59b840ea59e014e2610fdccc30a1593e763590e298314f00700561"
version = "0.3.9"
url = "https://soldeer-revisions.s3.amazonaws.com/rain-string/0_3_9_25-08-2026_10:18:31_rain.zip"
checksum = "fbeecc1f85d4449728c600abe78667db8367df5c391591195fe3bfc6bffd868e"
integrity = "898116147f72443a8c34315abbeb9906d8a4665fdcbb39e6ad70ddd84354db53"
2 changes: 1 addition & 1 deletion src/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity ^0.8.25;

import {Math} from "@openzeppelin-contracts-5.6.1/utils/math/Math.sol";
import {Math} from "@openzeppelin-contracts-5.7.0/utils/math/Math.sol";

import {FIXED_POINT_ONE} from "./FixedPointDecimalConstants.sol";

Expand Down
6 changes: 3 additions & 3 deletions src/lib/LibFixedPointDecimalStrings.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ pragma solidity ^0.8.25;
import {FIXED_POINT_ONE} from "./FixedPointDecimalConstants.sol";
// Exported for convenience.
//forge-lint: disable-next-line(unused-import)
import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol";
import {Strings} from "@openzeppelin-contracts-5.7.0/utils/Strings.sol";
// Exported for convenience.
//forge-lint: disable-next-line(unused-import)
import {LibParseChar} from "rain-string-0.2.0/src/lib/parse/LibParseChar.sol";
import {LibParseChar} from "rain-string-0.3.9/src/lib/parse/LibParseChar.sol";
// Exported for convenience.
//forge-lint: disable-next-line(unused-import)
import {CMASK_NUMERIC_0_9, CMASK_DECIMAL_POINT} from "rain-string-0.2.0/src/lib/parse/LibParseCMask.sol";
import {CMASK_NUMERIC_0_9, CMASK_DECIMAL_POINT} from "rain-string-0.3.9/src/lib/parse/LibParseCMask.sol";

library LibFixedPointDecimalStrings {}
2 changes: 1 addition & 1 deletion src/lib/format/LibFixedPointDecimalFormat.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity ^0.8.25;

import {FIXED_POINT_ONE} from "../FixedPointDecimalConstants.sol";
import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol";
import {Strings} from "@openzeppelin-contracts-5.7.0/utils/Strings.sol";

library LibFixedPointDecimalFormat {
/// @notice Convert a fixed point decimal to a string representation.
Expand Down
8 changes: 4 additions & 4 deletions src/lib/parse/LibFixedPointDecimalParse.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ pragma solidity ^0.8.25;

import {FIXED_POINT_ONE} from "../FixedPointDecimalConstants.sol";
import {ParseDecimalPrecisionLoss, ParseDecimalInvalidString} from "../../error/ErrParse.sol";
import {LibParseDecimal} from "rain-string-0.2.0/src/lib/parse/LibParseDecimal.sol";
import {CMASK_NUMERIC_0_9, CMASK_DECIMAL_POINT, CMASK_ZERO} from "rain-string-0.2.0/src/lib/parse/LibParseCMask.sol";
import {LibParseChar} from "rain-string-0.2.0/src/lib/parse/LibParseChar.sol";
import {ParseDecimalOverflow} from "rain-string-0.2.0/src/error/ErrParse.sol";
import {LibParseDecimal} from "rain-string-0.3.9/src/lib/parse/LibParseDecimal.sol";
import {CMASK_NUMERIC_0_9, CMASK_DECIMAL_POINT, CMASK_ZERO} from "rain-string-0.3.9/src/lib/parse/LibParseCMask.sol";
import {LibParseChar} from "rain-string-0.3.9/src/lib/parse/LibParseChar.sol";
import {ParseDecimalOverflow} from "rain-string-0.3.9/src/error/ErrParse.sol";

library LibFixedPointDecimalParse {
/// Converts a decimal string to a fixed point decimal. Returns error
Expand Down
4 changes: 2 additions & 2 deletions test/src/lib/FixedPointDecimalArithmeticOpenZeppelin.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Math} from "@openzeppelin-contracts-5.6.1/utils/math/Math.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {Math} from "@openzeppelin-contracts-5.7.0/utils/math/Math.sol";

import {LibFixedPointDecimalArithmeticOpenZeppelin} from "src/lib/LibFixedPointDecimalArithmeticOpenZeppelin.sol";
import {LibWillOverflow} from "src/lib/LibWillOverflow.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {DECIMAL_MAX_SAFE_INT, FIXED_POINT_ONE} from "src/lib/FixedPointDecimalConstants.sol";
import {IntegerOverflow, ErrScaleDownPrecisionLoss} from "src/error/ErrScale.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScale.scale18.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test, stdError} from "forge-std-1.16.1/src/Test.sol";
import {Test, stdError} from "forge-std-1.17.0/src/Test.sol";
import {LibWillOverflow, FLAG_MAX_INT} from "src/lib/LibWillOverflow.sol";
import {
LibFixedPointDecimalScale,
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScale.scaleBy.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test, stdError, stdMath} from "forge-std-1.16.1/src/Test.sol";
import {Test, stdError, stdMath} from "forge-std-1.17.0/src/Test.sol";
import {FLAG_MAX_INT, FLAG_ROUND_UP, FLAG_SATURATE, LibWillOverflow} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScale.scaleDown.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {LibWillOverflow, OVERFLOW_RESCALE_OOMS} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScale.scaleDownRoundUp.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {OVERFLOW_RESCALE_OOMS} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {ErrScaleDownPrecisionLoss} from "src/error/ErrScale.sol";

Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScale.scaleUp.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test, stdError} from "forge-std-1.16.1/src/Test.sol";
import {Test, stdError} from "forge-std-1.17.0/src/Test.sol";
import {LibWillOverflow, OVERFLOW_RESCALE_OOMS} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";
import {LibWillOverflow} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScale} from "src/lib/LibFixedPointDecimalScale.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/src/lib/FixedPointDecimalScaleN.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test, stdError} from "forge-std-1.16.1/src/Test.sol";
import {Test, stdError} from "forge-std-1.17.0/src/Test.sol";
import {LibWillOverflow, FLAG_MAX_INT, FLAG_SATURATE, FLAG_ROUND_UP} from "src/lib/LibWillOverflow.sol";
import {LibFixedPointDecimalScale, FIXED_POINT_DECIMALS} from "src/lib/LibFixedPointDecimalScale.sol";
import {LibFixedPointDecimalScaleSlow} from "test/lib/LibFixedPointDecimalScaleSlow.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";

import {LibFixedPointDecimalParse} from "src/lib/parse/LibFixedPointDecimalParse.sol";
import {LibFixedPointDecimalFormat} from "src/lib/format/LibFixedPointDecimalFormat.sol";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {Test} from "forge-std-1.16.1/src/Test.sol";
import {Test} from "forge-std-1.17.0/src/Test.sol";

import {LibFixedPointDecimalParse} from "src/lib/parse/LibFixedPointDecimalParse.sol";
import {ParseDecimalInvalidString, ParseDecimalPrecisionLoss} from "src/error/ErrParse.sol";
import {ParseEmptyDecimalString, ParseDecimalOverflow} from "rain-string-0.2.0/src/error/ErrParse.sol";
import {ParseEmptyDecimalString, ParseDecimalOverflow} from "rain-string-0.3.9/src/error/ErrParse.sol";

contract LibFixedPointDecimalParseTest is Test {
function checkDecimalStringToFixedPoint(string memory value, uint256 expected) internal pure {
Expand Down
Loading