mock-consensus: 🌱 single genesis validator

crates/core/app/Cargo.toml

@@ -81,6 +81,7 @@ tracing = {workspace = true}
 ed25519-consensus = {workspace = true}
 penumbra-mock-consensus = {workspace = true}
 penumbra-mock-client = {workspace = true}
+rand = {workspace = true}
 rand_core = {workspace = true}
 rand_chacha = {workspace = true}
 tap = {workspace = true}

crates/core/app/src/app/mod.rs

@@ -56,6 +56,7 @@ pub struct App {
 }
 
 impl App {
+    /// Constructs a new application, using the provided [`Snapshot`].
     pub async fn new(snapshot: Snapshot) -> Result<Self> {
         tracing::debug!("initializing App instance");
 

crates/core/app/tests/common/mod.rs

@@ -3,15 +3,24 @@
 // NB: Allow dead code, these are in fact shared by files in `tests/`.
 #![allow(dead_code)]
 
-use async_trait::async_trait;
-use cnidarium::TempStorage;
-use penumbra_app::{
-    app::App,
-    server::consensus::{Consensus, ConsensusService},
+pub use self::test_node_builder_ext::BuilderExt;
+
+use {
+    async_trait::async_trait,
+    cnidarium::TempStorage,
+    penumbra_app::{
+        app::App,
+        server::consensus::{Consensus, ConsensusService},
+    },
+    penumbra_genesis::AppState,
+    penumbra_mock_consensus::TestNode,
+    std::ops::Deref,
 };
-use penumbra_genesis::AppState;
-use penumbra_mock_consensus::TestNode;
-use std::ops::Deref;
+
+/// Penumbra-specific extensions to the mock consensus builder.
+///
+/// See [`BuilderExt`].
+mod test_node_builder_ext;
 
 // Installs a tracing subscriber to log events until the returned guard is dropped.
 pub fn set_tracing_subscriber() -> tracing::subscriber::DefaultGuard {
@@ -80,22 +89,3 @@ impl TempStorageExt for TempStorage {
         self.apply_genesis(Default::default()).await
     }
 }
-
-/// Penumbra-specific extensions to the mock consensus builder.
-pub trait BuilderExt: Sized {
-    type Error;
-    fn with_penumbra_auto_app_state(self, app_state: AppState) -> Result<Self, Self::Error>;
-}
-
-impl BuilderExt for penumbra_mock_consensus::builder::Builder {
-    type Error = anyhow::Error;
-    fn with_penumbra_auto_app_state(self, app_state: AppState) -> Result<Self, Self::Error> {
-        // what to do here?
-        // - read out list of abci/comet validators from the builder,
-        // - define a penumbra validator for each one
-        // - inject that into the penumbra app state
-        // - serialize to json and then call `with_app_state_bytes`
-        let app_state = serde_json::to_vec(&app_state)?;
-        Ok(self.app_state(app_state))
-    }
-}

crates/core/app/tests/common/test_node_builder_ext.rs

@@ -0,0 +1,118 @@
+use {
+    penumbra_genesis::AppState,
+    penumbra_mock_consensus::builder::Builder,
+    penumbra_proto::{
+        core::keys::v1::{GovernanceKey, IdentityKey},
+        penumbra::core::component::stake::v1::Validator as PenumbraValidator,
+    },
+};
+
+/// Penumbra-specific extensions to the mock consensus builder.
+pub trait BuilderExt: Sized {
+    /// The error thrown by [`with_penumbra_auto_app_state`]
+    type Error;
+    /// Add the provided Penumbra [`AppState`] to the builder.
+    ///
+    /// This will inject any configured validators into the state before serializing it into bytes.
+    fn with_penumbra_auto_app_state(self, app_state: AppState) -> Result<Self, Self::Error>;
+}
+
+impl BuilderExt for Builder {
+    type Error = anyhow::Error;
+    fn with_penumbra_auto_app_state(self, app_state: AppState) -> Result<Self, Self::Error> {
+        let Self { keyring, .. } = &self;
+
+        let app_state = if keyring.is_empty() {
+            // If there are no consensus keys to inject, pass along the provided app state.
+            app_state
+        } else {
+            // Otherwise, generate a penumbra validator for each entry in the keyring...
+            let validators = keyring
+                .verification_keys()
+                .cloned()
+                .map(generate_penumbra_validator)
+                .inspect(log_validator)
+                .collect::<Vec<_>>();
+            // ...and then inject these validators into the app state.
+            inject_penumbra_validators(app_state, validators)?
+        };
+
+        // Serialize the app state into bytes, and add it to the builder.
+        serde_json::to_vec(&app_state)
+            .map_err(Self::Error::from)
+            .map(|s| self.app_state(s))
+    }
+}
+
+/// Injects the given collection of [`Validator`s][PenumbraValidator] into the app state.
+fn inject_penumbra_validators(
+    app_state: AppState,
+    validators: Vec<PenumbraValidator>,
+) -> Result<AppState, anyhow::Error> {
+    use AppState::{Checkpoint, Content};
+    match app_state {
+        Checkpoint(_) => anyhow::bail!("checkpoint app state isn't supported"),
+        Content(mut content) => {
+            // Inject the builder's validators into the staking component's genesis state...
+            let overwritten = std::mem::replace(&mut content.stake_content.validators, validators);
+            // ...and log a warning if this overwrote any validators already in the app state.
+            if !overwritten.is_empty() {
+                tracing::warn!(
+                    ?overwritten,
+                    "`with_penumbra_auto_app_state` overwrote validators in the given AppState"
+                )
+            }
+            Ok(Content(content))
+        }
+    }
+}
+
+/// Generates a [`Validator`][PenumbraValidator] given a consensus verification key.
+fn generate_penumbra_validator(
+    consensus_key: ed25519_consensus::VerificationKey,
+) -> PenumbraValidator {
+    /// A temporary stub for validator keys.
+    ///
+    /// An invalid key is intentionally provided here, until we have test coverage exercising the
+    /// use of these keys. Once we need it we will:
+    /// - generate a random signing key
+    /// - get its verification key
+    /// - use that for the identity key
+    /// - throw the signing key away
+    ///
+    /// NB: for now, we will use the same key for governance. See the documentation of
+    /// `GovernanceKey` for more information about cold storage of validator keys.
+    const INVALID_KEY_BYTES: [u8; 32] = [0; 32];
+
+    PenumbraValidator {
+        identity_key: Some(IdentityKey {
+            ik: INVALID_KEY_BYTES.to_vec().clone(),
+        }),
+        governance_key: Some(GovernanceKey {
+            gk: INVALID_KEY_BYTES.to_vec().clone(),
+        }),
+        consensus_key: consensus_key.as_bytes().to_vec(),
+        enabled: true,
+        sequence_number: 0,
+        name: String::default(),
+        website: String::default(),
+        description: String::default(),
+        funding_streams: Vec::default(),
+    }
+}
+
+fn log_validator(
+    PenumbraValidator {
+        name,
+        enabled,
+        sequence_number,
+        ..
+    }: &PenumbraValidator,
+) {
+    tracing::trace!(
+        %name,
+        %enabled,
+        %sequence_number,
+        "injecting validator into app state"
+    )
+}

crates/core/app/tests/mock_consensus.rs

@@ -14,6 +14,7 @@ use {
     penumbra_proto::DomainType,
     penumbra_sct::component::{clock::EpochRead, tree::SctRead as _},
     penumbra_shielded_pool::{OutputPlan, SpendPlan},
+    penumbra_stake::component::validator_handler::ValidatorDataRead as _,
     penumbra_transaction::{
         memo::MemoPlaintext, plan::MemoPlan, TransactionParameters, TransactionPlan,
     },
@@ -37,6 +38,42 @@ async fn mock_consensus_can_send_an_init_chain_request() -> anyhow::Result<()> {
     Ok(())
 }
 
+/// Exercises that the mock consensus engine can provide a single genesis validator.
+#[tokio::test]
+async fn mock_consensus_can_define_a_genesis_validator() -> anyhow::Result<()> {
+    // Install a test logger, acquire some temporary storage, and start the test node.
+    let guard = common::set_tracing_subscriber();
+    let storage = TempStorage::new().await?;
+    let _test_node = common::start_test_node(&storage).await?;
+
+    let snapshot = storage.latest_snapshot();
+    let validators = snapshot
+        .validator_definitions()
+        .tap(|_| info!("getting validator definitions"))
+        .await?;
+    match validators.as_slice() {
+        [v] => {
+            let identity_key = v.identity_key;
+            let status = snapshot
+                .get_validator_state(&identity_key)
+                .await?
+                .ok_or_else(|| anyhow!("could not find validator status"))?;
+            assert_eq!(
+                status,
+                penumbra_stake::validator::State::Active,
+                "validator should be active"
+            );
+        }
+        unexpected => panic!("there should be one validator, got: {unexpected:?}"),
+    }
+
+    // Free our temporary storage.
+    drop(storage);
+    drop(guard);
+
+    Ok(())
+}
+
 /// Exercises that a series of empty blocks, with no validator set present, can be successfully
 /// executed by the consensus service.
 #[tokio::test]

crates/test/mock-consensus/Cargo.toml

@@ -7,10 +7,15 @@ repository.workspace = true
 homepage.workspace = true
 license.workspace = true
 
+# NB: to avoid circular dependencies: do not add other `penumbra-*` crates
+# as dependencies, below. we should provide interfaces in terms of generic
+# types, and provide penumbra-specific helper functions via extension traits.
+
 [dependencies]
 anyhow = { workspace = true }
 bytes = { workspace = true }
-serde_json = { workspace = true }
+ed25519-consensus = { workspace = true }
+rand_core = { workspace = true }
 tap = { workspace = true }
 tendermint = { workspace = true }
 tower = { workspace = true, features = ["full"] }

crates/test/mock-consensus/src/builder.rs

@@ -5,12 +5,16 @@
 /// Most importantly, defines [`Builder::init_chain()`].
 mod init_chain;
 
-use {crate::TestNode, bytes::Bytes};
+use {
+    crate::{keyring::Keyring, TestNode},
+    bytes::Bytes,
+};
 
 /// A buider, used to prepare and instantiate a new [`TestNode`].
 #[derive(Default)]
 pub struct Builder {
-    app_state: Option<Bytes>,
+    pub app_state: Option<Bytes>,
+    pub keyring: Keyring,
 }
 
 impl TestNode<()> {
@@ -21,17 +25,17 @@ impl TestNode<()> {
 }
 
 impl Builder {
-    // TODO: add other convenience methods for validator config?
-
-    /// Creates a single validator with a randomly generated key.
-    pub fn single_validator(self) -> Self {
-        // this does not do anything yet
-        self
-    }
-
     /// Sets the `app_state_bytes` to send the ABCI application upon chain initialization.
     pub fn app_state(self, app_state: impl Into<Bytes>) -> Self {
         let app_state = Some(app_state.into());
         Self { app_state, ..self }
     }
+
+    /// Generates a single set of validator keys.
+    pub fn single_validator(self) -> Self {
+        Self {
+            keyring: Keyring::new_with_size(1),
+            ..self
+        }
+    }
 }

crates/test/mock-consensus/src/builder/init_chain.rs

@@ -32,6 +32,7 @@ impl Builder {
 
         let Self {
             app_state: Some(app_state),
+            keyring: _,
         } = self
         else {
             bail!("builder was not fully initialized")