Remove Validator's address field

fjarri · fjarri · commit 3bc84c68fa7b · 2025-11-06T15:56:27.000-08:00
diff --git a/ferveo-python/examples/exception.py b/ferveo-python/examples/exception.py
@@ -5,18 +5,14 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
-
 tau = 1
 shares_num = 4
 # In precomputed variant, security threshold must be equal to shares_num
 security_threshold = shares_num
 
 validator_keypairs = [Keypair.random() for _ in range(0, shares_num)]
 validators = [
-    Validator(gen_eth_addr(i), keypair.public_key(), i)
+    Validator(keypair.public_key(), i)
     for i, keypair in enumerate(validator_keypairs)
 ]
 
diff --git a/ferveo-python/examples/server_api_precomputed.py b/ferveo-python/examples/server_api_precomputed.py
@@ -10,10 +10,6 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
-
 tau = 1
 shares_num = 4
 validators_num = shares_num + 2
@@ -22,7 +18,7 @@ def gen_eth_addr(i: int) -> str:
 
 validator_keypairs = [Keypair.random() for _ in range(0, validators_num)]
 validators = [
-    Validator(gen_eth_addr(i), keypair.public_key(), i)
+    Validator(keypair.public_key(), i)
     for i, keypair in enumerate(validator_keypairs)
 ]
 
diff --git a/ferveo-python/examples/server_api_simple.py b/ferveo-python/examples/server_api_simple.py
@@ -10,23 +10,16 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
-
 tau = 1
 security_threshold = 3
 shares_num = 4
 validators_num = shares_num + 2
 validator_keypairs = [Keypair.random() for _ in range(0, validators_num)]
 validators = [
-    Validator(gen_eth_addr(i), keypair.public_key(), i)
+    Validator(keypair.public_key(), i)
     for i, keypair in enumerate(validator_keypairs)
 ]
 
-# Validators must be sorted by their public key
-validators.sort(key=lambda v: v.address)
-
 # Each validator holds their own DKG instance and generates a transcript every
 # validator, including themselves
 messages = []
diff --git a/ferveo-python/examples/server_api_simple_with_handover.py b/ferveo-python/examples/server_api_simple_with_handover.py
@@ -10,23 +10,16 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
-
 tau = 1
 security_threshold = 3
 shares_num = 4
 validators_num = shares_num + 2
 validator_keypairs = [Keypair.random() for _ in range(0, validators_num)]
 validators = [
-    Validator(gen_eth_addr(i), keypair.public_key(), i)
+    Validator(keypair.public_key(), i)
     for i, keypair in enumerate(validator_keypairs)
 ]
 
-# Validators must be sorted by their public key
-validators.sort(key=lambda v: v.address)
-
 # Each validator holds their own DKG instance and generates a transcript every
 # validator, including themselves
 messages = []
diff --git a/ferveo-python/ferveo/__init__.pyi b/ferveo-python/ferveo/__init__.pyi
@@ -25,9 +25,7 @@ class FerveoPublicKey:
 
 @final
 class Validator:
-    def __new__(cls, address: str, public_key: FerveoPublicKey, share_index: int): ...
-
-    address: str
+    def __new__(cls, public_key: FerveoPublicKey, share_index: int): ...
 
     public_key: FerveoPublicKey
 
diff --git a/ferveo-python/test/test_ferveo.py b/ferveo-python/test/test_ferveo.py
@@ -16,9 +16,6 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
 def combine_shares_for_variant(v: FerveoVariant, decryption_shares):
     if v == FerveoVariant.Simple:
         return combine_decryption_shares_simple(decryption_shares)
@@ -47,7 +44,7 @@ def scenario_for_variant(
     tau = 1
     validator_keypairs = [Keypair.random() for _ in range(0, validators_num)]
     validators = [
-        Validator(gen_eth_addr(i), keypair.public_key(), i)
+        Validator(keypair.public_key(), i)
         for i, keypair in enumerate(validator_keypairs)
     ]
 
diff --git a/ferveo-python/test/test_serialization.py b/ferveo-python/test/test_serialization.py
@@ -9,19 +9,14 @@
 )
 
 
-def gen_eth_addr(i: int) -> str:
-    return f"0x{i:040x}"  # TODO: Randomize - #207
-
-
 tau = 1
 security_threshold = 3
 shares_num = 4
 validator_keypairs = [Keypair.random() for _ in range(shares_num)]
 validators = [
-    Validator(gen_eth_addr(i), keypair.public_key(), i)
+    Validator(keypair.public_key(), i)
     for i, keypair in enumerate(validator_keypairs)
 ]
-validators.sort(key=lambda v: v.address)
 
 
 def make_dkg_public_key():
diff --git a/ferveo-wasm/examples/node/src/main.test.ts b/ferveo-wasm/examples/node/src/main.test.ts
@@ -10,18 +10,11 @@ import {
   ValidatorMessage,
   DecryptionSharePrecomputed,
   combineDecryptionSharesPrecomputed,
-  EthereumAddress,
 } from "ferveo-wasm";
 
 const zip = <A1, A2>(a: Array<A1>, b: Array<A2>): Array<[A1, A2]> =>
   a.map((k: A1, i: number) => [k, b[i]]);
 
-const genEthAddr = (i: number) => {
-  const ethAddr =
-    "0x" + "0".repeat(40 - i.toString(16).length) + i.toString(16);
-  return EthereumAddress.fromString(ethAddr);
-};
-
 const TAU = 1;
 
 function setupTest(
@@ -34,7 +27,7 @@ function setupTest(
   for (let i = 0; i < validatorsNum; i++) {
     const keypair = Keypair.random();
     validatorKeypairs.push(keypair);
-    const validator = new Validator(genEthAddr(i), keypair.publicKey, i);
+    const validator = new Validator(keypair.publicKey, i);
     validators.push(validator);
   }
 
diff --git a/ferveo/benches/benchmarks/validity_checks.rs b/ferveo/benches/benchmarks/validity_checks.rs
@@ -1,8 +1,6 @@
 #![allow(clippy::redundant_closure)]
 #![allow(clippy::unit_arg)]
 
-use std::str::FromStr;
-
 use ark_bls12_381::Bls12_381;
 pub use ark_bls12_381::Bls12_381 as EllipticCurve;
 use criterion::{black_box, criterion_group, BenchmarkId, Criterion};
@@ -21,16 +19,11 @@ fn gen_keypairs(num: u32) -> Vec<ferveo_common::Keypair<EllipticCurve>> {
         .collect()
 }
 
-pub fn gen_address(i: usize) -> EthereumAddress {
-    EthereumAddress::from_str(&format!("0x{i:040}")).unwrap() // TODO: Randomize - #207
-}
-
 fn gen_validators(
     keypairs: &[ferveo_common::Keypair<EllipticCurve>],
 ) -> Vec<Validator<EllipticCurve>> {
     (0..keypairs.len())
         .map(|i| Validator {
-            address: gen_address(i),
             public_key: keypairs[i].public_key(),
             share_index: i as u32,
         })
diff --git a/ferveo/examples/bench_primitives_size.rs b/ferveo/examples/bench_primitives_size.rs
@@ -3,7 +3,6 @@ use std::{
     fs::{create_dir_all, OpenOptions},
     io::prelude::*,
     path::PathBuf,
-    str::FromStr,
 };
 
 use ark_bls12_381::Bls12_381 as EllipticCurve;
@@ -55,16 +54,11 @@ fn gen_keypairs(num: u32) -> Vec<ferveo_common::Keypair<EllipticCurve>> {
         .collect()
 }
 
-pub fn gen_address(i: usize) -> EthereumAddress {
-    EthereumAddress::from_str(&format!("0x{i:040}")).unwrap() // TODO: Randomize - #207
-}
-
 fn gen_validators(
     keypairs: &[ferveo_common::Keypair<EllipticCurve>],
 ) -> Vec<Validator<EllipticCurve>> {
     (0..keypairs.len())
         .map(|i| Validator {
-            address: gen_address(i),
             public_key: keypairs[i].public_key(),
             share_index: i as u32,
         })
diff --git a/ferveo/src/api.rs b/ferveo/src/api.rs
@@ -24,7 +24,6 @@ use serde_with::serde_as;
 use crate::bindings_python;
 #[cfg(feature = "bindings-wasm")]
 use crate::bindings_wasm;
-pub use crate::EthereumAddress;
 use crate::{
     do_verify_aggregation, Error, PubliclyVerifiableSS, Result,
     UpdateTranscript,
@@ -444,7 +443,7 @@ mod test_ferveo_api {
 
     use crate::{
         api::*,
-        test_common::{gen_address, gen_keypairs, AAD, MSG, TAU},
+        test_common::{gen_keypairs, AAD, MSG, TAU},
     };
 
     type TestInputs =
@@ -463,7 +462,6 @@ mod test_ferveo_api {
             .iter()
             .enumerate()
             .map(|(i, keypair)| Validator {
-                address: gen_address(i),
                 public_key: keypair.public_key(),
                 share_index: i as u32,
             })
diff --git a/ferveo/src/bindings_python.rs b/ferveo/src/bindings_python.rs
@@ -417,19 +417,9 @@ pub struct Validator(api::Validator);
 #[pymethods]
 impl Validator {
     #[new]
-    pub fn new(
-        address: String,
-        public_key: &FerveoPublicKey,
-        share_index: u32,
-    ) -> PyResult<Self> {
-        let validator = api::Validator::new(address, public_key.0, share_index)
-            .map_err(|err| FerveoPythonError::Other(err.to_string()))?;
-        Ok(Self(validator))
-    }
-
-    #[getter]
-    pub fn address(&self) -> String {
-        self.0.address.to_string()
+    pub fn new(public_key: &FerveoPublicKey, share_index: u32) -> Self {
+        let validator = api::Validator::new(public_key.0, share_index);
+        Self(validator)
     }
 
     #[getter]
@@ -867,12 +857,7 @@ mod test_ferveo_python {
         let validators: HashMap<u32, Validator> = validator_keypairs
             .iter()
             .map(|(&i, keypair)| {
-                let validator = Validator::new(
-                    format!("0x{i:040}"), // TODO: Randomize - #207
-                    &keypair.public_key(),
-                    i,
-                )
-                .unwrap();
+                let validator = Validator::new(&keypair.public_key(), i);
                 (i, validator)
             })
             .collect::<HashMap<u32, Validator>>();
@@ -1138,11 +1123,9 @@ mod test_ferveo_python {
         // New participant that will receive the handover
         let incoming_validator_keypair = Keypair::random();
         let incoming_validator = Validator::new(
-            format!("0x{:040}", 123456789), // TODO: Randomize - #207
             &incoming_validator_keypair.public_key(),
             handover_slot_index,
-        )
-        .unwrap();
+        );
 
         // Incoming node creates a handover transcript
         let handover_transcript = dkg
diff --git a/ferveo/src/bindings_wasm.rs b/ferveo/src/bindings_wasm.rs
@@ -1,4 +1,4 @@
-use std::{fmt, str::FromStr};
+use std::fmt;
 
 use ferveo_common::{FromBytes, ToBytes};
 use js_sys::Error;
@@ -347,34 +347,12 @@ pub struct Transcript(pub(crate) api::Transcript);
 
 generate_common_methods!(Transcript);
 
-#[wasm_bindgen(js_name = EthereumAddress)]
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct EthereumAddress(api::EthereumAddress);
-
-#[wasm_bindgen]
-impl EthereumAddress {
-    #[wasm_bindgen(js_name = "fromString")]
-    pub fn from_string(address: &str) -> JsResult<EthereumAddress> {
-        set_panic_hook();
-        Ok(Self(
-            api::EthereumAddress::from_str(address).map_err(map_js_err)?,
-        ))
-    }
-
-    #[wasm_bindgen(js_name = "toString")]
-    pub fn to_string(&self) -> JsResult<String> {
-        set_panic_hook();
-        Ok(self.0.to_string())
-    }
-}
-
 // Using a separate Validator struct for WASM bindings to avoid issues with serialization of
 // `ark_ec::models::bls12::Bls12<ark_bls12_381::curves::Config>`, i.e. G2Affine public key
 #[derive(TryFromJsValue)]
 #[wasm_bindgen]
 #[derive(Clone, Debug, derive_more::AsRef, derive_more::From)]
 pub struct Validator {
-    address: EthereumAddress,
     public_key: FerveoPublicKey,
     share_index: u32,
 }
@@ -383,13 +361,11 @@ pub struct Validator {
 impl Validator {
     #[wasm_bindgen(constructor)]
     pub fn new(
-        address: &EthereumAddress,
         public_key: &FerveoPublicKey,
         share_index: u32,
     ) -> JsResult<Validator> {
         set_panic_hook();
         Ok(Self {
-            address: address.clone(),
             public_key: public_key.clone(),
             share_index,
         })
@@ -398,7 +374,6 @@ impl Validator {
     pub(crate) fn to_inner(&self) -> JsResult<api::Validator> {
         set_panic_hook();
         Ok(api::Validator {
-            address: self.address.0.clone(),
             public_key: self.public_key.0,
             share_index: self.share_index,
         })
@@ -408,11 +383,6 @@ impl Validator {
     pub fn public_key(&self) -> FerveoPublicKey {
         self.public_key.clone()
     }
-
-    #[wasm_bindgen(getter)]
-    pub fn address(&self) -> EthereumAddress {
-        self.address.clone()
-    }
 }
 
 #[derive(TryFromJsValue)]
@@ -580,13 +550,8 @@ pub mod test_common {
         Keypair::from_secure_randomness(&[i as u8; 32]).unwrap()
     }
 
-    pub fn gen_address(i: usize) -> EthereumAddress {
-        EthereumAddress::from_string(&format!("0x{i:040}")).unwrap() // TODO: Randomize - #207
-    }
-
     pub fn gen_validator(i: usize, keypair: &Keypair) -> Validator {
         Validator {
-            address: gen_address(i),
             public_key: keypair.public_key(),
             share_index: i as u32,
         }
diff --git a/ferveo/src/dkg.rs b/ferveo/src/dkg.rs
diff --git a/ferveo/src/lib.rs b/ferveo/src/lib.rs
diff --git a/ferveo/src/test_common.rs b/ferveo/src/test_common.rs
diff --git a/ferveo/src/test_serialization.rs b/ferveo/src/test_serialization.rs
diff --git a/ferveo/src/validator.rs b/ferveo/src/validator.rs
