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

Changes spec/wasm engine for run scripts #178

Merged
merged 9 commits into from
Jan 18, 2021
Merged
Show file tree
Hide file tree
Changes from 5 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
2 changes: 1 addition & 1 deletion docker/moonbase-alphanet.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CMD ["/moonbase-alphanet/moonbase-alphanet", \
"--rpc-port","9933", \
"--ws-port","9944", \
"--validator", \
"--chain", "/moonbase-alphanet/moonbase-alphanet-specs-plain.json", \
"--chain", "/moonbase-alphanet/moonbase-alphanet-specs-raw.json", \
"--", \
"--chain", "/moonbase-alphanet/rococo-alphanet-specs-raw.json" \
]
20 changes: 7 additions & 13 deletions scripts/_init_var.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ if [ -z "$PARACHAIN_IP" ]; then
PARACHAIN_IP="127.0.0.1"
fi

if [ -z "$SUDO_SEED" ]; then
SUDO_SEED="0x078782a1f82fd4f9ab59131646f92caa3104dfb6b6975d025647760f693991b3"
fi

NODE_KEYS=(
0000000000000000000000000000000000000000000000000000000000000000
1111111111111111111111111111111111111111111111111111111111111111
Expand All @@ -92,16 +88,14 @@ RELAY_SEEDS=(
"six stumble adjust guide delay rail waste ivory hood peasant seminar fluid"
)

RELAY_SR25519_PUB=(
"0xb23ebd9c1c2c0b65eebbc6d3db6bbbd287219bfb5468931a1c129119a3369d07"
"0x8802ba4e93c98107e70884ca3b1510824351100dace655e0dc3bbe304b1c5205"
"0xb2caf068a6e89d13a1ae47884fcedb35a4481339d168f5aba5fa77f0a6d0755d"
)
RELAY_USERS=(
"alice"
"bob"
"charlie"
"dave"
"eve"
"ferdie"

RELAY_ED25519_PUB=(
"0xa1c35491bd3487995756678c3bc5e5491897d8bdfa9b512e2e1b1bf7e11664c2"
"0xcd2424a7c0f1ec30aeb0124e732d13406f63abaee72b2b4e6d0817935bb02099"
"0x4c559e6b50b27ad7a54af29fe99c4c5b7d064eb3bd9c4d2141daf426719a75b9"
)

RELAY_LOCAL_IDS=(
Expand Down
14 changes: 10 additions & 4 deletions scripts/run-alphanet-parachain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,22 @@ $PARACHAIN_BINARY \
--rpc-port $((PARACHAIN_PORT + 10 + 1)) \
--ws-port $((PARACHAIN_PORT + 10 + 2)) \
--validator \
--rpc-cors all \
--rpc-methods=unsafe \
--execution wasm \
--wasm-execution compiled \
--name parachain_$PARACHAIN_INDEX \
$PARACHAIN_BASE_PATH \
'-linfo,evm=trace,ethereum=trace,rpc=trace' \
--chain $PARACHAIN_SPEC_PLAIN \
'-linfo,evm=debug,ethereum=trace,rpc=trace,cumulus_collator=debug,txpool=debug' \
--alice \
--chain staging \
crystalin marked this conversation as resolved.
Show resolved Hide resolved
--account-id 6Be02d1d3665660d22FF9624b7BE0551ee1Ac91b \
JoshOrndorff marked this conversation as resolved.
Show resolved Hide resolved
$PARACHAIN_BOOTNODES_ARGS \
-- \
--node-key ${PARACHAIN_KEYS[$PARACHAIN_INDEX]} \
--chain rococo-local \
JoshOrndorff marked this conversation as resolved.
Show resolved Hide resolved
$PARACHAIN_BASE_PATH \
--port $((PARACHAIN_PORT)) \
--rpc-port $((PARACHAIN_PORT + 1)) \
--ws-port $((PARACHAIN_PORT + 2)) \
$RELAY_BOOTNODES_ARGS \
--chain $POLKADOT_SPEC_RAW;
$RELAY_BOOTNODES_ARGS;
66 changes: 17 additions & 49 deletions scripts/run-alphanet-relay.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,52 +54,20 @@ docker run \
-p $((RELAY_PORT + 1)):$((RELAY_PORT + 1)) \
-p $((RELAY_PORT + 2)):$((RELAY_PORT + 2)) \
-it purestake/moonbase-relay-testnet:$POLKADOT_VERSION \
bash -c "
echo 'Inserting keys...';
/usr/local/bin/polkadot \
key insert \
--keystore-path /tmp/chains/rococo_moonbase_relay_testnet/keystore \
--base-path /tmp \
--suri '${RELAY_SEEDS[$RELAY_INDEX]}' \
--key-type gran \
--scheme ed25519;
/usr/local/bin/polkadot \
key insert \
--keystore-path /tmp/chains/rococo_moonbase_relay_testnet/keystore \
--base-path /tmp \
--suri '${RELAY_SEEDS[$RELAY_INDEX]}' \
--key-type babe;
/usr/local/bin/polkadot \
key insert \
--keystore-path /tmp/chains/rococo_moonbase_relay_testnet/keystore \
--base-path /tmp \
--suri '${RELAY_SEEDS[$RELAY_INDEX]}' \
--key-type imon;
/usr/local/bin/polkadot \
key insert \
--keystore-path /tmp/chains/rococo_moonbase_relay_testnet/keystore \
--base-path /tmp \
--suri '${RELAY_SEEDS[$RELAY_INDEX]}' \
--key-type para;
/usr/local/bin/polkadot \
key insert \
--keystore-path /tmp/chains/rococo_moonbase_relay_testnet/keystore \
--base-path /tmp \
--suri '${RELAY_SEEDS[$RELAY_INDEX]}' \
--key-type audi;
echo 'Starting node...';
/usr/local/bin/polkadot \
--chain /$POLKADOT_SPEC_RAW \
--node-key ${NODE_KEYS[$RELAY_INDEX]} \
--base-path /tmp \
--validator \
--force-authoring \
--name relay_$RELAY_INDEX \
--rpc-methods=Unsafe \
--unsafe-rpc-external \
--unsafe-ws-external \
--port $((RELAY_PORT)) \
--rpc-port $((RELAY_PORT + 1)) \
--ws-port $((RELAY_PORT + 2)) \
$BOOTNODES_ARGS \
'-linfo,evm=trace,ethereum=trace,rpc=trace'"
/usr/local/bin/polkadot \
--chain rococo-local \
--${RELAY_USERS[$RELAY_INDEX]}
--node-key ${NODE_KEYS[$RELAY_INDEX]} \
--base-path /tmp \
--validator \
--force-authoring \
--name relay_$RELAY_INDEX \
--rpc-methods=Unsafe \
--unsafe-rpc-external \
--unsafe-ws-external \
--rpc-cors all \
--port $((RELAY_PORT)) \
--rpc-port $((RELAY_PORT + 1)) \
--ws-port $((RELAY_PORT + 2)) \
$BOOTNODES_ARGS \
'-linfo,evm=debug,ethereum=trace,rpc=trace,txpool=debug,polkadot_parachain=debug'"
6 changes: 5 additions & 1 deletion scripts/run-moonbase-standalone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ $EXECUTABLE \
--rpc-port $((STANDALONE_PORT + 1)) \
--ws-port $((STANDALONE_PORT + 2)) \
--validator \
--rpc-cors all \
--rpc-methods=unsafe \
--execution wasm \
--wasm-execution compiled \
--name STANDALONE_$STANDALONE_INDEX \
$STANDALONE_BASE_PATH \
'-linfo,evm=trace,ethereum=trace,rpc=trace' \
'-lerror,evm=debug,ethereum=trace,rpc=trace,cumulus_collator=debug,txpool=debug' \
$STANDALONE_BOOTNODES_ARGS