Merge branch 'dev' into ib-circuit-transfer-fix

aniann · Nov 9, 2021 · 26f6716 · 26f6716
2 parents 332abfa + 9561054
commit 26f6716
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contracts/contracts/DeployFactory.sol b/contracts/contracts/DeployFactory.sol
@@ -40,8 +40,6 @@ contract DeployFactory is TokenDeployInit {
         require(_governor != address(0), "governor check");
         require(_feeAccountAddress != address(0), "fee acc address check");
 
-        ZkSync(_zkSyncTarget).initialize(abi.encode(address(0), address(0), address(0), bytes32(0)));
-
         deployProxyContracts(_govTarget, _verifierTarget, _zkSyncTarget, _genesisRoot, _firstValidator, _governor);
 
         selfdestruct(msg.sender);

diff --git a/contracts/contracts/ZkSync.sol b/contracts/contracts/ZkSync.sol
@@ -118,6 +118,10 @@ contract ZkSync is UpgradeableMaster, Storage, Config, Events, ReentrancyGuard {
         return !exodusMode;
     }
 
+    constructor() {
+        initializeReentrancyGuard();
+    }
+
     /// @notice zkSync contract initialization. Can be external because Proxy contract intercepts illegal calls of this function.
     /// @param initializationParameters Encoded representation of initialization parameters:
     /// @dev _governanceAddress The address of Governance contract