Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Litmus from runtime #3018

Merged
merged 5 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
"path": "runtime/rococo",
"uri": "wss://rpc.rococo-parachain.litentry.io:443"
},
{
"name": "litmus",
"package": "litmus-parachain-runtime",
"path": "runtime/litmus",
"uri": "wss://rpc.litmus-parachain.litentry.io:443"
},
{
"name": "litentry",
"package": "litentry-parachain-runtime",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
chmod 600 ./benchmark-server-key.pem
ssh -o StrictHostKeyChecking=no -i ./benchmark-server-key.pem "${{ env.BENCHMARK_SSH_USER }}@${{ steps.start_instance.outputs.remote_ip }}" \
"docker pull litentry/litentry-parachain:${{ github.event.inputs.docker_tag }} && \
docker run --rm litentry/litentry-parachain:${{ github.event.inputs.docker_tag }} benchmark machine --allow-fail --chain=litmus-dev"
docker run --rm litentry/litentry-parachain:${{ github.event.inputs.docker_tag }} benchmark machine --allow-fail --chain=litentry-dev"
rm -f ./benchmark-server-key.pem

- name: Stop remote instance
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/benchmark-runtime-weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ on:
description: litentry
required: true
default: true
litmus:
type: boolean
description: litmus
required: true
default: true
rococo:
type: boolean
description: rococo
Expand Down Expand Up @@ -83,9 +78,6 @@ jobs:
- name: Set env
run: |
chain=""
if [ "${{ github.event.inputs.litmus }}" = "true" ]; then
chain="$chain litmus"
fi
if [ "${{ github.event.inputs.litentry }}" = "true" ]; then
chain="$chain litentry"
fi
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
type: choice
description: The chain whose runtime-wasm is built
options:
- litmus
- litentry
- rococo
ref:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,6 @@ jobs:
strategy:
matrix:
chain:
- litmus
- litentry
- rococo
name: ${{ matrix.chain }}
Expand Down Expand Up @@ -727,9 +726,6 @@ jobs:
echo "::group::rococo runtime test"
cargo test --locked -p rococo-parachain-runtime --lib
echo "::endgroup::"
echo "::group::litmus runtime test"
cargo test --locked -p litmus-parachain-runtime --lib
echo "::endgroup::"
echo "::group::litentry runtime test"
cargo test --locked -p litentry-parachain-runtime --lib
echo "::endgroup::"
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/create-release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ on:
description: If any of the genesis artefacts should be released alongside
options:
- none
- litmus
- rococo
- litentry

Expand Down Expand Up @@ -76,7 +75,6 @@ jobs:
strategy:
matrix:
chain:
- litmus
- rococo
- litentry
name: ${{ matrix.chain }}
Expand Down Expand Up @@ -305,7 +303,6 @@ jobs:
strategy:
matrix:
chain:
- litmus
- litentry
name: ${{ matrix.chain }}
steps:
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/release-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@ jobs:
🚀 A new client release has been built: https://github.com/litentry/litentry-parachain/releases/tag/${{ github.event.release.tag_name }}
✨ Please update the client using the docker image litentry/litentry-parachain:$DOCKER_TAG

- name: Update litmus image version
uses: "OnFinality-io/action-onf-release@v1"
continue-on-error: true
with:
# These keys should be in your GitHub secrets
# https://documentation.onfinality.io/support/onfinality-cli-tool-and-access-keys
onf-access-key: ${{ secrets.ONF_ACCESS_KEY }}
onf-secret-key: ${{ secrets.ONF_SECRET_KEY }}
onf-workspace-id: ${{ secrets.ONF_WORKSPACE_ID }}
onf-network-key: litmus-onfinality-key
# Add a new image version to network spec
onf-sub-command: image
onf-action: add
image-version: $DOCKER_TAG

- name: Update litentry image version
uses: "OnFinality-io/action-onf-release@v1"
continue-on-error: true
Expand Down
109 changes: 0 additions & 109 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ members = [
'primitives/core/macros',
'primitives/hex',
'runtime/litentry',
'runtime/litmus',
'runtime/rococo',
'runtime/common',
]
Expand Down Expand Up @@ -250,7 +249,6 @@ litentry-proc-macros = { path = "primitives/core/proc-macros" }
litentry-hex-utils = { path = "primitives/hex", default-features = false }
runtime-common = { path = "runtime/common", default-features = false }
litentry-parachain-runtime = { path = "runtime/litentry", default-features = false }
litmus-parachain-runtime = { path = "runtime/litmus", default-features = false }
rococo-parachain-runtime = { path = "runtime/rococo", default-features = false }
pallet-account-fix = { path = "pallets/account-fix", default-features = false }
pallet-asset-manager = { path = "pallets/xcm-asset-manager", default-features = false }
Expand Down
32 changes: 0 additions & 32 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ build-node:
build-runtime-litentry:
cargo build --locked -p $(call pkgid, litentry-parachain-runtime) --release

.PHONY: build-runtime-litmus ## Build litmus release runtime
build-runtime-litmus:
cargo build --locked -p $(call pkgid, litmus-parachain-runtime) --release

.PHONY: build-runtime-rococo ## Build rococo release runtime
build-runtime-rococo:
cargo build --locked -p $(call pkgid, rococo-parachain-runtime) --release
Expand All @@ -50,10 +46,6 @@ build-runtime-rococo:
srtool-build-wasm-litentry:
@./scripts/build-wasm.sh litentry

.PHONY: srtool-build-wasm-litmus ## Build litmus wasm with srtools
srtool-build-wasm-litmus:
@./scripts/build-wasm.sh litmus

.PHONY: srtool-build-wasm-rococo ## Build rococo wasm with srtools
srtool-build-wasm-rococo:
@./scripts/build-wasm.sh rococo
Expand Down Expand Up @@ -88,10 +80,6 @@ launch-docker-bridge:
launch-docker-litentry: generate-docker-compose-litentry
@./scripts/launch-local-docker.sh litentry

.PHONY: launch-docker-litmus ## Launch a local litmus-parachain network with docker
launch-docker-litmus: generate-docker-compose-litmus
@./scripts/launch-local-docker.sh litmus

.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
Expand All @@ -100,10 +88,6 @@ launch-docker-rococo: generate-docker-compose-rococo
launch-binary-litentry:
@./scripts/launch-local-binary.sh litentry

.PHONY: launch-binary-litmus ## Launch a local litmus-parachain network with binaries
launch-binary-litmus:
@./scripts/launch-local-binary.sh litmus

.PHONY: launch-binary-rococo ## Launch a local rococo-parachain network with binaries
launch-binary-rococo:
@./scripts/launch-local-binary.sh rococo
Expand All @@ -126,10 +110,6 @@ test-cargo-all-benchmarks:
test-ts-docker-litentry: launch-docker-litentry launch-docker-bridge
@./scripts/run-ts-test.sh litentry bridge evm

.PHONY: test-ts-docker-litmus ## Run litmus ts tests with docker without clean-up
test-ts-docker-litmus: launch-docker-litmus launch-docker-bridge
@./scripts/run-ts-test.sh litmus bridge no_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
@./scripts/run-ts-test.sh rococo bridge evm
Expand All @@ -138,10 +118,6 @@ test-ts-docker-rococo: launch-docker-rococo launch-docker-bridge
test-ts-binary-litentry: launch-binary-litentry
@./scripts/run-ts-test.sh litentry no_bridge evm

.PHONY: test-ts-binary-litmus ## Run litmus ts tests with binary without clean-up
test-ts-binary-litmus: launch-binary-litmus
@./scripts/run-ts-test.sh litmus no_bridge no_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
Expand All @@ -152,10 +128,6 @@ test-ts-binary-rococo: launch-binary-rococo
clean-docker-litentry:
@./scripts/clean-local-docker.sh litentry

.PHONY: clean-docker-litmus ## Clean up litmus docker images, containers, volumes, etc
clean-docker-litmus:
@./scripts/clean-local-docker.sh litmus

.PHONY: clean-docker-rococo ## Clean up rococo docker images, containers, volumes, etc
clean-docker-rococo:
@./scripts/clean-local-docker.sh rococo
Expand All @@ -170,10 +142,6 @@ clean-binary:
generate-docker-compose-litentry:
@./scripts/generate-docker-files.sh litentry

.PHONY: generate-docker-compose-litmus ## Generate docker-compose files for litmus local network
generate-docker-compose-litmus:
@./scripts/generate-docker-files.sh litmus

.PHONY: generate-docker-compose-rococo ## Generate docker-compose files for rococo local network
generate-docker-compose-rococo:
@./scripts/generate-docker-files.sh rococo
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ Basically, parachains are layer-1 blockchains that connect to the relaychains (P

To achieve identity aggregation, Litentry has a requirement to store sensitive user data, like web3 addresses, computed credit scores, and VCs in the trusted execution environment (TEE). Litentry builds a TEE side chain for this purpose and it is composed of multiple TEE-equipped nodes, to guarantee the security of data storage and data processing without exposing users' private data. A core component of this is the Litentry TEE worker which is based on Integritee's worker. It executes functions with specified inputs and resource limits in response to TEE calls and operations to ensure a sufficient level of scaling.

Overall, our architecture is made of up Relaychains ( Polkadot and Kusama), Parachains (Litentry and Litmus), and the TEE sidechain which is supported by and enables the runtime to execute in an SGX secure run environment.
Overall, our architecture is made of up Relaychains (Polkadot and Kusama), Parachains (Litentry and rococo), and the TEE sidechain which is supported by and enables the runtime to execute in an SGX secure run environment.

To serve as the backbone platform for various Litentry products and achieve a transparent and decentralized user experience, we have different chain-specs/runtimes compiled into one single binary. They are:

- litentry-parachain-runtime (on polkadot)
- litmus-parachain-runtime (on kusama)
- rococo-parachain-runtime (on rococo testnet)

Therefore, when building node binary or docker image, no distinction is required. But when building runtime/starting binary/running tests, the chain type must be explicitly given. See the examples below.
Expand Down Expand Up @@ -57,7 +56,7 @@ make build-runtime-litentry

The wasms should be located under `target/release/wbuild/litentry-parachain-runtime/`

Similarly, use `make build-runtime-litmus` and `make build-runtime-rococo` to build the litmus-parachain-runtime and rococo-parachain-runtime, respectively.
Similarly, use `make build-runtime-rococo` to build the rococo-parachain-runtime.

## Launch parachain
### Launch a full parachain network with relay chains
Expand Down
2 changes: 1 addition & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ check(){
export CHAIN="rococo"
fi

ALLOWED_VALUES=("rococo" "litmus" "litentry")
ALLOWED_VALUES=("rococo" "litentry")

if [[ " ${ALLOWED_VALUES[@]} " =~ " ${CHAIN} " ]]; then
echo "CHAIN is set to a valid value: $CHAIN"
Expand Down
Loading
Loading