Skip to content

Commit 308ac18

Browse files
authored
fix(consensus): bump commonware and adapt application actor (tempoxyz#3697)
Updates all commonware dependencies to the most recent head at commonwarexyz/monorepo@2a7dd42. This notably contains the patches commonwarexyz/monorepo#3543 and commonwarexyz/monorepo#3641 to improve durability and persistence of proposed and verified blocks in the marshal actor. In certain scenarios (especially around epoch transitions, but also in single-node tests), there were races between simplex engines asking for new proposals (overwriting the last-proposed-block mutex), and broadcasts of proposal parents. This patch removes this logic, instead relying on the marshal actor to provide the blocks.
1 parent d218b2f commit 308ac18

11 files changed

Lines changed: 136 additions & 171 deletions

File tree

Cargo.lock

Lines changed: 15 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,4 +357,16 @@ vergen-git2 = "9.1.0"
357357
# reth-trie-parallel = { path = "../reth/crates/trie/parallel" }
358358
# reth-trie-sparse = { path = "../reth/crates/trie/sparse" }
359359

360-
# [patch.crates-io]
360+
[patch.crates-io]
361+
# Commonware at HEAD after PR #3588 was merged
362+
commonware-broadcast = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
363+
commonware-codec = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
364+
commonware-consensus = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
365+
commonware-cryptography = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
366+
commonware-macros = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
367+
commonware-math = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
368+
commonware-p2p = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
369+
commonware-parallel = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
370+
commonware-runtime = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
371+
commonware-storage = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }
372+
commonware-utils = { git = "https://github.com/commonwarexyz/monorepo", rev = "2a7dd423f0a241276a5a38db8cc3d05f11de0c03" }

0 commit comments

Comments
 (0)