Updated ironfish-frost to the latest version

iron-fish · Feb 22, 2024 · 116e6d8 · 116e6d8
1 parent 67345ea
commit 116e6d8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ironfish-rust-nodejs/src/frost.rs b/ironfish-rust-nodejs/src/frost.rs
@@ -218,7 +218,7 @@ pub fn split_secret(
 
     let mut public_key_package_vec: Vec<u8> = vec![];
     t.public_key_package
-        .write(&mut public_key_package_vec)
+        .serialize_into(&mut public_key_package_vec)
         .map_err(to_napi_err)?;
 
     Ok(TrustedDealerKeyPackages {

diff --git a/ironfish-rust-nodejs/src/structs/transaction.rs b/ironfish-rust-nodejs/src/structs/transaction.rs
@@ -531,7 +531,7 @@ pub fn aggregate_signature_shares(
     signing_package_str: String,
     signature_shares_arr: Vec<String>,
 ) -> Result<Buffer> {
-    let public_key_package = PublicKeyPackage::read(
+    let public_key_package = PublicKeyPackage::deserialize_from(
         &hex_to_vec_bytes(&public_key_package_str).map_err(to_napi_err)?[..],
     )
     .map_err(to_napi_err)?;

diff --git a/ironfish-rust/src/frost_utils/split_secret.rs b/ironfish-rust/src/frost_utils/split_secret.rs
@@ -65,10 +65,8 @@ pub(crate) fn split_secret<R: RngCore + CryptoRng>(
         key_packages.insert(identity, key_package);
     }
 
-    let public_key_package = PublicKeyPackage {
-        frost_public_key_package: pubkeys,
-        identities: config.identities.clone(),
-    };
+    let public_key_package =
+        PublicKeyPackage::from_frost(pubkeys, config.identities.iter().cloned());
 
     Ok((key_packages, public_key_package))
 }

diff --git a/ironfish-rust/src/frost_utils/split_spender_key.rs b/ironfish-rust/src/frost_utils/split_spender_key.rs
@@ -50,10 +50,7 @@ pub fn split_spender_key(
 
     let (key_packages, public_key_package) = split_secret(&secret_config, rng)?;
 
-    let authorizing_key_bytes = public_key_package
-        .frost_public_key_package
-        .verifying_key()
-        .serialize();
+    let authorizing_key_bytes = public_key_package.verifying_key().serialize();
 
     let authorizing_key = Option::from(SubgroupPoint::from_bytes(&authorizing_key_bytes))
         .ok_or_else(|| IronfishError::new(IronfishErrorKind::InvalidAuthorizingKey))?;

diff --git a/ironfish-rust/src/transaction/unsigned.rs b/ironfish-rust/src/transaction/unsigned.rs
@@ -206,15 +206,13 @@ impl UnsignedTransaction {
 
         let randomizer = Randomizer::deserialize(&self.public_key_randomness.to_bytes())
             .map_err(|e| IronfishError::new_with_source(IronfishErrorKind::InvalidRandomizer, e))?;
-        let randomized_params = RandomizedParams::from_randomizer(
-            public_key_package.frost_public_key_package.verifying_key(),
-            randomizer,
-        );
+        let randomized_params =
+            RandomizedParams::from_randomizer(public_key_package.verifying_key(), randomizer);
 
         let authorizing_group_signature = aggregate(
             authorizing_signing_package,
             &authorizing_signature_shares,
-            &public_key_package.frost_public_key_package,
+            public_key_package.frost_public_key_package(),
             &randomized_params,
         )
         .map_err(|e| {