Split penumbra crate into pd, pcli crates.

These don't actually share code, so they should be separate.
toptop34 · Nov 15, 2021 · d7939f4 · d7939f4
1 parent 55c2dd1
commit d7939f4
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 7 deletions.
diff --git a/.github/workflows/notes.yml b/.github/workflows/notes.yml
@@ -52,7 +52,9 @@ jobs:
             -p decaf377-fmd \
             -p penumbra-crypto \
             -p penumbra-proto \
-            -p penumbra
+            -p penumbra-wallet \
+            -p pd \
+            -p pcli \
       - name: Move API docs to subdirectory
         run: |
           if [ -d "firebase-tmp" ]; then rm -rf firebase-tmp; fi

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,12 +2,13 @@
 
 # Also remember to add to .github/workflows/notes.yml
 members = [
-  "proto",
-  "crypto",
   "decaf377-fmd",
   "decaf377-ka",
-  "penumbra",
+  "proto",
+  "crypto",
   "wallet",
+  "pd",
+  "pcli",
 ]
 
 [patch.crates-io]

diff --git a/pcli/Cargo.toml b/pcli/Cargo.toml
@@ -0,0 +1,56 @@
+[package]
+name = "pcli"
+version = "0.1.0"
+authors = ["Penumbra Labs <[email protected]>"]
+edition = "2021"
+description = "The command-line interface for the Penumbra Zone"
+repository = "https://github.com/penumbra-zone/penumbra/"
+homepage = "https://penumbra.zone"
+license = "MIT OR Apache-2.0"
+publish = false
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+# Workspace dependencies
+penumbra-proto = { path = "../proto" }
+penumbra-crypto = { path = "../crypto" , features = ["sqlx"]}
+penumbra-wallet = { path = "../wallet" }
+
+# Penumbra dependencies
+ark-ff = { git = "https://github.com/penumbra-zone/algebra", branch = "ours" }
+decaf377 = { git = "https://github.com/penumbra-zone/decaf377" }
+tower-abci = { git = "https://github.com/penumbra-zone/tower-abci/" }
+tendermint-proto = { git = "https://github.com/penumbra-zone/tendermint-rs.git", branch = "abci-domain-types" }
+tendermint = { git = "https://github.com/penumbra-zone/tendermint-rs.git", branch = "abci-domain-types" }
+# External dependencies
+async-stream = "0.2"
+bincode = "1.3.3"
+blake2b_simd = "0.5"
+bytes = "1"
+comfy-table = "5"
+directories = "4.0.1"
+tokio = { version = "1", features = ["full"]}
+tokio-stream = "0.1"
+tokio-util = "0.6"
+tower = { version = "0.4", features = ["full"]}
+tracing = "0.1"
+structopt = "0.3"
+tonic = "0.6.1"
+tracing-subscriber = "0.2"
+pin-project = "1"
+futures = "0.3"
+serde_json = "1"
+serde = { version = "1", features = ["derive"] }
+serde_with = { version = "1.11", features = ["hex"] }
+reqwest = { version = "0.11", features = ["json"] }
+sha2 = "0.9"
+anyhow = "1"
+hex = "0.4"
+rand = "0.8"
+rand_chacha = "0.3.1"
+rand_core = { version = "0.6.3", features = ["getrandom"] }
+sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "postgres" ] }
+
+[build-dependencies]
+vergen = "5"
diff --git a/penumbra/build.rs → pcli/build.rs b/penumbra/build.rs → pcli/build.rs
diff --git a/penumbra/src/bin/pcli.rs → pcli/src/main.rs b/penumbra/src/bin/pcli.rs → pcli/src/main.rs
diff --git a/penumbra/Cargo.toml → pd/Cargo.toml b/penumbra/Cargo.toml → pd/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "penumbra"
+name = "pd"
 version = "0.1.0"
 authors = ["Penumbra Labs <[email protected]>"]
 edition = "2021"

diff --git a/pd/build.rs b/pd/build.rs
@@ -0,0 +1,5 @@
+use vergen::{vergen, Config};
+
+fn main() {
+    vergen(Config::default()).unwrap()
+}
diff --git a/penumbra/src/app.rs → pd/src/app.rs b/penumbra/src/app.rs → pd/src/app.rs
diff --git a/penumbra/src/db.rs → pd/src/db.rs b/penumbra/src/db.rs → pd/src/db.rs
diff --git a/penumbra/src/db/schema.rs → pd/src/db/schema.rs b/penumbra/src/db/schema.rs → pd/src/db/schema.rs
diff --git a/penumbra/src/genesis.rs → pd/src/genesis.rs b/penumbra/src/genesis.rs → pd/src/genesis.rs
diff --git a/penumbra/src/lib.rs → pd/src/lib.rs b/penumbra/src/lib.rs → pd/src/lib.rs
diff --git a/penumbra/src/bin/pd.rs → pd/src/main.rs b/penumbra/src/bin/pd.rs → pd/src/main.rs
@@ -3,11 +3,12 @@ use rand_chacha::ChaCha20Rng;
 use structopt::StructOpt;
 use tonic::transport::Server;
 
-use penumbra::{
+use penumbra_proto::wallet::wallet_server;
+
+use pd::{
     genesis::{generate_genesis_notes, GenesisAddr},
     App, State, WalletApp,
 };
-use penumbra_proto::wallet::wallet_server;
 
 #[derive(Debug, StructOpt)]
 #[structopt(

diff --git a/penumbra/src/pending_block.rs → pd/src/pending_block.rs b/penumbra/src/pending_block.rs → pd/src/pending_block.rs
diff --git a/penumbra/src/state.rs → pd/src/state.rs b/penumbra/src/state.rs → pd/src/state.rs
diff --git a/penumbra/src/wallet.rs → pd/src/wallet.rs b/penumbra/src/wallet.rs → pd/src/wallet.rs