Skip to content

[Feature] Consensus V6 #2670

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

Merged
vicsn merged 7 commits into from
Apr 10, 2025
Merged

[Feature] Consensus V6 #2670

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
f2cdc7a
doc: move specific version info to `ConsensusVersion`
niklaslong Mar 29, 2025
d143095
doc: fix links to consensus version documentation
niklaslong Apr 1, 2025
7e3cebf
feat: consensus v6
niklaslong Apr 9, 2025
ad28de6
feat: increase validator count to 35
niklaslong Apr 9, 2025
23fea12
feat: tweak consensus v6 activation heights
niklaslong Apr 9, 2025
bc5a8b3
feat: refine v6 activation heights
niklaslong Apr 9, 2025
eed31a9
Merge branch 'staging' into doc/consensus-version
niklaslong Apr 10, 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
26 changes: 18 additions & 8 deletions console/network/src/canary_v0.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,26 @@ impl Network for CanaryV0 {
type TransmissionChecksum = u128;

/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(not(any(test, feature = "test")))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 2_900_000),
(ConsensusVersion::V3, 4_560_000),
(ConsensusVersion::V4, 5_730_000),
(ConsensusVersion::V5, 5_780_000),
(ConsensusVersion::V6, 6_240_000),
];
/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(any(test, feature = "test"))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 10),
(ConsensusVersion::V3, 11),
(ConsensusVersion::V4, 12),
(ConsensusVersion::V5, 13),
(ConsensusVersion::V6, 14),
];
/// The network edition.
const EDITION: u16 = 0;
Expand All @@ -173,12 +175,20 @@ impl Network for CanaryV0 {
const INCLUSION_FUNCTION_NAME: &'static str = MainnetV0::INCLUSION_FUNCTION_NAME;
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(not(any(test, feature = "test")))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 100), (ConsensusVersion::V3, 100), (ConsensusVersion::V5, 100)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 100),
(ConsensusVersion::V3, 100),
(ConsensusVersion::V5, 100),
(ConsensusVersion::V6, 100),
];
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(any(test, feature = "test"))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 25), (ConsensusVersion::V3, 25), (ConsensusVersion::V5, 25)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 25),
(ConsensusVersion::V3, 25),
(ConsensusVersion::V5, 25),
(ConsensusVersion::V6, 25),
];
/// The network name.
const NAME: &'static str = "Aleo Canary (v0)";

Expand Down
23 changes: 10 additions & 13 deletions console/network/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,21 @@ pub(crate) type VarunaProvingKey<N> = CircuitProvingKey<<N as Environment>::Pair
pub(crate) type VarunaVerifyingKey<N> = CircuitVerifyingKey<<N as Environment>::PairingCurve>;

/// The different consensus versions.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// If you need the version active for a specific height, see: `N::CONSENSUS_VERSION`.
#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord, PartialOrd)]
pub enum ConsensusVersion {
/// V1: The initial genesis consensus version.
V1 = 1,
/// V2: Update to the block reward and execution cost algorithms.
V2 = 2,
/// V3: Update to the number of validators and finalize scope RNG seed.
V3 = 3,
/// V4: Update to the Varuna version.
V4 = 4,
/// V5: Update to the number of validators and enable batch proposal spend limits.
V5 = 5,
/// V6: Update to the number of validators.
V6 = 6,
}

pub trait Network:
Expand Down Expand Up @@ -217,25 +224,15 @@ pub trait Network:

/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5];
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6];
/// A list of (consensus_version, size) pairs indicating the maximum number of validators in a committee.
// Note: This value must **not** decrease without considering the impact on serialization.
// Decreasing this value will break backwards compatibility of serialization without explicit
// declaration of migration based on round number rather than block height.
// Increasing this value will require a migration to prevent forking during network upgrades.
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4];

/// Returns the consensus version which is active at the given height.
///
/// V1: The initial genesis consensus version.
///
/// V2: Update to the block reward and execution cost algorithms.
///
/// V3: Update to the number of validators and finalize scope RNG seed.
///
/// V4: Update to the Varuna version.
///
/// V5: Update to the number of validators and enable batch proposal spend limits.
#[allow(non_snake_case)]
fn CONSENSUS_VERSION(seek_height: u32) -> anyhow::Result<ConsensusVersion> {
match Self::CONSENSUS_VERSION_HEIGHTS.binary_search_by(|(_, height)| height.cmp(&seek_height)) {
Expand Down
26 changes: 18 additions & 8 deletions console/network/src/mainnet_v0.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,26 @@ impl Network for MainnetV0 {
type TransmissionChecksum = u128;

/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(not(any(test, feature = "test")))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 2_800_000),
(ConsensusVersion::V3, 4_900_000),
(ConsensusVersion::V4, 6_135_000),
(ConsensusVersion::V5, 7_060_000),
(ConsensusVersion::V6, 7_900_000),
];
/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(any(test, feature = "test"))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 10),
(ConsensusVersion::V3, 11),
(ConsensusVersion::V4, 12),
(ConsensusVersion::V5, 13),
(ConsensusVersion::V6, 14),
];
/// The network edition.
const EDITION: u16 = 0;
Expand All @@ -178,12 +180,20 @@ impl Network for MainnetV0 {
const INCLUSION_FUNCTION_NAME: &'static str = snarkvm_parameters::mainnet::NETWORK_INCLUSION_FUNCTION_NAME;
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(not(any(test, feature = "test")))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 16), (ConsensusVersion::V3, 25), (ConsensusVersion::V5, 30)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 16),
(ConsensusVersion::V3, 25),
(ConsensusVersion::V5, 30),
(ConsensusVersion::V6, 35),
];
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(any(test, feature = "test"))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 100), (ConsensusVersion::V3, 100), (ConsensusVersion::V5, 100)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 100),
(ConsensusVersion::V3, 100),
(ConsensusVersion::V5, 100),
(ConsensusVersion::V6, 100),
];
/// The network name.
const NAME: &'static str = "Aleo Mainnet (v0)";

Expand Down
26 changes: 18 additions & 8 deletions console/network/src/testnet_v0.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,26 @@ impl Network for TestnetV0 {
type TransmissionChecksum = u128;

/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(not(any(test, feature = "test")))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 2_950_000),
(ConsensusVersion::V3, 4_800_000),
(ConsensusVersion::V4, 6_625_000),
(ConsensusVersion::V5, 6_765_000),
(ConsensusVersion::V6, 7_600_000),
];
/// A list of (consensus_version, block_height) pairs indicating when each consensus version takes effect.
/// Documentation for what is changed at each version can be found in `N::CONSENSUS_VERSION`
/// Documentation for what is changed at each version can be found in `ConsensusVersion`.
#[cfg(any(test, feature = "test"))]
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 5] = [
const CONSENSUS_VERSION_HEIGHTS: [(ConsensusVersion, u32); 6] = [
(ConsensusVersion::V1, 0),
(ConsensusVersion::V2, 10),
(ConsensusVersion::V3, 11),
(ConsensusVersion::V4, 12),
(ConsensusVersion::V5, 13),
(ConsensusVersion::V6, 14),
];
/// The network edition.
const EDITION: u16 = 0;
Expand All @@ -173,12 +175,20 @@ impl Network for TestnetV0 {
const INCLUSION_FUNCTION_NAME: &'static str = MainnetV0::INCLUSION_FUNCTION_NAME;
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(not(any(test, feature = "test")))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 100), (ConsensusVersion::V3, 100), (ConsensusVersion::V5, 100)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 100),
(ConsensusVersion::V3, 100),
(ConsensusVersion::V5, 100),
(ConsensusVersion::V6, 100),
];
/// A list of (consensus_version, size) pairs indicating the maximum number of certificates in a batch.
#[cfg(any(test, feature = "test"))]
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 3] =
[(ConsensusVersion::V1, 25), (ConsensusVersion::V3, 25), (ConsensusVersion::V5, 25)];
const MAX_CERTIFICATES: [(ConsensusVersion, u16); 4] = [
(ConsensusVersion::V1, 25),
(ConsensusVersion::V3, 25),
(ConsensusVersion::V5, 25),
(ConsensusVersion::V6, 25),
];
/// The network name.
const NAME: &'static str = "Aleo Testnet (v0)";

Expand Down