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
5e815e22
Unverified
Commit
5e815e22
authored
Dec 06, 2023
by
Maurelian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: fix init tests
parent
1be5a875
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
10 deletions
+25
-10
l2standardbridge.go
op-bindings/bindings/l2standardbridge.go
+1
-1
l2standardbridge_more.go
op-bindings/bindings/l2standardbridge_more.go
+1
-1
semver-lock.json
packages/contracts-bedrock/semver-lock.json
+2
-2
L2StandardBridge.sol
packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+3
-1
Initializable.t.sol
packages/contracts-bedrock/test/vendor/Initializable.t.sol
+18
-5
No files found.
op-bindings/bindings/l2standardbridge.go
View file @
5e815e22
This diff is collapsed.
Click to expand it.
op-bindings/bindings/l2standardbridge_more.go
View file @
5e815e22
This diff is collapsed.
Click to expand it.
packages/contracts-bedrock/semver-lock.json
View file @
5e815e22
...
@@ -68,8 +68,8 @@
...
@@ -68,8 +68,8 @@
"sourceCodeHash"
:
"0x2b9b106a924ac21d6e8f57219e7f7c72f6581ea1cfd5cff77d79a7f144f0ebd2"
"sourceCodeHash"
:
"0x2b9b106a924ac21d6e8f57219e7f7c72f6581ea1cfd5cff77d79a7f144f0ebd2"
},
},
"src/L2/L2StandardBridge.sol"
:
{
"src/L2/L2StandardBridge.sol"
:
{
"initCodeHash"
:
"0x
f9766fcac5424a26be6e30e7e23df1b2addf1efc176047d0340375367d271a4f
"
,
"initCodeHash"
:
"0x
0f39bfd5d2d61018845c9e189c7a206a71e85c813eb9fc6ff37c060a0e2d1431
"
,
"sourceCodeHash"
:
"0x
82b4b1274a29e755441f385162a1c47f75cbc78b0616605c3f114221558346d7
"
"sourceCodeHash"
:
"0x
13fd1bee99da3c71addf0dd5017ea80bb560e65dfaaf7535de1f6c9c380490ad
"
},
},
"src/L2/L2ToL1MessagePasser.sol"
:
{
"src/L2/L2ToL1MessagePasser.sol"
:
{
"initCodeHash"
:
"0x08bbede75cd6dfd076903b8f04d24f82fa7881576c135825098778632e37eebc"
,
"initCodeHash"
:
"0x08bbede75cd6dfd076903b8f04d24f82fa7881576c135825098778632e37eebc"
,
...
...
packages/contracts-bedrock/src/L2/L2StandardBridge.sol
View file @
5e815e22
...
@@ -59,7 +59,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
...
@@ -59,7 +59,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
/// @param _otherBridge Address of the L1StandardBridge.
/// @param _otherBridge Address of the L1StandardBridge.
constructor(address payable _otherBridge)
constructor(address payable _otherBridge)
StandardBridge(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER), _otherBridge)
StandardBridge(payable(Predeploys.L2_CROSS_DOMAIN_MESSENGER), _otherBridge)
{ }
{
initialize();
}
/// @notice Initializes the contract. This is a noop in the implementation but included to ensure that
/// @notice Initializes the contract. This is a noop in the implementation but included to ensure that
/// the contract cannot be initialized a second time.
/// the contract cannot be initialized a second time.
...
...
packages/contracts-bedrock/test/vendor/Initializable.t.sol
View file @
5e815e22
...
@@ -103,6 +103,14 @@ contract Initializer_Test is Bridge_Initializer {
...
@@ -103,6 +103,14 @@ contract Initializer_Test is Bridge_Initializer {
initializedSlotVal: deploy.loadInitializedSlot("ProtocolVersions", true)
initializedSlotVal: deploy.loadInitializedSlot("ProtocolVersions", true)
})
})
);
);
// L2CrossDomainMessenger
contracts.push(
InitializeableContract({
target: address(l2CrossDomainMessenger),
initCalldata: abi.encodeCall(l2CrossDomainMessenger.initialize, ()),
initializedSlotVal: deploy.loadInitializedSlot("L2CrossDomainMessenger", false)
})
);
// L1StandardBridge
// L1StandardBridge
contracts.push(
contracts.push(
InitializeableContract({
InitializeableContract({
...
@@ -111,12 +119,12 @@ contract Initializer_Test is Bridge_Initializer {
...
@@ -111,12 +119,12 @@ contract Initializer_Test is Bridge_Initializer {
initializedSlotVal: deploy.loadInitializedSlot("L1StandardBridge", true)
initializedSlotVal: deploy.loadInitializedSlot("L1StandardBridge", true)
})
})
);
);
// L2
CrossDomainMessenger
// L2
StandardBridge
contracts.push(
contracts.push(
InitializeableContract({
InitializeableContract({
target: address(l2
CrossDomainMessenger
),
target: address(l2
StandardBridge
),
initCalldata: abi.encodeCall(l2
CrossDomainMessenger
.initialize, ()),
initCalldata: abi.encodeCall(l2
StandardBridge
.initialize, ()),
initializedSlotVal: deploy.loadInitializedSlot("L2
CrossDomainMessenger
", false)
initializedSlotVal: deploy.loadInitializedSlot("L2
StandardBridge
", false)
})
})
);
);
// L1ERC721Bridge
// L1ERC721Bridge
...
@@ -149,7 +157,12 @@ contract Initializer_Test is Bridge_Initializer {
...
@@ -149,7 +157,12 @@ contract Initializer_Test is Bridge_Initializer {
// Attempt to re-initialize all contracts within the `contracts` array.
// Attempt to re-initialize all contracts within the `contracts` array.
for (uint256 i; i < contracts.length; i++) {
for (uint256 i; i < contracts.length; i++) {
InitializeableContract memory _contract = contracts[i];
InitializeableContract memory _contract = contracts[i];
uint256 size;
address target = _contract.target;
assembly {
size := extcodesize(target)
}
console.log(size);
// Assert that the contract is already initialized.
// Assert that the contract is already initialized.
assertEq(_contract.initializedSlotVal, 1);
assertEq(_contract.initializedSlotVal, 1);
...
...
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