Skip to content

Commit 1781608

Browse files
fix: return back new chain creation/genesis params (matter-labs#3640)
Reverts matter-labs#3631
1 parent 7afa20f commit 1781608

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/ci-prover-e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
working-directory: ./etc/env/file_based
5454
if: matrix.compressor-mode == 'fflonk'
5555
run: |
56-
sudo sed -i 's/^genesis_root: .*/genesis_root: 0xc3fa60b6769a0c2f222053d7cbd1d6f63be7777e3c8d029cbd61cc075526ab81/' genesis.yaml
57-
sudo sed -i "s/^genesis_batch_commitment: .*/genesis_batch_commitment: 0x17689e705b5749ed0bbd53c845988d17c419697c2cb29eabab8785f1cb775b4a/" genesis.yaml
56+
sudo sed -i 's/^genesis_root: .*/genesis_root: 0xf15e1f51b54d18843eb6ff18532921165b3393910b489a7b58933220363d9204/' genesis.yaml
57+
sudo sed -i "s/^genesis_batch_commitment: .*/genesis_batch_commitment: 0xabfaad1553b5325624826db5b57de11b6be33285b9e0324665cce50d7f179a63/" genesis.yaml
5858
5959
- name: Init
6060
run: |

contracts

Submodule contracts updated 68 files

etc/env/file_based/genesis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
genesis_root: 0xd8c9be7efb705e7dcf529c14fce7048ea99dea9eab6a6b4e5f8de1ebf4f2ebf2
1+
genesis_root: 0x7bdb3d822ad837a3611c436d3be457363a08d06d83b74469831482353a7d8277
22
genesis_rollup_leaf_index: 68
3-
genesis_batch_commitment: 0xf6e873e8894b90f157511a133d941fb6f0892f83147e3d0d2cafa71af8c838e5
3+
genesis_batch_commitment: 0x81f5e324a4019e4161fb9dc5058a588aa364a551fdd5c0e8788521e64e7ad596
44
genesis_protocol_version: 26
55
default_aa_hash: 0x010004dbf8be36c421254d005352f8245146906919be0099e8a50d0e78df85e0
66
bootloader_hash: 0x0100088580465d88420e6369230ee94a32ff356dbcdd407a4be49fc8009b2a81

zkstack_cli/crates/common/src/contracts.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ use crate::cmd::Cmd;
66

77
pub fn build_l1_contracts(shell: Shell, link_to_code: PathBuf) -> anyhow::Result<()> {
88
let _dir_guard = shell.push_dir(link_to_code.join("contracts/l1-contracts"));
9+
// Do not update era-contract's lockfile to avoid dirty submodule
10+
// Note, tha the v26 contracts depend on the node_modules to be present at the time of the compilation.
11+
Cmd::new(cmd!(shell, "yarn install --frozen-lockfile")).run()?;
912
Ok(Cmd::new(cmd!(shell, "yarn build:foundry")).run()?)
1013
}
1114

@@ -22,7 +25,5 @@ pub fn build_l2_contracts(shell: Shell, link_to_code: PathBuf) -> anyhow::Result
2225

2326
pub fn build_system_contracts(shell: Shell, link_to_code: PathBuf) -> anyhow::Result<()> {
2427
let _dir_guard = shell.push_dir(link_to_code.join("contracts/system-contracts"));
25-
// Do not update era-contract's lockfile to avoid dirty submodule
26-
Cmd::new(cmd!(shell, "yarn install --frozen-lockfile")).run()?;
2728
Ok(Cmd::new(cmd!(shell, "yarn build:foundry")).run()?)
2829
}

0 commit comments

Comments
 (0)