feat: use particle signature as id for actors [NET-540] (#1877)

Cargo.toml

@@ -144,6 +144,7 @@ cid = "0.10.1"
 libipld = "0.16.0"
 axum = "0.6.20"
 hyper = "0.14.27"
+faster-hex = "0.8.1"
 once_cell = "1.18.0"
 
 # Enable a small amount of optimization in debug mode

aquamarine/src/actor.rs

@@ -99,15 +99,21 @@ where
         self.future.is_some()
     }
 
-    pub fn cleanup(
-        &self,
-        particle_id: &str,
-        current_peer_id: &str,
-        vm: &mut RT,
-    ) -> eyre::Result<()> {
+    pub fn cleanup(&self, vm: &mut RT) {
+        tracing::debug!(
+            target: "particle_reap",
+            particle_id = self.particle.id, worker_id = self.current_peer_id.to_string(),
+            "Reaping particle's actor"
+        );
         // TODO: remove dirs without using vm https://github.com/fluencelabs/fluence/issues/1216
-        vm.cleanup(particle_id, current_peer_id)?;
-        Ok(())
+        // TODO: ??? we don't have this issue anymore
+        if let Err(err) = vm.cleanup(&self.particle.id, &self.current_peer_id.to_string()) {
+            tracing::warn!(
+                particle_id = self.particle.id,
+                "Error cleaning up after particle {:?}",
+                err
+            );
+        }
     }
 
     pub fn mailbox_size(&self) -> usize {

aquamarine/src/particle_executor.rs

@@ -80,6 +80,7 @@ impl<RT: AquaRuntime> ParticleExecutor for RT {
                     let particle_params = ParticleParameters {
                         current_peer_id: Cow::Owned(current_peer_id.to_string()),
                         init_peer_id: Cow::Owned(particle.init_peer_id.to_string()),
+                        // we use signature hex as particle id to prevent compromising of particle data store
                         particle_id: Cow::Borrowed(&particle.id),
                         timestamp: particle.timestamp,
                         ttl: particle.ttl,

aquamarine/src/plumber.rs

@@ -43,7 +43,9 @@ use crate::particle_effects::RoutingEffects;
 use crate::particle_functions::Functions;
 use crate::vm_pool::VmPool;
 
-type ParticleId = String;
+/// particle signature is used as a particle id
+#[derive(PartialEq, Hash, Eq)]
+struct ParticleId(Vec<u8>);
 
 pub struct Plumber<RT: AquaRuntime, F> {
     events: VecDeque<Result<RoutingEffects, AquamarineApiError>>,
@@ -103,7 +105,7 @@ impl<RT: AquaRuntime, F: ParticleFunctionStatic> Plumber<RT, F> {
         }
 
         let builtins = &self.builtins;
-        let key = (particle.id.clone(), worker_id);
+        let key = (ParticleId(particle.signature.clone()), worker_id);
         let entry = self.actors.entry(key);
 
         let actor = match entry {
@@ -224,27 +226,17 @@ impl<RT: AquaRuntime, F: ParticleFunctionStatic> Plumber<RT, F> {
         if let Some((vm_id, mut vm)) = self.vm_pool.get_vm() {
             let now = now_ms();
 
-            self.actors.retain(|(particle_id, worker_id), actor| {
+            self.actors.retain(|_, actor| {
                 // if actor hasn't yet expired or is still executing, keep it
                 // TODO: if actor is expired, cancel execution and return VM back to pool
                 //       https://github.com/fluencelabs/fluence/issues/1212
                 if !actor.is_expired(now) || actor.is_executing() {
                     return true; // keep actor
                 }
-                tracing::debug!(
-                    target: "particle_reap",
-                    particle_id = particle_id, worker_id = worker_id.to_string(),
-                    "Reaping particle's actor"
-                );
+
                 // cleanup files and dirs after particle processing (vault & prev_data)
                 // TODO: do not pass vm https://github.com/fluencelabs/fluence/issues/1216
-                if let Err(err) = actor.cleanup(particle_id, &worker_id.to_string(), &mut vm) {
-                    tracing::warn!(
-                        particle_id = particle_id,
-                        "Error cleaning up after particle {:?}",
-                        err
-                    )
-                }
+                actor.cleanup(&mut vm);
                 false // remove actor
             });
 

crates/air-interpreter-fs/Cargo.toml

@@ -11,4 +11,4 @@ eyre = { workspace = true }
 serde = { version = "1.0.190", features = ["derive"] }
 serde_json = { workspace = true }
 blake3 = "1.5.0"
-faster-hex = "0.8.1"
+faster-hex = { workspace = true }

crates/service-modules/Cargo.toml

@@ -11,7 +11,7 @@ cid-utils = { workspace = true }
 
 eyre = { workspace = true }
 serde = { version = "1.0.190", features = ["derive"] }
-faster-hex = "0.8.1"
+faster-hex = { workspace = true }
 maplit = { workspace = true }
 serde_json = { workspace = true }
 libipld = { workspace = true }

particle-protocol/Cargo.toml

@@ -23,6 +23,7 @@ log = { workspace = true }
 derivative = { workspace = true }
 base64 = { workspace = true }
 tokio = { workspace = true }
+faster-hex = { workspace = true }
 
 [dev-dependencies]
 rand = "0.8.5"