Evm Integration and integration script

packages/ciphernode/core/src/ciphernode.rs

@@ -7,27 +7,26 @@ use crate::{
     DecryptionshareCreated, Get,
 };
 use actix::prelude::*;
-use alloy_primitives::Address;
 use anyhow::Result;
 
 pub struct Ciphernode {
     fhe: Addr<Fhe>,
     data: Addr<Data>,
     bus: Addr<EventBus>,
-    address: Address,
+    address: String,
 }
 
 impl Actor for Ciphernode {
     type Context = Context<Self>;
 }
 
 impl Ciphernode {
-    pub fn new(bus: Addr<EventBus>, fhe: Addr<Fhe>, data: Addr<Data>, address: Address) -> Self {
+    pub fn new(bus: Addr<EventBus>, fhe: Addr<Fhe>, data: Addr<Data>, address: &str) -> Self {
         Self {
             bus,
             fhe,
             data,
-            address,
+            address:address.to_string(),
         }
     }
 }
@@ -51,7 +50,7 @@ impl Handler<CiphernodeSelected> for Ciphernode {
         let fhe = self.fhe.clone();
         let data = self.data.clone();
         let bus = self.bus.clone();
-        let address = self.address;
+        let address = self.address.clone();
         Box::pin(async move {
             on_ciphernode_selected(fhe, data, bus, event, address)
                 .await
@@ -68,7 +67,7 @@ impl Handler<CiphertextOutputPublished> for Ciphernode {
         let fhe = self.fhe.clone();
         let data = self.data.clone();
         let bus = self.bus.clone();
-        let address = self.address;
+        let address = self.address.clone();
         Box::pin(async move {
             on_decryption_requested(fhe, data, bus, event, address)
                 .await
@@ -82,7 +81,7 @@ async fn on_ciphernode_selected(
     data: Addr<Data>,
     bus: Addr<EventBus>,
     event: CiphernodeSelected,
-    address: Address,
+    address: String,
 ) -> Result<()> {
     let CiphernodeSelected { e3_id, .. } = event;
 
@@ -117,7 +116,7 @@ async fn on_decryption_requested(
     data: Addr<Data>,
     bus: Addr<EventBus>,
     event: CiphertextOutputPublished,
-    address: Address,
+    address: String,
 ) -> Result<()> {
     let CiphertextOutputPublished {
         e3_id,
@@ -151,7 +150,8 @@ async fn on_decryption_requested(
 
 pub struct CiphernodeFactory;
 impl CiphernodeFactory {
-    pub fn create(bus: Addr<EventBus>, data: Addr<Data>, address: Address) -> ActorFactory {
+    pub fn create(bus: Addr<EventBus>, data: Addr<Data>, address: &str) -> ActorFactory {
+        let address = address.to_string();
         Box::new(move |ctx, evt| {
             // Save Ciphernode on CiphernodeSelected
             let EnclaveEvent::CiphernodeSelected { .. } = evt else {
@@ -163,7 +163,7 @@ impl CiphernodeFactory {
             };
 
             ctx.ciphernode =
-                Some(Ciphernode::new(bus.clone(), fhe.clone(), data.clone(), address).start())
+                Some(Ciphernode::new(bus.clone(), fhe.clone(), data.clone(), &address).start())
         })
     }
 }

packages/ciphernode/core/src/ciphernode_selector.rs

@@ -1,5 +1,4 @@
 use actix::prelude::*;
-use alloy_primitives::Address;
 
 use crate::{
     CiphernodeSelected, EnclaveEvent, EventBus, GetHasNode, Sortition, Subscribe,
@@ -8,27 +7,27 @@ use crate::{
 pub struct CiphernodeSelector {
     bus: Addr<EventBus>,
     sortition: Addr<Sortition>,
-    address: Address, 
+    address: String, 
 }
 
 impl Actor for CiphernodeSelector {
     type Context = Context<Self>;
 }
 
 impl CiphernodeSelector {
-    pub fn new(bus: Addr<EventBus>, sortition: Addr<Sortition>, address: Address) -> Self {
+    pub fn new(bus: Addr<EventBus>, sortition: Addr<Sortition>, address: &str) -> Self {
         Self {
             bus,
             sortition,
-            address,
+            address:address.to_owned(),
         }
     }
 
-    pub fn attach(bus: Addr<EventBus>, sortition: Addr<Sortition>, address: Address) -> Addr<Self> {
+    pub fn attach(bus: Addr<EventBus>, sortition: Addr<Sortition>, address: &str) -> Addr<Self> {
         let addr = CiphernodeSelector::new(bus.clone(), sortition, address).start();
 
         bus.do_send(Subscribe::new(
-            "CommitteeRequested",
+            "E3Requested",
             addr.clone().recipient(),
         ));
 
@@ -40,17 +39,17 @@ impl Handler<EnclaveEvent> for CiphernodeSelector {
     type Result = ResponseFuture<()>;
 
     fn handle(&mut self, event: EnclaveEvent, _ctx: &mut Self::Context) -> Self::Result {
-        let address = self.address;
+        let address = self.address.clone();
         let sortition = self.sortition.clone();
         let bus = self.bus.clone();
 
         Box::pin(async move {
-            let EnclaveEvent::CommitteeRequested { data, .. } = event else {
+            let EnclaveEvent::E3Requested { data, .. } = event else {
                 return;
             };
 
-            let seed = data.sortition_seed;
-            let size = data.nodecount;
+            let seed = data.seed;
+            let size = data.threshold_m as usize;
 
             if let Ok(is_selected) = sortition
                 .send(GetHasNode {
@@ -66,7 +65,7 @@ impl Handler<EnclaveEvent> for CiphernodeSelector {
 
                 bus.do_send(EnclaveEvent::from(CiphernodeSelected {
                     e3_id: data.e3_id,
-                    nodecount: data.nodecount,
+                    threshold_m: data.threshold_m,
                 }));
             }
         })

packages/ciphernode/core/src/committee_meta.rs

@@ -1,8 +1,8 @@
-use crate::{ActorFactory, CommitteeRequested, EnclaveEvent};
+use crate::{ActorFactory, E3Requested, EnclaveEvent};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct CommitteeMeta {
-    pub nodecount: usize,
+    pub threshold_m: u32,
     pub seed: u64,
 }
 
@@ -11,16 +11,16 @@ pub struct CommitteeMetaFactory;
 impl CommitteeMetaFactory {
     pub fn create() -> ActorFactory {
         Box::new(move |ctx, evt| {
-            let EnclaveEvent::CommitteeRequested { data, .. }: crate::EnclaveEvent = evt else {
+            let EnclaveEvent::E3Requested { data, .. }: crate::EnclaveEvent = evt else {
                 return;
             };
-            let CommitteeRequested {
-                nodecount,
-                sortition_seed: seed,
+            let E3Requested {
+                threshold_m,
+                seed,
                 ..
             } = data;
 
-            ctx.meta = Some(CommitteeMeta { nodecount, seed });
+            ctx.meta = Some(CommitteeMeta { threshold_m, seed });
         })
     }
 }

packages/ciphernode/core/src/e3_request.rs

@@ -16,19 +16,11 @@ pub struct E3RequestContext {
     pub publickey: Option<Addr<PublicKeyAggregator>>,
     pub meta: Option<CommitteeMeta>,
 }
-
+#[derive(Default)]
 struct EventBuffer {
     buffer: HashMap<String, Vec<EnclaveEvent>>,
 }
 
-impl Default for EventBuffer {
-    fn default() -> Self {
-        Self {
-            buffer: HashMap::new(),
-        }
-    }
-}
-
 impl EventBuffer {
     pub fn add(&mut self, key: &str, event: EnclaveEvent) {
         self.buffer.entry(key.to_string()).or_default().push(event)

packages/ciphernode/core/src/events.rs

@@ -1,21 +1,11 @@
 use actix::Message;
-use alloy_primitives::Address;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{
     fmt,
     hash::{DefaultHasher, Hash, Hasher},
 };
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct EthAddr(pub Vec<u8>);
-
-impl From<Address> for EthAddr {
-    fn from(value: Address) -> Self {
-        Self(value.to_vec())
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct E3id(pub String);
 impl fmt::Display for E3id {
@@ -36,6 +26,12 @@ impl From<u32> for E3id {
     }
 }
 
+impl From<String> for E3id {
+    fn from(value: String) -> Self {
+        E3id::new(value)
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct EventId(pub [u8; 32]);
 
@@ -64,9 +60,9 @@ pub enum EnclaveEvent {
         id: EventId,
         data: KeyshareCreated,
     },
-    CommitteeRequested {
+    E3Requested {
         id: EventId,
-        data: CommitteeRequested,
+        data: E3Requested,
     },
     PublicKeyAggregated {
         id: EventId,
@@ -128,7 +124,7 @@ impl From<EnclaveEvent> for EventId {
     fn from(value: EnclaveEvent) -> Self {
         match value {
             EnclaveEvent::KeyshareCreated { id, .. } => id,
-            EnclaveEvent::CommitteeRequested { id, .. } => id,
+            EnclaveEvent::E3Requested { id, .. } => id,
             EnclaveEvent::PublicKeyAggregated { id, .. } => id,
             EnclaveEvent::CiphertextOutputPublished { id, .. } => id,
             EnclaveEvent::DecryptionshareCreated { id, .. } => id,
@@ -144,7 +140,7 @@ impl EnclaveEvent {
     pub fn get_e3_id(&self) -> Option<E3id> {
         match self.clone() {
             EnclaveEvent::KeyshareCreated { data, .. } => Some(data.e3_id),
-            EnclaveEvent::CommitteeRequested { data, .. } => Some(data.e3_id),
+            EnclaveEvent::E3Requested { data, .. } => Some(data.e3_id),
             EnclaveEvent::PublicKeyAggregated { data, .. } => Some(data.e3_id),
             EnclaveEvent::CiphertextOutputPublished { data, .. } => Some(data.e3_id),
             EnclaveEvent::DecryptionshareCreated { data, .. } => Some(data.e3_id),
@@ -164,9 +160,9 @@ impl From<KeyshareCreated> for EnclaveEvent {
     }
 }
 
-impl From<CommitteeRequested> for EnclaveEvent {
-    fn from(data: CommitteeRequested) -> Self {
-        EnclaveEvent::CommitteeRequested {
+impl From<E3Requested> for EnclaveEvent {
+    fn from(data: E3Requested) -> Self {
+        EnclaveEvent::E3Requested {
             id: EventId::from(data.clone()),
             data: data.clone(),
         }
@@ -246,15 +242,15 @@ impl fmt::Display for EnclaveEvent {
 pub struct KeyshareCreated {
     pub pubkey: Vec<u8>,
     pub e3_id: E3id,
-    pub node: Address,
+    pub node: String,
 }
 
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[rtype(result = "anyhow::Result<()>")]
 pub struct DecryptionshareCreated {
     pub decryption_share: Vec<u8>,
     pub e3_id: E3id,
-    pub node: Address,
+    pub node: String,
 }
 
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -266,10 +262,10 @@ pub struct PublicKeyAggregated {
 
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[rtype(result = "()")]
-pub struct CommitteeRequested {
+pub struct E3Requested {
     pub e3_id: E3id,
-    pub nodecount: usize,
-    pub sortition_seed: u64, // Should actually be much larger eg [u8;32]
+    pub threshold_m: u32,
+    pub seed: u64, // Should actually be much larger eg [u8;32]
 
     // fhe params
     pub moduli: Vec<u64>,
@@ -287,7 +283,7 @@ pub struct CommitteeRequested {
 #[rtype(result = "()")]
 pub struct CiphernodeSelected {
     pub e3_id: E3id,
-    pub nodecount: usize,
+    pub threshold_m: u32,
 }
 
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -307,15 +303,15 @@ pub struct PlaintextAggregated {
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[rtype(result = "()")]
 pub struct CiphernodeAdded {
-    pub address: Address,
+    pub address: String,
     pub index: usize,
     pub num_nodes: usize,
 }
 
 #[derive(Message, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[rtype(result = "()")]
 pub struct CiphernodeRemoved {
-    pub address: Address,
+    pub address: String,
     pub index: usize,
     pub num_nodes: usize,
 }
@@ -383,7 +379,7 @@ mod tests {
         let kse = EnclaveEvent::from(KeyshareCreated {
             e3_id: E3id::from(1001),
             pubkey,
-            node: address!("d8dA6BF26964aF9D7eEd9e03E53415D37aA96045"),
+            node: address!("d8dA6BF26964aF9D7eEd9e03E53415D37aA96045").to_string(),
         });
         let kse_bytes = kse.to_bytes()?;
         let _ = EnclaveEvent::from_bytes(&kse_bytes.clone());