Skip to content

A0-0000: New ABFT version #1967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timorleph wants to merge 7 commits into
base: main
Choose a base branch
from
Open

A0-0000: New ABFT version #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e9f283
New ABFT version
timorleph Apr 2, 2025
a80fe1e
Bump version some more, and new Rust toolchain
timorleph Apr 4, 2025
0fa59a1
Merge branch 'main' into abft-bump
timorleph Apr 4, 2025
f27b855
Merge branch 'main' into abft-bump
timorleph Apr 9, 2025
322f07e
Fix clippy
timorleph Apr 9, 2025
5049324
Merge branch 'main' into abft-bump
timorleph Apr 15, 2025
26eb335
Expect a clippy problem in a macro
timorleph Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 75 additions & 49 deletions Cargo.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ homepage = "https://alephzero.org"
repository = "https://github.com/Cardinal-Cryptography/aleph-node"

[workspace.dependencies]
aleph-bft-crypto = { version = "0.9" }
aleph-bft-mock = { version = "0.15" }
aleph-bft-rmc = { version = "0.14" }
aleph-bft-types = { version = "0.14" }
aleph-bft-crypto = { version = "0.11" }
aleph-bft-mock = { version = "0.18" }
aleph-bft-rmc = { version = "0.16" }
aleph-bft-types = { version = "0.16" }
async-trait = { version = "0.1" }
array-bytes = { version = "6" }
bytes = { version = "1.8" }
Expand Down
2 changes: 2 additions & 0 deletions bin/fake-runtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ std = [
"pallet-aleph-runtime-api/std",
]
short_session = []
try-runtime = []
runtime-benchmarks = []
4 changes: 2 additions & 2 deletions bin/node/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use sc_service::Configuration;

#[cfg(not(any(feature = "runtime-benchmarks", feature = "aleph-native-runtime",)))]
#[cfg(not(feature = "runtime-benchmarks"))]
pub mod aleph_executor {
use sc_executor::WasmExecutor;

Expand All @@ -18,7 +18,7 @@ pub mod aleph_executor {
}
}

#[cfg(any(feature = "runtime-benchmarks", feature = "aleph-native-runtime",))]
#[cfg(feature = "runtime-benchmarks")]
pub mod aleph_executor {
use sc_executor::NativeElseWasmExecutor;

Expand Down
2 changes: 1 addition & 1 deletion bin/node/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ mod service;

pub use cli::{Cli, Subcommand};
pub use config::Validator as ConfigValidator;
#[cfg(any(feature = "runtime-benchmarks", feature = "aleph-native-runtime"))]
#[cfg(feature = "runtime-benchmarks")]
pub use executor::aleph_executor::ExecutorDispatch;
pub use service::{new_authority, new_partial, ServiceComponents};
10 changes: 5 additions & 5 deletions finality-aleph/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ repository.workspace = true
# fixed version to 'freeze' some types used in abft, mainly `SignatureSet` used in justification and signature aggregation
aleph-bft-crypto = { workspace = true }

current-aleph-bft = { package = "aleph-bft", version = "0.42" }
current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.14" }
legacy-aleph-bft = { package = "aleph-bft", version = "0.36" }
legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.13" }
current-aleph-bft = { package = "aleph-bft", version = "0.45" }
current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.16" }
legacy-aleph-bft = { package = "aleph-bft", version = "0.42" }
legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.14" }

network-clique = { workspace = true }
primitives = { workspace = true }
legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "r-14.0.0" }
legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "r-15.2.0" }
current-aleph-aggregator = { path = "../aggregator", package = "aggregator" }
rate-limiter = { package = "rate-limiter", path = "../rate-limiter" }
fake-runtime-api = { workspace = true, features = ["std"] }
Expand Down
Loading