integrate pallet teerex refactoring (#180)

* build succeeds

* ran benchmarks on thinkpad T14s to get initial reasonable weight files

* rebenchmarked after optimizations

* rerun benchmarks with shield unshield

* lift patches and bump version

* rerun benchmarks

* fmt

* remove skip-ias-check flag from CI, but leave the dev build because of extrinsic filtering

* upgraded pallet deps again. added new genesis and new benchmark for set_security_flags

* lifted patches again

* fmt

.github/workflows/ci.yml

@@ -141,11 +141,11 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-skip-ias-check
+          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-with-ias
 
       - name: Release
         if: ${{ matrix.binary == 'release' }}
-        run: cargo build --release --locked --features skip-ias-check,skip-extrinsic-filtering
+        run: cargo build --release --locked --features skip-extrinsic-filtering
 
       # Upload artifacts
       - name: Upload integritee-node-dev
@@ -257,7 +257,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-skip-ias-check
+          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}-${{ matrix.binary }}-with-ias
 
       - name: Build benchmarking binary
         if: ${{ matrix.binary == 'release' }}

Cargo.toml

@@ -9,5 +9,14 @@ members = [
 
 #[patch."https://github.com/integritee-network/pallets.git"]
 #pallet-claims = { path = '../pallets/claims' }
+#pallet-enclave-bridge = { path = '../pallets/enclave-bridge' }
 #pallet-teerex = { path = '../pallets/teerex' }
+#pallet-sidechain = { path = '../pallets/sidechain' }
+#sgx-verify = { path = '../pallets/teerex/sgx-verify' }
 #pallet-teeracle = { path = '../pallets/teeracle' }
+#test-utils = { path = '../pallets/test-utils' }
+#claims-primitives = { path = '../pallets/primitives/claims' }
+#enclave-bridge-primitives = { path = '../pallets/primitives/enclave-bridge' }
+#teerex-primitives = { path = '../pallets/primitives/teerex' }
+#teeracle-primitives = { path = '../pallets/primitives/teeracle' }
+#common-primitives = { path = '../pallets/primitives/common' }

node/Cargo.toml

@@ -8,7 +8,7 @@ license = 'Apache-2.0'
 name = 'integritee-node'
 repository = 'https://github.com/integritee-network/integritee-node'
 # Align major.minor revision with the runtimes, bump patch revision ad lib. Make this the github release tag.
-version = '1.0.36'
+version = '1.1.0'
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
@@ -71,7 +71,5 @@ runtime-benchmarks = [
     "integritee-node-runtime/runtime-benchmarks",
     "sc-service/runtime-benchmarks",
 ]
-# allow workers to register without remote attestation for dev purposes
-skip-ias-check = ["integritee-node-runtime/skip-ias-check"]
 # lift filters for development binaries
 skip-extrinsic-filtering = ["integritee-node-runtime/skip-extrinsic-filtering"]

node/src/chain_spec.rs

@@ -369,7 +369,7 @@ fn genesis_config(
 			// Assign network admin rights.
 			key: Some(root_key),
 		},
-		teerex: TeerexConfig { allow_sgx_debug_mode: true },
+		teerex: TeerexConfig { allow_sgx_debug_mode: true, allow_skipping_attestation: true },
 		claims: Default::default(),
 		treasury: Default::default(),
 		vesting: Default::default(),

runtime/Cargo.toml

@@ -6,7 +6,7 @@ license = 'Apache-2.0'
 name = 'integritee-node-runtime'
 repository = 'https://github.com/integritee-network/integritee-node'
 # keep patch revision with spec_version of runtime
-version = '1.0.33'
+version = '1.1.34'
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -31,6 +31,7 @@ pallet-utility = { default-features = false, git = "https://github.com/paritytec
 pallet-vesting = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
 
 pallet-claims = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v0.9.42" }
+pallet-enclave-bridge = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v0.9.42" }
 pallet-sidechain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v0.9.42" }
 pallet-teeracle = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v0.9.42" }
 pallet-teerex = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "polkadot-v0.9.42" }
@@ -67,7 +68,6 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/substrate.git",
 
 [features]
 default = ["std"]
-skip-ias-check = ["pallet-teerex/skip-ias-check"]
 skip-extrinsic-filtering = []
 std = [
     "codec/std",
@@ -102,6 +102,7 @@ std = [
     "sp-version/std",
     "pallet-teerex/std",
     "pallet-claims/std",
+    "pallet-enclave-bridge/std",
     "pallet-proxy/std",
     "pallet-utility/std",
     "pallet-teeracle/std",
@@ -122,6 +123,7 @@ runtime-benchmarks = [
     "pallet-scheduler/runtime-benchmarks",
     "pallet-teerex/runtime-benchmarks",
     "pallet-claims/runtime-benchmarks",
+    "pallet-enclave-bridge/runtime-benchmarks",
     "pallet-timestamp/runtime-benchmarks",
     "pallet-treasury/runtime-benchmarks",
     "pallet-vesting/runtime-benchmarks",