Skip to content

Commit

Permalink
Merge pull request #2 from matter-labs/vb-make-the-repo-work-separate…
Browse files Browse the repository at this point in the history
…ly-from-zksync-2

Add default config to compile
  • Loading branch information
vladbochok authored Jan 13, 2023
2 parents 0a5170f + 4890de8 commit 5c204f2
Show file tree
Hide file tree
Showing 7 changed files with 12,183 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ethereum/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CHAIN_ETH_NETWORK=localhost
CONTRACTS_PRIORITY_TX_MAX_ERGS_LIMIT=50000
ETH_CLIENT_WEB3_URL=http://127.0.0.1:8545
2 changes: 2 additions & 0 deletions ethereum/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/artifacts
/cache
/typechain
node_modules

5 changes: 5 additions & 0 deletions ethereum/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import 'hardhat-typechain';
import 'hardhat-contract-sizer';
import { getNumberFromEnv } from './scripts/utils';

// If no network is specified, use the default config
if (!process.env.CHAIN_ETH_NETWORK) {
require('dotenv').config();
}

const PRIORITY_TX_MAX_ERGS_LIMIT = getNumberFromEnv('CONTRACTS_PRIORITY_TX_MAX_ERGS_LIMIT');

const prodConfig = {
Expand Down
3 changes: 3 additions & 0 deletions ethereum/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,8 @@
"initialize-allow-list": "zk f ts-node scripts/initialize-l1-allow-list.ts",
"upgrade-l2-force-deploy": "zk f ts-node scripts/upgrade-l2-force-deploy.ts",
"force-deploy-upgrade-2": "zk f ts-node scripts/force-deploy-upgrade-2.ts"
},
"dependencies": {
"dotenv": "^16.0.3"
}
}
8,823 changes: 8,823 additions & 0 deletions ethereum/yarn.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions zksync/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/cache
/cache-zk
/typechain
node_modules
3,346 changes: 3,346 additions & 0 deletions zksync/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 5c204f2

Please sign in to comment.