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

feat: add new paseo runtime #3013

Merged
merged 33 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4e92752
feat: add paseo runtime
felixfaisal Aug 12, 2024
66318e2
fix: update CI to run tests on paseo
felixfaisal Aug 12, 2024
f8e6cb0
fix: update lock files
felixfaisal Aug 12, 2024
a301db4
fix: add ts-tests for paseo in CI
felixfaisal Aug 13, 2024
34464dc
Merge branch 'dev' of github.com:litentry/litentry-parachain into p-8…
felixfaisal Aug 19, 2024
661d251
fix: remove paseo to push docker
felixfaisal Aug 20, 2024
8833c75
fix: add paseo to ci
felixfaisal Aug 21, 2024
e26114d
fix: add paseo to node files
felixfaisal Aug 21, 2024
8fd5f40
fix: update load-spec
felixfaisal Aug 21, 2024
9c8dbd5
fix: update node command
felixfaisal Aug 23, 2024
efbbe88
fix: resolve conflicts and update with dev
felixfaisal Aug 26, 2024
e9b872a
fix: update chain_spec file
felixfaisal Aug 26, 2024
c5e6991
fix: update command.rs
felixfaisal Aug 26, 2024
c9c6ef6
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 2, 2024
19171f8
fix: update based on comments
felixfaisal Sep 2, 2024
0d3c495
Merge branch 'p-884-integrate-with-passeo' of github.com:litentry/lit…
felixfaisal Sep 2, 2024
482e4ce
fix: update chain_id
felixfaisal Sep 2, 2024
089f5da
fix: update build fixes
felixfaisal Sep 2, 2024
43ce77d
fix: update lock file
felixfaisal Sep 2, 2024
22b65ca
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 2, 2024
d5fe2d5
Try to fix paseo CI (#3036)
Kailai-Wang Sep 3, 2024
635d546
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 3, 2024
ccc2991
fix: resolve conflicts
felixfaisal Sep 9, 2024
b477ccd
fix: add paseo network into launch setup
felixfaisal Sep 9, 2024
23a3a7a
refactor: clean up makefile
felixfaisal Sep 9, 2024
31b690a
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 10, 2024
6329e64
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 12, 2024
9c193c6
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 13, 2024
8358487
refactor: remove parachain-launch config for paseo
felixfaisal Sep 16, 2024
1a66aae
Merge branch 'dev' into p-884-integrate-with-passeo
felixfaisal Sep 16, 2024
22cfe31
add paseo benchmark option
BillyWooo Sep 16, 2024
2455724
Merge remote-tracking branch 'origin/p-884-integrate-with-passeo' int…
BillyWooo Sep 16, 2024
a7ef62f
[benchmarking bot] Auto commit generated weights files (#3065)
github-actions[bot] Sep 16, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ jobs:
- litmus
- litentry
- rococo
- paseo
name: ${{ matrix.chain }}
steps:
- uses: actions/checkout@v4
Expand Down
113 changes: 113 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ members = [
'runtime/litentry',
'runtime/litmus',
'runtime/rococo',
'runtime/paseo',
'runtime/common',
]
exclude = [
Expand Down Expand Up @@ -252,6 +253,7 @@ 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 }
paseo-parachain-runtime = { path = "runtime/paseo", default-features = false }
pallet-account-fix = { path = "pallets/account-fix", default-features = false }
pallet-asset-manager = { path = "pallets/xcm-asset-manager", default-features = false }
pallet-assets-handler = { path = "pallets/assets-handler", default-features = false }
Expand Down
24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ build-runtime-litmus:
build-runtime-rococo:
cargo build --locked -p $(call pkgid, rococo-parachain-runtime) --release

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

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

.PHONY: launch-docker-paseo ## Launch a local rococo-parachain network with docker
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved
launch-docker-paseo: generate-docker-compose-paseo
@./scripts/launch-local-docker.sh paseo

.PHONY: launch-binary-litentry ## Launch a local litentry-parachain network with binaries
launch-binary-litentry:
@./scripts/launch-local-binary.sh litentry
Expand All @@ -108,6 +116,10 @@ launch-binary-litmus:
launch-binary-rococo:
@./scripts/launch-local-binary.sh rococo

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

.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
Expand All @@ -134,6 +146,10 @@ test-ts-docker-litmus: launch-docker-litmus launch-docker-bridge
test-ts-docker-rococo: launch-docker-rococo launch-docker-bridge
@./scripts/run-ts-test.sh rococo bridge evm

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

.PHONY: test-ts-binary-paseo ## Run paseo ts tests with binary without clean-up
test-ts-binary-paseo: launch-binary-paseo
@./scripts/run-ts-test.sh paseo no_bridge evm

# clean up

.PHONY: clean-docker-litentry ## Clean up litentry docker images, containers, volumes, etc
Expand Down Expand Up @@ -178,6 +198,10 @@ generate-docker-compose-litmus:
generate-docker-compose-rococo:
@./scripts/generate-docker-files.sh rococo

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

# update dependencies

.PHONY: update-ts-dep ## update ts-tests dependencies
Expand Down
47 changes: 47 additions & 0 deletions docker/paseo-parachain-launch-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# A parachain-launch (https://github.com/open-web3-stack/parachain-launch) config
# used in dev env
# contains 2 relaychain nodes + 1 parachain node
#
# Relaychain Configuration
relaychain:
image: parity/polkadot:v0.9.42
chain: rococo-local
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved
env:
RUST_LOG: parachain::candidate-backing=trace,parachain::candidate-selection=trace,parachain::pvf=trace,parachain::collator-protocol=trace,parachain::provisioner=trace
flags:
- --rpc-methods=unsafe
- --execution=wasm
nodes:
- name: alice
wsPort: ${AliceWSPort:-9946}
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved
rpcPort: ${AliceRPCPort:-9936}
port: ${AlicePort:-30336}
- name: bob
wsPort: ${BobWSPort:-9947}
rpcPort: ${BobRPCPort:-9937}
port: ${BobPort:-30337}

# Parachain Configuration
parachains:
- image: litentry/litentry-parachain:latest
chain: paseo-dev
id: 2106
parachain: true
flags:
- --rpc-methods=unsafe
- --force-authoring
- --execution=wasm
- --state-pruning=archive
- --blocks-pruning=archive
- --enable-evm-rpc
relaychainFlags:
- --execution=wasm
env:
RUST_LOG: sc_basic_authorship=trace,cumulus-consensus=trace,cumulus-collator=trace,collator_protocol=trace,collation_generation=trace,aura=debug
volumePath: /data
nodes:
- flags:
- --alice
wsPort: ${CollatorWSPort:-9944}
rpcPort: ${CollatorRPCPort:-9933}
port: ${CollatorPort:-30333}
6 changes: 3 additions & 3 deletions docker/pnpm-lock.yaml

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

4 changes: 4 additions & 0 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ try-runtime-cli = { workspace = true }
core-primitives = { workspace = true, features = ["std"] }
litentry-parachain-runtime = { workspace = true, features = ["std"] }
litmus-parachain-runtime = { workspace = true, features = ["std"] }
paseo-parachain-runtime = { workspace = true, features = ["std"] }
rococo-parachain-runtime = { workspace = true, features = ["std"] }

[build-dependencies]
Expand All @@ -108,18 +109,21 @@ fast-runtime = [
"litentry-parachain-runtime/fast-runtime",
"litmus-parachain-runtime/fast-runtime",
"rococo-parachain-runtime/fast-runtime",
"paseo-parachain-runtime/fast-runtime",
]
runtime-benchmarks = [
"litentry-parachain-runtime/runtime-benchmarks",
"litmus-parachain-runtime/runtime-benchmarks",
"rococo-parachain-runtime/runtime-benchmarks",
"paseo-parachain-runtime/runtime-benchmarks",
"polkadot-service/runtime-benchmarks",
"polkadot-cli/runtime-benchmarks",
]
try-runtime = [
"litentry-parachain-runtime/try-runtime",
"litmus-parachain-runtime/try-runtime",
"rococo-parachain-runtime/try-runtime",
"paseo-parachain-runtime/try-runtime",
"polkadot-service/try-runtime",
"polkadot-cli/try-runtime",
]
50 changes: 50 additions & 0 deletions node/res/genesis_info/paseo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"rootKey": "jcMcexZDWw6PUEeSEXAcGppmyy1mSzSvgHCmge6jYYmVma2Y7",
"invulnerables": [
[
"jcRVUU8svEMTtwJjX1HzySNrrVEHVnoAdNAmhnbM8ub5dfbM9",
"jcSmq9jXyvZWwJQY6cqf7fCAbnFpesph35H3iqKPgSexTLbCr"
],
[
"jcSQcu5RXtWXKPN78zJogNyqsff1j4ffgoJ2njNcDbZ3qNEh5",
"jcQ9fNkocehtVvSa9deQr36bnJWt656EQdN3zDgSgP7dgX2kr"
]
],
"candidacyBond": "16000000000000000000",
"endowedAccounts": [
[
"jcRVUU8svEMTtwJjX1HzySNrrVEHVnoAdNAmhnbM8ub5dfbM9",
"1000000000000000000000"
],
[
"jcSQcu5RXtWXKPN78zJogNyqsff1j4ffgoJ2njNcDbZ3qNEh5",
"1000000000000000000000"
],
[
"jcMcexZDWw6PUEeSEXAcGppmyy1mSzSvgHCmge6jYYmVma2Y7",
"1000000000000000000000"
],
[
"jcS2wD5jDwouCqVABGCZhVjKQQm3ZHxMYTabySfT3Pygzck9W",
"1000000000000000000000"
]
],
"council": [
"jcRVUU8svEMTtwJjX1HzySNrrVEHVnoAdNAmhnbM8ub5dfbM9",
"jcSQcu5RXtWXKPN78zJogNyqsff1j4ffgoJ2njNcDbZ3qNEh5"
],
"technicalCommittee": [
"jcRVUU8svEMTtwJjX1HzySNrrVEHVnoAdNAmhnbM8ub5dfbM9",
"jcSQcu5RXtWXKPN78zJogNyqsff1j4ffgoJ2njNcDbZ3qNEh5"
],
"developerCommittee": [
"jcRVUU8svEMTtwJjX1HzySNrrVEHVnoAdNAmhnbM8ub5dfbM9",
"jcSQcu5RXtWXKPN78zJogNyqsff1j4ffgoJ2njNcDbZ3qNEh5"
],
"bootNodes": [
"/dns/rpc.rococo-parachain.litentry.io/tcp/40333/ws/p2p/12D3KooWD9t5jsf5m2g4acXfyVf2KxR5j11F9SLC5wKhv6JRquyv"
felixfaisal marked this conversation as resolved.
Show resolved Hide resolved
],
"telemetryEndpoints": [
"wss://telemetry.polkadot.io/submit/"
]
}
1 change: 1 addition & 0 deletions node/src/chain_specs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use sp_runtime::traits::{IdentifyAccount, Verify};

pub mod litentry;
pub mod litmus;
pub mod paseo;
pub mod rococo;

// This is a default chain spec using litentry genesis config
Expand Down
Loading
Loading