wip: move governance out of the app crate to its component crate

crates/core/app/src/lib.rs

@@ -8,7 +8,6 @@ pub use mock_client::MockClient;
 pub use temp_storage_ext::TempStorageExt;
 
 pub mod app;
-pub mod governance;
 
 #[cfg(test)]
 mod tests;

crates/core/component/governance/Cargo.toml

@@ -11,7 +11,8 @@ component = [
     "penumbra-storage",
     "penumbra-proto/penumbra-storage",
     "penumbra-chain/component",
-    "penumbra-sct/component"
+    "penumbra-sct/component",
+    "penumbra-stake/component",
 ]
 proving-keys = ["penumbra-proof-params/proving-keys"]
 default = ["std", "component", "proving-keys"]
@@ -28,9 +29,11 @@ penumbra-proof-params = { path = "../../../crypto/proof-params", default-feature
 penumbra-sct = { path = "../sct", default-features = false }
 penumbra-component = { path = "../component", optional = true }
 penumbra-shielded-pool = { path = "../shielded-pool", default-features = false  }
+penumbra-stake = { path = "../stake", default-features = false }
 penumbra-chain = { path = "../chain", default-features = false }
 penumbra-asset = { path = "../../../core/asset", default-features = false  } 
 penumbra-keys = { path = "../../../core/keys", default-features = false  } 
+penumbra-num = { path = "../../../core/num", default-features = false  } 
 
 # Penumbra dependencies
 decaf377-rdsa = { version = "0.7" }
@@ -56,6 +59,8 @@ rand_core = { version = "0.6.3", features = ["getrandom"] }
 rand = "0.8"
 im = "15.1"
 regex = "1.5"
+futures = "0.3"
 
 [dev-dependencies]
 proptest = "1"
+proptest-derive = "0.3"

crates/core/component/governance/src/action_handler.rs

@@ -0,0 +1 @@
+use penumbra_component::ActionHandler;

crates/core/app/src/governance/component.rs → crates/core/component/governance/src/component.rs

@@ -4,13 +4,19 @@ use anyhow::{Context, Result};
 use async_trait::async_trait;
 use penumbra_chain::component::StateReadExt;
 use penumbra_storage::StateWrite;
-use penumbra_transaction::proposal;
 use tendermint::v0_34::abci;
 use tracing::instrument;
 
-use super::{tally, StateReadExt as _, StateWriteExt as _};
 use penumbra_component::Component;
 
+use crate::{
+    proposal_state::{
+        Outcome as ProposalOutcome, State as ProposalState, Withdrawn as ProposalWithdrawn,
+    },
+    tally,
+    view::{StateReadExt as _, StateWriteExt},
+};
+
 pub struct Governance {}
 
 #[async_trait]
@@ -84,7 +90,7 @@ pub async fn enact_all_passed_proposals<S: StateWrite>(mut state: S) -> Result<(
             .context("proposal has id")?;
 
         let outcome = match current_state {
-            proposal::State::Voting => {
+            ProposalState::Voting => {
                 // If the proposal is still in the voting state, tally and conclude it (this will
                 // automatically remove it from the list of unfinished proposals)
                 let outcome = state.current_tally(proposal_id).await?.outcome(
@@ -126,22 +132,22 @@ pub async fn enact_all_passed_proposals<S: StateWrite>(mut state: S) -> Result<(
 
                 outcome.into()
             }
-            proposal::State::Withdrawn { reason } => {
+            ProposalState::Withdrawn { reason } => {
                 tracing::info!(proposal = %proposal_id, reason = ?reason, "proposal concluded after being withdrawn");
-                proposal::Outcome::Failed {
-                    withdrawn: proposal::Withdrawn::WithReason { reason },
+                ProposalOutcome::Failed {
+                    withdrawn: ProposalWithdrawn::WithReason { reason },
                 }
             }
-            proposal::State::Finished { outcome: _ } => {
+            ProposalState::Finished { outcome: _ } => {
                 anyhow::bail!("proposal {proposal_id} is already finished, and should have been removed from the active set");
             }
-            proposal::State::Claimed { outcome: _ } => {
+            ProposalState::Claimed { outcome: _ } => {
                 anyhow::bail!("proposal {proposal_id} is already claimed, and should have been removed from the active set");
             }
         };
 
         // Update the proposal state to reflect the outcome
-        state.put_proposal_state(proposal_id, proposal::State::Finished { outcome });
+        state.put_proposal_state(proposal_id, ProposalState::Finished { outcome });
     }
 
     Ok(())

crates/core/component/governance/src/lib.rs

@@ -3,7 +3,28 @@ mod delegator_vote;
 pub use delegator_vote::proof::{DelegatorVoteCircuit, DelegatorVoteProof};
 
 pub mod proposal_nft;
+pub mod proposal_state;
 pub mod voting_receipt_token;
 
 pub use proposal_nft::ProposalNft;
 pub use voting_receipt_token::VotingReceiptToken;
+
+mod metrics;
+mod state_key;
+mod tally;
+mod view;
+
+#[cfg_attr(docsrs, doc(cfg(feature = "component")))]
+#[cfg(feature = "component")]
+pub mod component;
+
+#[cfg_attr(docsrs, doc(cfg(feature = "component")))]
+#[cfg(feature = "component")]
+mod action_handler;
+
+#[cfg_attr(docsrs, doc(cfg(feature = "component")))]
+#[cfg(feature = "component")]
+pub use component::StateReadExt;
+
+pub mod proposal;
+pub mod vote;