Skip to content

Commit

Permalink
updates local parachain setup to work with latest versions (#258)
Browse files Browse the repository at this point in the history
  • Loading branch information
vayesy authored May 25, 2023
1 parent f054f77 commit c51b26f
Show file tree
Hide file tree
Showing 10 changed files with 341 additions and 184 deletions.
8 changes: 4 additions & 4 deletions .docker/local-relay-parachain/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ docker-compose -f .docker/local-relay-parachain/docker-compose.yaml up
2. Generate parachain chainspec
3. Generate new chain spec, wasm and genesis binaries.
```bash
./target/release/subzero-collator build-spec --disable-default-bootnode > .docker/local-relay-parachain/chainspec/subzero-parachain-plain.json
./target/release/subzero-collator build-spec --chain .docker/local-relay-parachain/chainspec/subzero-parachain-plain.json --raw --disable-default-bootnode > .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json
./target/release/subzero-collator export-genesis-wasm --chain .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json > .docker/local-relay-parachain/wasm/subzero-wasm
./target/release/subzero-collator export-genesis-state --chain .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json > .docker/local-relay-parachain/wasm/subzero-genesis
./target/release/subzero build-spec --disable-default-bootnode > .docker/local-relay-parachain/chainspec/subzero-parachain-plain.json
./target/release/subzero build-spec --chain .docker/local-relay-parachain/chainspec/subzero-parachain-plain.json --raw --disable-default-bootnode > .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json
./target/release/subzero export-genesis-wasm --chain .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json > .docker/local-relay-parachain/wasm/subzero-wasm
./target/release/subzero export-genesis-state --chain .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json > .docker/local-relay-parachain/wasm/subzero-genesis
```


Expand Down
66 changes: 43 additions & 23 deletions .docker/local-relay-parachain/chainspec/rococo-local.json

Large diffs are not rendered by default.

157 changes: 157 additions & 0 deletions .docker/local-relay-parachain/chainspec/subzero-parachain-plain.json

Large diffs are not rendered by default.

121 changes: 121 additions & 0 deletions .docker/local-relay-parachain/chainspec/subzero-parachain-raw.json

Large diffs are not rendered by default.

145 changes: 0 additions & 145 deletions .docker/local-relay-parachain/chainspec/subzero.json

This file was deleted.

14 changes: 8 additions & 6 deletions .docker/local-relay-parachain/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3.7"
services:
relaychain-alice:
image: parity/polkadot:v0.9.28
image: parity/polkadot:v0.9.40
user: "0:0"
ports:
- 9944:9944
Expand All @@ -22,10 +22,11 @@ services:
- --rpc-methods=unsafe
- --wasm-execution=compiled
- --execution=wasm
- --node-key=bf16b85cdce899363bb32e5baf1f2d58e967ac9bd97e8dd3bdc6df26e2cd35ee
environment:
RUST_LOG: parachain::candidate-backing=trace,parachain::candidate-selection=trace,parachain::pvf=trace,parachain::collator-protocol=trace,parachain::provisioner=trace
relaychain-bob:
image: parity/polkadot:v0.9.28
image: parity/polkadot:v0.9.40
user: "0:0"
ports:
- 9945:9944
Expand All @@ -49,8 +50,8 @@ services:
environment:
RUST_LOG: parachain::candidate-backing=trace,parachain::candidate-selection=trace,parachain::pvf=trace,parachain::collator-protocol=trace,parachain::provisioner=trace
parachain-alice:
# image: playzero/subzero:local
image: subzero:local
image: playzero/subzero:local
# image: subzero:local
user: "0:0"
ports:
- 9946:9944
Expand All @@ -61,12 +62,12 @@ services:
- "./tmp:/tmp"
command:
- /usr/local/bin/subzero
- --chain=/chainspec/subzero.json
- --chain=/chainspec/subzero-parachain-raw.json
- --base-path=/tmp/parachain/alice
- --ws-external
- --rpc-external
- --rpc-cors=all
- --name=parachain-4040-0
- --name=parachain-2000-0
- --collator
- --rpc-methods=unsafe
- --force-authoring
Expand All @@ -77,6 +78,7 @@ services:
- --listen-addr=/ip4/0.0.0.0/tcp/30333
- --
- --chain=/chainspec/rococo-local.json
# - --bootnodes=/dns/relaychain-alice/tcp/30333/p2p/12D3KooWEkXWjRHhoMXzj3gKzewqem5Kppg65vpK8qTsRTkoKf3A
- --wasm-execution=compiled
- --execution=wasm
environment:
Expand Down
1 change: 1 addition & 0 deletions .docker/local-relay-parachain/wasm/subzero-genesis
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x000000000000000000000000000000000000000000000000000000000000000000237e665edd37eff1770a04140378078f10f94cecdfd4c3c9a745c607ce4b5d1403170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c11131400
1 change: 1 addition & 0 deletions .docker/local-relay-parachain/wasm/subzero-wasm

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions bin/subzero/node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {

impl SubstrateCli for Cli {
fn impl_name() -> String {
"Subzero Collator".into()
"Zero Network".into()
}

fn impl_version() -> String {
Expand All @@ -43,7 +43,7 @@ impl SubstrateCli for Cli {

fn description() -> String {
format!(
"Subzero Collator\n\nThe command-line arguments provided first will be \
"Zero Network\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand Down Expand Up @@ -74,7 +74,7 @@ impl SubstrateCli for Cli {

impl SubstrateCli for RelayChainCli {
fn impl_name() -> String {
"Subzero Collator".into()
"Zero Network".into()
}

fn impl_version() -> String {
Expand All @@ -83,7 +83,7 @@ impl SubstrateCli for RelayChainCli {

fn description() -> String {
format!(
"Subzero Collator\n\nThe command-line arguments provided first will be \
"Zero Network\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relay chain node.\n\n\
{} <parachain-args> -- <relay-chain-args>",
Expand Down
4 changes: 2 additions & 2 deletions bin/subzero/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use frame_support::{
traits::{
tokens::nonfungibles_v2::Inspect,
AsEnsureOriginWithArg, ConstU32, ConstU64, ConstU8, Contains, EitherOfDiverse,
EnsureOrigin, EnsureOriginWithArg, EqualPrivilegeOnly, InstanceFilter,
Everything, EnsureOrigin, EnsureOriginWithArg, EqualPrivilegeOnly, InstanceFilter,
LockIdentifier, U128CurrencyToVote, Nothing, ConstBool
},
weights::{
Expand Down Expand Up @@ -353,7 +353,7 @@ impl frame_system::Config for Runtime {
type DbWeight = RocksDbWeight;
/// The basic call filter to use in dispatchable.
// type BaseCallFilter = BaseFilter;
type BaseCallFilter = ();
type BaseCallFilter = Everything;
/// Weight information for the extrinsics of this pallet.
type SystemWeightInfo = ();
/// Block & extrinsics weights: base values and limits.
Expand Down

0 comments on commit c51b26f

Please sign in to comment.