Merge remote-tracking branch 'origin/deniallugo-init-with-new-stack' …

…into aon-add-zk-toolbox-ci
matter-labs · May 17, 2024 · a8458b2 · a8458b2
2 parents 55ed274 + b6abda6
commit a8458b2
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,7 @@ hyperchain-*.yml
 
 # Prover keys that should not be commited
 prover/vk_setup_data_generator_server_fri/data/setup_*
+
+# Zk Toolbox
+hyperchains/era/configs/*
+configs/*
diff --git a/ZkStack.yaml b/ZkStack.yaml
@@ -0,0 +1,10 @@
+name: zksync
+l1_network: Localhost
+link_to_code: .
+hyperchains: ./hyperchains
+config: ./configs/
+default_hyperchain: era
+l1_rpc_url: http://localhost:8545
+era_chain_id: 270
+prover_version: NoProofs
+wallet_creation: Localhost
diff --git a/configs/.gitkeep b/configs/.gitkeep
diff --git a/contracts b/contracts
diff --git a/etc/env/file_based/wallets.yaml b/etc/env/file_based/wallets.yaml
@@ -11,5 +11,5 @@ deployer:
   private_key: 0x3eb15da85647edd9a1159a4a13b9e7c56877c4eb33f614546d4db06a51868b1c
   address: 0xE90E12261CCb0F3F7976Ae611A29e84a6A85f424
 governor:
-  private_key: 0x0324a1a769864837a67b051112e19b47c3ef0d2b300a7a9e3eb83a36156956f9
-  address: 0xF8A3188d179133204bFE984d5275D926D140953b
+  private_key: 0xac1e735be8536c6534bb4f17f06f6afc73b2b5ba84ac2cfb12f7461b20c0bbe3
+  address: 0xa61464658AfeAf65CccaaFD3a512b69A83B77618
diff --git a/hyperchains/era/ZkStack.yaml b/hyperchains/era/ZkStack.yaml
@@ -0,0 +1,12 @@
+id: 1
+name: era
+chain_id: 271
+prover_version: NoProofs
+configs: ./hyperchains/era/configs/
+rocks_db_path: ./hyperchains/era/db/
+l1_batch_commit_data_generator_mode: Rollup
+wallet_creation: Localhost
+base_token:
+  address: '0x0000000000000000000000000000000000000001'
+  nominator: 1
+  denominator: 1
diff --git a/hyperchains/era/configs/.gitkeep b/hyperchains/era/configs/.gitkeep
+9 −10		.github/workflows/l1-contracts-foundry-ci.yaml
+4 −3		l1-contracts-foundry/foundry.toml
+3 −0		l1-contracts-foundry/script-config-template/config-deploy-l1.toml
+3 −0		l1-contracts-foundry/script-config-template/config-deploy-paymaster.toml
+6 −0		l1-contracts-foundry/script-config-template/config-initialize-shared-bridges.toml
+57 −0		l1-contracts-foundry/script/AcceptAdmin.s.sol
+18 −5		l1-contracts-foundry/script/DeployL1.s.sol
+60 −0		l1-contracts-foundry/script/DeployPaymaster.s.sol
+1 −1		l1-contracts-foundry/script/InitializeL2WethToken.s.sol
+158 −0		l1-contracts-foundry/script/InitializeSharedBridgeOnL2.sol
+40 −28		l1-contracts-foundry/script/RegisterHyperchain.s.sol
+164 −2		l1-contracts-foundry/script/Utils.sol
+19 −3		l2-contracts/src/deploy-shared-bridge-on-l2-through-l1.ts