refactor: populate penumbra-num, penumbra-asset

Towards #2765
penumbra-zone · Jul 2, 2023 · b15059d · b15059d
1 parent 20231f7
commit b15059d
Show file tree

Hide file tree

Showing 157 changed files with 499 additions and 370 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bin/pcli/Cargo.toml b/crates/bin/pcli/Cargo.toml
@@ -23,6 +23,8 @@ parallel = ["penumbra-proof-params/parallel", "decaf377/parallel", "penumbra-cry
 penumbra-proto            = { path = "../../proto", features = ["rpc"] }
 penumbra-tct              = { path = "../../crypto/tct" }
 penumbra-crypto           = { path = "../../core/crypto", features = ["parallel"] }
+penumbra-num           = { path = "../../core/num", default-features=false }
+penumbra-asset           = { path = "../../core/asset", default-features=false }
 penumbra-chain            = { path = "../../core/component/chain", default-features = false }
 penumbra-shielded-pool    = { path = "../../core/component/shielded-pool", default-features = false }
 penumbra-stake            = { path = "../../core/component/stake", default-features = false }

diff --git a/crates/bin/pcli/src/command/query/dao.rs b/crates/bin/pcli/src/command/query/dao.rs
@@ -3,7 +3,8 @@ use futures::TryStreamExt;
 //use penumbra_app::dao;
 use penumbra_dao::component::state_key;
 
-use penumbra_crypto::{asset, Amount, Value};
+use penumbra_asset::{asset, Value};
+use penumbra_num::Amount;
 use penumbra_view::ViewClient;
 
 use crate::{command::query::dao, App};

diff --git a/crates/bin/pcli/src/command/query/dex.rs b/crates/bin/pcli/src/command/query/dex.rs
@@ -3,10 +3,7 @@ use comfy_table::{presets, Table};
 use futures::{Stream, StreamExt, TryStreamExt};
 use std::pin::Pin;
 
-use penumbra_crypto::{
-    asset::{self, DenomMetadata},
-    Value,
-};
+use penumbra_asset::{asset, asset::DenomMetadata, Value};
 use penumbra_dex::{
     lp::position::{self, Position},
     BatchSwapOutputData, DirectedTradingPair, SwapExecution, TradingPair,

diff --git a/crates/bin/pcli/src/command/tx.rs b/crates/bin/pcli/src/command/tx.rs
@@ -10,14 +10,12 @@ use anyhow::{anyhow, Context, Result};
 use ark_ff::UniformRand;
 use decaf377::{Fq, Fr};
 use ibc_types2::core::channel::{ChannelId, PortId};
-use penumbra_crypto::{
-    asset::{self, DenomMetadata},
-    keys::AddressIndex,
-    Amount, Value, STAKING_TOKEN_ASSET_ID,
-};
+use penumbra_asset::{asset, asset::DenomMetadata, Value, STAKING_TOKEN_ASSET_ID};
+use penumbra_crypto::keys::AddressIndex;
 use penumbra_dex::{lp::position, swap_claim::SwapClaimPlan};
 use penumbra_fee::Fee;
 use penumbra_ibc::Ics20Withdrawal;
+use penumbra_num::Amount;
 use penumbra_proto::{
     client::v1alpha1::{
         EpochByHeightRequest, LiquidityPositionByIdRequest, ProposalInfoRequest,

diff --git a/crates/bin/pcli/src/command/tx/liquidity_position.rs b/crates/bin/pcli/src/command/tx/liquidity_position.rs
@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-use penumbra_crypto::asset;
+use penumbra_asset::asset;
 use penumbra_dex::lp::{
     position::{self, Position},
     BuyOrder, SellOrder,

diff --git a/crates/bin/pcli/src/command/tx/replicate.rs b/crates/bin/pcli/src/command/tx/replicate.rs
@@ -5,10 +5,10 @@ use crate::dex_utils;
 use crate::dex_utils::replicate::debug;
 use anyhow::{anyhow, bail, Result};
 use dialoguer::Confirm;
-use penumbra_crypto::fixpoint::U128x128;
+use penumbra_asset::Value;
 use penumbra_crypto::keys::AddressIndex;
-use penumbra_crypto::{Amount, Value};
 use penumbra_dex::{lp::position::Position, DirectedUnitPair};
+use penumbra_num::{fixpoint::U128x128, Amount};
 use penumbra_proto::client::v1alpha1::SpreadRequest;
 use penumbra_view::{Planner, ViewClient};
 use rand_core::OsRng;

diff --git a/crates/bin/pcli/src/command/utils.rs b/crates/bin/pcli/src/command/utils.rs
@@ -1,5 +1,5 @@
 use comfy_table::{presets, Table};
-use penumbra_crypto::{asset, Value};
+use penumbra_asset::{asset, Value};
 use penumbra_dex::lp::position::Position;
 
 pub(crate) fn render_positions(asset_cache: &asset::Cache, positions: &[Position]) -> String {

diff --git a/crates/bin/pcli/src/command/view/balance.rs b/crates/bin/pcli/src/command/view/balance.rs
@@ -1,6 +1,7 @@
 use anyhow::Result;
 use comfy_table::{presets, Table};
-use penumbra_crypto::{asset::Cache, keys::AddressIndex, FullViewingKey, Value};
+use penumbra_asset::{asset::Cache, Value};
+use penumbra_crypto::{keys::AddressIndex, FullViewingKey};
 use penumbra_view::ViewClient;
 #[derive(Debug, clap::Args)]
 pub struct BalanceCmd {

diff --git a/crates/bin/pcli/src/command/view/staked.rs b/crates/bin/pcli/src/command/view/staked.rs
@@ -3,7 +3,8 @@ use std::collections::BTreeMap;
 use anyhow::Result;
 use comfy_table::{presets, Table};
 use futures::TryStreamExt;
-use penumbra_crypto::{FullViewingKey, Value, STAKING_TOKEN_ASSET_ID};
+use penumbra_asset::{Value, STAKING_TOKEN_ASSET_ID};
+use penumbra_crypto::FullViewingKey;
 use penumbra_proto::client::v1alpha1::{
     oblivious_query_service_client::ObliviousQueryServiceClient, ValidatorInfoRequest,
 };

diff --git a/crates/bin/pcli/src/command/view/tx.rs b/crates/bin/pcli/src/command/view/tx.rs
@@ -1,6 +1,7 @@
 use anyhow::{Context, Result};
 use comfy_table::{presets, Table};
-use penumbra_crypto::{asset::Cache, keys::IncomingViewingKey, Address, Note, NoteView, Value};
+use penumbra_asset::{asset::Cache, Value};
+use penumbra_crypto::{keys::IncomingViewingKey, Address, Note, NoteView};
 use penumbra_dex::{
     lp::position::Position,
     swap::SwapPlaintext,

diff --git a/crates/bin/pcli/src/dex_utils/replicate/debug.rs b/crates/bin/pcli/src/dex_utils/replicate/debug.rs
@@ -1,6 +1,6 @@
-use penumbra_crypto::fixpoint::U128x128;
 use penumbra_dex::lp::position::Position;
 use penumbra_dex::DirectedUnitPair;
+use penumbra_num::fixpoint::U128x128;
 use serde::Serialize;
 
 #[derive(Serialize)]

diff --git a/crates/bin/pcli/src/dex_utils/replicate/xyk.rs b/crates/bin/pcli/src/dex_utils/replicate/xyk.rs
@@ -1,10 +1,11 @@
 use crate::dex_utils::replicate::math_utils;
 use ndarray::Array;
-use penumbra_crypto::{fixpoint::U128x128, Amount, Value};
+use penumbra_asset::Value;
 use penumbra_dex::{
     lp::{position::Position, Reserves},
     DirectedUnitPair,
 };
+use penumbra_num::{fixpoint::U128x128, Amount};
 use rand_core::OsRng;
 use tracing::field;
 

diff --git a/crates/bin/pcli/tests/proof.rs b/crates/bin/pcli/tests/proof.rs
@@ -3,18 +3,19 @@
 
 use ark_ff::UniformRand;
 use decaf377::Fr;
+use penumbra_asset::{asset, Balance, Value};
 use penumbra_crypto::{
-    asset,
     keys::{SeedPhrase, SpendKey},
     proofs::groth16::{DelegatorVoteProof, NullifierDerivationProof, OutputProof, SpendProof},
     rdsa::{self, SpendAuth, VerificationKey},
-    Amount, Balance, Fq, Note, Value,
+    Fq, Note,
 };
 use penumbra_dex::{
     swap::proof::SwapProof, swap::SwapPlaintext, swap_claim::proof::SwapClaimProof,
     BatchSwapOutputData, TradingPair,
 };
 use penumbra_fee::Fee;
+use penumbra_num::Amount;
 use penumbra_proof_params::{
     DELEGATOR_VOTE_PROOF_PROVING_KEY, DELEGATOR_VOTE_PROOF_VERIFICATION_KEY,
     NULLIFIER_DERIVATION_PROOF_PROVING_KEY, NULLIFIER_DERIVATION_PROOF_VERIFICATION_KEY,

diff --git a/crates/bin/pclientd/Cargo.toml b/crates/bin/pclientd/Cargo.toml
@@ -17,6 +17,7 @@ parallel = ["penumbra-crypto/parallel"]
 penumbra-proto            = { path = "../../proto", features = ["rpc"] }
 penumbra-tct              = { path = "../../crypto/tct" }
 penumbra-crypto           = { path = "../../core/crypto", features = ["parallel"] }
+penumbra-asset           = { path = "../../core/asset" }
 penumbra-chain            = { path = "../../core/component/chain" }
 penumbra-transaction      = { path = "../../core/transaction" }
 penumbra-app              = { path = "../../core/app" }