Evm Integration and integration script

package.json

@@ -14,14 +14,20 @@
     "typechain": "yarn evm:typechain",
     "test": "yarn evm:test && yarn ciphernode:test",
     "coverage": "yarn evm:coverage",
+    "ciphernode:launch": "cd packages/ciphernode && ./scripts/launch.sh",
+    "ciphernode:add": "cd packages/evm && yarn ciphernode:add",
+    "ciphernode:remove": "cd packages/evm && yarn ciphernode:remove",
+    "ciphernode:aggregator": "cd packages/ciphernode && ./scripts/aggregator.sh",
     "ciphernode:test": "cd packages/ciphernode && cargo test",
     "ciphernode:build": "cd packages/ciphernode && cargo build --release",
     "evm:install": "cd packages/evm && yarn install",
+    "evm:node": "cd packages/evm && yarn hardhat node",
     "evm:compile": "cd packages/evm && yarn compile",
     "evm:lint": "cd packages/evm && yarn lint",
     "evm:typechain": "cd packages/evm && yarn typechain",
     "evm:test": "cd packages/evm && yarn test",
     "evm:coverage": "cd packages/evm && yarn coverage",
+    "evm:committee:new": "cd packages/evm && yarn committee:new",
     "preinstall": "yarn evm:install",
     "evm:release": "cd packages/evm && yarn release"
   },

packages/ciphernode/core/src/ciphernode_selector.rs → packages/ciphernode/core/src/cipernode_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/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,12 +81,10 @@ async fn on_ciphernode_selected(
     data: Addr<Data>,
     bus: Addr<EventBus>,
     event: CiphernodeSelected,
-    address: Address,
+    address: String,
 ) -> Result<()> {
     let CiphernodeSelected { e3_id, .. } = event;
 
-    println!("\n\nGENERATING KEY!\n\n");
-
     // generate keyshare
     let (sk, pubkey) = fhe.send(GenerateKeyshare {}).await??;
 
@@ -117,7 +114,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 +148,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 +161,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/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)