Merge branch 'release-v25-protocol-defense' into deniallugo-zk-toolbo…

…x-dev
matter-labs · Sep 27, 2024 · c5fda60 · c5fda60
2 parents fc7c206 + 1fba03d
commit c5fda60
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/gas-bound-caller/package.json b/gas-bound-caller/package.json
@@ -14,7 +14,8 @@
     "ethers": "^5.7.0",
     "fast-glob": "^3.3.2",
     "hardhat": "=2.22.2",
-    "preprocess": "^3.2.0"
+    "preprocess": "^3.2.0",
+    "zksync-ethers": "^5.9.0"
   },
   "devDependencies": {
     "@matterlabs/hardhat-zksync-chai-matchers": "^0.2.0",

diff --git a/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol
@@ -339,16 +339,13 @@ contract ExperimentalBridgeTest is Test {
         bridgeHub.addToken(randomAddress);
     }
 
-    function test_addToken_cannotBeCalledByRandomAddress(
-        address randomAddress,
-        address randomCaller,
-        uint256 randomValue
-    ) public useRandomToken(randomValue) {
-        if (randomCaller != bridgeOwner) {
-            vm.prank(randomCaller);
-            vm.expectRevert(bytes("Ownable: caller is not the owner"));
-            bridgeHub.addToken(randomAddress);
-        }
+    function test_addToken_cannotBeCalledByRandomAddress(address randomAddress, address randomCaller) public {
+        vm.assume(randomCaller != bridgeOwner);
+        vm.assume(randomCaller != bridgeHub.admin());
+
+        vm.prank(randomCaller);
+        vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller));
+        bridgeHub.addToken(randomAddress);
 
         assertTrue(!bridgeHub.tokenIsRegistered(randomAddress), "This random address is not registered as a token");
 

diff --git a/l2-contracts/contracts/ConsensusRegistry.sol b/l2-contracts/contracts/ConsensusRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity 0.8.24;
 
 import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable-v4/access/Ownable2StepUpgradeable.sol";
 import {Initializable} from "@openzeppelin/contracts-upgradeable-v4/proxy/utils/Initializable.sol";

diff --git a/l2-contracts/contracts/interfaces/IConsensusRegistry.sol b/l2-contracts/contracts/interfaces/IConsensusRegistry.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.20;
+pragma solidity 0.8.24;
 
 /// @author Matter Labs
 /// @custom:security-contact [email protected]

diff --git a/system-contracts/package.json b/system-contracts/package.json
@@ -14,7 +14,8 @@
     "ethers": "^5.7.0",
     "fast-glob": "^3.3.2",
     "hardhat": "=2.22.2",
-    "preprocess": "^3.2.0"
+    "preprocess": "^3.2.0",
+    "zksync-ethers": "^5.9.0"
   },
   "devDependencies": {
     "@matterlabs/hardhat-zksync-chai-matchers": "^0.2.0",

diff --git a/system-contracts/scripts/preprocess-bootloader.ts b/system-contracts/scripts/preprocess-bootloader.ts
@@ -13,7 +13,8 @@ const preprocess = require("preprocess");
 const SYSTEM_PARAMS = require("../../SystemConfig.json");
 /* eslint-enable@typescript-eslint/no-var-requires */
 
-const OUTPUT_DIR = "contracts-preprocessed/bootloader";
+const OUTPUT_DIR_1 = "contracts-preprocessed/bootloader";
+const OUTPUT_DIR_2 = "bootloader/build";
 
 const PREPROCCESING_MODES = ["proved_batch", "playground_batch"];
 
@@ -224,20 +225,32 @@ async function main() {
   });
   const provedBootloaderWithTests = preprocess.preprocess(bootloaderWithTests, { BOOTLOADER_TYPE: "proved_batch" });
 
-  if (!existsSync(OUTPUT_DIR)) {
-    mkdirSync(OUTPUT_DIR);
+  if (!existsSync(OUTPUT_DIR_1)) {
+    mkdirSync(OUTPUT_DIR_1);
+  }
+
+  if (!existsSync(OUTPUT_DIR_2)) {
+    mkdirSync(OUTPUT_DIR_2);
   }
 
   const transferTest = readFileSync("bootloader/tests/transfer_test.yul").toString();
   const dummy = readFileSync("bootloader/tests/dummy.yul").toString();
 
-  writeFileSync(`${OUTPUT_DIR}/bootloader_test.yul`, provedBootloaderWithTests);
-  writeFileSync(`${OUTPUT_DIR}/proved_batch.yul`, provedBatchBootloader);
-  writeFileSync(`${OUTPUT_DIR}/playground_batch.yul`, playgroundBatchBootloader);
-  writeFileSync(`${OUTPUT_DIR}/gas_test.yul`, gasTestBootloader);
-  writeFileSync(`${OUTPUT_DIR}/fee_estimate.yul`, feeEstimationBootloader);
-  writeFileSync(`${OUTPUT_DIR}/dummy.yul`, dummy);
-  writeFileSync(`${OUTPUT_DIR}/transfer_test.yul`, transferTest);
+  writeFileSync(`${OUTPUT_DIR_1}/bootloader_test.yul`, provedBootloaderWithTests);
+  writeFileSync(`${OUTPUT_DIR_1}/proved_batch.yul`, provedBatchBootloader);
+  writeFileSync(`${OUTPUT_DIR_1}/playground_batch.yul`, playgroundBatchBootloader);
+  writeFileSync(`${OUTPUT_DIR_1}/gas_test.yul`, gasTestBootloader);
+  writeFileSync(`${OUTPUT_DIR_1}/fee_estimate.yul`, feeEstimationBootloader);
+  writeFileSync(`${OUTPUT_DIR_1}/dummy.yul`, dummy);
+  writeFileSync(`${OUTPUT_DIR_1}/transfer_test.yul`, transferTest);
+
+  writeFileSync(`${OUTPUT_DIR_2}/bootloader_test.yul`, provedBootloaderWithTests);
+  writeFileSync(`${OUTPUT_DIR_2}/proved_batch.yul`, provedBatchBootloader);
+  writeFileSync(`${OUTPUT_DIR_2}/playground_batch.yul`, playgroundBatchBootloader);
+  writeFileSync(`${OUTPUT_DIR_2}/gas_test.yul`, gasTestBootloader);
+  writeFileSync(`${OUTPUT_DIR_2}/fee_estimate.yul`, feeEstimationBootloader);
+  writeFileSync(`${OUTPUT_DIR_2}/dummy.yul`, dummy);
+  writeFileSync(`${OUTPUT_DIR_2}/transfer_test.yul`, transferTest);
 
   console.log("Bootloader preprocessing done!");
 }