From 1c85271e6e2b00b049d3238ede07457e0cedb541 Mon Sep 17 00:00:00 2001 From: pompon0 Date: Fri, 12 Apr 2024 18:53:08 +0200 Subject: [PATCH] chore: bumped consensus deps (#1678) Includes a quickfix for the excessive throttling of p2p requests: https://github.com/matter-labs/era-consensus/pull/95 --- Cargo.lock | 23 ++++++++++++----------- Cargo.toml | 20 ++++++++++---------- prover/Cargo.lock | 14 +++++++------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ffce1cb7019..5f7e8af3a57e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8149,7 +8149,7 @@ dependencies = [ [[package]] name = "zksync_concurrency" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "once_cell", @@ -8179,7 +8179,7 @@ dependencies = [ [[package]] name = "zksync_consensus_bft" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "async-trait", @@ -8200,7 +8200,7 @@ dependencies = [ [[package]] name = "zksync_consensus_crypto" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "blst", @@ -8218,7 +8218,7 @@ dependencies = [ [[package]] name = "zksync_consensus_executor" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "rand 0.8.5", @@ -8238,7 +8238,7 @@ dependencies = [ [[package]] name = "zksync_consensus_network" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "async-trait", @@ -8263,7 +8263,7 @@ dependencies = [ [[package]] name = "zksync_consensus_roles" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "bit-vec", @@ -8283,7 +8283,7 @@ dependencies = [ [[package]] name = "zksync_consensus_storage" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "async-trait", @@ -8301,9 +8301,10 @@ dependencies = [ [[package]] name = "zksync_consensus_sync_blocks" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", + "rand 0.8.5", "thiserror", "tracing", "zksync_concurrency", @@ -8316,7 +8317,7 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "rand 0.8.5", "thiserror", @@ -8775,7 +8776,7 @@ dependencies = [ [[package]] name = "zksync_protobuf" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "bit-vec", @@ -8795,7 +8796,7 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "heck 0.5.0", diff --git a/Cargo.toml b/Cargo.toml index 8aa37038e307..526aad46af75 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -170,16 +170,16 @@ zk_evm_1_3_3 = { package = "zk_evm", git = "https://github.com/matter-labs/era-z zk_evm_1_4_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.0" } zk_evm_1_4_1 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.1" } zk_evm_1_5_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.5.0" } -zksync_concurrency = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_bft = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_crypto = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_executor = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_network = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_roles = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_storage = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_consensus_utils = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } -zksync_protobuf_build = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "36be3daba58703c5639892c2f3a6b037f0654837" } +zksync_concurrency = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_bft = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_crypto = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_executor = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_network = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_roles = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_storage = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_consensus_utils = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } +zksync_protobuf_build = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "c9935c0fa69cde357a3d6f5eca148962dd3313e1" } # "Local" dependencies multivm = { path = "core/lib/multivm" } diff --git a/prover/Cargo.lock b/prover/Cargo.lock index d20418a2d3f5..7262bd7ecdaa 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -7501,7 +7501,7 @@ dependencies = [ [[package]] name = "zksync_concurrency" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "once_cell", @@ -7531,7 +7531,7 @@ dependencies = [ [[package]] name = "zksync_consensus_crypto" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "blst", @@ -7549,7 +7549,7 @@ dependencies = [ [[package]] name = "zksync_consensus_roles" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "bit-vec", @@ -7569,7 +7569,7 @@ dependencies = [ [[package]] name = "zksync_consensus_storage" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "async-trait", @@ -7587,7 +7587,7 @@ dependencies = [ [[package]] name = "zksync_consensus_utils" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "rand 0.8.5", "thiserror", @@ -7773,7 +7773,7 @@ dependencies = [ [[package]] name = "zksync_protobuf" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "bit-vec", @@ -7793,7 +7793,7 @@ dependencies = [ [[package]] name = "zksync_protobuf_build" version = "0.1.0" -source = "git+https://github.com/matter-labs/era-consensus.git?rev=36be3daba58703c5639892c2f3a6b037f0654837#36be3daba58703c5639892c2f3a6b037f0654837" +source = "git+https://github.com/matter-labs/era-consensus.git?rev=c9935c0fa69cde357a3d6f5eca148962dd3313e1#c9935c0fa69cde357a3d6f5eca148962dd3313e1" dependencies = [ "anyhow", "heck 0.5.0",