Skip to content

Commit 643f31f

Browse files
committed
Merge remote-tracking branch 'origin/main' into 2026-08-16-issue-80
# Conflicts: # test/src/lib/LibCodeGen.addressConstantString.t.sol # test/src/lib/LibCodeGen.bytes32ConstantString.t.sol # test/src/lib/LibCodeGen.bytesConstantString.t.sol # test/src/lib/LibCodeGen.describedByMetaHashConstantString.t.sol # test/src/lib/LibCodeGen.requireIdentifier.t.sol # test/src/lib/LibCodeGen.uint8ConstantString.t.sol
2 parents c572772 + 3109352 commit 643f31f

32 files changed

Lines changed: 39 additions & 39 deletions

foundry.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cbor_metadata = false
1919

2020
evm_version = "cancun"
2121

22-
# No cheatcode in forge-std 1.16.1 creates a symlink, so the tests that pin what
22+
# No cheatcode in forge-std 1.16.2 creates a symlink, so the tests that pin what
2323
# this library does when it finds one at a generated path build it with `ln`.
2424
ffi = true
2525

@@ -39,7 +39,7 @@ tab_width = 4
3939
runs = 2048
4040

4141
[dependencies]
42-
forge-std = "1.16.1"
42+
forge-std = "1.16.2"
4343

4444
[soldeer]
4545
recursive_deps = false

remappings.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
forge-std-1.16.1/=dependencies/forge-std-1.16.1/
1+
forge-std-1.16.2/=dependencies/forge-std-1.16.2/

soldeer.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[[dependencies]]
22
name = "forge-std"
3-
version = "1.16.1"
4-
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_1_08-05-2026_08:51:16_forge-std-1.16.zip"
5-
checksum = "839b61832925c7152c7b6dffbfa4998d9e606211179bd8f604733124e8a7cb57"
6-
integrity = "60e55d10150354ca4a1e2985c5456c834b92b82ef85ab0e1d92a7786cddbd219"
3+
version = "1.16.2"
4+
url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_2_03-07-2026_07:37:45_forge-std-1.16.zip"
5+
checksum = "405dccc9d60d753f6abc412b4adf0359f4390f65dbadbbb277a12b4946ed8969"
6+
integrity = "5fb4325b60d7d4194bd0481e2f94398cf1d9c6561dd12a66fb2748ef4a68205f"

src/lib/LibCodeGen.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity ^0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66
import {IOpcodeToolingV1} from "../interface/IOpcodeToolingV1.sol";
77
import {IParserToolingV1} from "../interface/IParserToolingV1.sol";
88
import {ISubParserToolingV1} from "../interface/ISubParserToolingV1.sol";

src/lib/LibFs.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity ^0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66
import {LibCodeGen} from "./LibCodeGen.sol";
77

88
/// @dev The directory that generated contract files are written to, relative to

src/lib/LibHexString.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity ^0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66

77
/// Thrown when the `Vm` handed to `bytesToHex` does not return the string that
88
/// `toString(bytes)` is defined to return, which is "0x" followed by exactly two

test/concrete/LibFsExternal.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66
import {LibFs} from "src/lib/LibFs.sol";
77

88
/// @title LibFsExternal

test/concrete/LibHexStringExternal.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66
import {LibHexString} from "src/lib/LibHexString.sol";
77

88
/// @title LibHexStringExternal

test/lib/LibCodeGenSlow.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity ^0.8.25;
44

5-
import {Vm} from "forge-std-1.16.1/src/Vm.sol";
5+
import {Vm} from "forge-std-1.16.2/src/Vm.sol";
66

77
/// @dev `forge fmt`'s own `line_length` default. Written out here rather than
88
/// imported from `LibCodeGen` so that this reference does not move when the

test/src/interface/IIntegrityToolingV1.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {Test} from "forge-std-1.16.1/src/Test.sol";
5+
import {Test} from "forge-std-1.16.2/src/Test.sol";
66
import {IIntegrityToolingV1} from "src/interface/IIntegrityToolingV1.sol";
77
import {ToolingMock} from "test/concrete/ToolingMock.sol";
88

0 commit comments

Comments
 (0)