Decoding evm events in ciphernode

gnosisguild · Sep 30, 2024 · e66ab85 · e66ab85
1 parent 0c6eab7
commit e66ab85
Show file tree

Hide file tree

Showing 11 changed files with 202 additions and 158 deletions.
diff --git a/packages/ciphernode/core/src/evm_enclave.rs b/packages/ciphernode/core/src/evm_enclave.rs
@@ -2,13 +2,18 @@ use crate::{
     events,
     evm_listener::{AddEventHandler, ContractEvent, StartListening},
     evm_manager::{AddListener, EvmContractManager},
-    EnclaveEvent, EventBus, Seed,
+    EnclaveEvent, EventBus,
 };
 use actix::Addr;
-use alloy::{primitives::Address, sol};
+use alloy::{primitives::Address, sol, sol_types::SolValue};
 use anyhow::{Context, Result};
 
 sol! {
+    struct EncodedE3ProgramParams {
+        bytes params;
+        address input_validator;
+    }
+
     #[derive(Debug)]
     struct E3 {
         uint256 seed;
@@ -44,10 +49,10 @@ sol! {
 impl TryFrom<&E3Requested> for events::E3Requested {
     type Error = anyhow::Error;
     fn try_from(value: &E3Requested) -> Result<Self, Self::Error> {
-        let params = value.e3.e3ProgramParams.to_vec();
-
+        let program_params = value.e3.e3ProgramParams.to_vec();
+        let decoded = EncodedE3ProgramParams::abi_decode(&program_params, true)?;
         Ok(events::E3Requested {
-            params,
+            params: decoded.params.into(),
             threshold_m: value.e3.threshold[0] as usize,
             seed: value.e3.seed.into(),
             e3_id: value.e3Id.to_string().into(),

diff --git a/packages/ciphernode/core/src/evm_utils.rs b/packages/ciphernode/core/src/evm_utils.rs
diff --git a/packages/ciphernode/core/src/lib.rs b/packages/ciphernode/core/src/lib.rs
@@ -12,7 +12,6 @@ mod evm_ciphernode_registry;
 mod evm_enclave;
 mod evm_listener;
 mod evm_manager;
-mod evm_utils;
 mod fhe;
 mod keyshare;
 mod logger;
@@ -35,7 +34,6 @@ pub use data::*;
 pub use e3_request::*;
 pub use eventbus::*;
 pub use events::*;
-pub use evm_utils::*;
 pub use fhe::*;
 pub use keyshare::*;
 pub use logger::*;

diff --git a/packages/ciphernode/enclave_node/src/bin/bfvgen.rs b/packages/ciphernode/enclave_node/src/bin/bfvgen.rs
@@ -1,6 +1,5 @@
-use alloy::sol;
 use clap::{command, Parser};
-use enclave_core::{abi_encode_params, abi_encode_params_crpgen, encode_bfv_params};
+use enclave_core::encode_bfv_params;
 use std::{error::Error, num::ParseIntError, process};
 
 fn parse_hex(arg: &str) -> Result<u64, ParseIntError> {

diff --git a/packages/evm/contracts/test/MockE3Program.sol b/packages/evm/contracts/test/MockE3Program.sol
@@ -20,9 +20,9 @@ contract MockE3Program is IE3Program {
             computeProviderParams.length == 32,
             invalidParams(e3ProgramParams, computeProviderParams)
         );
-        (inputValidator, ) = abi.decode(
+        (,inputValidator) = abi.decode(
             e3ProgramParams,
-            (IInputValidator, bytes)
+            (bytes, IInputValidator)
         );
 
         encryptionSchemeId = 0x0000000000000000000000000000000000000000000000000000000000000001;