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.

Sign up for GitHub

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

Jump to bottom

new shell spec for unbricking our parachain #78

Merged
merged 6 commits into from
Mar 10, 2022
Merged

new shell spec for unbricking our parachain #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
183484a
new launch config for unbricking tests
brenzi Mar 9, 2022
5cf7d71
fix #65
brenzi Mar 9, 2022
9816b5a
de-cluttered spec generation and regenesis all hardcoded specs
brenzi Mar 9, 2022
14e067c
fmt and script cleanup
brenzi Mar 9, 2022
c8dfec1
update launch scripts
brenzi Mar 9, 2022
aa0f2c8
fix and extend CI
brenzi Mar 9, 2022
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
8 changes: 3 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@ jobs:
strategy:
fail-fast: false
matrix:
chain: [shell]
config: [kusama]
chain: [integritee]
config: [rococo, westend, kusama, polkadot]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -238,11 +238,9 @@ jobs:
name: integritee-collator-${{ github.sha }}

- name: 'Create binaries for artifacts'
# Note: there is no way to pass the parachain-id to the `build-spec` cmd, which which imposes to set
# `DEFAULT_PARA_ID=2015` in the `polkadot-parachains/command`.
run: |
chmod +x ./integritee-collator
./integritee-collator export-genesis-state --chain ${{ env.CHAIN_SPEC }} --parachain-id 2015 > ${{ env.CHAIN_SPEC }}.state
./integritee-collator export-genesis-state --chain ${{ env.CHAIN_SPEC }} > ${{ env.CHAIN_SPEC }}.state
./integritee-collator build-spec --chain ${{ env.CHAIN_SPEC }} --disable-default-bootnode --raw > ${{ env.CHAIN_SPEC }}.json


Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 2 additions & 3 deletions polkadot-launch/launch-kusama-local-with-shell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "kusama-local",
"nodes": [
{
Expand All @@ -24,7 +24,6 @@
{
"bin": "./../target/release/integritee-collator",
"chain": "shell-kusama-local-dev",
"balance": "10_000_000__000_000_000_000",
"nodes": [
{
"wsPort": 9944,
Expand All @@ -34,7 +33,7 @@
},
{
"wsPort": 9945,
"port": 31200,
"port": 31201,
"name": "eve",
"flags": ["--", "--execution=wasm"]
}
Expand Down
2 changes: 1 addition & 1 deletion polkadot-launch/launch-kusama-local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "kusama-local",
"nodes": [
{
Expand Down
4 changes: 2 additions & 2 deletions polkadot-launch/launch-rococo-local-with-integritee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "rococo-local",
"nodes": [
{
Expand Down Expand Up @@ -33,7 +33,7 @@
},
{
"wsPort": 9945,
"port": 31200,
"port": 31201,
"name": "eve",
"flags": ["--", "--execution=wasm"]
}
Expand Down
43 changes: 43 additions & 0 deletions polkadot-launch/launch-rococo-local-with-shell-rococo-1.4.12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.17",
"chain": "rococo-local",
"nodes": [
{
"name": "alice",
"wsPort": 9999,
"port": 30444
},
{
"name": "bob",
"wsPort": 9988,
"port": 30555
},
{
"name": "charlie",
"wsPort": 9977,
"port": 30666
}
]
},
"parachains": [
{
"bin": "../../../bin/integritee-collator-1.4.12",
"chain": "shell-rococo-local-dev",
"nodes": [
{
"wsPort": 9944,
"rpcPort": 9933,
"port": 31200,
"name": "dave",
"flags": ["--", "--execution=wasm"]
}
]
}
],
"simpleParachains": [
],
"hrmpChannels": [
],
"finalization": false
}
5 changes: 2 additions & 3 deletions polkadot-launch/launch-rococo-local-with-shell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "rococo-local",
"nodes": [
{
Expand All @@ -24,7 +24,6 @@
{
"bin": "./../target/release/integritee-collator",
"chain": "shell-rococo-local-dev",
"balance": "10_000_000__000_000_000_000",
"nodes": [
{
"wsPort": 9944,
Expand All @@ -34,7 +33,7 @@
},
{
"wsPort": 9945,
"port": 31200,
"port": 31201,
"name": "eve",
"flags": ["--", "--execution=wasm"]
}
Expand Down
2 changes: 1 addition & 1 deletion polkadot-launch/launch-rococo-local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "rococo-local",
"nodes": [
{
Expand Down
48 changes: 48 additions & 0 deletions polkadot-launch/launch-westend-local-with-shell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.17",
"chain": "westend-local",
"nodes": [
{
"name": "alice",
"wsPort": 9999,
"port": 30444
},
{
"name": "bob",
"wsPort": 9988,
"port": 30555
},
{
"name": "charlie",
"wsPort": 9977,
"port": 30666
}
]
},
"parachains": [
{
"bin": "./../target/release/integritee-collator",
"chain": "shell-westend-local-dev",
"nodes": [
{
"wsPort": 9944,
"port": 31200,
"name": "dave",
"flags": ["--", "--execution=wasm"]
},
{
"wsPort": 9945,
"port": 31201,
"name": "eve",
"flags": ["--", "--execution=wasm"]
}
]
}
],
"simpleParachains": [
],
"hrmpChannels": [
],
"finalization": false
}
2 changes: 1 addition & 1 deletion polkadot-launch/launch-westend-local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"relaychain": {
"bin": "../../../bin/polkadot-0.9.13",
"bin": "../../../bin/polkadot-0.9.17",
"chain": "westend-local",
"nodes": [
{
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "integritee-collator"
description = "The Integritee parachain collator binary"
# align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
version = "1.4.12"
version = "1.5.13"
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/integritee-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = 'integritee-runtime'
description = "The Integritee parachain runtime"
# patch revision must match runtime spec_version
version = '1.4.12'
version = '1.5.13'
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/integritee-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("integritee-parachain"),
impl_name: create_runtime_str!("integritee-full"),
authoring_version: 2,
spec_version: 12,
spec_version: 13,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
Expand Down
76 changes: 39 additions & 37 deletions polkadot-parachains/res/integritee-kusama.json
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 53 additions & 0 deletions polkadot-parachains/res/integritee-polkadot.json
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 39 additions & 39 deletions polkadot-parachains/res/integritee-rococo.json
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 39 additions & 37 deletions polkadot-parachains/res/integritee-westend.json
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 0 additions & 52 deletions polkadot-parachains/res/shell-kusama.json
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions polkadot-parachains/res/shell-rococo.json
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions polkadot-parachains/res/shell-westend.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion polkadot-parachains/shell-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = 'shell-runtime'
description = "The Integritee shell parachain runtime"
# major.minor revision must match collator node. patch should match spec_version
version = '1.4.2'
version = '1.5.3'
authors = ["Integritee AG <[email protected]>"]
homepage = "https://integritee.network/"
repository = "https://github.com/integritee-network/parachain"
Expand Down
2 changes: 1 addition & 1 deletion polkadot-parachains/shell-runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("integritee-parachain"),
impl_name: create_runtime_str!("integritee-shell"),
authoring_version: 0,
spec_version: 2,
spec_version: 3,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 0,
Expand Down
Loading