Upgrade ed25519_dalek 1.0.1 -> 2.0.0 (#1475)

Resolves https://github.com/FuelLabs/fuel-core/security/dependabot/29.
FuelLabs · Nov 8, 2023 · 6313ab7 · 6313ab7
1 parent dc15f7f
commit 6313ab7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -11,8 +11,7 @@ async-trait = { workspace = true }
 clap = { workspace = true, features = ["derive"] }
 criterion = { version = "0.5", features = ["html_reports", "async", "async_tokio"] }
 ctrlc = "3.2.3"
-ed25519-dalek = "1.0" # TODO: upgrade to 2.0 when it's released, and remove rand below
-ed25519-dalek_old_rand = { package = "rand", version = "0.7.3" }
+ed25519-dalek = { version = "2.0", features = ["rand_core"] }
 ethnum = "1.3"
 fuel-core = { path = "../crates/fuel-core", default-features = false, features = ["rocksdb-production"] }
 fuel-core-services = { path = "./../crates/services" }

diff --git a/benches/benches/block_target_gas_set/crypto.rs b/benches/benches/block_target_gas_set/crypto.rs
@@ -98,9 +98,8 @@ pub fn run_crypto(group: &mut BenchmarkGroup<WallTime>) {
     );
 
     let message = fuel_core_types::fuel_crypto::Message::new(b"foo");
-    let ed19_keypair =
-        ed25519_dalek::Keypair::generate(&mut ed25519_dalek_old_rand::rngs::OsRng {});
-    let ed19_signature = ed19_keypair.sign(&*message);
+    let ed19_secret = ed25519_dalek::SigningKey::generate(&mut rand::rngs::OsRng {});
+    let ed19_signature = ed19_secret.sign(&*message);
 
     run(
         "crypto/ed19 opcode",
@@ -110,12 +109,17 @@ pub fn run_crypto(group: &mut BenchmarkGroup<WallTime>) {
             op::addi(
                 0x21,
                 0x20,
-                ed19_keypair.public.as_ref().len().try_into().unwrap(),
+                ed19_secret
+                    .verifying_key()
+                    .as_ref()
+                    .len()
+                    .try_into()
+                    .unwrap(),
             ),
             op::addi(
                 0x22,
                 0x21,
-                ed19_signature.as_ref().len().try_into().unwrap(),
+                ed19_signature.to_bytes().len().try_into().unwrap(),
             ),
             op::addi(0x22, 0x21, message.as_ref().len().try_into().unwrap()),
             op::movi(0x10, ed25519_dalek::PUBLIC_KEY_LENGTH.try_into().unwrap()),
@@ -125,13 +129,13 @@ pub fn run_crypto(group: &mut BenchmarkGroup<WallTime>) {
             op::jmpb(RegId::ZERO, 0),
         ]
         .to_vec(),
-        ed19_keypair
-            .public
-            .as_ref()
+        ed19_secret
+            .verifying_key()
+            .to_bytes()
             .iter()
-            .chain(ed19_signature.as_ref())
-            .chain(message.as_ref())
             .copied()
+            .chain(ed19_signature.to_bytes())
+            .chain(message.as_ref().iter().copied())
             .collect(),
     );
 

diff --git a/benches/benches/vm_set/crypto.rs b/benches/benches/vm_set/crypto.rs
@@ -101,9 +101,8 @@ pub fn run(c: &mut Criterion) {
     }
     bench_s256.finish();
 
-    let ed19_keypair =
-        ed25519_dalek::Keypair::generate(&mut ed25519_dalek_old_rand::rngs::OsRng {});
-    let ed19_signature = ed19_keypair.sign(&*message);
+    let ed19_secret = ed25519_dalek::SigningKey::generate(&mut rand::rngs::OsRng {});
+    let ed19_signature = ed19_secret.sign(&*message);
 
     run_group_ref(
         &mut c.benchmark_group("ed19"),
@@ -114,17 +113,22 @@ pub fn run(c: &mut Criterion) {
                 op::addi(
                     0x21,
                     0x20,
-                    ed19_keypair.public.as_ref().len().try_into().unwrap(),
+                    ed19_secret
+                        .verifying_key()
+                        .as_bytes()
+                        .len()
+                        .try_into()
+                        .unwrap(),
                 ),
                 op::addi(
                     0x22,
                     0x21,
-                    ed19_signature.as_ref().len().try_into().unwrap(),
+                    ed19_signature.to_bytes().len().try_into().unwrap(),
                 ),
             ])
             .with_data(
-                ed19_keypair
-                    .public
+                ed19_secret
+                    .verifying_key()
                     .to_bytes()
                     .iter()
                     .chain(ed19_signature.to_bytes().iter())