Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
b4429a4a
Commit
b4429a4a
authored
Mar 22, 2023
by
clabby
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: Bump `forge` & `forge-std`; Use new `expectSafeMemory` cheatcode.
parent
3b267e56
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
Dockerfile
ops/docker/ci-builder/Dockerfile
+1
-1
Bytes.t.sol
packages/contracts-bedrock/contracts/test/Bytes.t.sol
+9
-4
package.json
packages/contracts-bedrock/package.json
+1
-1
yarn.lock
yarn.lock
+4
-4
No files found.
ops/docker/ci-builder/Dockerfile
View file @
b4429a4a
...
@@ -16,7 +16,7 @@ WORKDIR /opt/foundry
...
@@ -16,7 +16,7 @@ WORKDIR /opt/foundry
# Only diff from upstream docker image is this clone instead
# Only diff from upstream docker image is this clone instead
# of COPY. We select a specific commit to use.
# of COPY. We select a specific commit to use.
RUN
git clone https://github.com/foundry-rs/foundry.git
.
\
RUN
git clone https://github.com/foundry-rs/foundry.git
.
\
&&
git checkout
8f3fca9c608d58981daaffe11e7f8076644cb753
&&
git checkout
da2392e58bb8a7fefeba46b40c4df1afad8ccd22
RUN
source
$HOME
/.profile
&&
\
RUN
source
$HOME
/.profile
&&
\
cargo build
--release
&&
\
cargo build
--release
&&
\
...
...
packages/contracts-bedrock/contracts/test/Bytes.t.sol
View file @
b4429a4a
...
@@ -139,16 +139,20 @@ contract Bytes_slice_Test is Test {
...
@@ -139,16 +139,20 @@ contract Bytes_slice_Test is Test {
vm.assume(_length <= _input.length - _start);
vm.assume(_length <= _input.length - _start);
// Grab the free memory pointer before the slice operation
// Grab the free memory pointer before the slice operation
uint
256
initPtr;
uint
64
initPtr;
assembly {
assembly {
initPtr := mload(0x40)
initPtr := mload(0x40)
}
}
uint64 expectedPtr = uint64(initPtr + 0x20 + ((_length + 0x1f) & ~uint256(0x1f)));
// Ensure that all memory outside of the expected range is safe.
vm.expectSafeMemory(initPtr, expectedPtr);
// Slice the input bytes array from `_start` to `_start + _length`
// Slice the input bytes array from `_start` to `_start + _length`
bytes memory slice = Bytes.slice(_input, _start, _length);
bytes memory slice = Bytes.slice(_input, _start, _length);
// Grab the free memory pointer after the slice operation
// Grab the free memory pointer after the slice operation
uint
256
finalPtr;
uint
64
finalPtr;
assembly {
assembly {
finalPtr := mload(0x40)
finalPtr := mload(0x40)
}
}
...
@@ -165,10 +169,11 @@ contract Bytes_slice_Test is Test {
...
@@ -165,10 +169,11 @@ contract Bytes_slice_Test is Test {
// Note that we use a slightly less efficient, but equivalent method of rounding
// Note that we use a slightly less efficient, but equivalent method of rounding
// up `_length` to the next multiple of 32 than is used in the `slice` function.
// up `_length` to the next multiple of 32 than is used in the `slice` function.
// This is to diff test the method used in `slice`.
// This is to diff test the method used in `slice`.
assertEq(finalPtr, initPtr + 0x20 + (((_length + 0x1F) >> 5) << 5));
uint64 _expectedPtr = uint64(initPtr + 0x20 + (((_length + 0x1F) >> 5) << 5));
assertEq(finalPtr, _expectedPtr);
// Sanity check for equivalence of the rounding methods.
// Sanity check for equivalence of the rounding methods.
assertEq(
((_length + 0x1F) >> 5) << 5, (_length + 0x1F) & ~uint256(0x1F)
);
assertEq(
_expectedPtr, expectedPtr
);
}
}
// The slice length should be equal to `_length`
// The slice length should be equal to `_length`
...
...
packages/contracts-bedrock/package.json
View file @
b4429a4a
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
"dotenv"
:
"^16.0.0"
,
"dotenv"
:
"^16.0.0"
,
"ds-test"
:
"https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5"
,
"ds-test"
:
"https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5"
,
"ethereum-waffle"
:
"^3.0.0"
,
"ethereum-waffle"
:
"^3.0.0"
,
"forge-std"
:
"https://github.com/foundry-rs/forge-std.git#
fd86115ed6aba8e234ee0fb86c12fe35eff0b2a
0"
,
"forge-std"
:
"https://github.com/foundry-rs/forge-std.git#
46264e9788017fc74f9f58b7efa0bc6e1df6d41
0"
,
"glob"
:
"^7.1.6"
,
"glob"
:
"^7.1.6"
,
"hardhat-deploy"
:
"^0.11.4"
,
"hardhat-deploy"
:
"^0.11.4"
,
"solhint"
:
"^3.3.7"
,
"solhint"
:
"^3.3.7"
,
...
...
yarn.lock
View file @
b4429a4a
...
@@ -11471,14 +11471,14 @@ forever-agent@~0.6.1:
...
@@ -11471,14 +11471,14 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
"forge-std@https://github.com/foundry-rs/forge-std.git#46264e9788017fc74f9f58b7efa0bc6e1df6d410":
version "1.5.2"
resolved "https://github.com/foundry-rs/forge-std.git#46264e9788017fc74f9f58b7efa0bc6e1df6d410"
"forge-std@https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02":
"forge-std@https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02":
version "1.2.0"
version "1.2.0"
resolved "https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02"
resolved "https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02"
"forge-std@https://github.com/foundry-rs/forge-std.git#fd86115ed6aba8e234ee0fb86c12fe35eff0b2a0":
version "1.4.0"
resolved "https://github.com/foundry-rs/forge-std.git#fd86115ed6aba8e234ee0fb86c12fe35eff0b2a0"
form-data@^2.2.0:
form-data@^2.2.0:
version "2.5.1"
version "2.5.1"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment