Merge branch 'dev' into p-164-clippy-runs-out-of-space-in-ci

.github/workflows/ci.yml

@@ -676,7 +676,6 @@ jobs:
         include:
           - test_name: demo-indirect-invocation
           - test_name: demo-direct-call
-          - test_name: demo-sidechain
           # Litentry
           - test_name: lit-user-shielding-key
           - test_name: lit-resume-worker

tee-worker/cli/lit_parentchain_nonce.sh

@@ -10,18 +10,12 @@ while getopts ":p:A:B:u:W:V:C:" opt; do
         A)
             WORKER1PORT=$OPTARG
             ;;
-        B)
-            WORKER2PORT=$OPTARG
-            ;;
         u)
             NODEURL=$OPTARG
             ;;
         V)
             WORKER1URL=$OPTARG
             ;;
-        W)
-            WORKER2URL=$OPTARG
-            ;;
         C)
             CLIENT_BIN=$OPTARG
             ;;
@@ -67,9 +61,9 @@ echo "* Send wrong parentchain extrinsic"
 ${CLIENT} trusted --mrenclave $MRENCLAVE --direct send-erroneous-parentchain-call
 echo ""
 
-sleep 10
-# wait for 20 `ProcessedParentchainBlock` events, which should take around 2 min (2 workers)
+sleep 20
+# wait for 10 `ProcessedParentchainBlock` events, which should take around 2 min (1 worker)
 # if the incoming parentchain extrinsic is blocked (due to the wrong nonce), there won't be
 # such many events.
 set -e
-timeout -v --foreground 150s $CLIENT listen -e 20
+timeout -v --foreground 150s $CLIENT listen -e 10

tee-worker/docker/demo-direct-call.yml

@@ -16,13 +16,11 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint:
-      "/usr/local/worker-cli/demo_direct_call_2_workers.sh -p 9912 -u ws://litentry-node
-      -V wss://litentry-worker-1 -A 2011 -W wss://litentry-worker-2 -B 2012 -C /usr/local/bin/litentry-cli 2>&1"
+      "/usr/local/worker-cli/demo_direct_call.sh -p 9912 -u ws://litentry-node
+      -V wss://litentry-worker-1 -P 2011 -C /usr/local/bin/litentry-cli 2>&1"
     restart: "no"
 networks:
   litentry-test-network:

tee-worker/docker/demo-indirect-invocation.yml

@@ -16,15 +16,13 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     environment:
       - RUST_LOG=warn,ws=warn,itc_rpc_client=debug,litentry_cli=debug
     networks:
       - litentry-test-network
     entrypoint:
-      "/usr/local/worker-cli/demo_indirect_invocation.sh -p 9912 -u ws://litentry-node
-      -V wss://litentry-worker-1 -A 2011 -W wss://litentry-worker-2 -B 2012 -C /usr/local/bin/litentry-cli 2>&1"
+      "/usr/local/worker-cli/demo_shielding_unshielding.sh -t first -p 9912 -u ws://litentry-node
+      -V wss://litentry-worker-1 -P 2011 -C /usr/local/bin/litentry-cli 2>&1"
     restart: "no"
 networks:
   litentry-test-network:

tee-worker/docker/docker-compose.yml

@@ -129,38 +129,6 @@ services:
       -u ws://litentry-node -U ws://litentry-worker-1 -P 2011 -w 2101 -p 9912 -h 4645 --enable-mock-server --running-mode mock
       run --dev --skip-ra"
     restart: "no"
-  litentry-worker-2:
-    image: litentry/litentry-worker:latest
-    container_name: litentry-worker-2
-    build:
-      context: ${PWD}/..
-      dockerfile: build.Dockerfile
-      target: deployed-worker
-    depends_on:
-      litentry-node:
-        condition: service_healthy
-      litentry-worker-1:
-        condition: service_healthy
-    devices:
-      - "${SGX_PROVISION:-/dev/null}:/dev/sgx/provision"
-      - "${SGX_ENCLAVE:-/dev/null}:/dev/sgx/enclave"
-    volumes:
-      - "${AESMD:-/dev/null}:/var/run/aesmd"
-      - "${SGX_QCNL:-/dev/null}:/etc/sgx_default_qcnl.conf"
-    environment:
-      - RUST_LOG=info,litentry_worker=debug,ws=warn,sp_io=error,substrate_api_client=warn,itc_parentchain_light_client=info,jsonrpsee_ws_client=warn,jsonrpsee_ws_server=warn,enclave_runtime=debug,ita_stf=debug,its_rpc_handler=warn,itc_rpc_client=warn,its_consensus_common=debug,its_state=warn,its_consensus_aura=warn,aura*=warn,its_consensus_slots=warn,itp_attestation_handler=debug,http_req=debug,lc_mock_server=warn,itc_rest_client=debug,lc_credentials=debug,lc_identity_verification=debug,lc_stf_task_receiver=debug,lc_stf_task_sender=debug,lc_data_providers=debug,itp_top_pool=debug,itc_parentchain_indirect_calls_executor=debug,
-    networks:
-      - litentry-test-network
-    healthcheck:
-      test: curl -s -f http://litentry-worker-2:4646/is_initialized || exit 1
-      interval: 30s
-      timeout: 10s
-      retries: 20
-    entrypoint:
-      "/usr/local/bin/litentry-worker --clean-reset --ws-external -M litentry-worker-2 -T wss://litentry-worker-2
-      -u ws://litentry-node -U ws://litentry-worker-2 -P 2012 -w 2102 -p 9912 -h 4646 --enable-mock-server --running-mode mock
-      run --dev --skip-ra --request-state"
-    restart: "no"
 volumes:
   ? relaychain-alice
   ? relaychain-bob

tee-worker/docker/lit-di-evm-identity-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-evm-identity 2>&1' "

tee-worker/docker/lit-di-substrate-identity-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-substrate-identity 2>&1' "

tee-worker/docker/lit-di-vc-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-di-vc 2>&1' "

tee-worker/docker/lit-id-graph-stats.yml

@@ -13,8 +13,6 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint:

tee-worker/docker/lit-ii-batch-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-batch 2>&1' "

tee-worker/docker/lit-ii-identity-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-identity 2>&1' "

tee-worker/docker/lit-ii-vc-test.yml

@@ -15,8 +15,6 @@ services:
                 condition: service_healthy
             litentry-worker-1:
                 condition: service_healthy
-            litentry-worker-2:
-                condition: service_healthy
         networks:
             - litentry-test-network
         entrypoint: "bash -c '/usr/local/worker-cli/lit_ts_test.sh test-ii-vc 2>&1' "

tee-worker/docker/lit-parentchain-nonce.yml

@@ -13,13 +13,11 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint:
       "/usr/local/worker-cli/lit_parentchain_nonce.sh -p 9912 -u ws://litentry-node
-      -V wss://litentry-worker-1 -A 2011 -W wss://litentry-worker-2 -B 2012 -C /usr/local/bin/litentry-cli 2>&1"
+      -V wss://litentry-worker-1 -A 2011 -C /usr/local/bin/litentry-cli 2>&1"
     restart: "no"
 networks:
   litentry-test-network:

tee-worker/docker/lit-set-heartbeat-timeout.yml

@@ -13,8 +13,6 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint:

tee-worker/docker/lit-user-shielding-key.yml

@@ -13,8 +13,6 @@ services:
         condition: service_healthy
       litentry-worker-1:
         condition: service_healthy
-      litentry-worker-2:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint:

tee-worker/docker/sidechain-benchmark.yml

@@ -16,8 +16,6 @@ services:
         condition: service_healthy
       litentry-worker-1-${VERSION}:
         condition: service_healthy
-      litentry-worker-2-${VERSION}:
-        condition: service_healthy
     networks:
       - litentry-test-network
     entrypoint: