feat: trickle validators

applications/minotari_app_grpc/proto/types.proto

@@ -25,122 +25,123 @@ package tari.rpc;
 
 /// An unsigned range interface to more accurately represent Rust native Range's
 message Range {
-    uint64 min = 1;
-    uint64 max = 2;
+  uint64 min = 1;
+  uint64 max = 2;
 }
 
 /// An Empty placeholder for endpoints without request parameters
 message Empty {}
 
 /// Define an interface for block height
 message BlockHeight {
-    uint64 block_height = 1;
+  uint64 block_height = 1;
 }
 
 // Define the explicit Signature implementation for the Minotari base layer. A different signature scheme can be
 // employed by redefining this type.
 message Signature {
-    bytes public_nonce = 1;
-    bytes signature = 2;
+  bytes public_nonce = 1;
+  bytes signature = 2;
 }
 
 // Define the explicit ComAndPubSignature implementation for the Minotari base layer. A different signature scheme can be
 // employed by redefining this type.
 message ComAndPubSignature {
-    bytes ephemeral_commitment = 1;
-    bytes ephemeral_pubkey = 2;
-    bytes u_a = 3;
-    bytes u_x = 4;
-    bytes u_y = 5;
+  bytes ephemeral_commitment = 1;
+  bytes ephemeral_pubkey = 2;
+  bytes u_a = 3;
+  bytes u_x = 4;
+  bytes u_y = 5;
 }
 
 // Define the explicit CommitmentSignature implementation for the Minotari base layer. A different signature scheme can be
 // employed by redefining this type
 message CommitmentSignature {
-    bytes public_nonce = 1;
-    bytes u = 2;
-    bytes v = 3;
+  bytes public_nonce = 1;
+  bytes u = 2;
+  bytes v = 3;
 }
 
 /// PoW Algorithm constants
 message PowAlgorithmConstants {
-    uint64 min_difficulty = 2;
-    uint64 max_difficulty = 3;
-    uint64 target_time = 4;
+  uint64 min_difficulty = 2;
+  uint64 max_difficulty = 3;
+  uint64 target_time = 4;
 }
 
 /// Weight params
 message WeightParams {
-    uint64 kernel_weight = 1;
-    uint64 input_weight = 2;
-    uint64 output_weight = 3;
-    uint64 features_and_scripts_bytes_per_gram = 4;
+  uint64 kernel_weight = 1;
+  uint64 input_weight = 2;
+  uint64 output_weight = 3;
+  uint64 features_and_scripts_bytes_per_gram = 4;
 }
 
 /// Output version
 message OutputsVersion {
-    Range outputs = 1;
-    Range features = 2;
+  Range outputs = 1;
+  Range features = 2;
 }
 
 /// Output types
 enum OutputType {
-    STANDARD = 0;
-    COINBASE = 1;
-    BURN = 2;
-    VALIDATOR_NODE_REGISTRATION = 3;
-    CODE_TEMPLATE_REGISTRATION = 4;
+  STANDARD = 0;
+  COINBASE = 1;
+  BURN = 2;
+  VALIDATOR_NODE_REGISTRATION = 3;
+  CODE_TEMPLATE_REGISTRATION = 4;
 }
 
 /// Range proof types
 enum RangeProofType {
-    BULLETPROOF_PLUS = 0;
-    REVEALED_VALUE = 1;
+  BULLETPROOF_PLUS = 0;
+  REVEALED_VALUE = 1;
 }
 
 message PermittedRangeProofs {
-    OutputType output_type = 1;
-    repeated RangeProofType range_proof_types = 2;
+  OutputType output_type = 1;
+  repeated RangeProofType range_proof_types = 2;
 }
 
 /// Range proof
 message RangeProof {
-    bytes proof_bytes = 1;
+  bytes proof_bytes = 1;
 }
 
 /// Consensus Constants response
 message ConsensusConstants {
-    uint64 coinbase_min_maturity = 1;
-    uint32 blockchain_version = 2;
-    uint64 future_time_limit = 3;
-    uint64 difficulty_block_window = 5;
-    uint64 max_block_transaction_weight = 7;
-    uint64 pow_algo_count = 8;
-    uint64 median_timestamp_count = 9;
-    uint64 emission_initial = 10;
-    repeated uint64 emission_decay = 11;
-    uint64 emission_tail = 12 [deprecated=true];
-    uint64 min_sha3x_pow_difficulty = 13;
-    uint64 block_weight_inputs = 14;
-    uint64 block_weight_outputs = 15;
-    uint64 block_weight_kernels = 16;
-    uint64 pre_mine_value = 17;
-    uint64 max_script_byte_size = 18;
-    uint64 validator_node_validity_period = 19;
-    uint64 effective_from_height = 20;
-    Range valid_blockchain_version_range = 21;
-    uint64 max_randomx_seed_height = 22;
-    map<uint32, PowAlgorithmConstants> proof_of_work = 23;
-    WeightParams transaction_weight = 24;
-    Range input_version_range = 26;
-    OutputsVersion output_version_range = 27;
-    Range kernel_version_range = 28;
-    repeated OutputType permitted_output_types = 29;
-    uint64 epoch_length = 30;
-    uint64 validator_node_registration_min_deposit_amount = 31;
-    uint64 validator_node_registration_min_lock_height = 32;
-    uint64 validator_node_registration_shuffle_interval_epoch = 33;
-    repeated PermittedRangeProofs permitted_range_proof_types = 34;
-    uint64 inflation_bips = 35;
-    uint64 tail_epoch_length = 36;
+  uint64 coinbase_min_maturity = 1;
+  uint32 blockchain_version = 2;
+  uint64 future_time_limit = 3;
+  uint64 difficulty_block_window = 5;
+  uint64 max_block_transaction_weight = 7;
+  uint64 pow_algo_count = 8;
+  uint64 median_timestamp_count = 9;
+  uint64 emission_initial = 10;
+  repeated uint64 emission_decay = 11;
+  uint64 emission_tail = 12 [deprecated = true];
+  uint64 min_sha3x_pow_difficulty = 13;
+  uint64 block_weight_inputs = 14;
+  uint64 block_weight_outputs = 15;
+  uint64 block_weight_kernels = 16;
+  uint64 pre_mine_value = 17;
+  uint64 max_script_byte_size = 18;
+  uint64 vn_registration_max_vns_initial_epoch = 19;
+  uint64 vn_registration_max_vns_per_epoch = 20;
+  uint64 effective_from_height = 21;
+  Range valid_blockchain_version_range = 22;
+  uint64 max_randomx_seed_height = 23;
+  map<uint32, PowAlgorithmConstants> proof_of_work = 24;
+  WeightParams transaction_weight = 25;
+  Range input_version_range = 26;
+  OutputsVersion output_version_range = 27;
+  Range kernel_version_range = 28;
+  repeated OutputType permitted_output_types = 29;
+  uint64 epoch_length = 30;
+  uint64 validator_node_registration_min_deposit_amount = 31;
+  uint64 validator_node_registration_min_lock_height = 32;
+  uint64 validator_node_registration_shuffle_interval_epoch = 33;
+  repeated PermittedRangeProofs permitted_range_proof_types = 34;
+  uint64 inflation_bips = 35;
+  uint64 tail_epoch_length = 36;
 }

applications/minotari_app_grpc/src/conversions/consensus_constants.rs

@@ -130,7 +130,6 @@ impl From<ConsensusConstants> for grpc::ConsensusConstants {
             output_version_range: Some(output_version_range),
             permitted_output_types,
             permitted_range_proof_types,
-            validator_node_validity_period: cc.validator_node_validity_period_epochs().as_u64(),
             epoch_length: cc.epoch_length(),
             validator_node_registration_min_deposit_amount: cc
                 .validator_node_registration_min_deposit_amount()
@@ -139,6 +138,8 @@ impl From<ConsensusConstants> for grpc::ConsensusConstants {
             validator_node_registration_shuffle_interval_epoch: cc
                 .validator_node_registration_shuffle_interval()
                 .as_u64(),
+            vn_registration_max_vns_initial_epoch: cc.vn_registration_max_vns_initial_epoch(),
+            vn_registration_max_vns_per_epoch: cc.vn_registration_max_vns_per_epoch(),
         }
     }
 }

applications/minotari_app_grpc/src/conversions/mod.rs

@@ -40,6 +40,7 @@ pub mod transaction_input;
 pub mod transaction_kernel;
 pub mod transaction_output;
 pub mod unblinded_output;
+pub mod validator_node_change;
 
 use prost_types::Timestamp;
 

applications/minotari_app_grpc/src/conversions/validator_node_change.rs

@@ -0,0 +1,39 @@
+// Copyright 2024 The Tari Project
+// SPDX-License-Identifier: BSD-3-Clause
+
+use tari_core::base_node::comms_interface::{ValidatorNodeChange, ValidatorNodeChangeState};
+use tari_utilities::ByteArray;
+
+impl From<&ValidatorNodeChange> for crate::tari_rpc::ValidatorNodeChange {
+    fn from(node_change: &ValidatorNodeChange) -> Self {
+        crate::tari_rpc::ValidatorNodeChange {
+            public_key: node_change.public_key.to_vec(),
+            state: match node_change.state {
+                ValidatorNodeChangeState::ADD => crate::tari_rpc::ValidatorNodeChangeState::Add.into(),
+                ValidatorNodeChangeState::REMOVE => crate::tari_rpc::ValidatorNodeChangeState::Remove.into(),
+            },
+            start_height: node_change.height,
+            registration: match &node_change.registration {
+                Some(value) => Some(crate::tari_rpc::ValidatorNodeRegistration {
+                    public_key: value.public_key().to_vec(),
+                    signature: Some(crate::tari_rpc::Signature {
+                        public_nonce: value.signature().get_public_nonce().to_vec(),
+                        signature: value.signature().get_signature().to_vec(),
+                    }),
+                    claim_public_key: value.claim_public_key().to_vec(),
+                    sidechain_id: match value.sidechain_id() {
+                        None => vec![],
+                        Some(id) => id.to_vec(),
+                    },
+                    sidechain_id_knowledge_proof: value.sidechain_id_knowledge_proof().map(|signature| {
+                        crate::tari_rpc::Signature {
+                            public_nonce: signature.get_public_nonce().to_vec(),
+                            signature: signature.get_signature().to_vec(),
+                        }
+                    }),
+                }),
+                None => None,
+            },
+        }
+    }
+}

applications/minotari_node/src/commands/command/list_validator_nodes.rs

@@ -52,6 +52,7 @@ impl CommandContext {
             public_key,
             sidechain_id: validator_network,
             shard_key,
+            ..
         } in vns
         {
             table.add_row(row![

applications/minotari_node/src/grpc/base_node_grpc_server.rs

@@ -32,7 +32,7 @@ use futures::{channel::mpsc, SinkExt};
 use log::*;
 use minotari_app_grpc::{
     tari_rpc,
-    tari_rpc::{CalcType, Sorting},
+    tari_rpc::{CalcType, GetValidatorNodeChangesRequest, GetValidatorNodeChangesResponse, Sorting},
 };
 use tari_common_types::{
     key_branches::TransactionKeyManagerBranch,
@@ -159,6 +159,7 @@ impl BaseNodeGrpcServer {
             GrpcMethod::GetMempoolStats,
             GrpcMethod::GetTipInfo,
             GrpcMethod::GetActiveValidatorNodes,
+            GrpcMethod::GetValidatorNodeChanges,
             GrpcMethod::GetShardKey,
             GrpcMethod::GetTemplateRegistrations,
             GrpcMethod::GetHeaderByHash,
@@ -2315,6 +2316,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
                 public_key,
                 sidechain_id,
                 shard_key,
+                ..
             } in active_validator_nodes
             {
                 let active_validator_node = tari_rpc::GetActiveValidatorNodesResponse {
@@ -2550,6 +2552,39 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer {
         );
         Ok(Response::new(rx))
     }
+
+    async fn get_validator_node_changes(
+        &self,
+        request: Request<GetValidatorNodeChangesRequest>,
+    ) -> Result<Response<GetValidatorNodeChangesResponse>, Status> {
+        self.check_method_enabled(GrpcMethod::GetValidatorNodeChanges)?;
+        let request = request.into_inner();
+        trace!(target: LOG_TARGET, "Incoming GRPC request for GetActiveValidatorNodes");
+
+        let mut handler = self.node_service.clone();
+
+        let sidechain_id = if request.sidechain_id.is_empty() {
+            None
+        } else {
+            Some(
+                PublicKey::from_canonical_bytes(&request.sidechain_id)
+                    .map_err(|e| Status::invalid_argument(format!("Invalid sidechain_id '{}'", e)))?,
+            )
+        };
+
+        let changes = handler
+            .get_validator_node_changes(request.start_height, request.end_height, sidechain_id)
+            .await
+            .map_err(|error| {
+                warn!(target: LOG_TARGET, "Base node service error: {}", error);
+                Status::internal("Internal error!")
+            })?
+            .iter()
+            .map(|node_change| node_change.into())
+            .collect();
+
+        Ok(Response::new(GetValidatorNodeChangesResponse { changes }))
+    }
 }
 
 enum BlockGroupType {

applications/minotari_node/src/grpc_method.rs

@@ -62,14 +62,15 @@ pub enum GrpcMethod {
     ListConnectedPeers,
     GetMempoolStats,
     GetActiveValidatorNodes,
+    GetValidatorNodeChanges,
     GetShardKey,
     GetTemplateRegistrations,
     GetSideChainUtxos,
 }
 
 impl GrpcMethod {
     /// All the GRPC methods as a fixed array
-    pub const ALL_VARIANTS: [GrpcMethod; 36] = [
+    pub const ALL_VARIANTS: [GrpcMethod; 37] = [
         GrpcMethod::ListHeaders,
         GrpcMethod::GetHeaderByHash,
         GrpcMethod::GetBlocks,
@@ -103,14 +104,15 @@ impl GrpcMethod {
         GrpcMethod::ListConnectedPeers,
         GrpcMethod::GetMempoolStats,
         GrpcMethod::GetActiveValidatorNodes,
+        GrpcMethod::GetValidatorNodeChanges,
         GrpcMethod::GetShardKey,
         GrpcMethod::GetTemplateRegistrations,
         GrpcMethod::GetSideChainUtxos,
     ];
 }
 
 impl IntoIterator for GrpcMethod {
-    type IntoIter = std::array::IntoIter<GrpcMethod, 36>;
+    type IntoIter = std::array::IntoIter<GrpcMethod, 37>;
     type Item = GrpcMethod;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -158,6 +160,7 @@ impl FromStr for GrpcMethod {
             "list_connected_peers" => Ok(GrpcMethod::ListConnectedPeers),
             "get_mempool_stats" => Ok(GrpcMethod::GetMempoolStats),
             "get_active_validator_nodes" => Ok(GrpcMethod::GetActiveValidatorNodes),
+            "get_validator_node_changes" => Ok(GrpcMethod::GetValidatorNodeChanges),
             "get_shard_key" => Ok(GrpcMethod::GetShardKey),
             "get_template_registrations" => Ok(GrpcMethod::GetTemplateRegistrations),
             "get_side_chain_utxos" => Ok(GrpcMethod::GetSideChainUtxos),
@@ -253,6 +256,7 @@ mod tests {
                 GrpcMethod::ListConnectedPeers => count += 1,
                 GrpcMethod::GetMempoolStats => count += 1,
                 GrpcMethod::GetActiveValidatorNodes => count += 1,
+                GrpcMethod::GetValidatorNodeChanges => count += 1,
                 GrpcMethod::GetShardKey => count += 1,
                 GrpcMethod::GetTemplateRegistrations => count += 1,
                 GrpcMethod::GetSideChainUtxos => count += 1,