Skip to content

Commit

Permalink
feat: change seal criteria for gateway (matter-labs#3320)
Browse files Browse the repository at this point in the history
## What ❔

- replaces sk l1 gas criterion with l1 l2 txs criterion
- removes commit aggregation in eth sender
- enables execute aggregation only for chains that settle on L1
- adds sk criterion for l2 l1 logs

## Why ❔

- make criteria work with gateway

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] 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.
- [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.
  • Loading branch information
perekopskiy authored Nov 27, 2024
1 parent aa9575f commit a0a74aa
Show file tree
Hide file tree
Showing 63 changed files with 584 additions and 1,018 deletions.
2 changes: 0 additions & 2 deletions core/lib/config/src/configs/eth_sender.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ impl EthConfig {
pub fn for_tests() -> Self {
Self {
sender: Some(SenderConfig {
aggregated_proof_sizes: vec![1],
wait_confirmations: Some(10),
tx_poll_period: 1,
aggregate_tx_poll_period: 1,
Expand Down Expand Up @@ -82,7 +81,6 @@ pub enum ProofLoadingMode {

#[derive(Debug, Deserialize, Clone, PartialEq)]
pub struct SenderConfig {
pub aggregated_proof_sizes: Vec<usize>,
/// Amount of confirmations required to consider L1 transaction committed.
/// If not specified L1 transaction will be considered finalized once its block is finalized.
pub wait_confirmations: Option<u64>,
Expand Down
1 change: 0 additions & 1 deletion core/lib/config/src/testonly.rs
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ impl Distribution<configs::eth_sender::ProofLoadingMode> for EncodeDist {
impl Distribution<configs::eth_sender::SenderConfig> for EncodeDist {
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::eth_sender::SenderConfig {
configs::eth_sender::SenderConfig {
aggregated_proof_sizes: self.sample_collect(rng),
wait_confirmations: self.sample(rng),
tx_poll_period: self.sample(rng),
aggregate_tx_poll_period: self.sample(rng),
Expand Down

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE eth_txs
ALTER COLUMN predicted_gas_cost SET NOT NULL;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE eth_txs
ALTER COLUMN predicted_gas_cost DROP NOT NULL;
Loading

0 comments on commit a0a74aa

Please sign in to comment.