Fix bugs

gnosisguild · Oct 31, 2024 · 9977a69 · 9977a69
1 parent 14cfe86
commit 9977a69
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/ciphernode/enclave_node/src/aggregator.rs b/packages/ciphernode/enclave_node/src/aggregator.rs
@@ -48,7 +48,7 @@ pub async fn setup_aggregator(
         let rpc_url = &chain.rpc_url;
         let read_provider = create_readonly_provider(&ensure_ws_rpc(rpc_url)).await?;
         let write_provider = create_provider_with_signer(&ensure_http_rpc(rpc_url), &signer).await?;
-        EnclaveSol::attach(&bus, &read_provider, &chain.contracts.enclave, &signer).await?;
+        EnclaveSol::attach(&bus, &read_provider, &write_provider, &chain.contracts.enclave, &signer).await?;
         RegistryFilterSol::attach(&bus, &write_provider, &chain.contracts.filter_registry).await?;
         CiphernodeRegistrySol::attach(&bus, &read_provider, &chain.contracts.ciphernode_registry)
             .await?;

diff --git a/packages/ciphernode/evm/src/enclave_sol.rs b/packages/ciphernode/evm/src/enclave_sol.rs
@@ -1,6 +1,10 @@
 use std::sync::Arc;
 
-use crate::{enclave_sol_reader::EnclaveSolReader, enclave_sol_writer::EnclaveSolWriter};
+use crate::{
+    enclave_sol_reader::EnclaveSolReader,
+    enclave_sol_writer::EnclaveSolWriter,
+    helpers::{ReadonlyProvider, SignerProvider},
+};
 use actix::Addr;
 use alloy::signers::local::PrivateKeySigner;
 use anyhow::Result;
@@ -10,12 +14,13 @@ pub struct EnclaveSol;
 impl EnclaveSol {
     pub async fn attach(
         bus: &Addr<EventBus>,
-        rpc_url: &str,
+        read_provider: &ReadonlyProvider,
+        write_provider: &SignerProvider,
         contract_address: &str,
         signer: &Arc<PrivateKeySigner>,
     ) -> Result<()> {
-        EnclaveSolReader::attach(bus, rpc_url, contract_address).await?;
-        EnclaveSolWriter::attach(bus, rpc_url, contract_address, signer).await?;
+        EnclaveSolReader::attach(bus, read_provider, contract_address).await?;
+        EnclaveSolWriter::attach(bus, write_provider, contract_address, signer).await?;
         Ok(())
     }
 }
diff --git a/packages/ciphernode/evm/src/enclave_sol_writer.rs b/packages/ciphernode/evm/src/enclave_sol_writer.rs
@@ -34,24 +34,24 @@ pub struct EnclaveSolWriter {
 impl EnclaveSolWriter {
     pub async fn new(
         bus: &Addr<EventBus>,
-        rpc_url: &str,
+        provider: &SignerProvider,
         contract_address: Address,
         signer: &Arc<PrivateKeySigner>,
     ) -> Result<Self> {
         Ok(Self {
-            provider: create_provider_with_signer(&ensure_http_rpc(rpc_url), signer).await?,
+            provider: provider.clone(),
             contract_address,
             bus: bus.clone(),
         })
     }
 
     pub async fn attach(
         bus: &Addr<EventBus>,
-        rpc_url: &str,
+        provider: &SignerProvider,
         contract_address: &str,
         signer: &Arc<PrivateKeySigner>,
     ) -> Result<Addr<EnclaveSolWriter>> {
-        let addr = EnclaveSolWriter::new(bus, rpc_url, contract_address.parse()?, signer)
+        let addr = EnclaveSolWriter::new(bus, provider, contract_address.parse()?, signer)
             .await?
             .start();
         bus.send(Subscribe::new("PlaintextAggregated", addr.clone().into()))