Skip to content

Commit 0ded71b

Browse files
erwanorerwanor
authored
penumbra: move crates into penumbra-sdk namespace (#4975)
## 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
1 parent 7943f3e commit 0ded71b

File tree

520 files changed

+3128
-5404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+3128
-5404
lines changed

‎Cargo.lock

Lines changed: 346 additions & 344 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ camino = { version = "1" }
135135
chacha20poly1305 = { version = "0.9.0" }
136136
chrono = { default-features = false, version = "0.4" }
137137
clap = { version = "3.2" }
138-
cnidarium = { version = "0.81", default-features = false}
138+
cnidarium = { version = "0.82.1", default-features = false}
139139
cnidarium-component = { default-features = false, path = "crates/cnidarium-component" }
140140
cometindex = { path = "crates/util/cometindex" }
141141
criterion = { version = "0.4" }
@@ -169,35 +169,35 @@ once_cell = { version = "1.8" }
169169
parking_lot = { version = "0.12.1" }
170170
pbjson = { version = "0.7.0" }
171171
pbjson-types = { version = "0.7.0" }
172-
penumbra-app = { default-features = false, path = "crates/core/app" }
173-
penumbra-asset = { default-features = false, path = "crates/core/asset" }
174-
penumbra-community-pool = { default-features = false, path = "crates/core/component/community-pool" }
175-
penumbra-compact-block = { default-features = false, path = "crates/core/component/compact-block" }
176-
penumbra-custody = { path = "crates/custody" }
177-
penumbra-auction = { default-features = false, path = "crates/core/component/auction" }
178-
penumbra-dex = { default-features = false, path = "crates/core/component/dex" }
179-
penumbra-distributions = { default-features = false, path = "crates/core/component/distributions" }
180-
penumbra-fee = { default-features = false, path = "crates/core/component/fee" }
181-
penumbra-funding = { default-features = false, path = "crates/core/component/funding" }
182-
penumbra-governance = { default-features = false, path = "crates/core/component/governance" }
183-
penumbra-ibc = { default-features = false, path = "crates/core/component/ibc" }
184-
penumbra-keys = { default-features = false, path = "crates/core/keys" }
185-
penumbra-mock-client = { path = "crates/test/mock-client" }
186-
penumbra-mock-consensus = { path = "crates/test/mock-consensus" }
187-
penumbra-mock-tendermint-proxy = { path = "crates/test/mock-tendermint-proxy" }
188-
penumbra-num = { default-features = false, path = "crates/core/num" }
189-
penumbra-proof-params = { default-features = false, path = "crates/crypto/proof-params" }
190-
penumbra-proof-setup = { path = "crates/crypto/proof-setup" }
191-
penumbra-proto = { default-features = false, path = "crates/proto" }
192-
penumbra-sct = { default-features = false, path = "crates/core/component/sct" }
193-
penumbra-shielded-pool = { default-features = false, path = "crates/core/component/shielded-pool" }
194-
penumbra-stake = { default-features = false, path = "crates/core/component/stake" }
195-
penumbra-tct = { default-features = false, path = "crates/crypto/tct" }
196-
penumbra-test-subscriber = { path = "crates/test/tracing-subscriber" }
197-
penumbra-transaction = { default-features = false, path = "crates/core/transaction" }
198-
penumbra-txhash = { default-features = false, path = "crates/core/txhash" }
199-
penumbra-view = { path = "crates/view" }
200-
penumbra-wallet = { path = "crates/wallet" }
172+
penumbra-sdk-app = { default-features = false, path = "crates/core/app" }
173+
penumbra-sdk-asset = { default-features = false, path = "crates/core/asset" }
174+
penumbra-sdk-community-pool = { default-features = false, path = "crates/core/component/community-pool" }
175+
penumbra-sdk-compact-block = { default-features = false, path = "crates/core/component/compact-block" }
176+
penumbra-sdk-custody = { path = "crates/custody" }
177+
penumbra-sdk-auction = { default-features = false, path = "crates/core/component/auction" }
178+
penumbra-sdk-dex = { default-features = false, path = "crates/core/component/dex" }
179+
penumbra-sdk-distributions = { default-features = false, path = "crates/core/component/distributions" }
180+
penumbra-sdk-fee = { default-features = false, path = "crates/core/component/fee" }
181+
penumbra-sdk-funding = { default-features = false, path = "crates/core/component/funding" }
182+
penumbra-sdk-governance = { default-features = false, path = "crates/core/component/governance" }
183+
penumbra-sdk-ibc = { default-features = false, path = "crates/core/component/ibc" }
184+
penumbra-sdk-keys = { default-features = false, path = "crates/core/keys" }
185+
penumbra-sdk-mock-client = { path = "crates/test/mock-client" }
186+
penumbra-sdk-mock-consensus = { path = "crates/test/mock-consensus" }
187+
penumbra-sdk-mock-tendermint-proxy = { path = "crates/test/mock-tendermint-proxy" }
188+
penumbra-sdk-num = { default-features = false, path = "crates/core/num" }
189+
penumbra-sdk-proof-params = { default-features = false, path = "crates/crypto/proof-params" }
190+
penumbra-sdk-proof-setup = { path = "crates/crypto/proof-setup" }
191+
penumbra-sdk-proto = { default-features = false, path = "crates/proto" }
192+
penumbra-sdk-sct = { default-features = false, path = "crates/core/component/sct" }
193+
penumbra-sdk-shielded-pool = { default-features = false, path = "crates/core/component/shielded-pool" }
194+
penumbra-sdk-stake = { default-features = false, path = "crates/core/component/stake" }
195+
penumbra-sdk-tct = { default-features = false, path = "crates/crypto/tct" }
196+
penumbra-sdk-test-subscriber = { path = "crates/test/tracing-subscriber" }
197+
penumbra-sdk-transaction = { default-features = false, path = "crates/core/transaction" }
198+
penumbra-sdk-txhash = { default-features = false, path = "crates/core/txhash" }
199+
penumbra-sdk-view = { path = "crates/view" }
200+
penumbra-sdk-wallet = { path = "crates/wallet" }
201201
pin-project = { version = "1.0.12" }
202202
pin-project-lite = { version = "0.2.9" }
203203
poseidon377 = { version = "1.2.0" }

‎crates/bench/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "penumbra-bench"
2+
name = "penumbra-sdk-bench"
33
version = {workspace = true}
44
edition = {workspace = true}
55

@@ -74,9 +74,9 @@ bech32 = {workspace = true}
7474
decaf377 = {workspace = true, features = ["r1cs"], default-features = true}
7575
num-bigint = {workspace = true}
7676
once_cell = {workspace = true}
77-
penumbra-asset = {workspace = true, default-features = true}
78-
penumbra-keys = {workspace = true, default-features = true}
79-
penumbra-num = {workspace = true, default-features = true}
77+
penumbra-sdk-asset = {workspace = true, default-features = true}
78+
penumbra-sdk-keys = {workspace = true, default-features = true}
79+
penumbra-sdk-num = {workspace = true, default-features = true}
8080
rand = {workspace = true}
8181
rand_core = {workspace = true, features = ["getrandom"]}
8282
serde = {workspace = true, features = ["derive"]}
@@ -88,15 +88,15 @@ criterion = {workspace = true, features = ["html_reports"]}
8888
decaf377-fmd = {workspace = true}
8989
decaf377-ka = {workspace = true}
9090
decaf377-rdsa = {workspace = true}
91-
penumbra-dex = {workspace = true, default-features = true}
92-
penumbra-fee = {workspace = true, default-features = true}
93-
penumbra-governance = {workspace = true, default-features = true}
94-
penumbra-sct = {workspace = true, default-features = true}
95-
penumbra-shielded-pool = {workspace = true, default-features = true}
96-
penumbra-stake = {workspace = true, default-features = true}
97-
penumbra-tct = {workspace = true, features = ["r1cs"], default-features = true}
91+
penumbra-sdk-dex = {workspace = true, default-features = true}
92+
penumbra-sdk-fee = {workspace = true, default-features = true}
93+
penumbra-sdk-governance = {workspace = true, default-features = true}
94+
penumbra-sdk-sct = {workspace = true, default-features = true}
95+
penumbra-sdk-shielded-pool = {workspace = true, default-features = true}
96+
penumbra-sdk-stake = {workspace = true, default-features = true}
97+
penumbra-sdk-tct = {workspace = true, features = ["r1cs"], default-features = true}
9898

99-
[dev-dependencies.penumbra-proof-params]
99+
[dev-dependencies.penumbra-sdk-proof-params]
100100
workspace = true
101101
default-features = true
102102
features = [

‎crates/bench/benches/convert.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use ark_relations::r1cs::{
22
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
33
};
44
use decaf377::{Fq, Fr};
5-
use penumbra_asset::{Balance, Value, STAKING_TOKEN_ASSET_ID};
6-
use penumbra_num::{fixpoint::U128x128, Amount};
7-
use penumbra_proof_params::{DummyWitness, CONVERT_PROOF_PROVING_KEY};
8-
use penumbra_shielded_pool::{
5+
use penumbra_sdk_asset::{Balance, Value, STAKING_TOKEN_ASSET_ID};
6+
use penumbra_sdk_num::{fixpoint::U128x128, Amount};
7+
use penumbra_sdk_proof_params::{DummyWitness, CONVERT_PROOF_PROVING_KEY};
8+
use penumbra_sdk_shielded_pool::{
99
ConvertCircuit, ConvertProof, ConvertProofPrivate, ConvertProofPublic,
1010
};
1111

‎crates/bench/benches/delegator_vote.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ use ark_relations::r1cs::{
55
};
66
use decaf377::{Fq, Fr};
77
use decaf377_rdsa::{SpendAuth, VerificationKey};
8-
use penumbra_asset::Value;
9-
use penumbra_governance::{
8+
use penumbra_sdk_asset::Value;
9+
use penumbra_sdk_governance::{
1010
DelegatorVoteCircuit, DelegatorVoteProof, DelegatorVoteProofPrivate, DelegatorVoteProofPublic,
1111
};
12-
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13-
use penumbra_proof_params::{DummyWitness, DELEGATOR_VOTE_PROOF_PROVING_KEY};
14-
use penumbra_sct::Nullifier;
15-
use penumbra_shielded_pool::Note;
16-
use penumbra_tct as tct;
12+
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13+
use penumbra_sdk_proof_params::{DummyWitness, DELEGATOR_VOTE_PROOF_PROVING_KEY};
14+
use penumbra_sdk_sct::Nullifier;
15+
use penumbra_sdk_shielded_pool::Note;
16+
use penumbra_sdk_tct as tct;
1717

1818
use criterion::{criterion_group, criterion_main, Criterion};
1919
use rand_core::OsRng;

‎crates/bench/benches/nullifier_derivation.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ use ark_relations::r1cs::{
44
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
55
};
66
use decaf377::Fq;
7-
use penumbra_asset::Value;
8-
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
9-
use penumbra_proof_params::{DummyWitness, NULLIFIER_DERIVATION_PROOF_PROVING_KEY};
10-
use penumbra_sct::Nullifier;
11-
use penumbra_shielded_pool::{
7+
use penumbra_sdk_asset::Value;
8+
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
9+
use penumbra_sdk_proof_params::{DummyWitness, NULLIFIER_DERIVATION_PROOF_PROVING_KEY};
10+
use penumbra_sdk_sct::Nullifier;
11+
use penumbra_sdk_shielded_pool::{
1212
Note, NullifierDerivationProofPrivate, NullifierDerivationProofPublic, Rseed,
1313
};
14-
use penumbra_shielded_pool::{NullifierDerivationCircuit, NullifierDerivationProof};
15-
use penumbra_tct as tct;
14+
use penumbra_sdk_shielded_pool::{NullifierDerivationCircuit, NullifierDerivationProof};
15+
use penumbra_sdk_tct as tct;
1616

1717
use criterion::{criterion_group, criterion_main, Criterion};
1818
use rand_core::OsRng;

‎crates/bench/benches/output.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ use ark_relations::r1cs::{
66
use decaf377::{Fq, Fr};
77
use decaf377_fmd as fmd;
88
use decaf377_ka as ka;
9-
use penumbra_asset::{Balance, Value};
10-
use penumbra_keys::{keys::Diversifier, Address};
11-
use penumbra_proof_params::{DummyWitness, OUTPUT_PROOF_PROVING_KEY};
12-
use penumbra_shielded_pool::{
9+
use penumbra_sdk_asset::{Balance, Value};
10+
use penumbra_sdk_keys::{keys::Diversifier, Address};
11+
use penumbra_sdk_proof_params::{DummyWitness, OUTPUT_PROOF_PROVING_KEY};
12+
use penumbra_sdk_shielded_pool::{
1313
output::{OutputProofPrivate, OutputProofPublic},
1414
Note, OutputCircuit, OutputProof, Rseed,
1515
};

‎crates/bench/benches/spend.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ use ark_relations::r1cs::{
55
};
66
use decaf377::{Fq, Fr};
77
use decaf377_rdsa::{SpendAuth, VerificationKey};
8-
use penumbra_asset::Value;
9-
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
10-
use penumbra_proof_params::{DummyWitness, SPEND_PROOF_PROVING_KEY};
11-
use penumbra_sct::Nullifier;
12-
use penumbra_shielded_pool::{Note, SpendCircuit, SpendProof, SpendProofPrivate, SpendProofPublic};
13-
use penumbra_tct as tct;
8+
use penumbra_sdk_asset::Value;
9+
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
10+
use penumbra_sdk_proof_params::{DummyWitness, SPEND_PROOF_PROVING_KEY};
11+
use penumbra_sdk_sct::Nullifier;
12+
use penumbra_sdk_shielded_pool::{
13+
Note, SpendCircuit, SpendProof, SpendProofPrivate, SpendProofPublic,
14+
};
15+
use penumbra_sdk_tct as tct;
1416

1517
use criterion::{criterion_group, criterion_main, Criterion};
1618
use rand_core::OsRng;

‎crates/bench/benches/swap.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ use ark_relations::r1cs::{
22
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
33
};
44
use decaf377::{Fq, Fr};
5-
use penumbra_asset::{asset, Balance, Value};
6-
use penumbra_dex::{
5+
use penumbra_sdk_asset::{asset, Balance, Value};
6+
use penumbra_sdk_dex::{
77
swap::proof::{SwapCircuit, SwapProof, SwapProofPublic},
88
swap::{proof::SwapProofPrivate, SwapPlaintext},
99
TradingPair,
1010
};
11-
use penumbra_fee::Fee;
12-
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13-
use penumbra_num::Amount;
14-
use penumbra_proof_params::{DummyWitness, SWAP_PROOF_PROVING_KEY};
11+
use penumbra_sdk_fee::Fee;
12+
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13+
use penumbra_sdk_num::Amount;
14+
use penumbra_sdk_proof_params::{DummyWitness, SWAP_PROOF_PROVING_KEY};
1515

1616
use criterion::{criterion_group, criterion_main, Criterion};
1717
use rand_core::OsRng;

‎crates/bench/benches/swap_claim.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ use ark_relations::r1cs::{
22
ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisMode,
33
};
44
use decaf377::Fq;
5-
use penumbra_asset::asset;
6-
use penumbra_dex::{
5+
use penumbra_sdk_asset::asset;
6+
use penumbra_sdk_dex::{
77
swap::SwapPlaintext,
88
swap_claim::{SwapClaimCircuit, SwapClaimProof, SwapClaimProofPrivate, SwapClaimProofPublic},
99
BatchSwapOutputData, TradingPair,
1010
};
11-
use penumbra_fee::Fee;
12-
use penumbra_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13-
use penumbra_num::Amount;
14-
use penumbra_proof_params::{DummyWitness, SWAPCLAIM_PROOF_PROVING_KEY};
15-
use penumbra_sct::Nullifier;
16-
use penumbra_tct as tct;
11+
use penumbra_sdk_fee::Fee;
12+
use penumbra_sdk_keys::keys::{Bip44Path, SeedPhrase, SpendKey};
13+
use penumbra_sdk_num::Amount;
14+
use penumbra_sdk_proof_params::{DummyWitness, SWAPCLAIM_PROOF_PROVING_KEY};
15+
use penumbra_sdk_sct::Nullifier;
16+
use penumbra_sdk_tct as tct;
1717

1818
use criterion::{criterion_group, criterion_main, Criterion};
1919
use rand_core::OsRng;

‎crates/bin/pcli/Cargo.toml

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ dist = true
1414

1515
[features]
1616
default = ["std", "parallel", "download-proving-keys"]
17-
download-proving-keys = ["penumbra-proof-params/download-proving-keys"]
18-
sct-divergence-check = ["penumbra-view/sct-divergence-check"]
17+
download-proving-keys = ["penumbra-sdk-proof-params/download-proving-keys"]
18+
sct-divergence-check = ["penumbra-sdk-view/sct-divergence-check"]
1919
std = ["ark-ff/std", "ibc-types/std"]
2020
parallel = [
21-
"penumbra-proof-params/parallel",
21+
"penumbra-sdk-proof-params/parallel",
2222
"decaf377/parallel",
23-
"penumbra-shielded-pool/parallel",
24-
"penumbra-auction/parallel",
25-
"penumbra-dex/parallel",
26-
"penumbra-governance/parallel",
27-
"penumbra-stake/parallel",
28-
"penumbra-transaction/parallel",
29-
"penumbra-wallet/parallel",
23+
"penumbra-sdk-shielded-pool/parallel",
24+
"penumbra-sdk-auction/parallel",
25+
"penumbra-sdk-dex/parallel",
26+
"penumbra-sdk-governance/parallel",
27+
"penumbra-sdk-stake/parallel",
28+
"penumbra-sdk-transaction/parallel",
29+
"penumbra-sdk-wallet/parallel",
3030
]
3131

3232
[dependencies]
@@ -39,6 +39,7 @@ bincode = {workspace = true}
3939
blake2b_simd = {workspace = true}
4040
bytes = {workspace = true}
4141
camino = {workspace = true}
42+
cnidarium = {workspace = true, features = ["rpc"] }
4243
clap = {workspace = true, features = ["derive", "env"]}
4344
colored = "2.1.0"
4445
colored_json = "4.1"
@@ -59,27 +60,27 @@ indicatif = {workspace = true}
5960
jmt = {workspace = true}
6061
ndarray = "0.15.6"
6162
once_cell = {workspace = true}
62-
penumbra-app = {workspace = true, default-features = false}
63-
penumbra-asset = {workspace = true, default-features = false}
64-
penumbra-community-pool = {workspace = true, default-features = false}
65-
penumbra-compact-block = {workspace = true, default-features = false}
66-
penumbra-custody = {workspace = true}
67-
penumbra-auction = {workspace = true, default-features = false}
68-
penumbra-dex = {workspace = true, default-features = false}
69-
penumbra-fee = {workspace = true, default-features = false}
70-
penumbra-governance = {workspace = true, default-features = false}
71-
penumbra-ibc = {workspace = true, default-features = false}
72-
penumbra-keys = {workspace = true, default-features = false}
73-
penumbra-num = {workspace = true, default-features = false}
74-
penumbra-proof-params = { workspace = true, default-features = true }
75-
penumbra-proto = {workspace = true, features = ["rpc", "box-grpc"], default-features = true}
76-
penumbra-sct = {workspace = true, default-features = false}
77-
penumbra-shielded-pool = {workspace = true, default-features = false}
78-
penumbra-stake = {workspace = true, default-features = false}
79-
penumbra-tct = {workspace = true, default-features = true}
80-
penumbra-transaction = {workspace = true, default-features = true}
81-
penumbra-view = {workspace = true}
82-
penumbra-wallet = {workspace = true}
63+
penumbra-sdk-app = {workspace = true, default-features = false}
64+
penumbra-sdk-asset = {workspace = true, default-features = false}
65+
penumbra-sdk-community-pool = {workspace = true, default-features = false}
66+
penumbra-sdk-compact-block = {workspace = true, default-features = false}
67+
penumbra-sdk-custody = {workspace = true}
68+
penumbra-sdk-auction = {workspace = true, default-features = false}
69+
penumbra-sdk-dex = {workspace = true, default-features = false}
70+
penumbra-sdk-fee = {workspace = true, default-features = false}
71+
penumbra-sdk-governance = {workspace = true, default-features = false}
72+
penumbra-sdk-ibc = {workspace = true, default-features = false}
73+
penumbra-sdk-keys = {workspace = true, default-features = false}
74+
penumbra-sdk-num = {workspace = true, default-features = false}
75+
penumbra-sdk-proof-params = { workspace = true, default-features = true }
76+
penumbra-sdk-proto = {workspace = true, features = ["rpc", "box-grpc"], default-features = true}
77+
penumbra-sdk-sct = {workspace = true, default-features = false}
78+
penumbra-sdk-shielded-pool = {workspace = true, default-features = false}
79+
penumbra-sdk-stake = {workspace = true, default-features = false}
80+
penumbra-sdk-tct = {workspace = true, default-features = true}
81+
penumbra-sdk-transaction = {workspace = true, default-features = true}
82+
penumbra-sdk-view = {workspace = true}
83+
penumbra-sdk-wallet = {workspace = true}
8384
pin-project = {workspace = true}
8485
rand = {workspace = true}
8586
rand_chacha = {workspace = true}
@@ -105,12 +106,12 @@ url = {workspace = true, features = ["serde"]}
105106

106107
[dev-dependencies]
107108
assert_cmd = {workspace = true}
108-
penumbra-governance = {workspace = true, default-features = false}
109+
penumbra-sdk-governance = {workspace = true, default-features = false}
109110
predicates = "2.1"
110111
regex = {workspace = true}
111112
tempfile = {workspace = true}
112113

113-
[dev-dependencies.penumbra-proof-params]
114+
[dev-dependencies.penumbra-sdk-proof-params]
114115
default-features = true
115116
workspace = true
116117
features = [

0 commit comments

Comments
 (0)