Skip to content

Commit

Permalink
Moved the shielded keys used in the integration tests into the localn…
Browse files Browse the repository at this point in the history 
…et wallet.
  • Loading branch information
@murisi
murisi committed Sep 27, 2024
1 parent 0ecf8ed commit 0332a63
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 229 deletions.
20 changes: 10 additions & 10 deletions crates/tests/src/e2e/setup.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1463,23 +1463,23 @@ pub mod constants {
pub const FRANK_KEY: &str = "Frank-key";

// Shielded spending and viewing keys and payment addresses
pub const A_SPENDING_KEY: &str = "zsknam1qdrk9kd8qqqqpqy3pxzxu2kexydl7ug22s3808htl604emmz9qlde9cl9mx6euhvh3cpl9w7guustfzjxsyaeqtefhden6q8776t9cr9vkqztj7u0mgs5k9nz945sypev9ppptn5d85as3ccsnu3q6g3acqp2gpsrwe6naqg3stqp43uk9x2cj79gcxuum8a7jayjqlv4ptcfnunqkqzsj6m2r3sn8ft0tyqqpv28nghe4ag68eccaqx7v5f65he95g5uwq2wr4yuqc06jgc7";
pub const B_SPENDING_KEY: &str = "zsknam1qdml0zguqqqqpqx8elavks722m0cjelgh3r044cfregyw049jze9lwha2cfqdqnekecnttdvygd6s784kch2v3wjs45g5z0n36hpqv5ruy8jjfu5mz2snl8ljyz79h3szmyf43zve79l6hwnlfk94r422tfwr2f62vvgkeqvc4z2dgrvqy033ymq5ylz3gmf6wdzhsdmzm0h9uv9374x755rzgvmcxhxntu6v63acqktv6zk390e9pd6vr0pzqaq6auu59kwpnw0haczfyju8";
pub const A_SPENDING_KEY: &str = "albert-sk";
pub const B_SPENDING_KEY: &str = "bertha-sk";
// A payment address derived from A_SPENDING_KEY
pub const AA_PAYMENT_ADDRESS: &str = "znam1ky620tz7z658cralqt693qpvk42wvth468zp38nqvq2apmex5rfut3dfqm2asrsqv0tc7saqje7";
pub const AA_PAYMENT_ADDRESS: &str = "albert-pa";
// A payment address derived from B_SPENDING_KEY
pub const AB_PAYMENT_ADDRESS: &str = "znam1zxt8e22uz666ce7hxqpc69yfj3tpd9v26ep2epwn34kvyuwjh98hhre9897shcjj4cnqugwlv4q";
pub const AB_PAYMENT_ADDRESS: &str = "bertha-pa-a";
// A viewing key derived from B_SPENDING_KEY
pub const AB_VIEWING_KEY: &str = "zvknam1qdml0zguqqqqpqx8elavks722m0cjelgh3r044cfregyw049jze9lwha2cfqdqnekem0xdqf9ytuhaxzeunyl7svgvxjv5g73m24k7w0h6q7wtvcltvlzynzhc5grlfgv7037lfh8w3su5krnzzzjh4nsleydtlns4gl0vmnc4z2dgrvqy033ymq5ylz3gmf6wdzhsdmzm0h9uv9374x755rzgvmcxhxntu6v63acqktv6zk390e9pd6vr0pzqaq6auu59kwpnw0hacdsfkws";
pub const AB_VIEWING_KEY: &str = "bertha-vk";
// A payment address derived from B_VIEWING_KEY
pub const BB_PAYMENT_ADDRESS: &str = "znam1mqt0ja2zccy70du2d6rcr77jscgq3gkekfvhrqe7zkxa8rr3qsjsrd66gxnrykdmdeh5wmglmcm";
pub const BB_PAYMENT_ADDRESS: &str = "bertha-pa-b";
// A viewing key derived from A_SPENDING_KEY
pub const AA_VIEWING_KEY: &str = "zvknam1qdrk9kd8qqqqpqy3pxzxu2kexydl7ug22s3808htl604emmz9qlde9cl9mx6euhvhnc63hymme53jz3mmwrzfkr9tk82nqacf5vlmj9du3s3rjz0h6usnh47pw0ufw4u6yrfvf95wfa9xj0m8pcrns9yh90s0jkf3cqy2z7c3stqp43uk9x2cj79gcxuum8a7jayjqlv4ptcfnunqkqzsj6m2r3sn8ft0tyqqpv28nghe4ag68eccaqx7v5f65he95g5uwq2wr4yuqc8djdrp";
pub const C_SPENDING_KEY: &str = "zsknam1qdy5g4udqqqqpqrfdzej0s45m8s6nprder4udwqm3ql8wx34e8f46dv8cwnmcjp40uj3qy5tgetj27jytvxk4vpa3pjsd80y332nj542w39wta8lsrzqzs822ydgmz5g2sd2k29hxc3uh77v5cmcext799fxn6sa9rd3zuggl6flgjz7wz9wwu9kxd4rth4clw6ug4drxln96y96nf8fmvgm5eddm93azuzlkjj0dpw343ukwcfuvkdhd772539cskgggcqsaaf0j7czshjwe";
pub const AA_VIEWING_KEY: &str = "albert-vk";
pub const C_SPENDING_KEY: &str = "christel-sk";
// A viewing key derived from C_SPENDING_KEY
pub const AC_VIEWING_KEY: &str = "zvknam1qdy5g4udqqqqpqrfdzej0s45m8s6nprder4udwqm3ql8wx34e8f46dv8cwnmcjp40lr4vutffut7ed5x6egd6etcdh9sxh3j9fe5dshhrn3nq4yfp78gt8ve59y4vnu45xlt93vtrzsxtwlxjjgu2p496lc3ye8m83qplsqfl6flgjz7wz9wwu9kxd4rth4clw6ug4drxln96y96nf8fmvgm5eddm93azuzlkjj0dpw343ukwcfuvkdhd772539cskgggcqsaaf0j7cfyd3jr";
pub const AC_VIEWING_KEY: &str = "christel-vk";
// A viewing key derived from C_VIEWING_KEY
pub const AC_PAYMENT_ADDRESS: &str = "znam1xv4ml6fp3zqjhw20xj3srd75cq8tyejdst0xweq60c70732ty2chd2v39tllpzf4uf6s66vfm6w";
pub const AC_PAYMENT_ADDRESS: &str = "christel-pa";

// Native VP aliases
pub const GOVERNANCE_ADDRESS: &str = "governance";
Expand Down
219 changes: 0 additions & 219 deletions crates/tests/src/integration/masp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,35 +1288,6 @@ fn multiple_unfetched_txs_same_block() -> Result<()> {
let (mut node, _services) = setup::setup()?;
_ = node.next_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// 1. Shield tokens
_ = node.next_epoch();
run(
Expand Down Expand Up @@ -1536,22 +1507,6 @@ fn expired_masp_tx() -> Result<()> {
let (mut node, _services) = setup::setup()?;
_ = node.next_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// 1. Shield tokens
_ = node.next_epoch();
run(
Expand Down Expand Up @@ -2357,35 +2312,6 @@ fn masp_fee_payment() -> Result<()> {
let (mut node, _services) = setup::setup()?;
_ = node.next_masp_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Shield some tokens
run(
&node,
Expand Down Expand Up @@ -2655,35 +2581,6 @@ fn masp_fee_payment_gas_limit() -> Result<()> {
})?;
_ = node.next_masp_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Shield some tokens
run(
&node,
Expand Down Expand Up @@ -2805,35 +2702,6 @@ fn masp_fee_payment_with_non_disposable() -> Result<()> {
let (mut node, _services) = setup::setup()?;
_ = node.next_masp_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Shield some tokens
run(
&node,
Expand Down Expand Up @@ -2994,48 +2862,6 @@ fn masp_fee_payment_with_custom_spending_key() -> Result<()> {
let (mut node, _services) = setup::setup()?;
_ = node.next_masp_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_c",
"--value",
AC_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Shield some tokens
run(
&node,
Expand Down Expand Up @@ -3234,35 +3060,6 @@ fn masp_fee_payment_with_different_token() -> Result<()> {
})?;
_ = node.next_masp_epoch();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_b",
"--value",
AB_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Shield some tokens
run(
&node,
Expand Down Expand Up @@ -3516,22 +3313,6 @@ fn identical_output_descriptions() -> Result<()> {
_ = node.next_masp_epoch();
let tempdir = tempfile::tempdir().unwrap();

// Add the relevant viewing keys to the wallet otherwise the shielded
// context won't precache the masp data
run(
&node,
Bin::Wallet,
vec![
"add",
"--alias",
"alias_a",
"--value",
AA_VIEWING_KEY,
"--unsafe-dont-encrypt",
],
)?;
node.assert_success();

// Generate a tx to shield some tokens
run(
&node,
Expand Down
13 changes: 13 additions & 0 deletions genesis/localnet/src/pre-genesis/wallet.toml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
[birthdays]

[view_keys]
albert-sk = "zvknam1qdrk9kd8qqqqpqy3pxzxu2kexydl7ug22s3808htl604emmz9qlde9cl9mx6euhvhnc63hymme53jz3mmwrzfkr9tk82nqacf5vlmj9du3s3rjz0h6usnh47pw0ufw4u6yrfvf95wfa9xj0m8pcrns9yh90s0jkf3cqy2z7c3stqp43uk9x2cj79gcxuum8a7jayjqlv4ptcfnunqkqzsj6m2r3sn8ft0tyqqpv28nghe4ag68eccaqx7v5f65he95g5uwq2wr4yuqc8djdrp"
albert-vk = "zvknam1qdrk9kd8qqqqpqy3pxzxu2kexydl7ug22s3808htl604emmz9qlde9cl9mx6euhvhnc63hymme53jz3mmwrzfkr9tk82nqacf5vlmj9du3s3rjz0h6usnh47pw0ufw4u6yrfvf95wfa9xj0m8pcrns9yh90s0jkf3cqy2z7c3stqp43uk9x2cj79gcxuum8a7jayjqlv4ptcfnunqkqzsj6m2r3sn8ft0tyqqpv28nghe4ag68eccaqx7v5f65he95g5uwq2wr4yuqc8djdrp"
bertha-sk = "zvknam1qdml0zguqqqqpqx8elavks722m0cjelgh3r044cfregyw049jze9lwha2cfqdqnekem0xdqf9ytuhaxzeunyl7svgvxjv5g73m24k7w0h6q7wtvcltvlzynzhc5grlfgv7037lfh8w3su5krnzzzjh4nsleydtlns4gl0vmnc4z2dgrvqy033ymq5ylz3gmf6wdzhsdmzm0h9uv9374x755rzgvmcxhxntu6v63acqktv6zk390e9pd6vr0pzqaq6auu59kwpnw0hacdsfkws"
bertha-vk = "zvknam1qdml0zguqqqqpqx8elavks722m0cjelgh3r044cfregyw049jze9lwha2cfqdqnekem0xdqf9ytuhaxzeunyl7svgvxjv5g73m24k7w0h6q7wtvcltvlzynzhc5grlfgv7037lfh8w3su5krnzzzjh4nsleydtlns4gl0vmnc4z2dgrvqy033ymq5ylz3gmf6wdzhsdmzm0h9uv9374x755rzgvmcxhxntu6v63acqktv6zk390e9pd6vr0pzqaq6auu59kwpnw0hacdsfkws"
christel-sk = "zvknam1qdy5g4udqqqqpqrfdzej0s45m8s6nprder4udwqm3ql8wx34e8f46dv8cwnmcjp40lr4vutffut7ed5x6egd6etcdh9sxh3j9fe5dshhrn3nq4yfp78gt8ve59y4vnu45xlt93vtrzsxtwlxjjgu2p496lc3ye8m83qplsqfl6flgjz7wz9wwu9kxd4rth4clw6ug4drxln96y96nf8fmvgm5eddm93azuzlkjj0dpw343ukwcfuvkdhd772539cskgggcqsaaf0j7cfyd3jr"
christel-vk = "zvknam1qdy5g4udqqqqpqrfdzej0s45m8s6nprder4udwqm3ql8wx34e8f46dv8cwnmcjp40lr4vutffut7ed5x6egd6etcdh9sxh3j9fe5dshhrn3nq4yfp78gt8ve59y4vnu45xlt93vtrzsxtwlxjjgu2p496lc3ye8m83qplsqfl6flgjz7wz9wwu9kxd4rth4clw6ug4drxln96y96nf8fmvgm5eddm93azuzlkjj0dpw343ukwcfuvkdhd772539cskgggcqsaaf0j7cfyd3jr"

[spend_keys]
albert-sk = "unencrypted:zsknam1qdrk9kd8qqqqpqy3pxzxu2kexydl7ug22s3808htl604emmz9qlde9cl9mx6euhvh3cpl9w7guustfzjxsyaeqtefhden6q8776t9cr9vkqztj7u0mgs5k9nz945sypev9ppptn5d85as3ccsnu3q6g3acqp2gpsrwe6naqg3stqp43uk9x2cj79gcxuum8a7jayjqlv4ptcfnunqkqzsj6m2r3sn8ft0tyqqpv28nghe4ag68eccaqx7v5f65he95g5uwq2wr4yuqc06jgc7"
bertha-sk = "unencrypted:zsknam1qdml0zguqqqqpqx8elavks722m0cjelgh3r044cfregyw049jze9lwha2cfqdqnekecnttdvygd6s784kch2v3wjs45g5z0n36hpqv5ruy8jjfu5mz2snl8ljyz79h3szmyf43zve79l6hwnlfk94r422tfwr2f62vvgkeqvc4z2dgrvqy033ymq5ylz3gmf6wdzhsdmzm0h9uv9374x755rzgvmcxhxntu6v63acqktv6zk390e9pd6vr0pzqaq6auu59kwpnw0haczfyju8"
christel-sk = "unencrypted:zsknam1qdy5g4udqqqqpqrfdzej0s45m8s6nprder4udwqm3ql8wx34e8f46dv8cwnmcjp40uj3qy5tgetj27jytvxk4vpa3pjsd80y332nj542w39wta8lsrzqzs822ydgmz5g2sd2k29hxc3uh77v5cmcext799fxn6sa9rd3zuggl6flgjz7wz9wwu9kxd4rth4clw6ug4drxln96y96nf8fmvgm5eddm93azuzlkjj0dpw343ukwcfuvkdhd772539cskgggcqsaaf0j7czshjwe"

[payment_addrs]
albert-pa = "znam1ky620tz7z658cralqt693qpvk42wvth468zp38nqvq2apmex5rfut3dfqm2asrsqv0tc7saqje7"
bertha-pa-a = "znam1zxt8e22uz666ce7hxqpc69yfj3tpd9v26ep2epwn34kvyuwjh98hhre9897shcjj4cnqugwlv4q"
bertha-pa-b = "znam1mqt0ja2zccy70du2d6rcr77jscgq3gkekfvhrqe7zkxa8rr3qsjsrd66gxnrykdmdeh5wmglmcm"
christel-pa = "znam1xv4ml6fp3zqjhw20xj3srd75cq8tyejdst0xweq60c70732ty2chd2v39tllpzf4uf6s66vfm6w"

[secret_keys]
albert-key = "unencrypted:000d5e9d7d66f0e4307edacde6e6578e31d331bcf234352647d00d20955102d3ce"
Expand Down

0 comments on commit 0332a63

Please sign in to comment.