From 194b4cdd34283779c5d42241ad927d46fabcc564 Mon Sep 17 00:00:00 2001 From: Adrian Brink Date: Sat, 11 Nov 2023 19:13:37 +0100 Subject: [PATCH] Fix the build, that we seemed to have fucked up on the office while doing this release. --- Cargo.lock | 70 +++++++++++++++++++++++---------- apps/src/lib/client/tx.rs | 8 ++-- apps/src/lib/wallet/defaults.rs | 2 +- wasm/Cargo.lock | 12 ------ 4 files changed, 55 insertions(+), 37 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f7c8b9cd1..6217b5344a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1422,6 +1422,19 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" +[[package]] +name = "curve25519-dalek" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle 2.4.1", + "zeroize", +] + [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -1642,10 +1655,19 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature", + "signature 2.1.0", "spki", ] +[[package]] +name = "ed25519" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +dependencies = [ + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.2" @@ -1653,7 +1675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature", + "signature 2.1.0", ] [[package]] @@ -1684,6 +1706,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek", + "ed25519 1.5.3", + "rand 0.7.3", + "serde 1.0.190", + "sha2 0.9.9", + "zeroize", +] + [[package]] name = "either" version = "1.8.1" @@ -3173,7 +3209,7 @@ dependencies = [ "once_cell", "serdect", "sha2 0.10.6", - "signature", + "signature 2.1.0", ] [[package]] @@ -3225,8 +3261,8 @@ dependencies = [ "leb128", "ledger-transport", "ledger-zondax-generic", - "prost", - "prost-types", + "prost 0.11.9", + "prost-types 0.11.9", "sha2 0.10.6", "thiserror", ] @@ -3265,7 +3301,7 @@ checksum = "02036c84eab9c48e85bc568d269221ba4f5e1cfbc785c3c2c2f6bb8c131f9287" dependencies = [ "async-trait", "ledger-transport", - "serde 1.0.163", + "serde 1.0.190", "thiserror", ] @@ -4430,18 +4466,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "num_enum_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.15", -] - [[package]] name = "object" version = "0.28.4" @@ -6106,6 +6130,12 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.1.0" @@ -6404,7 +6434,7 @@ checksum = "bc2294fa667c8b548ee27a9ba59115472d0a09c2ba255771092a7f1dcf03a789" dependencies = [ "bytes", "digest 0.10.6", - "ed25519", + "ed25519 2.2.2", "ed25519-consensus 2.1.0", "flex-error", "futures", @@ -6419,7 +6449,7 @@ dependencies = [ "serde_json", "serde_repr", "sha2 0.10.6", - "signature", + "signature 2.1.0", "subtle 2.4.1", "subtle-encoding", "tendermint-proto", diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs index 2c94d948b7..306c08c412 100644 --- a/apps/src/lib/client/tx.rs +++ b/apps/src/lib/client/tx.rs @@ -1122,7 +1122,7 @@ where if args.tx.dump_tx { tx::dump_tx(namada.io(), &args.tx, tx); } else { - namada.sign(&mut tx, &args.tx, signing_data).await?; + sign(namada, &mut tx, &args.tx, signing_data).await?; namada.submit(tx, &args.tx).await?; } @@ -1187,7 +1187,7 @@ where if args.tx.dump_tx { tx::dump_tx(namada.io(), &args.tx, tx); } else { - namada.sign(&mut tx, &args.tx, signing_data).await?; + sign(namada, &mut tx, &args.tx, signing_data).await?; namada.submit(tx, &args.tx).await?; } @@ -1231,7 +1231,7 @@ where if args.tx.dump_tx { tx::dump_tx(namada.io(), &args.tx, tx); } else { - namada.sign(&mut tx, &args.tx, signing_data).await?; + sign(namada, &mut tx, &args.tx, signing_data).await?; namada.submit(tx, &args.tx).await?; } @@ -1253,7 +1253,7 @@ where if args.tx.dump_tx { tx::dump_tx(namada.io(), &args.tx, tx); } else { - namada.sign(&mut tx, &args.tx, signing_data).await?; + sign(namada, &mut tx, &args.tx, signing_data).await?; namada.submit(tx, &args.tx).await?; } diff --git a/apps/src/lib/wallet/defaults.rs b/apps/src/lib/wallet/defaults.rs index d16cb32f2e..e994203c88 100644 --- a/apps/src/lib/wallet/defaults.rs +++ b/apps/src/lib/wallet/defaults.rs @@ -130,7 +130,7 @@ mod dev { } let path = root_dir.join("genesis/localnet/src/pre-genesis"); let wallet = crate::wallet::load(&path).unwrap(); - let sk = match wallet.get_keys().get(name).unwrap().0 { + let sk = match wallet.get_secret_keys().get(name).unwrap().0 { namada_sdk::wallet::StoredKeypair::Encrypted(_) => { panic!("{}'s keypair should not be encrypted", name) } diff --git a/wasm/Cargo.lock b/wasm/Cargo.lock index d00f7f026d..e83929fae9 100644 --- a/wasm/Cargo.lock +++ b/wasm/Cargo.lock @@ -3441,18 +3441,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "num_enum_derive" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.16", -] - [[package]] name = "object" version = "0.28.4"