Upgrade dalek to V2.

Concordium · Dec 4, 2023 · f51ca32 · f51ca32
1 parent d43e16d
commit f51ca32
Show file tree

Hide file tree

Showing 23 changed files with 424 additions and 216 deletions.
diff --git a/identity-provider-service/Cargo.toml b/identity-provider-service/Cargo.toml
@@ -26,7 +26,7 @@ clap = "2.33"
 anyhow = "1.0"
 hex = "0.4"
 rust-embed = "6"
-ed25519-dalek = "=1.0"
+ed25519-dalek = "2.0"
 chrono = "0.4.24" # the patch version is necessary since chrono adds new functionality in patch versions
 sha2 = "0.10"
 

diff --git a/idiss/Cargo.toml b/idiss/Cargo.toml
@@ -32,7 +32,7 @@ hex = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 chrono = "0.4.24" # the patch version is necessary since chrono adds new functionality in patch versions
-ed25519-dalek = "1.0.1"
+ed25519-dalek = "2.0"
 byteorder = "1.3"
 
 [dependencies.nodejs-sys]

diff --git a/mobile_wallet/Cargo.toml b/mobile_wallet/Cargo.toml
@@ -16,7 +16,7 @@ serde = "1.0"
 serde_json = "1.0"
 anyhow = "1.0"
 chrono = "0.4.24" # the patch version is necessary since chrono adds new functionality in patch versions
-ed25519-dalek = "=1.0.0"
+ed25519-dalek = "2.0"
 byteorder = "1.3"
 either = "1.6"
 sha2 = "0.10"

diff --git a/rust-bins/Cargo.lock b/rust-bins/Cargo.lock
diff --git a/rust-bins/Cargo.toml b/rust-bins/Cargo.toml
@@ -17,7 +17,7 @@ pairing = "0.15"
 rand = "=0.7"
 serde = "1.0"
 serde_json = "1.0"
-ed25519-dalek = "=1.0"
+ed25519-dalek = "2.0"
 curve25519-dalek = "3.0"
 structopt = "0.3"
 hex = "0.4"

diff --git a/rust-bins/src/bin/client.rs b/rust-bins/src/bin/client.rs
@@ -1144,7 +1144,7 @@ fn handle_create_credential(cc: CreateCredential) {
             };
             let cred_data = {
                 let mut keys = std::collections::BTreeMap::new();
-                let public = ed25519::PublicKey::from(&secret);
+                let public = ed25519::VerifyingKey::from(&secret);
                 keys.insert(KeyIndex(0), KeyPair { secret, public });
 
                 CredentialData {

diff --git a/rust-bins/src/bin/user_cli.rs b/rust-bins/src/bin/user_cli.rs
@@ -786,7 +786,7 @@ fn handle_create_credential_v1(cc: CreateCredentialV1) -> anyhow::Result<()> {
         };
     let acc_data = {
         let mut keys = std::collections::BTreeMap::new();
-        let public = ed25519::PublicKey::from(&secret);
+        let public = ed25519::VerifyingKey::from(&secret);
         keys.insert(KeyIndex(0), KeyPair { secret, public });
 
         CredentialData {