Special deployer w/o using Clone for zkSync Era

contracts/core/TTFutureTokenV2.sol

@@ -46,7 +46,11 @@ contract TTFutureTokenV2 is ITTFutureTokenV2, ERC721AQueryableUpgradeable {
 
     // solhint-disable-next-line ordering
     constructor() {
-        if (block.chainid != 33133) {
+        if (
+            block.chainid != 33133 &&
+            block.chainid != 300 &&
+            block.chainid != 324
+        ) {
             _dummyInitialize();
         }
     }

contracts/core/TTTrackerTokenV2.sol

@@ -21,7 +21,11 @@ contract TTTrackerTokenV2 is ITTTrackerTokenV2, IERC20Metadata, Initializable {
     TokenTableUnlockerV2 public ttuInstance;
 
     constructor() {
-        if (block.chainid != 33133) {
+        if (
+            block.chainid != 33133 &&
+            block.chainid != 300 &&
+            block.chainid != 324
+        ) {
             _disableInitializers();
         }
     }

contracts/core/TokenTableUnlockerV2.sol

@@ -61,7 +61,11 @@ contract TokenTableUnlockerV2 is
 
     // solhint-disable-next-line ordering
     constructor() {
-        if (block.chainid != 33133) {
+        if (
+            block.chainid != 33133 &&
+            block.chainid != 300 &&
+            block.chainid != 324
+        ) {
             _disableInitializers();
         }
     }

contracts/proxy/TTUDeployerLite.sol

@@ -52,27 +52,13 @@ contract TTUDeployerLite is ITTUDeployer, Ownable, IVersionable {
         ITokenTableUnlockerV2 unlocker;
         ITTTrackerTokenV2 trackerToken;
         if (!isUpgradeable) {
-            futureToken = ITTFutureTokenV2(
-                Clones.clone(beaconManager.futureTokenBeacon().implementation())
-            );
-            futureToken.initialize(projectToken, isTransferable);
-            unlocker = ITokenTableUnlockerV2(
-                Clones.clone(beaconManager.unlockerBeacon().implementation())
-            );
-            unlocker.initialize(
+            (unlocker, futureToken, trackerToken) = _deployClonesAndInitialize(
                 projectToken,
-                address(futureToken),
-                address(this),
+                isTransferable,
                 isCancelable,
                 isHookable,
                 isWithdrawable
             );
-            trackerToken = ITTTrackerTokenV2(
-                Clones.clone(
-                    beaconManager.trackerTokenBeacon().implementation()
-                )
-            );
-            trackerToken.initialize(address(unlocker));
         } else {
             futureToken = ITTFutureTokenV2(
                 address(
@@ -126,7 +112,43 @@ contract TTUDeployerLite is ITTUDeployer, Ownable, IVersionable {
         return (unlocker, futureToken, trackerToken);
     }
 
-    function version() external pure returns (string memory) {
-        return "2.5.0";
+    function version() external pure virtual returns (string memory) {
+        return "2.5.7";
+    }
+
+    function _deployClonesAndInitialize(
+        address projectToken,
+        bool isTransferable,
+        bool isCancelable,
+        bool isHookable,
+        bool isWithdrawable
+    )
+        internal
+        virtual
+        returns (
+            ITokenTableUnlockerV2 unlocker,
+            ITTFutureTokenV2 futureToken,
+            ITTTrackerTokenV2 trackerToken
+        )
+    {
+        futureToken = ITTFutureTokenV2(
+            Clones.clone(beaconManager.futureTokenBeacon().implementation())
+        );
+        futureToken.initialize(projectToken, isTransferable);
+        unlocker = ITokenTableUnlockerV2(
+            Clones.clone(beaconManager.unlockerBeacon().implementation())
+        );
+        unlocker.initialize(
+            projectToken,
+            address(futureToken),
+            address(this),
+            isCancelable,
+            isHookable,
+            isWithdrawable
+        );
+        trackerToken = ITTTrackerTokenV2(
+            Clones.clone(beaconManager.trackerTokenBeacon().implementation())
+        );
+        trackerToken.initialize(address(unlocker));
     }
 }

contracts/proxy/TTUDeployerLiteZkSync.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: AGPL v3
+pragma solidity ^0.8.20;
+
+import {TTUDeployerLite} from "./TTUDeployerLite.sol";
+import {ITokenTableUnlockerV2} from "../interfaces/ITokenTableUnlockerV2.sol";
+import {ITTFutureTokenV2} from "../interfaces/ITTFutureTokenV2.sol";
+import {ITTTrackerTokenV2} from "../interfaces/ITTTrackerTokenV2.sol";
+import {TokenTableUnlockerV2} from "../core/TokenTableUnlockerV2.sol";
+import {TTFutureTokenV2} from "../core/TTFutureTokenV2.sol";
+import {TTTrackerTokenV2} from "../core/TTTrackerTokenV2.sol";
+
+contract TTUDeployerLiteZkSync is TTUDeployerLite {
+    function version() external pure virtual override returns (string memory) {
+        return "2.5.7-zkSync";
+    }
+
+    function _deployClonesAndInitialize(
+        address projectToken,
+        bool isTransferable,
+        bool isCancelable,
+        bool isHookable,
+        bool isWithdrawable
+    )
+        internal
+        virtual
+        override
+        returns (
+            ITokenTableUnlockerV2 unlocker,
+            ITTFutureTokenV2 futureToken,
+            ITTTrackerTokenV2 trackerToken
+        )
+    {
+        futureToken = new TTFutureTokenV2();
+        futureToken.initialize(projectToken, isTransferable);
+        unlocker = new TokenTableUnlockerV2();
+        unlocker.initialize(
+            projectToken,
+            address(futureToken),
+            address(this),
+            isCancelable,
+            isHookable,
+            isWithdrawable
+        );
+        trackerToken = new TTTrackerTokenV2();
+        trackerToken.initialize(address(unlocker));
+    }
+}

deploy/10-deploy-ttudeployer-lite.ts

@@ -38,12 +38,28 @@ const deployLite: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
         args: [],
         waitConfirmations: 1
     })
-    const deployerLiteDeploymentResult = await deploy('TTUDeployerLite', {
-        from: deployer,
-        log: true,
-        args: [],
-        waitConfirmations: 1
-    })
+
+    let deployerLiteDeploymentResult
+    if (
+        hre.network.config.chainId === 300 ||
+        hre.network.config.chainId === 324
+    ) {
+        log.info('Deploying zkSync...')
+        deployerLiteDeploymentResult = await deploy('TTUDeployerLiteZkSync', {
+            from: deployer,
+            log: true,
+            args: [],
+            waitConfirmations: 1
+        })
+    } else {
+        deployerLiteDeploymentResult = await deploy('TTUDeployerLite', {
+            from: deployer,
+            log: true,
+            args: [],
+            waitConfirmations: 1
+        })
+    }
+
     const beaconManagerDeploymentResult = await deploy('TTUV2BeaconManager', {
         from: deployer,
         log: true,

hardhat.config.ts

@@ -54,7 +54,7 @@ export default {
             zksync: false
         },
         zkSyncTestnet: {
-            chainId: 280,
+            chainId: 300,
             url: 'https://sepolia.era.zksync.dev/',
             ethNetwork: 'https://rpc.ankr.com/eth_sepolia',
             accounts: [process.env.PRIVATE_KEY],
@@ -171,36 +171,34 @@ export default {
                     optimizer: {
                         enabled: true,
                         runs: 200
+                    },
+                    metadata: {
+                        bytecodeHash: 'none'
                     }
-                },
-                eraVersion: '1.0.0'
+                }
             }
         ]
     },
     zksolc: {
-        version: '1.3.23',
+        version: '1.4.0',
         settings: {
             optimizer: {
                 enabled: true,
-                runs: 200
+                runs: 10
             },
-            isSystem: true
-            // libraries: {
-            //     'contracts/libraries/Clones.sol': {
-            //         /*
-            //          * zkSync Era Mainnet: 0x52cb8d348604aBB1720a713eADf3e4Afef650f93
-            //          * zkSync Era Testnet: 0x222C78A7CaDC3D63c72cE39F9A382B6aF075fC74
-            //          */
-            //         Clones: '0x52cb8d348604aBB1720a713eADf3e4Afef650f93'
-            //     }
-            // }
+            metadata: {
+                bytecodeHash: 'none'
+            }
         }
     },
     namedAccounts: {
         deployer: {
             default: 0
         }
     },
+    sourcify: {
+        enabled: false
+    },
     etherscan: {
         apiKey: {
             polygonMumbai: process.env.POLYGONSCAN_KEY,

package.json

@@ -38,9 +38,9 @@
     "sizes": "hardhat size-contracts"
   },
   "devDependencies": {
-    "@matterlabs/hardhat-zksync-deploy": "1.1.2",
-    "@matterlabs/hardhat-zksync-solc": "1.1.2",
-    "@matterlabs/hardhat-zksync-verify": "1.3.0",
+    "@matterlabs/hardhat-zksync-deploy": "1.2.0",
+    "@matterlabs/hardhat-zksync-solc": "1.1.4",
+    "@matterlabs/hardhat-zksync-verify": "1.4.0",
     "@nomicfoundation/hardhat-toolbox": "4.0.0",
     "@openzeppelin/hardhat-upgrades": "3.0.3",
     "@types/bunyan": "^1.8.7",