Merge pull request #714 from matter-labs/sb-fix-sl-stable

Fix sync layer stable stable
matter-labs · Aug 19, 2024 · d50bf31 · d50bf31
2 parents 859eed8 + fa16bcb
commit d50bf31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol b/l1-contracts/contracts/dev-contracts/DummyL1ERC20Bridge.sol
@@ -9,8 +9,9 @@ import {IL1NativeTokenVault} from "../bridge/interfaces/IL1NativeTokenVault.sol"
 contract DummyL1ERC20Bridge is L1ERC20Bridge {
     constructor(
         IL1AssetRouter _l1SharedBridge,
-        IL1NativeTokenVault _l1NativeTokenVault
-    ) L1ERC20Bridge(_l1SharedBridge, _l1NativeTokenVault, 1) {}
+        IL1NativeTokenVault _l1NativeTokenVault,
+        uint256 _eraChainId
+    ) L1ERC20Bridge(_l1SharedBridge, _l1NativeTokenVault, _eraChainId) {}
 
     function setValues(address _l2SharedBridge, address _l2TokenBeacon, bytes32 _l2TokenProxyBytecodeHash) external {
         l2Bridge = _l2SharedBridge;

diff --git a/l1-contracts/scripts/setup-legacy-bridge-era.ts b/l1-contracts/scripts/setup-legacy-bridge-era.ts
@@ -116,7 +116,8 @@ async function main() {
       console.log("l2TokenBytecodeHash:", ethers.utils.hexlify(l2TokenBytecodeHash));
 
       // set storage values
-      const tx = await dummyBridge.setValues(l2SharedBridgeAddress, l2TokenBeacon, l2TokenBytecodeHash);
+      // FIXME(EVM-716): we provide the `L2NativeTokenVaultAddress` as the "shared bridge value" as it is only used for calculating of L2 token addresses.
+      const tx = await dummyBridge.setValues(L2NativeTokenVaultAddress, l2TokenBeacon, l2TokenBytecodeHash);
       await tx.wait();
 
       console.log("Set storage values for TestERC20Bridge");