Merge pull request #535 from LayerXcom/feature/feathc

Join_group修正

Author: osuketh

config/IntegrationTestEnclave.config.xml

@@ -0,0 +1,12 @@
+<!-- Please refer to User's Guide for the explanation of each field -->
+<EnclaveConfiguration>
+  <ProdID>0</ProdID>
+  <ISVSVN>0</ISVSVN>
+  <StackMaxSize>0x40000</StackMaxSize>
+  <HeapMaxSize>0x100000</HeapMaxSize>
+  <TCSNum>8</TCSNum>
+  <TCSPolicy>0</TCSPolicy>
+  <DisableDebug>0</DisableDebug>
+  <MiscSelect>0</MiscSelect>
+  <MiscMask>0xFFFFFFFF</MiscMask>
+</EnclaveConfiguration>

modules/anonify-eth-driver/src/dispatcher.rs

@@ -121,14 +121,12 @@ impl Dispatcher {
         join_group_ecall_cmd: u32,
     ) -> Result<Self> {
         let this = self.clone();
-        let receipt = self.join_group(signer, gas, join_group_ecall_cmd).await?;
-        info!("A transaction hash of join_group: {:?}", receipt);
 
         // it spawns a new OS thread, and hosts an event loop.
         actix_rt::Arbiter::new().exec_fn(move || {
             actix_rt::spawn(async move {
                 loop {
-                    match self
+                    match this
                         .fetch_events(fetch_ciphertext_ecall_cmd, fetch_handshake_ecalll_cmd)
                         .await
                     {
@@ -140,7 +138,10 @@ impl Dispatcher {
             });
         });
 
-        Ok(this)
+        let receipt = self.join_group(signer, gas, join_group_ecall_cmd).await?;
+        info!("A transaction hash of join_group: {:?}", receipt);
+
+        Ok(self)
     }
 
     pub fn set_healthy(self) -> Self {

modules/anonify-eth-driver/src/eth/connection.rs

@@ -2,12 +2,14 @@ use super::{event_def::*, event_watcher::Web3Logs};
 use crate::{
     cache::EventCache,
     error::{HostError, Result},
-    utils::ContractInfo,
+    utils::{event_fetch_retry_condition, ContractInfo},
     workflow::*,
 };
 use anonify_ecall_types::CommandCiphertext;
 use anyhow::anyhow;
 use ethabi::{Topic, TopicFilter};
+use frame_config::{REQUEST_RETRIES, RETRY_DELAY_MILLS};
+use frame_retrier::{strategy, Retry};
 use std::{env, fs, path::Path};
 use web3::{
     contract::{Contract, Options},
@@ -189,7 +191,14 @@ impl Web3Contract {
             .limit(self.event_limit)
             .build();
 
-        let logs = self.web3_conn.get_logs(&filter).await?;
+        let logs = Retry::new(
+            "fetch_event",
+            *REQUEST_RETRIES,
+            strategy::FixedDelay::new(*RETRY_DELAY_MILLS),
+        )
+        .set_condition(event_fetch_retry_condition)
+        .spawn_async(|| async { self.web3_conn.get_logs(&filter).await })
+        .await?;
 
         Ok(Web3Logs::new(logs, cache))
     }

modules/anonify-eth-driver/src/utils.rs

@@ -11,7 +11,7 @@ use std::{fs, path::Path};
 use web3::{
     contract::Contract,
     transports::Http,
-    types::{Address, TransactionReceipt, H256},
+    types::{Address, TransactionReceipt, H256, Log},
 };
 
 /// Define a retry condition of deploying contracts.
@@ -66,6 +66,20 @@ pub const fn call_with_conf_retry_condition(res: &Result<TransactionReceipt>) ->
     }
 }
 
+pub const fn event_fetch_retry_condition(res: &Result<Vec<Log>>) -> bool {
+    match res {
+        Ok(_) => false,
+        Err(err) => match err {
+            HostError::Web3ContractError(web3_err) => match web3_err {
+                web3::contract::Error::Abi(_) => false,
+                _ => true,
+            },
+            HostError::EcallOutputNotSet => false,
+            _ => true,
+        },
+    }
+}
+
 /// Needed information to handle smart contracts.
 #[derive(Debug, Clone)]
 pub struct ContractInfo {

nodes/state-runtime/server/src/tests.rs

@@ -533,6 +533,7 @@ async fn test_join_group_then_handshake() {
     )
     .await;
 
+    env::set_var("MY_ROSTER_IDX", "1");
     let enclave2 = EnclaveDir::new()
         .init_enclave(true)
         .expect("Failed to initialize enclave.");
@@ -580,7 +581,7 @@ async fn test_join_group_then_handshake() {
 
     // Party 2
 
-    other_turn();
+    env::set_var("ACCOUNT_INDEX", "1");
 
     // using the same encryption key because app2 have to sync with bc, but app2's enclave encryption key cannot be set here
     // so using app1's key
@@ -606,6 +607,7 @@ async fn test_join_group_then_handshake() {
     )
     .await;
 
+    actix_rt::time::delay_for(time::Duration::from_millis(SYNC_TIME)).await;
     let req = test::TestRequest::get()
         .uri("/api/v1/state")
         .set_json(&balance_of_req(&mut csprng, &enc_key))

scripts/Makefile

@@ -20,7 +20,7 @@ SGX_SDK ?= /opt/sgxsdk
 SGX_MODE ?= HW
 SGX_ARCH ?= x64
 
-ifeq ($(TEST), 1)
+ifeq ($(TEST), UNIT)
 	EDL_FILE := Anonify_test.edl
 	T_H_FILE := Anonify_test_t.h
 	T_C_FILE := Anonify_test_t.c
@@ -29,6 +29,15 @@ ifeq ($(TEST), 1)
 	U_C_FILE := Anonify_test_u.c
 	U_O_FILE := Anonify_test_u.o
 	Enclave_Config_File_Name := UnitTestEnclave.config.xml
+else ifeq ($(TEST), INTEGRATION)
+	EDL_FILE := Anonify_common.edl
+	T_H_FILE := Anonify_common_t.h
+	T_C_FILE := Anonify_common_t.c
+	T_O_FILE := Anonify_common_t.o
+	U_H_FILE := Anonify_common_u.h
+	U_C_FILE := Anonify_common_u.c
+	U_O_FILE := Anonify_common_u.o
+	Enclave_Config_File_Name := IntegrationTestEnclave.config.xml
 else
 	EDL_FILE := Anonify_common.edl
 	T_H_FILE := Anonify_common_t.h

scripts/test.sh

@@ -21,10 +21,10 @@ echo "Integration testing..."
 cd ${ANONIFY_ROOT}/scripts
 unset BACKUP
 export ENCLAVE_PKG_NAME=key_vault
-make DEBUG=1 ENCLAVE_DIR=example/key-vault/enclave
+make DEBUG=1 TEST=INTEGRATION ENCLAVE_DIR=example/key-vault/enclave
 export BACKUP=disable
 export ENCLAVE_PKG_NAME=erc20
-make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave
+make DEBUG=1 TEST=INTEGRATION ENCLAVE_DIR=example/erc20/enclave
 
 #
 # Integration Tests
@@ -67,7 +67,7 @@ exec_sr_node_tests test_health_check \
 cd ${ANONIFY_ROOT}/scripts
 unset BACKUP
 export ENCLAVE_PKG_NAME=erc20
-make DEBUG=1 ENCLAVE_DIR=example/erc20/enclave
+make DEBUG=1 TEST=INTEGRATION ENCLAVE_DIR=example/erc20/enclave
 
 function exec_kv_node_tests() {
   for N in $@
@@ -95,7 +95,7 @@ echo "Unit testing..."
 export ENCLAVE_PKG_NAME=units
 export BACKUP=disable
 cd ${ANONIFY_ROOT}/scripts
-make DEBUG=1 TEST=1 ENCLAVE_DIR=tests/units/enclave
+make DEBUG=1 TEST=UNIT ENCLAVE_DIR=tests/units/enclave
 
 cd ${ANONIFY_ROOT}
 RUST_BACKTRACE=1 RUST_LOG=debug TEST=1 cargo test \