Switch to local dependencies (#1037)

* use local dependencies

* fix docker path

Author: Kailai-Wang

.github/workflows/tee-worker-ci.yml

@@ -107,19 +107,19 @@ jobs:
         env:
           DOCKER_BUILDKIT: 1
         run: >
-          docker build -t integritee-worker-${{ matrix.flavor_id }}-${{ github.sha }}
+          cd .. && docker build -t integritee-worker-${{ matrix.flavor_id }}-${{ github.sha }}
           --target deployed-worker
           --build-arg WORKER_MODE_ARG=${{ matrix.mode }} --build-arg ADDITIONAL_FEATURES_ARG=${{ matrix.additional_features }}
-          -f build.Dockerfile .
+          -f tee-worker/build.Dockerfile .
 
       - name: Build CLI client
         env:
           DOCKER_BUILDKIT: 1
         run: >
-          docker build -t integritee-cli-client-${{ matrix.flavor_id }}-${{ github.sha }}
+          cd .. && docker build -t integritee-cli-client-${{ matrix.flavor_id }}-${{ github.sha }}
           --target deployed-client
           --build-arg WORKER_MODE_ARG=${{ matrix.mode }} --build-arg ADDITIONAL_FEATURES_ARG=${{ matrix.additional_features }}
-          -f build.Dockerfile .
+          -f tee-worker/build.Dockerfile .
 
       - run: docker images --all
 
@@ -322,12 +322,12 @@ jobs:
           name: logs-${{ matrix.test }}-${{ matrix.flavor_id }}
           path: ${{ env.UPLOAD_DOWNLOAD_DIR_PREFIX }}/${{ env.LOG_DIR }}
 
-  # Only push docker image when tests are passed on dev branch
+  # Only push docker image when tests are passed and it's a push event
   push-docker-image:
     runs-on: ubuntu-latest
     needs:
       - integration-tests
-    if: ${{ success() && (github.event_name == 'push') && (github.ref == 'refs/heads/dev') }}
+    if: ${{ success() && (github.event_name == 'push') }}
     steps:
       - uses: actions/download-artifact@v3
         with:

tee-worker/Cargo.lock

@@ -50,7 +50,7 @@ pallet-parentchain = { default-features = false, git = "https://github.com/integ
 
 # Litentry
 litentry-primitives = { path = "../../litentry/primitives", default-features = false }
-pallet-identity-management = { path = "../../litentry/pallets/identity-management", default-features = false }
+pallet-imt = { package = "pallet-identity-management-tee", path = "../../litentry/pallets/identity-management", default-features = false }
 
 [features]
 default = ["std"]
@@ -85,7 +85,7 @@ std = [
     "pallet-timestamp/std",
     "pallet-transaction-payment/std",
     "pallet-parentchain/std",
-    "pallet-identity-management/std",
+    "pallet-imt/std",
     "pallet-grandpa/std",
     "sp-api/std",
     "sp-core/std",

tee-worker/app-libs/sgx-runtime/Cargo.toml

@@ -77,7 +77,7 @@ pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
 // litentry
-pub use pallet_identity_management::{self, Call as IdentityManagementCall};
+pub use pallet_imt::{self, Call as IdentityManagementCall};
 
 /// Block type as expected by this sgx-runtime.
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
@@ -260,7 +260,7 @@ impl pallet_parentchain::Config for Runtime {
 	type WeightInfo = ();
 }
 
-impl pallet_identity_management::Config for Runtime {
+impl pallet_imt::Config for Runtime {
 	type Event = Event;
 	type ManageOrigin = EnsureRoot<AccountId>;
 	type MaxMetadataLength = ConstU32<128>;
@@ -281,7 +281,7 @@ construct_runtime!(
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Parentchain: pallet_parentchain::{Pallet, Call, Storage},
-		IdentityManagement: pallet_identity_management,
+		IdentityManagement: pallet_imt,
 	}
 );
 
@@ -302,7 +302,7 @@ construct_runtime!(
 		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
 		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
 		Parentchain: pallet_parentchain::{Pallet, Call, Storage},
-		IdentityManagement: pallet_identity_management,
+		IdentityManagement: pallet_imt,
 
 		Evm: pallet_evm::{Pallet, Call, Storage, Config, Event<T>},
 	}

tee-worker/app-libs/sgx-runtime/src/lib.rs

@@ -41,7 +41,7 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su
 lc-stf-task-sender = { path = "../../litentry/core/stf-task/sender", default-features = false }
 litentry-primitives = { path = "../../litentry/primitives", default-features = false }
 pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "master" }
-parentchain-primitives = { package = "primitives", git = "https://github.com/litentry/litentry-parachain.git", branch = "tee-dev", default-features = false, optional = true }
+parentchain-primitives = { package = "primitives", path = "../../../primitives", default-features = false, optional = true }
 rand = { version = "0.7", optional = true }
 rand-sgx = { package = "rand", git = "https://github.com/mesalock-linux/rand-sgx", tag = "sgx_1.1.3", features = ["sgx_tstd"], optional = true }
 ring = { version = "0.16.20", default-features = false }

tee-worker/app-libs/stf/Cargo.toml

@@ -33,9 +33,7 @@ pub use parentchain_primitives::{Balance, BlockNumber, Index};
 
 use codec::{Compact, Decode, Encode};
 use derive_more::Display;
-use ita_sgx_runtime::{
-	pallet_identity_management::MetadataOf, IdentityManagement, Runtime, System,
-};
+use ita_sgx_runtime::{pallet_imt::MetadataOf, IdentityManagement, Runtime, System};
 use itp_node_api_metadata::Error as MetadataError;
 use itp_node_api_metadata_provider::Error as MetadataProviderError;
 use sp_core::{crypto::AccountId32, ed25519, sr25519, Pair, H256};

tee-worker/app-libs/stf/src/lib.rs

@@ -187,7 +187,7 @@ impl TrustedCallSigned {
 		assertion: Assertion,
 	) -> StfResult<()> {
 		let v_identity_context =
-		ita_sgx_runtime::pallet_identity_management::Pallet::<Runtime>::get_identity_and_identity_context(&who);
+			ita_sgx_runtime::pallet_imt::Pallet::<Runtime>::get_identity_and_identity_context(&who);
 
 		let mut vec_identity: BoundedVec<Identity, MaxIdentityLength> = vec![].try_into().unwrap();
 

tee-worker/app-libs/stf/src/trusted_call_litentry.rs

@@ -36,8 +36,8 @@ ENV WORKER_MODE=$WORKER_MODE_ARG
 ARG ADDITIONAL_FEATURES_ARG
 ENV ADDITIONAL_FEATURES=$ADDITIONAL_FEATURES_ARG
 
-WORKDIR $HOME/worker
-COPY . .
+WORKDIR $HOME/tee-worker
+COPY . $HOME
 
 RUN make
 
@@ -71,8 +71,8 @@ ENV RUSTC_WRAPPER="/usr/local/cargo/bin/sccache"
 ARG WORKER_MODE_ARG
 ENV WORKER_MODE=$WORKER_MODE_ARG
 
-WORKDIR $HOME/worker
-COPY . .
+WORKDIR $HOME/tee-worker
+COPY . $HOME
 
 RUN --mount=type=cache,id=cargo,target=/root/work/.cache/sccache make && sccache --show-stats
 
@@ -99,8 +99,8 @@ ARG LOG_DIR=/usr/local/log
 ENV SCRIPT_DIR ${SCRIPT_DIR}
 ENV LOG_DIR ${LOG_DIR}
 
-COPY --from=builder /root/work/worker/bin/integritee-cli /usr/local/bin
-COPY ./cli/*.sh /usr/local/worker-cli/
+COPY --from=builder /root/work/tee-worker/bin/integritee-cli /usr/local/bin
+COPY ./tee-worker/cli/*.sh /usr/local/worker-cli/
 
 RUN chmod +x /usr/local/bin/integritee-cli ${SCRIPT_DIR}/*.sh
 RUN mkdir ${LOG_DIR}
@@ -128,7 +128,7 @@ ENV LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:${SGX_SDK}/lib64"
 WORKDIR /usr/local/bin
 
 COPY --from=builder /opt/sgxsdk/lib64 /opt/sgxsdk/lib64
-COPY --from=builder /root/work/worker/bin/* ./
+COPY --from=builder /root/work/tee-worker/bin/* ./
 
 RUN touch spid.txt key.txt
 RUN chmod +x /usr/local/bin/integritee-service

tee-worker/build.Dockerfile

@@ -23,7 +23,7 @@ sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teacla
 ws = { version = "0.9.1", features = ["ssl"] }
 
 # scs / integritee
-my-node-runtime = { package = "rococo-parachain-runtime", git = "https://github.com/litentry/litentry-parachain.git", branch = "tee-dev" }
+my-node-runtime = { package = "rococo-parachain-runtime", path = "../../runtime/rococo" }
 pallet-evm = { optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.29" }
 substrate-api-client = { features = ["ws-client"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" }
 substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" }

tee-worker/cli/Cargo.toml

@@ -42,7 +42,7 @@ substrate-api-client = { git = "https://github.com/scs/substrate-api-client.git"
 # litentry
 ita-sgx-runtime = { path = "../../../app-libs/sgx-runtime", default-features = false }
 litentry-primitives = { path = "../../../litentry/primitives", default-features = false }
-pallet-imp = { package = "pallet-identity-management", git = "https://github.com/litentry/litentry-parachain.git", branch = "tee-dev", default-features = false }
+pallet-imp = { package = "pallet-identity-management", path = "../../../../pallets/identity-management", default-features = false }
 
 [dev-dependencies]
 env_logger = "0.9.0"