Skip to content

Commit

Permalink
fix(witness_generator): Disable BWIP dependency (#573)
Browse files Browse the repository at this point in the history
This revert is done to facilitate boojum upgrade on mainnet2. Without
this, old provers would be halt and boojum upgrade could take longer
than anticipated.

`waiting_for_artifacts` forced witness to wait on BWIP run. `queued`
makes them run instantly.

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [x] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `cargo spellcheck
--cfg=./spellcheck/era.cfg --code 1`.

---------

Signed-off-by: Danil <deniallugo@gmail.com>
Co-authored-by: Danil <deniallugo@gmail.com>
  • Loading branch information
EmilLuta and Deniallugo committed Dec 1, 2023
1 parent 15d7eaf commit e05d955
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
30 changes: 15 additions & 15 deletions core/lib/dal/sqlx-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -7470,21 +7470,6 @@
},
"query": "SELECT number, timestamp, is_finished, l1_tx_count, l2_tx_count, fee_account_address, bloom, priority_ops_onchain_data, hash, parent_hash, commitment, compressed_write_logs, compressed_contracts, eth_prove_tx_id, eth_commit_tx_id, eth_execute_tx_id, merkle_root_hash, l2_to_l1_logs, l2_to_l1_messages, used_contract_hashes, compressed_initial_writes, compressed_repeated_writes, l2_l1_compressed_messages, l2_l1_merkle_root, l1_gas_price, l2_fair_gas_price, rollup_last_leaf_index, zkporter_is_available, bootloader_code_hash, default_aa_code_hash, base_fee_per_gas, aux_data_hash, pass_through_data_hash, meta_parameters_hash, protocol_version, compressed_state_diffs, system_logs, events_queue_commitment, bootloader_initial_content_commitment FROM l1_batches LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number WHERE eth_prove_tx_id IS NOT NULL AND eth_execute_tx_id IS NULL ORDER BY number LIMIT $1"
},
"8ff9d76b4791af1177231661847b6c8879ad625fd11c15de51a16c81d8712129": {
"describe": {
"columns": [],
"nullable": [],
"parameters": {
"Left": [
"Int8",
"Bytea",
"Text",
"Int4"
]
}
},
"query": "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, protocol_version, created_at, updated_at) VALUES ($1, $2, $3, 'waiting_for_artifacts', $4, now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
},
"9051cc1a715e152afdd0c19739c76666b1a9b134e17601ef9fdf3dec5d2fc561": {
"describe": {
"columns": [
Expand Down Expand Up @@ -11182,6 +11167,21 @@
},
"query": "UPDATE l1_batches SET predicted_commit_gas_cost = $2, updated_at = now() WHERE number = $1"
},
"ec35fc5128cf59d19e6d65ed6d84fcc50fedce921405c4ce700dd2e08c990642": {
"describe": {
"columns": [],
"nullable": [],
"parameters": {
"Left": [
"Int8",
"Bytea",
"Text",
"Int4"
]
}
},
"query": "INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, protocol_version, created_at, updated_at) VALUES ($1, $2, $3, 'queued', $4, now(), now()) ON CONFLICT (l1_batch_number) DO NOTHING"
},
"ed50c609371b4588964e29f8757c41973706710090a80eb025ec263ce3d019b4": {
"describe": {
"columns": [],
Expand Down
2 changes: 1 addition & 1 deletion core/lib/dal/src/witness_generator_dal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@ impl WitnessGeneratorDal<'_, '_> {
{
sqlx::query!(
"INSERT INTO witness_inputs(l1_batch_number, merkle_tree_paths, merkel_tree_paths_blob_url, status, protocol_version, created_at, updated_at) \
VALUES ($1, $2, $3, 'waiting_for_artifacts', $4, now(), now()) \
VALUES ($1, $2, $3, 'queued', $4, now(), now()) \
ON CONFLICT (l1_batch_number) DO NOTHING",
block_number.0 as i64,
// TODO(SMA-1476): remove the below column once blob is migrated to GCS.
Expand Down
1 change: 1 addition & 0 deletions spellcheck/era.dic
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ sidechain
sidechains
tokenomics
validator's
validator
CHAINID
PREVRANDAO
ECDSA
Expand Down

0 comments on commit e05d955

Please sign in to comment.