fixes

matter-labs · Dec 17, 2024 · 3ea5878 · 3ea5878
1 parent d4af332
commit 3ea5878
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 787 deletions.
diff --git a/l1-contracts/contracts/upgrades/GatewayUpgrade.sol b/l1-contracts/contracts/upgrades/GatewayUpgrade.sol
@@ -11,10 +11,22 @@ import {PriorityQueue} from "../state-transition/libraries/PriorityQueue.sol";
 import {PriorityTree} from "../state-transition/libraries/PriorityTree.sol";
 
 import {IGatewayUpgrade} from "./IGatewayUpgrade.sol";
+import {IL2ContractDeployer} from "../common/interfaces/IL2ContractDeployer.sol";
 import {IL1SharedBridgeLegacy} from "../bridge/interfaces/IL1SharedBridgeLegacy.sol";
 
 import {IBridgehub} from "../bridgehub/IBridgehub.sol";
 
+// solhint-disable-next-line gas-struct-packing
+struct GatewayUpgradeEncodedInput {
+    IL2ContractDeployer.ForceDeployment[] forceDeployments;
+    uint256 l2GatewayUpgradePosition;
+    bytes fixedForceDeploymentsData;
+    address ctmDeployer;
+    address oldValidatorTimelock;
+    address newValidatorTimelock;
+    address wrappedBaseTokenStore;
+}
+
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
 /// @notice This upgrade will be used to migrate Era to be part of the ZK chain ecosystem contracts.

diff --git a/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol b/l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol
@@ -46,11 +46,6 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis {
         {
             bytes memory complexUpgraderCalldata;
             {
-                bytes memory additionalForceDeploymentsData = L1GatewayHelper.getZKChainSpecificForceDeploymentsData(
-                    s,
-                    address(0),
-                    baseTokenAddress
-                );
                 bytes memory l2GenesisUpgradeCalldata = abi.encodeCall(
                     IL2GenesisUpgrade.genesisUpgrade,
                     (_chainId, _l1CtmDeployerAddress, _forceDeploymentsData)

diff --git a/l1-contracts/src.ts/deploy.ts b/l1-contracts/src.ts/deploy.ts
@@ -212,13 +212,6 @@ export class Deployer {
       l2SharedBridgeLegacyImpl: ethers.constants.AddressZero,
       l2BridgedStandardERC20Impl: ethers.constants.AddressZero,
     };
-    const messageRootDeployment = {
-      bytecodeHash: ethers.utils.hexlify(hashL2Bytecode(messageRootZKBytecode)),
-      newAddress: L2_MESSAGE_ROOT_ADDRESS,
-      callConstructor: true,
-      value: 0,
-      input: ethers.utils.defaultAbiCoder.encode(["address"], [L2_BRIDGEHUB_ADDRESS]),
-    };
 
     return ethers.utils.defaultAbiCoder.encode([FIXED_FORCE_DEPLOYMENTS_DATA_ABI_STRING], [fixedForceDeploymentsData]);
   }

diff --git a/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol b/l1-contracts/test/foundry/l1/integration/AssetRouterTest.t.sol
@@ -89,8 +89,8 @@ contract AssetRouterTest is L1ContractDeployer, ZKChainDeployer, TokenDeployer,
         l2TokenAssetId = DataEncoding.encodeNTVAssetId(chainId, _tokenAddress);
         bytes memory transferData = DataEncoding.encodeBridgeMintData({
             _originalCaller: ETH_TOKEN_ADDRESS,
-            _remoteReceiver: address(this),
-            _originToken: ETH_TOKEN_ADDRESS,
+            _l2Receiver: address(this),
+            _l1Token: ETH_TOKEN_ADDRESS,
             _amount: 100,
             _erc20Metadata: BridgeHelper.getERC20Getters(_tokenAddress, chainId)
         });

diff --git a/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol b/l1-contracts/test/foundry/l1/integration/GatewayTests.t.sol
diff --git a/...racts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol b/...racts/test/foundry/l1/unit/concrete/state-transition/ChainTypeManager/RevertBatches.t.sol
@@ -89,7 +89,7 @@ contract revertBatchesTest is ChainTypeManagerTest {
             {
                 bytes memory l2GenesisUpgradeCalldata = abi.encodeCall(
                     IL2GenesisUpgrade.genesisUpgrade,
-                    (chainId, l1CtmDeployer, forceDeploymentsData, "0x")
+                    (chainId, l1CtmDeployer, forceDeploymentsData)
                 );
                 complexUpgraderCalldata = abi.encodeCall(
                     IComplexUpgrader.upgrade,