Skip to content

Commit

Permalink
penumbra: move crates into penumbra-sdk namespace (#4975)
Browse files Browse the repository at this point in the history 
## Describe your changes

This moves our workspace into a `penumbra-sdk` namespace ahead of
publishing `v0.82.0-alpha.0` on crates.io.

## Checklist before requesting a review

- [ ] I have added guiding text to explain how a reviewer should test
these changes.

- [x] If this code contains consensus-breaking changes, I have added the
"consensus-breaking" label. Otherwise, I declare my belief that there
are not consensus-breaking changes, for the following reason:

  > Crate plumbing
  • Loading branch information
@erwanor
erwanor authored Dec 25, 2024
1 parent 7943f3e commit 0ded71b
Show file tree
Hide file tree
Showing 520 changed files with 3,128 additions and 5,404 deletions.
690 changes: 346 additions & 344 deletions Cargo.lock
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ camino = { version = "1" }
chacha20poly1305 = { version = "0.9.0" }
chrono = { default-features = false, version = "0.4" }
clap = { version = "3.2" }
cnidarium = { version = "0.81", default-features = false}
cnidarium = { version = "0.82.1", default-features = false}
cnidarium-component = { default-features = false, path = "crates/cnidarium-component" }
cometindex = { path = "crates/util/cometindex" }
criterion = { version = "0.4" }
Expand Down Expand Up @@ -169,35 +169,35 @@ once_cell = { version = "1.8" }
parking_lot = { version = "0.12.1" }
pbjson = { version = "0.7.0" }
pbjson-types = { version = "0.7.0" }
penumbra-app = { default-features = false, path = "crates/core/app" }
penumbra-asset = { default-features = false, path = "crates/core/asset" }
penumbra-community-pool = { default-features = false, path = "crates/core/component/community-pool" }
penumbra-compact-block = { default-features = false, path = "crates/core/component/compact-block" }
penumbra-custody = { path = "crates/custody" }
penumbra-auction = { default-features = false, path = "crates/core/component/auction" }
penumbra-dex = { default-features = false, path = "crates/core/component/dex" }
penumbra-distributions = { default-features = false, path = "crates/core/component/distributions" }
penumbra-fee = { default-features = false, path = "crates/core/component/fee" }
penumbra-funding = { default-features = false, path = "crates/core/component/funding" }
penumbra-governance = { default-features = false, path = "crates/core/component/governance" }
penumbra-ibc = { default-features = false, path = "crates/core/component/ibc" }
penumbra-keys = { default-features = false, path = "crates/core/keys" }
penumbra-mock-client = { path = "crates/test/mock-client" }
penumbra-mock-consensus = { path = "crates/test/mock-consensus" }
penumbra-mock-tendermint-proxy = { path = "crates/test/mock-tendermint-proxy" }
penumbra-num = { default-features = false, path = "crates/core/num" }
penumbra-proof-params = { default-features = false, path = "crates/crypto/proof-params" }
penumbra-proof-setup = { path = "crates/crypto/proof-setup" }
penumbra-proto = { default-features = false, path = "crates/proto" }
penumbra-sct = { default-features = false, path = "crates/core/component/sct" }
penumbra-shielded-pool = { default-features = false, path = "crates/core/component/shielded-pool" }
penumbra-stake = { default-features = false, path = "crates/core/component/stake" }
penumbra-tct = { default-features = false, path = "crates/crypto/tct" }
penumbra-test-subscriber = { path = "crates/test/tracing-subscriber" }
penumbra-transaction = { default-features = false, path = "crates/core/transaction" }
penumbra-txhash = { default-features = false, path = "crates/core/txhash" }
penumbra-view = { path = "crates/view" }
penumbra-wallet = { path = "crates/wallet" }
penumbra-sdk-app = { default-features = false, path = "crates/core/app" }
penumbra-sdk-asset = { default-features = false, path = "crates/core/asset" }
penumbra-sdk-community-pool = { default-features = false, path = "crates/core/component/community-pool" }
penumbra-sdk-compact-block = { default-features = false, path = "crates/core/component/compact-block" }
penumbra-sdk-custody = { path = "crates/custody" }
penumbra-sdk-auction = { default-features = false, path = "crates/core/component/auction" }
penumbra-sdk-dex = { default-features = false, path = "crates/core/component/dex" }
penumbra-sdk-distributions = { default-features = false, path = "crates/core/component/distributions" }
penumbra-sdk-fee = { default-features = false, path = "crates/core/component/fee" }
penumbra-sdk-funding = { default-features = false, path = "crates/core/component/funding" }
penumbra-sdk-governance = { default-features = false, path = "crates/core/component/governance" }
penumbra-sdk-ibc = { default-features = false, path = "crates/core/component/ibc" }
penumbra-sdk-keys = { default-features = false, path = "crates/core/keys" }
penumbra-sdk-mock-client = { path = "crates/test/mock-client" }
penumbra-sdk-mock-consensus = { path = "crates/test/mock-consensus" }
penumbra-sdk-mock-tendermint-proxy = { path = "crates/test/mock-tendermint-proxy" }
penumbra-sdk-num = { default-features = false, path = "crates/core/num" }
penumbra-sdk-proof-params = { default-features = false, path = "crates/crypto/proof-params" }
penumbra-sdk-proof-setup = { path = "crates/crypto/proof-setup" }
penumbra-sdk-proto = { default-features = false, path = "crates/proto" }
penumbra-sdk-sct = { default-features = false, path = "crates/core/component/sct" }
penumbra-sdk-shielded-pool = { default-features = false, path = "crates/core/component/shielded-pool" }
penumbra-sdk-stake = { default-features = false, path = "crates/core/component/stake" }
penumbra-sdk-tct = { default-features = false, path = "crates/crypto/tct" }
penumbra-sdk-test-subscriber = { path = "crates/test/tracing-subscriber" }
penumbra-sdk-transaction = { default-features = false, path = "crates/core/transaction" }
penumbra-sdk-txhash = { default-features = false, path = "crates/core/txhash" }
penumbra-sdk-view = { path = "crates/view" }
penumbra-sdk-wallet = { path = "crates/wallet" }
pin-project = { version = "1.0.12" }
pin-project-lite = { version = "0.2.9" }
poseidon377 = { version = "1.2.0" }
Expand Down
24 changes: 12 additions & 12 deletions crates/bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "penumbra-bench"
name = "penumbra-sdk-bench"
version = {workspace = true}
edition = {workspace = true}

Expand Down Expand Up @@ -74,9 +74,9 @@ bech32 = {workspace = true}
decaf377 = {workspace = true, features = ["r1cs"], default-features = true}
num-bigint = {workspace = true}
once_cell = {workspace = true}
penumbra-asset = {workspace = true, default-features = true}
penumbra-keys = {workspace = true, default-features = true}
penumbra-num = {workspace = true, default-features = true}
penumbra-sdk-asset = {workspace = true, default-features = true}
penumbra-sdk-keys = {workspace = true, default-features = true}
penumbra-sdk-num = {workspace = true, default-features = true}
rand = {workspace = true}
rand_core = {workspace = true, features = ["getrandom"]}
serde = {workspace = true, features = ["derive"]}
Expand All @@ -88,15 +88,15 @@ criterion = {workspace = true, features = ["html_reports"]}
decaf377-fmd = {workspace = true}
decaf377-ka = {workspace = true}
decaf377-rdsa = {workspace = true}
penumbra-dex = {workspace = true, default-features = true}
penumbra-fee = {workspace = true, default-features = true}
penumbra-governance = {workspace = true, default-features = true}
penumbra-sct = {workspace = true, default-features = true}
penumbra-shielded-pool = {workspace = true, default-features = true}
penumbra-stake = {workspace = true, default-features = true}
penumbra-tct = {workspace = true, features = ["r1cs"], default-features = true}
penumbra-sdk-dex = {workspace = true, default-features = true}
penumbra-sdk-fee = {workspace = true, default-features = true}
penumbra-sdk-governance = {workspace = true, default-features = true}
penumbra-sdk-sct = {workspace = true, default-features = true}
penumbra-sdk-shielded-pool = {workspace = true, default-features = true}
penumbra-sdk-stake = {workspace = true, default-features = true}
penumbra-sdk-tct = {workspace = true, features = ["r1cs"], default-features = true}

[dev-dependencies.penumbra-proof-params]
[dev-dependencies.penumbra-sdk-proof-params]
workspace = true
default-features = true
features = [
Expand Down
8 changes: 4 additions & 4 deletions crates/bench/benches/convert.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ use ark_relations::r1cs::{
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
};
use decaf377::{Fq, Fr};
use penumbra_asset::{Balance, Value, STAKING_TOKEN_ASSET_ID};
use penumbra_num::{fixpoint::U128x128, Amount};
use penumbra_proof_params::{DummyWitness, CONVERT_PROOF_PROVING_KEY};
use penumbra_shielded_pool::{
use penumbra_sdk_asset::{Balance, Value, STAKING_TOKEN_ASSET_ID};
use penumbra_sdk_num::{fixpoint::U128x128, Amount};
use penumbra_sdk_proof_params::{DummyWitness, CONVERT_PROOF_PROVING_KEY};
use penumbra_sdk_shielded_pool::{
ConvertCircuit, ConvertProof, ConvertProofPrivate, ConvertProofPublic,
};

Expand Down
14 changes: 7 additions & 7 deletions crates/bench/benches/delegator_vote.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ use ark_relations::r1cs::{
};
use decaf377::{Fq, Fr};
use decaf377_rdsa::{SpendAuth, VerificationKey};
use penumbra_asset::Value;
use penumbra_governance::{
use penumbra_sdk_asset::Value;
use penumbra_sdk_governance::{
DelegatorVoteCircuit, DelegatorVoteProof, DelegatorVoteProofPrivate, DelegatorVoteProofPublic,
};
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_proof_params::{DummyWitness, DELEGATOR_VOTE_PROOF_PROVING_KEY};
use penumbra_sct::Nullifier;
use penumbra_shielded_pool::Note;
use penumbra_tct as tct;
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_sdk_proof_params::{DummyWitness, DELEGATOR_VOTE_PROOF_PROVING_KEY};
use penumbra_sdk_sct::Nullifier;
use penumbra_sdk_shielded_pool::Note;
use penumbra_sdk_tct as tct;

use criterion::{criterion_group, criterion_main, Criterion};
use rand_core::OsRng;
Expand Down
14 changes: 7 additions & 7 deletions crates/bench/benches/nullifier_derivation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ use ark_relations::r1cs::{
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
};
use decaf377::Fq;
use penumbra_asset::Value;
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_proof_params::{DummyWitness, NULLIFIER_DERIVATION_PROOF_PROVING_KEY};
use penumbra_sct::Nullifier;
use penumbra_shielded_pool::{
use penumbra_sdk_asset::Value;
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_sdk_proof_params::{DummyWitness, NULLIFIER_DERIVATION_PROOF_PROVING_KEY};
use penumbra_sdk_sct::Nullifier;
use penumbra_sdk_shielded_pool::{
Note, NullifierDerivationProofPrivate, NullifierDerivationProofPublic, Rseed,
};
use penumbra_shielded_pool::{NullifierDerivationCircuit, NullifierDerivationProof};
use penumbra_tct as tct;
use penumbra_sdk_shielded_pool::{NullifierDerivationCircuit, NullifierDerivationProof};
use penumbra_sdk_tct as tct;

use criterion::{criterion_group, criterion_main, Criterion};
use rand_core::OsRng;
Expand Down
8 changes: 4 additions & 4 deletions crates/bench/benches/output.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ use ark_relations::r1cs::{
use decaf377::{Fq, Fr};
use decaf377_fmd as fmd;
use decaf377_ka as ka;
use penumbra_asset::{Balance, Value};
use penumbra_keys::{keys::Diversifier, Address};
use penumbra_proof_params::{DummyWitness, OUTPUT_PROOF_PROVING_KEY};
use penumbra_shielded_pool::{
use penumbra_sdk_asset::{Balance, Value};
use penumbra_sdk_keys::{keys::Diversifier, Address};
use penumbra_sdk_proof_params::{DummyWitness, OUTPUT_PROOF_PROVING_KEY};
use penumbra_sdk_shielded_pool::{
output::{OutputProofPrivate, OutputProofPublic},
Note, OutputCircuit, OutputProof, Rseed,
};
Expand Down
14 changes: 8 additions & 6 deletions crates/bench/benches/spend.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ use ark_relations::r1cs::{
};
use decaf377::{Fq, Fr};
use decaf377_rdsa::{SpendAuth, VerificationKey};
use penumbra_asset::Value;
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_proof_params::{DummyWitness, SPEND_PROOF_PROVING_KEY};
use penumbra_sct::Nullifier;
use penumbra_shielded_pool::{Note, SpendCircuit, SpendProof, SpendProofPrivate, SpendProofPublic};
use penumbra_tct as tct;
use penumbra_sdk_asset::Value;
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_sdk_proof_params::{DummyWitness, SPEND_PROOF_PROVING_KEY};
use penumbra_sdk_sct::Nullifier;
use penumbra_sdk_shielded_pool::{
Note, SpendCircuit, SpendProof, SpendProofPrivate, SpendProofPublic,
};
use penumbra_sdk_tct as tct;

use criterion::{criterion_group, criterion_main, Criterion};
use rand_core::OsRng;
Expand Down
12 changes: 6 additions & 6 deletions crates/bench/benches/swap.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ use ark_relations::r1cs::{
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
};
use decaf377::{Fq, Fr};
use penumbra_asset::{asset, Balance, Value};
use penumbra_dex::{
use penumbra_sdk_asset::{asset, Balance, Value};
use penumbra_sdk_dex::{
swap::proof::{SwapCircuit, SwapProof, SwapProofPublic},
swap::{proof::SwapProofPrivate, SwapPlaintext},
TradingPair,
};
use penumbra_fee::Fee;
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_num::Amount;
use penumbra_proof_params::{DummyWitness, SWAP_PROOF_PROVING_KEY};
use penumbra_sdk_fee::Fee;
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_sdk_num::Amount;
use penumbra_sdk_proof_params::{DummyWitness, SWAP_PROOF_PROVING_KEY};

use criterion::{criterion_group, criterion_main, Criterion};
use rand_core::OsRng;
Expand Down
16 changes: 8 additions & 8 deletions crates/bench/benches/swap_claim.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ use ark_relations::r1cs::{
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
};
use decaf377::Fq;
use penumbra_asset::asset;
use penumbra_dex::{
use penumbra_sdk_asset::asset;
use penumbra_sdk_dex::{
swap::SwapPlaintext,
swap_claim::{SwapClaimCircuit, SwapClaimProof, SwapClaimProofPrivate, SwapClaimProofPublic},
BatchSwapOutputData, TradingPair,
};
use penumbra_fee::Fee;
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_num::Amount;
use penumbra_proof_params::{DummyWitness, SWAPCLAIM_PROOF_PROVING_KEY};
use penumbra_sct::Nullifier;
use penumbra_tct as tct;
use penumbra_sdk_fee::Fee;
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
use penumbra_sdk_num::Amount;
use penumbra_sdk_proof_params::{DummyWitness, SWAPCLAIM_PROOF_PROVING_KEY};
use penumbra_sdk_sct::Nullifier;
use penumbra_sdk_tct as tct;

use criterion::{criterion_group, criterion_main, Criterion};
use rand_core::OsRng;
Expand Down
67 changes: 34 additions & 33 deletions crates/bin/pcli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ dist = true

[features]
default = ["std", "parallel", "download-proving-keys"]
download-proving-keys = ["penumbra-proof-params/download-proving-keys"]
sct-divergence-check = ["penumbra-view/sct-divergence-check"]
download-proving-keys = ["penumbra-sdk-proof-params/download-proving-keys"]
sct-divergence-check = ["penumbra-sdk-view/sct-divergence-check"]
std = ["ark-ff/std", "ibc-types/std"]
parallel = [
"penumbra-proof-params/parallel",
"penumbra-sdk-proof-params/parallel",
"decaf377/parallel",
"penumbra-shielded-pool/parallel",
"penumbra-auction/parallel",
"penumbra-dex/parallel",
"penumbra-governance/parallel",
"penumbra-stake/parallel",
"penumbra-transaction/parallel",
"penumbra-wallet/parallel",
"penumbra-sdk-shielded-pool/parallel",
"penumbra-sdk-auction/parallel",
"penumbra-sdk-dex/parallel",
"penumbra-sdk-governance/parallel",
"penumbra-sdk-stake/parallel",
"penumbra-sdk-transaction/parallel",
"penumbra-sdk-wallet/parallel",
]

[dependencies]
Expand All @@ -39,6 +39,7 @@ bincode = {workspace = true}
blake2b_simd = {workspace = true}
bytes = {workspace = true}
camino = {workspace = true}
cnidarium = {workspace = true, features = ["rpc"] }
clap = {workspace = true, features = ["derive", "env"]}
colored = "2.1.0"
colored_json = "4.1"
Expand All @@ -59,27 +60,27 @@ indicatif = {workspace = true}
jmt = {workspace = true}
ndarray = "0.15.6"
once_cell = {workspace = true}
penumbra-app = {workspace = true, default-features = false}
penumbra-asset = {workspace = true, default-features = false}
penumbra-community-pool = {workspace = true, default-features = false}
penumbra-compact-block = {workspace = true, default-features = false}
penumbra-custody = {workspace = true}
penumbra-auction = {workspace = true, default-features = false}
penumbra-dex = {workspace = true, default-features = false}
penumbra-fee = {workspace = true, default-features = false}
penumbra-governance = {workspace = true, default-features = false}
penumbra-ibc = {workspace = true, default-features = false}
penumbra-keys = {workspace = true, default-features = false}
penumbra-num = {workspace = true, default-features = false}
penumbra-proof-params = { workspace = true, default-features = true }
penumbra-proto = {workspace = true, features = ["rpc", "box-grpc"], default-features = true}
penumbra-sct = {workspace = true, default-features = false}
penumbra-shielded-pool = {workspace = true, default-features = false}
penumbra-stake = {workspace = true, default-features = false}
penumbra-tct = {workspace = true, default-features = true}
penumbra-transaction = {workspace = true, default-features = true}
penumbra-view = {workspace = true}
penumbra-wallet = {workspace = true}
penumbra-sdk-app = {workspace = true, default-features = false}
penumbra-sdk-asset = {workspace = true, default-features = false}
penumbra-sdk-community-pool = {workspace = true, default-features = false}
penumbra-sdk-compact-block = {workspace = true, default-features = false}
penumbra-sdk-custody = {workspace = true}
penumbra-sdk-auction = {workspace = true, default-features = false}
penumbra-sdk-dex = {workspace = true, default-features = false}
penumbra-sdk-fee = {workspace = true, default-features = false}
penumbra-sdk-governance = {workspace = true, default-features = false}
penumbra-sdk-ibc = {workspace = true, default-features = false}
penumbra-sdk-keys = {workspace = true, default-features = false}
penumbra-sdk-num = {workspace = true, default-features = false}
penumbra-sdk-proof-params = { workspace = true, default-features = true }
penumbra-sdk-proto = {workspace = true, features = ["rpc", "box-grpc"], default-features = true}
penumbra-sdk-sct = {workspace = true, default-features = false}
penumbra-sdk-shielded-pool = {workspace = true, default-features = false}
penumbra-sdk-stake = {workspace = true, default-features = false}
penumbra-sdk-tct = {workspace = true, default-features = true}
penumbra-sdk-transaction = {workspace = true, default-features = true}
penumbra-sdk-view = {workspace = true}
penumbra-sdk-wallet = {workspace = true}
pin-project = {workspace = true}
rand = {workspace = true}
rand_chacha = {workspace = true}
Expand All @@ -105,12 +106,12 @@ url = {workspace = true, features = ["serde"]}

[dev-dependencies]
assert_cmd = {workspace = true}
penumbra-governance = {workspace = true, default-features = false}
penumbra-sdk-governance = {workspace = true, default-features = false}
predicates = "2.1"
regex = {workspace = true}
tempfile = {workspace = true}

[dev-dependencies.penumbra-proof-params]
[dev-dependencies.penumbra-sdk-proof-params]
default-features = true
workspace = true
features = [
Expand Down
Loading

0 comments on commit 0ded71b

Please sign in to comment.