Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust 1.4.1 tests for zkSync #625

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
27f06e5
chore: add .idea folder to the gitignore
ElvisKrop Jul 19, 2023
f2fc381
chore(deps): add zksync related packages
ElvisKrop Jul 19, 2023
26cfa3e
feat: add zksync configuration for hardhat
ElvisKrop Jul 19, 2023
81195ff
feat: build zk contracts on prepublish
ElvisKrop Jul 19, 2023
f7c7c7a
feat: zkSync related utils for tests
ElvisKrop Jul 20, 2023
fa7075e
refactor: adjust SimulateTxAccessor.spec.ts for zksync
ElvisKrop Jul 20, 2023
4b6e3ca
refactor: adjust Safe.Execution.spec.ts for zksync
ElvisKrop Jul 20, 2023
247ffcb
refactor: adjust Safe.FallbackManager.spec.ts for zksync
ElvisKrop Jul 20, 2023
af4f129
refactor: adjust Safe.GuardManager.spec.ts for zksync
ElvisKrop Jul 20, 2023
38c84a4
refactor: adjust Safe.Incoming.spec.ts for zksync
ElvisKrop Jul 21, 2023
664d585
refactor: adjust Safe.ModuleManager.spec.ts for zksync
ElvisKrop Jul 21, 2023
ed6fc55
refactor: adjust Safe.OwnerManager.spec.ts for zksync
ElvisKrop Jul 21, 2023
51acbb7
refactor: adjust Safe.Setup.spec.ts for zksync
ElvisKrop Jul 21, 2023
e25c11c
refactor: adjust Safe.Signatures.spec.ts for zksync
ElvisKrop Jul 21, 2023
71006e0
refactor: adjust Safe.StorageAccessible.spec.ts for zksync
ElvisKrop Jul 21, 2023
ca58734
refactor: adjust prediction of create2 address for zksync
ElvisKrop Jul 21, 2023
7053ee5
refactor: adjust Proxy.spec.ts and ProxyFactory.spec.ts
ElvisKrop Jul 21, 2023
0bdfb38
refactor: adjust guard tests for zksync
ElvisKrop Jul 21, 2023
4f35689
refactor: adjust handlers tests for zksync
ElvisKrop Jul 24, 2023
e825cea
refactor: adjust integration tests for zksync
ElvisKrop Jul 24, 2023
4470fd0
refactor: adjust l2 execution tests for zksync
ElvisKrop Jul 24, 2023
ae6865c
refactor: adjust libraries tests for zksync
ElvisKrop Jul 24, 2023
240b49c
refactor: skip migration tests for zksync
ElvisKrop Jul 24, 2023
6d15fec
feat: update hardhat-deploy package
ElvisKrop Jul 24, 2023
1abd61f
refactor: adjust Safe.ModuleManager.spec.ts for zksync
ElvisKrop Jul 24, 2023
04237bb
refactor: adjust hardhat tasks for zksync
ElvisKrop Jul 24, 2023
0a2e35a
feat: add zkSync Mainnet to hardhat config
nick8319 Jul 27, 2023
b09bdc2
feat: restore execution tests related to send method for zksync
ElvisKrop Aug 22, 2023
deff3c1
feat: force to use SafeL2 for tests on zkSync
ElvisKrop Aug 22, 2023
4ec6926
feat: adjust new GuardManager tests for zksync
ElvisKrop Aug 22, 2023
7deb8fc
feat: restore setup tests related to send method for zksync
ElvisKrop Aug 22, 2023
08e5894
fix: remove duplicated imports
ElvisKrop Aug 22, 2023
0b46d6c
feat: adjust new MultiSend tests for zksync
ElvisKrop Aug 22, 2023
949949c
feat: adjust new MultiSendCallOnly test for zksync
ElvisKrop Aug 22, 2023
d23c42b
fix: remove redundant argument for TASK_DEPLOY before running zksync …
ElvisKrop Aug 22, 2023
0a9775b
wip: remove conflicting deps
ElvisKrop Aug 31, 2023
fd1f3b0
wip: fix rebasing conflicts
ElvisKrop Aug 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea/
build/
node_modules/
.DS_Store
Expand All @@ -17,4 +18,4 @@ typechain-types
# Certora Formal Verification related files
.certora_internal
.certora_recent_jobs.json
.zip-output-url.txt
.zip-output-url.txt
34 changes: 34 additions & 0 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import "@nomicfoundation/hardhat-toolbox";
import type { HardhatUserConfig, HttpNetworkUserConfig } from "hardhat/types";
import "@matterlabs/hardhat-zksync-deploy";
import "@matterlabs/hardhat-zksync-solc";
import "@matterlabs/hardhat-zksync-verify";
import "hardhat-deploy";
import dotenv from "dotenv";
import yargs from "yargs";
Expand Down Expand Up @@ -36,8 +39,10 @@ if (["mainnet", "rinkeby", "kovan", "goerli", "ropsten", "mumbai", "polygon"].in
import "./src/tasks/local_verify";
import "./src/tasks/deploy_contracts";
import "./src/tasks/show_codesize";
import "./src/tasks/zk";
import { BigNumber } from "@ethersproject/bignumber";
import { DeterministicDeploymentInfo } from "hardhat-deploy/dist/types";
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;
Expand Down Expand Up @@ -72,6 +77,13 @@ const userConfig: HardhatUserConfig = {
solidity: {
compilers: [{ version: primarySolidityVersion, settings: soliditySettings }, { version: "0.6.12" }, { version: "0.5.17" }],
},
zksolc: {
version: "1.3.13",
compilerSource: "binary",
settings: {
isSystem: true,
},
},
networks: {
hardhat: {
allowUnlimitedContractSize: true,
Expand Down Expand Up @@ -114,6 +126,28 @@ const userConfig: HardhatUserConfig = {
...sharedNetworkConfig,
url: `https://api.avax.network/ext/bc/C/rpc`,
},
zkSyncMainnet: {
...sharedNetworkConfig,
url: "https://mainnet.era.zksync.io",
ethNetwork: "mainnet",
zksync: true,
verifyURL: "https://zksync2-mainnet-explorer.zksync.io/contract_verification",
},
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,
},
},
deterministicDeployment,
namedAccounts: {
Expand Down
Loading
Loading