Merge remote-tracking branch 'origin/dev' into fix_dcap_wrong_param

.github/workflows/ci.yml

@@ -616,7 +616,7 @@ jobs:
         if: needs.set-condition.outputs.run_parachain_test == 'true'
         timeout-minutes: 35
         run: |
-          make test-ts-docker-${{ matrix.chain }}
+          make test-ts-${{ matrix.chain }}
 
       - name: Collect docker logs if test fails
         continue-on-error: true
@@ -742,7 +742,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Litentry
           - test_name: lit-di-substrate-identity-test
           - test_name: lit-di-evm-identity-test
           - test_name: lit-di-bitcoin-identity-test
@@ -758,10 +757,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Pull polkadot image
-        run: |
-          docker pull parity/polkadot
-
       - uses: actions/download-artifact@v4
         with:
           name: litentry-parachain-dev
@@ -779,16 +774,9 @@ jobs:
       - name: Enable corepack and pnpm
         run: corepack enable && corepack enable pnpm
 
-      - name: Generate parachain artefacts
-        run: |
-          ./tee-worker/scripts/litentry/generate_parachain_artefacts.sh
-          ls -l docker/generated-rococo/
-          ls -l tee-worker/docker/litentry/
-
-      - name: Build litentry parachain docker images
+      - name: Launch parachain network
         run: |
-          cd tee-worker/docker
-          docker compose -f litentry-parachain.build.yml build
+          make launch-network-rococo
 
       - name: Integration single worker test ${{ matrix.test_name }}
         if: needs.set-condition.outputs.run_tee_test == 'true'
@@ -842,10 +830,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Pull polkadot image
-        run: |
-          docker pull parity/polkadot
-
       - uses: actions/download-artifact@v4
         with:
           name: litentry-parachain-dev
@@ -863,16 +847,9 @@ jobs:
       - name: Enable corepack and pnpm
         run: corepack enable && corepack enable pnpm
 
-      - name: Generate parachain artefacts
+      - name: Launch parachain network
         run: |
-          ./tee-worker/scripts/litentry/generate_parachain_artefacts.sh
-          ls -l docker/generated-rococo/
-          ls -l tee-worker/docker/litentry/
-
-      - name: Build litentry parachain docker images
-        run: |
-          cd tee-worker/docker
-          docker compose -f litentry-parachain.build.yml build
+          make launch-network-rococo
 
       - name: Integration multi worker test ${{ matrix.test_name }}
         if: needs.set-condition.outputs.run_tee_test == 'true'
@@ -919,10 +896,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Pull polkadot image
-        run: |
-          docker pull parity/polkadot
-
       - uses: actions/download-artifact@v4
         with:
           name: litentry-parachain-dev
@@ -940,16 +913,9 @@ jobs:
       - name: Enable corepack and pnpm
         run: corepack enable && corepack enable pnpm
 
-      - name: Generate parachain artefacts
+      - name: Launch parachain network
         run: |
-          ./tee-worker/scripts/litentry/generate_parachain_artefacts.sh
-          ls -l docker/generated-rococo/
-          ls -l bitacross-worker/docker/litentry/
-
-      - name: Build litentry parachain docker images
-        run: |
-          cd tee-worker/docker
-          docker compose -f litentry-parachain.build.yml build
+          make launch-network-rococo
 
       - name: Integration bitacross worker test ${{ matrix.test_name }}
         if: needs.set-condition.outputs.run_bitacross_test == 'true'

.gitignore

@@ -8,9 +8,6 @@
 **/node_modules/
 **/ts-tests/.yarn
 
-docker/generated-*/
-tee-worker/docker/litentry/
-
 tags.lock
 
 recipe.json

Makefile

@@ -64,30 +64,18 @@ build-node-tryruntime:
 launch-standalone:
 	@./scripts/launch-standalone.sh
 
+.PHONY: launch-network-rococo ## Launch a local rococo network with relaychain network
+launch-network-rococo:
+	@./scripts/launch-network.sh rococo
+
+.PHONY: launch-network-litentry ## Launch a local litentry network with relaychain network
+launch-network-litentry:
+	@./scripts/launch-network.sh litentry
+
 .PHONY: launch-docker-bridge
 launch-docker-bridge:
 	@./scripts/launch-local-bridge-docker.sh
 
-.PHONY: launch-docker-litentry ## Launch a local litentry-parachain network with docker
-launch-docker-litentry: generate-docker-compose-litentry
-	@./scripts/launch-local-docker.sh litentry
-
-.PHONY: launch-docker-rococo ## Launch a local rococo-parachain network with docker
-launch-docker-rococo: generate-docker-compose-rococo
-	@./scripts/launch-local-docker.sh rococo
-
-.PHONY: launch-binary-litentry ## Launch a local litentry-parachain network with binaries
-launch-binary-litentry:
-	@./scripts/launch-local-binary.sh litentry
-
-.PHONY: launch-binary-rococo ## Launch a local rococo-parachain network with binaries
-launch-binary-rococo:
-	@./scripts/launch-local-binary.sh rococo
-
-.PHONY: launch-custom-binary-rococo ## Launch a local rococo-parachain network with binary already built under target files
-launch-custom-binary-rococo:
-	@./scripts/launch-local-custom-binary.sh rococo
-
 # run tests
 
 .PHONY: test-cargo-all ## cargo test --all
@@ -98,45 +86,20 @@ test-cargo-all:
 test-cargo-all-benchmarks:
 	@cargo test --release --all --features runtime-benchmarks
 
-.PHONY: test-ts-docker-litentry ## Run litentry ts tests with docker without clean-up
-test-ts-docker-litentry: launch-docker-litentry launch-docker-bridge
+.PHONY: test-ts-litentry ## Run litentry ts tests without clean-up
+test-ts-litentry: launch-network-litentry
 	@./scripts/run-ts-test.sh litentry bridge evm
 
-.PHONY: test-ts-docker-rococo ## Run rococo ts tests with docker without clean-up
-test-ts-docker-rococo: launch-docker-rococo launch-docker-bridge
+.PHONY: test-ts-rococo ## Run rococo ts tests without clean-up
+test-ts-rococo: launch-network-rococo
 	@./scripts/run-ts-test.sh rococo bridge evm
 
-.PHONY: test-ts-binary-litentry ## Run litentry ts tests with binary without clean-up
-test-ts-binary-litentry: launch-binary-litentry
-	@./scripts/run-ts-test.sh litentry no_bridge evm
-
-.PHONY: test-ts-binary-rococo ## Run rococo ts tests with binary without clean-up
-test-ts-binary-rococo: launch-binary-rococo
-	@./scripts/run-ts-test.sh rococo no_bridge evm
 
 # clean up
 
-.PHONY: clean-docker-litentry ## Clean up litentry docker images, containers, volumes, etc
-clean-docker-litentry:
-	@./scripts/clean-local-docker.sh litentry
-
-.PHONY: clean-docker-rococo ## Clean up rococo docker images, containers, volumes, etc
-clean-docker-rococo:
-	@./scripts/clean-local-docker.sh rococo
-
-.PHONY: clean-binary ## Kill started polkadot and litentry-collator binaries
-clean-binary:
-	@./scripts/clean-local-binary.sh
-
-# generate docker-compose files
-
-.PHONY: generate-docker-compose-litentry ## Generate docker-compose files for litentry local network
-generate-docker-compose-litentry:
-	@./scripts/generate-docker-files.sh litentry
-
-.PHONY: generate-docker-compose-rococo ## Generate docker-compose files for rococo local network
-generate-docker-compose-rococo:
-	@./scripts/generate-docker-files.sh rococo
+.PHONY: clean-network ## Clean up the network launched by 'launch-network'
+clean-network:
+	@./scripts/clean-network.sh
 
 # update dependencies