update 996 (#1491)

* build_assertion error propagate to parachain (#1456)

* AssertionBuildFail: add more details

* handle errors in on_success method

* emit event when vc is non-exists

* remove event

* remove VCNotExist from Event

* Fix benchmarking pallet-teerex (#1460)

* remove tee-dev from node default feature

* only rococo has tee-dev

* remove sccache in docker

* missing RUN

* update Dockerfile

* sleep for 1 second before the event websocket reconnect(fix #1416) (#1462)

* debug: Sync of Moonbeam upstream debug (#1450)

* debug: change of test

* debug: fix benchmark

* Fix the panic from WeightInfo in CI (#1466)

* update comment

* update runner tag

* minor update, cleanup history data

* fix errors in teeracle

* [benchmarking bot] Auto commit generated weights files (#1465)

Co-authored-by: Kailai-Wang <[email protected]>

* using pallet weights

---------

Co-authored-by: BillyWooo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kailai-Wang <[email protected]>

* build_assertion error case test (#1463)

* error verify

* batch call of identity

* batch call of vc

* format code

* delete useless code

* verify error identity

* create error identities

* delete useless code

* delete useless code

* add comment&delete useless code

* format code

* txs types

* step error vc

* catch dispatchError

* revoke error test

* requestVc error

* change assert log

* fix merge errors

* add checkFailReason

* check fail reason

* move nonce out loop

* format code

* change test flow(only use A1 trigger error event)

* format code

* IDGraph adjustment (#1478)

* only keep idgraph for verified event

* add get_id_graph_with_max_len

* add tee pallets unittests

* adjust idgraph and prettier

* use context.api for better naming

* remove empty lines

---------

Co-authored-by: Zhouhui Tian <[email protected]>
Co-authored-by: Kai <[email protected]>
Co-authored-by: Linfeng.Yuan <[email protected]>
Co-authored-by: BillyWooo <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kailai-Wang <[email protected]>
Co-authored-by: Verin1005 <[email protected]>

Author: 7 people

.github/workflows/benchmark-machine.yml

@@ -16,7 +16,7 @@ env:
 jobs:
   ## run the benchmarking remotely
   benchmark-machine:
-    runs-on: self-hosted
+    runs-on: dev-builder
     steps:
       - name: Checkout codes on ${{ github.ref }}
         uses: actions/checkout@v3

.github/workflows/benchmark-runtime-weights.yml

@@ -39,7 +39,7 @@ jobs:
   ## build docker image with runtime-benchmarks feature
   build-docker:
     if: ${{ github.event.inputs.rebuild-docker == 'true' }}
-    runs-on: self-hosted
+    runs-on: dev-builder
     steps:
       - name: Checkout codes on ${{ github.ref }}
         uses: actions/checkout@v3
@@ -60,7 +60,7 @@ jobs:
 
   ## run the benchmarking remotely
   benchmark:
-    runs-on: self-hosted
+    runs-on: dev-builder
     needs: build-docker
     # see https://github.com/actions/runner/issues/491
     if: |

.github/workflows/build-docker-with-args.yml

@@ -27,7 +27,7 @@ env:
 jobs:
   ## build docker image of client binary with args ##
   build-docker-with-args:
-    runs-on: self-hosted
+    runs-on: dev-builder
     steps:
       - name: Checkout codes on ${{ github.event.inputs.ref || github.ref }}
         uses: actions/checkout@v3

.github/workflows/ci.yml

@@ -319,6 +319,12 @@ jobs:
 
       - run: docker images --all
 
+      - name: Pallet unittests
+        working-directory: ./tee-worker
+        run: |
+          rustup show
+          cargo test --locked --release -p pallet-* --lib
+
       - name: Test enclave
         # cargo test is not supported in the enclave
         # see https://github.com/apache/incubator-teaclave-sgx-sdk/issues/232

.github/workflows/create-release-draft.yml

@@ -104,7 +104,7 @@ jobs:
   ## build docker image of client binary ##
   build-docker:
     if: ${{ github.event.inputs.release_client == 'true' }}
-    runs-on: self-hosted
+    runs-on: dev-builder
     steps:
       - name: Checkout codes on ${{ env.RELEASE_TAG }}
         uses: actions/checkout@v3

Makefile

@@ -26,13 +26,13 @@ help:
 
 # build release
 
-.PHONY: build-all ## Build release version
+.PHONY: build-all ## Build release all with `tee-dev` feature
 build-all:
-	cargo build --locked --release
+	cargo build --locked --release --features=tee-dev
 
-.PHONY: build-node ## Build release node with default features
+.PHONY: build-node ## Build release node with `tee-dev` feature
 build-node:
-	cargo build --locked -p $(call pkgid, $(NODE_BIN)) --release
+	cargo build --locked -p $(call pkgid, $(NODE_BIN)) --release --features=tee-dev
 
 .PHONY: build-runtime-litentry ## Build litentry release runtime
 build-runtime-litentry:
@@ -59,16 +59,17 @@ srtool-build-wasm-rococo:
 	@./scripts/build-wasm.sh rococo
 
 .PHONY: build-docker-release ## Build docker image using cargo profile `release`
+# with `tee-dev` feature as we use release profile in dev
 build-docker-release:
-	@./scripts/build-docker.sh release
+	@./scripts/build-docker.sh release latest --features=tee-dev
 
 .PHONY: build-docker-production ## Build docker image using cargo profile `production`
 build-docker-production:
 	@./scripts/build-docker.sh production
 
 .PHONY: build-node-benchmarks ## Build release node with `runtime-benchmarks` feature
 build-node-benchmarks:
-	cargo build --locked --features runtime-benchmarks --release --no-default-features
+	cargo build --locked --features runtime-benchmarks --release
 
 .PHONY: build-node-tryruntime ## Build release node with `try-runtime` feature
 build-node-tryruntime:

docker/Dockerfile

@@ -13,28 +13,10 @@ COPY . /litentry
 
 RUN apt-get update && apt-get install -yq clang libclang-dev cmake protobuf-compiler
 
-# install sccache, must before `ARG RUSTC_WRAPPER`
-# otherwise the wrapper is set but sccache is not installed
-RUN cargo install sccache
-
 ARG BUILD_ARGS
 ARG PROFILE
-ARG RUSTC_WRAPPER
-
-RUN type sccache && sccache --version
-ENV SCCACHE_CACHE_SIZE=10G
-ENV SCCACHE_DIR=/root/.cache/sccache
-ENV RUSTC_WRAPPER=$RUSTC_WRAPPER
 
-# please note this only works for self-hosted runner (i.e. on the same host)
-# CI across different GH-runners won't work well, my understanding is docker only considers
-# image layers as "bulid cache", and mounted cache doesn't belong to it and therefore not
-# exported/imported with build-push-action
-#
-# see https://github.com/docker/build-push-action/issues/716
-#     https://github.com/moby/buildkit/issues/1512
-#     https://github.com/moby/buildkit/issues/1673
-RUN --mount=type=cache,target=/root/.cache/sccache cargo build --locked --profile $PROFILE $BUILD_ARGS && sccache --show-stats
+RUN cargo build --locked --profile $PROFILE $BUILD_ARGS
 
 # ==========================
 # stage 2: packaging

node/Cargo.toml

@@ -102,9 +102,7 @@ rococo-parachain-runtime = { path = "../runtime/rococo" }
 substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.37" }
 
 [features]
-default = [
-  "tee-dev",
-]
+default = []
 fast-runtime = [
   "litentry-parachain-runtime/fast-runtime",
   "litmus-parachain-runtime/fast-runtime",
@@ -127,6 +125,5 @@ try-runtime = [
 # allow workers to register without remote attestation for dev purposes
 # currently only available on litmus and rococo
 tee-dev = [
-  "litmus-parachain-runtime/tee-dev",
   "rococo-parachain-runtime/tee-dev",
 ]

pallets/identity-management/src/lib.rs

@@ -71,59 +71,26 @@ pub mod pallet {
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		DelegateeAdded {
-			account: T::AccountId,
-		},
-		DelegateeRemoved {
-			account: T::AccountId,
-		},
+		DelegateeAdded { account: T::AccountId },
+		DelegateeRemoved { account: T::AccountId },
 		// TODO: do we need account as event parameter? This needs to be decided by F/E
-		CreateIdentityRequested {
-			shard: ShardIdentifier,
-		},
-		RemoveIdentityRequested {
-			shard: ShardIdentifier,
-		},
-		VerifyIdentityRequested {
-			shard: ShardIdentifier,
-		},
-		SetUserShieldingKeyRequested {
-			shard: ShardIdentifier,
-		},
+		CreateIdentityRequested { shard: ShardIdentifier },
+		RemoveIdentityRequested { shard: ShardIdentifier },
+		VerifyIdentityRequested { shard: ShardIdentifier },
+		SetUserShieldingKeyRequested { shard: ShardIdentifier },
 		// event that should be triggered by TEECallOrigin
 		// these events keep the `account` as public to be consistent with VCMP and better
 		// indexing see https://github.com/litentry/litentry-parachain/issues/1313
-		UserShieldingKeySet {
-			account: T::AccountId,
-		},
-		IdentityCreated {
-			account: T::AccountId,
-			identity: AesOutput,
-			code: AesOutput,
-			id_graph: AesOutput,
-		},
-		IdentityRemoved {
-			account: T::AccountId,
-			identity: AesOutput,
-			id_graph: AesOutput,
-		},
-		IdentityVerified {
-			account: T::AccountId,
-			identity: AesOutput,
-			id_graph: AesOutput,
-		},
+		UserShieldingKeySet { account: T::AccountId },
+		IdentityCreated { account: T::AccountId, identity: AesOutput, code: AesOutput },
+		IdentityRemoved { account: T::AccountId, identity: AesOutput },
+		IdentityVerified { account: T::AccountId, identity: AesOutput, id_graph: AesOutput },
 		// event errors caused by processing in TEE
 		// copied from core_primitives::IMPError, we use events instead of pallet::errors,
 		// see https://github.com/litentry/litentry-parachain/issues/1275
-		DecodeHexFailed {
-			reason: ErrorString,
-		},
-		HttpRequestFailed {
-			reason: ErrorString,
-		},
-		StfError {
-			reason: ErrorString,
-		},
+		DecodeHexFailed { reason: ErrorString },
+		HttpRequestFailed { reason: ErrorString },
+		StfError { reason: ErrorString },
 		CreateIdentityHandlingFailed,
 		RemoveIdentityHandlingFailed,
 		VerifyIdentityHandlingFailed,
@@ -262,10 +229,9 @@ pub mod pallet {
 			account: T::AccountId,
 			identity: AesOutput,
 			code: AesOutput,
-			id_graph: AesOutput,
 		) -> DispatchResultWithPostInfo {
 			let _ = T::TEECallOrigin::ensure_origin(origin)?;
-			Self::deposit_event(Event::IdentityCreated { account, identity, code, id_graph });
+			Self::deposit_event(Event::IdentityCreated { account, identity, code });
 			Ok(Pays::No.into())
 		}
 
@@ -275,10 +241,9 @@ pub mod pallet {
 			origin: OriginFor<T>,
 			account: T::AccountId,
 			identity: AesOutput,
-			id_graph: AesOutput,
 		) -> DispatchResultWithPostInfo {
 			let _ = T::TEECallOrigin::ensure_origin(origin)?;
-			Self::deposit_event(Event::IdentityRemoved { account, identity, id_graph });
+			Self::deposit_event(Event::IdentityRemoved { account, identity });
 			Ok(Pays::No.into())
 		}
 

pallets/parachain-staking/src/benchmarking.rs

@@ -234,9 +234,9 @@ benchmarks! {
 
 	set_total_selected {
 		Pallet::<T>::set_blocks_per_round(RawOrigin::Root.into(), 100u32)?;
-	}: _(RawOrigin::Root, 100u32)
+	}: _(RawOrigin::Root, 99u32)
 	verify {
-		assert_eq!(Pallet::<T>::total_selected(), 100u32);
+		assert_eq!(Pallet::<T>::total_selected(), 99u32);
 	}
 
 	set_collator_commission {
@@ -800,7 +800,7 @@ benchmarks! {
 		// To set total selected to 40, must first increase round length to at least 40
 		// to avoid hitting RoundLengthMustBeAtLeastTotalSelectedCollators
 		Pallet::<T>::set_blocks_per_round(RawOrigin::Root.into(), 100u32)?;
-		Pallet::<T>::set_total_selected(RawOrigin::Root.into(), 100u32)?;
+		Pallet::<T>::set_total_selected(RawOrigin::Root.into(), 99u32)?;
 		// INITIALIZE COLLATOR STATE
 		let mut collators: Vec<T::AccountId> = Vec::new();
 		let mut collator_count = 1u32;