1.3.0 libs.0 zksync

.env.sample

@@ -5,4 +5,6 @@ INFURA_KEY=""
 NODE_URL=""
 ETHERSCAN_API_KEY=""
 # Use the Safe singleton factory for singleton deployment. This is required if EIP-155 is enforce on a chain.
-# CUSTOM_DETERMINISTIC_DEPLOYMENT="true"
+# CUSTOM_DETERMINISTIC_DEPLOYMENT="true"
+# To run tests with a fixed version of GnosisSafeL2 contract for zkSync
+SAFE_CONTRACT_UNDER_TEST="GnosisSafeL2Zk"

.gitignore

@@ -11,4 +11,6 @@ bin/
 solc
 coverage/
 coverage.json
-yarn-error.log
+yarn-error.log
+/.idea
+.vscode/launch.json

README.md

@@ -49,6 +49,32 @@ yarn hardhat --network <network> etherscan-verify
 yarn hardhat --network <network> local-verify
 ```
 
+#### zkSync Network
+
+In order to test and deploy locally to zkSync, you need to run zkSync local-node:
+
+Download the dockerized project with the following command:
+```bash
+git clone https://github.com/matter-labs/local-setup.git
+```
+
+To run zkSync Era locally, run the start.sh script
+```bash
+cd local-setup
+./start.sh
+```
+> Note: Wait about 10 minutes for node to startup
+
+To compile safe-contracts for zkSync run
+```bash
+yarn build:zk
+```
+
+To test safe-contracts with local zkSync node run
+```bash
+yarn test:zk
+```
+
 #### Custom Networks
 
 It is possible to use the `NODE_URL` env var to connect to any EVM based network via an RPC endpoint. This connection then can be used with the `custom` network.

benchmark/utils/setup.ts

@@ -20,7 +20,7 @@ const generateTarget = async (owners: Wallet[], threshold: number, guardAddress:
     return safe
 }
 
-export const configs = [
+export const configs: { name: string, signers: Wallet[], threshold: number, useGuard?: boolean }[] = [
     { name: "single owner", signers: [user1], threshold: 1 },
     { name: "single owner and guard", signers: [user1], threshold: 1, useGuard: true },
     { name: "2 out of 23", signers: [user1, user2], threshold: 2 },
@@ -85,4 +85,4 @@ export const benchmark = async (topic: string, benchmarks: Benchmark[]) => {
             }
         })
     }
-}
+}

contracts/proxies/GnosisSafeProxyFactory.sol

@@ -24,10 +24,10 @@ contract GnosisSafeProxyFactory {
         emit ProxyCreation(proxy, singleton);
     }
 
-    /// @dev Allows to retrieve the runtime code of a deployed Proxy. This can be used to check that the expected Proxy was deployed.
+    /* /// @dev Allows to retrieve the runtime code of a deployed Proxy. This can be used to check that the expected Proxy was deployed.
     function proxyRuntimeCode() public pure returns (bytes memory) {
         return type(GnosisSafeProxy).runtimeCode;
-    }
+    } */
 
     /// @dev Allows to retrieve the creation code used for the Proxy deployment. With this it is easily possible to calculate predicted address.
     function proxyCreationCode() public pure returns (bytes memory) {

hardhat.config.ts

@@ -1,142 +1,166 @@
 import type { HardhatUserConfig, HttpNetworkUserConfig } from "hardhat/types";
+import "@matterlabs/hardhat-zksync-deploy";
+import "@matterlabs/hardhat-zksync-solc";
+import "@matterlabs/hardhat-zksync-verify";
 import "@nomiclabs/hardhat-etherscan";
 import "@nomiclabs/hardhat-waffle";
 import "solidity-coverage";
-import "hardhat-deploy";
+import "@elvis-krop/hardhat-deploy";
 import dotenv from "dotenv";
 import yargs from "yargs";
 import { getSingletonFactoryInfo } from "@gnosis.pm/safe-singleton-factory";
 
 const argv = yargs
-  .option("network", {
-    type: "string",
-    default: "hardhat",
-  })
-  .help(false)
-  .version(false).argv;
+    .option("network", {
+        type: "string",
+        default: "hardhat",
+    })
+    .help(false)
+    .version(false).argv;
 
 // Load environment variables.
 dotenv.config();
-const { NODE_URL, INFURA_KEY, MNEMONIC, ETHERSCAN_API_KEY, PK, SOLIDITY_VERSION, SOLIDITY_SETTINGS, CUSTOM_DETERMINISTIC_DEPLOYMENT } = process.env;
+const { NODE_URL, INFURA_KEY, MNEMONIC, ETHERSCAN_API_KEY, PK, SOLIDITY_VERSION, SOLIDITY_SETTINGS } = process.env;
 
-const DEFAULT_MNEMONIC =
-  "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
+const DEFAULT_MNEMONIC = "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat";
 
 const sharedNetworkConfig: HttpNetworkUserConfig = {};
 if (PK) {
-  sharedNetworkConfig.accounts = [PK];
+    sharedNetworkConfig.accounts = [PK];
 } else {
-  sharedNetworkConfig.accounts = {
-    mnemonic: MNEMONIC || DEFAULT_MNEMONIC,
-  };
+    sharedNetworkConfig.accounts = {
+        mnemonic: MNEMONIC || DEFAULT_MNEMONIC,
+    };
 }
 
-if (["mainnet", "rinkeby", "kovan", "goerli"].includes(argv.network) && INFURA_KEY === undefined) {
-  throw new Error(
-    `Could not find Infura key in env, unable to connect to network ${argv.network}`,
-  );
+if (["mainnet", "rinkeby", "kovan", "goerli", "ropsten", "mumbai", "polygon"].includes(argv.network) && INFURA_KEY === undefined) {
+    throw new Error(`Could not find Infura key in env, unable to connect to network ${argv.network}`);
 }
 
-import "./src/tasks/local_verify"
-import "./src/tasks/deploy_contracts"
-import "./src/tasks/show_codesize"
+import "./src/tasks/local_verify";
+import "./src/tasks/zk";
+import "./src/tasks/deploy_contracts";
+import "./src/tasks/show_codesize";
 import { BigNumber } from "@ethersproject/bignumber";
+import { LOCAL_NODE_RICH_WALLETS } from "./src/zk-utils/constants";
 
-const primarySolidityVersion = SOLIDITY_VERSION || "0.7.6"
-const soliditySettings = !!SOLIDITY_SETTINGS ? JSON.parse(SOLIDITY_SETTINGS) : undefined
+const primarySolidityVersion = SOLIDITY_VERSION || "0.7.6";
+const soliditySettings = !!SOLIDITY_SETTINGS ? JSON.parse(SOLIDITY_SETTINGS) : undefined;
 
-const deterministicDeployment = CUSTOM_DETERMINISTIC_DEPLOYMENT == "true" ?
-  (network: string) => {
-    const info = getSingletonFactoryInfo(parseInt(network))
-    if (!info) return undefined
-    return {
-      factory: info.address,
-      deployer: info.signerAddress,
-      funding: BigNumber.from(info.gasLimit).mul(BigNumber.from(info.gasPrice)).toString(),
-      signedTx: info.transaction
+const deterministicDeployment = (network: string) => {
+    const info = getSingletonFactoryInfo(parseInt(network));
+    if (!info) {
+        throw new Error(`
+        Safe factory not found for network ${network}. You can request a new deployment at https://github.com/safe-global/safe-singleton-factory.
+        For more information, see https://github.com/safe-global/safe-contracts#replay-protection-eip-155
+      `);
     }
-  } : undefined
+    return {
+        factory: info.address,
+        deployer: info.signerAddress,
+        funding: BigNumber.from(info.gasLimit).mul(BigNumber.from(info.gasPrice)).toString(),
+        signedTx: info.transaction,
+    };
+};
 
 const userConfig: HardhatUserConfig = {
-  paths: {
-    artifacts: "build/artifacts",
-    cache: "build/cache",
-    deploy: "src/deploy",
-    sources: "contracts",
-  },
-  solidity: {
-    compilers: [
-      { version: primarySolidityVersion, settings: soliditySettings },
-      { version: "0.6.12" },
-      { version: "0.5.17" },
-    ]
-  },
-  networks: {
-    hardhat: {
-      allowUnlimitedContractSize: true,
-      blockGasLimit: 100000000,
-      gas: 100000000
-    },
-    mainnet: {
-      ...sharedNetworkConfig,
-      url: `https://mainnet.infura.io/v3/${INFURA_KEY}`,
+    paths: {
+        artifacts: "build/artifacts",
+        cache: "build/cache",
+        deploy: "src/deploy",
+        sources: "contracts",
     },
-    xdai: {
-      ...sharedNetworkConfig,
-      url: "https://xdai.poanetwork.dev",
+    solidity: {
+        compilers: [{ version: primarySolidityVersion, settings: soliditySettings }, { version: "0.6.12" }, { version: "0.5.17" }],
     },
-    ewc: {
-      ...sharedNetworkConfig,
-      url: `https://rpc.energyweb.org`,
+    zksolc: {
+        version: "1.3.8",
+        compilerSource: "binary",
+        settings: {
+            isSystem: true,
+        },
     },
-    rinkeby: {
-      ...sharedNetworkConfig,
-      url: `https://rinkeby.infura.io/v3/${INFURA_KEY}`,
+    networks: {
+        hardhat: {
+            allowUnlimitedContractSize: true,
+            blockGasLimit: 100000000,
+            gas: 100000000,
+        },
+        mainnet: {
+            ...sharedNetworkConfig,
+            url: `https://mainnet.infura.io/v3/${INFURA_KEY}`,
+        },
+        xdai: {
+            ...sharedNetworkConfig,
+            url: "https://xdai.poanetwork.dev",
+        },
+        ewc: {
+            ...sharedNetworkConfig,
+            url: `https://rpc.energyweb.org`,
+        },
+        goerli: {
+            ...sharedNetworkConfig,
+            url: `https://goerli.infura.io/v3/${INFURA_KEY}`,
+        },
+        mumbai: {
+            ...sharedNetworkConfig,
+            url: `https://polygon-mumbai.infura.io/v3/${INFURA_KEY}`,
+        },
+        polygon: {
+            ...sharedNetworkConfig,
+            url: `https://polygon-mainnet.infura.io/v3/${INFURA_KEY}`,
+        },
+        volta: {
+            ...sharedNetworkConfig,
+            url: `https://volta-rpc.energyweb.org`,
+        },
+        bsc: {
+            ...sharedNetworkConfig,
+            url: `https://bsc-dataseed.binance.org/`,
+        },
+        arbitrum: {
+            ...sharedNetworkConfig,
+            url: `https://arb1.arbitrum.io/rpc`,
+        },
+        fantomTestnet: {
+            ...sharedNetworkConfig,
+            url: `https://rpc.testnet.fantom.network/`,
+        },
+        avalanche: {
+            ...sharedNetworkConfig,
+            url: `https://api.avax.network/ext/bc/C/rpc`,
+        },
+        zkSyncTestnet: {
+            ...sharedNetworkConfig,
+            url: "https://testnet.era.zksync.dev",
+            ethNetwork: "goerli",
+            zksync: true,
+            verifyURL: 'https://zksync2-testnet-explorer.zksync.dev/contract_verification'
+        },
+        zkSyncLocal: {
+            chainId: 270,
+            accounts: LOCAL_NODE_RICH_WALLETS.map((account) => account.privateKey),
+            url: "http://localhost:3050",
+            ethNetwork: "http://localhost:8545",
+            zksync: true,
+            saveDeployments: true,
+        },
     },
-    goerli: {
-      ...sharedNetworkConfig,
-      url: `https://goerli.infura.io/v3/${INFURA_KEY}`,
+    deterministicDeployment,
+    namedAccounts: {
+        deployer: 0,
     },
-    kovan: {
-      ...sharedNetworkConfig,
-      url: `https://kovan.infura.io/v3/${INFURA_KEY}`,
+    mocha: {
+        timeout: 2000000,
     },
-    polygon: {
-      ...sharedNetworkConfig,
-      url: `https://polygon-mainnet.infura.io/v3/${INFURA_KEY}`,
+    etherscan: {
+        apiKey: ETHERSCAN_API_KEY,
     },
-    volta: {
-      ...sharedNetworkConfig,
-      url: `https://volta-rpc.energyweb.org`,
-    },
-    bsc: {
-      ...sharedNetworkConfig,
-      url: `https://bsc-dataseed.binance.org/`,
-    },
-    arbitrum: {
-      ...sharedNetworkConfig,
-      url: `https://arb1.arbitrum.io/rpc`,
-    },
-    fantomTestnet: {
-      ...sharedNetworkConfig,
-      url: `https://rpc.testnet.fantom.network/`,
-    }
-  },
-  deterministicDeployment,
-  namedAccounts: {
-    deployer: 0,
-  },
-  mocha: {
-    timeout: 2000000,
-  },
-  etherscan: {
-    apiKey: ETHERSCAN_API_KEY,
-  },
 };
 if (NODE_URL) {
-  userConfig.networks!!.custom = {
-    ...sharedNetworkConfig,
-    url: NODE_URL,
-  }
+    userConfig.networks!!.custom = {
+        ...sharedNetworkConfig,
+        url: NODE_URL,
+    };
 }
-export default userConfig
+export default userConfig;