Commit 5e815e22 authored by Maurelian's avatar Maurelian

contracts-bedrock: fix init tests

parent 1be5a875
This diff is collapsed.
......@@ -68,8 +68,8 @@
"sourceCodeHash": "0x2b9b106a924ac21d6e8f57219e7f7c72f6581ea1cfd5cff77d79a7f144f0ebd2"
},
"src/L2/L2StandardBridge.sol": {
"initCodeHash": "0xf9766fcac5424a26be6e30e7e23df1b2addf1efc176047d0340375367d271a4f",
"sourceCodeHash": "0x82b4b1274a29e755441f385162a1c47f75cbc78b0616605c3f114221558346d7"
"initCodeHash": "0x0f39bfd5d2d61018845c9e189c7a206a71e85c813eb9fc6ff37c060a0e2d1431",
"sourceCodeHash": "0x13fd1bee99da3c71addf0dd5017ea80bb560e65dfaaf7535de1f6c9c380490ad"
},
"src/L2/L2ToL1MessagePasser.sol": {
"initCodeHash": "0x08bbede75cd6dfd076903b8f04d24f82fa7881576c135825098778632e37eebc",
......
......@@ -59,7 +59,9 @@ contract L2StandardBridge is StandardBridge, ISemver {
/// @param _otherBridge Address of the L1StandardBridge.
constructor(address payable _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
/// the contract cannot be initialized a second time.
......
......@@ -103,6 +103,14 @@ contract Initializer_Test is Bridge_Initializer {
initializedSlotVal: deploy.loadInitializedSlot("ProtocolVersions", true)
})
);
// L2CrossDomainMessenger
contracts.push(
InitializeableContract({
target: address(l2CrossDomainMessenger),
initCalldata: abi.encodeCall(l2CrossDomainMessenger.initialize, ()),
initializedSlotVal: deploy.loadInitializedSlot("L2CrossDomainMessenger", false)
})
);
// L1StandardBridge
contracts.push(
InitializeableContract({
......@@ -111,12 +119,12 @@ contract Initializer_Test is Bridge_Initializer {
initializedSlotVal: deploy.loadInitializedSlot("L1StandardBridge", true)
})
);
// L2CrossDomainMessenger
// L2StandardBridge
contracts.push(
InitializeableContract({
target: address(l2CrossDomainMessenger),
initCalldata: abi.encodeCall(l2CrossDomainMessenger.initialize, ()),
initializedSlotVal: deploy.loadInitializedSlot("L2CrossDomainMessenger", false)
target: address(l2StandardBridge),
initCalldata: abi.encodeCall(l2StandardBridge.initialize, ()),
initializedSlotVal: deploy.loadInitializedSlot("L2StandardBridge", false)
})
);
// L1ERC721Bridge
......@@ -149,7 +157,12 @@ contract Initializer_Test is Bridge_Initializer {
// Attempt to re-initialize all contracts within the `contracts` array.
for (uint256 i; i < contracts.length; 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.
assertEq(_contract.initializedSlotVal, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment