From 53cde763820f1ae8561bc9714e54ac7bfd3c14a6 Mon Sep 17 00:00:00 2001 From: Max Andreev Date: Thu, 30 Mar 2023 16:34:09 +0000 Subject: [PATCH] Fix XCM local config --- --- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp +++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp @@ -2,6 +2,7 @@ FROM uniquenetwork/builder-moonbeam:{{ MOONRIVER_BUILD_BRANCH }} as moonbeam FROM uniquenetwork/builder-cumulus:{{ STATEMINE_BUILD_BRANCH }} as cumulus FROM uniquenetwork/builder-acala:{{ KARURA_BUILD_BRANCH }} as acala +FROM uniquenetwork/builder-astar:{{ SHIDEN_BUILD_BRANCH }} as astar # ===== Rust builder ===== FROM ubuntu:22.04 as rust-builder @@ -62,13 +63,14 @@ yarn install COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/launch-config.json -COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet +COPY --from=builder-unique /unique_parachain/.docker/xcm-config/6validators.jsonnet /polkadot-launch/6validators.jsonnet COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/ COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/ COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/ +COPY --from=astar /unique_parachain/Astar/target/production/astar /astar/target/release/ COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/ EXPOSE 9844 @@ -76,6 +78,7 @@ EXPOSE 9946 EXPOSE 9947 EXPOSE 9948 +EXPOSE 9949 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ --- a/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp +++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp @@ -2,6 +2,7 @@ FROM uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} as moonbeam FROM uniquenetwork/builder-cumulus:{{ STATEMINT_BUILD_BRANCH }} as cumulus FROM uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} as acala +FROM uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} as astar # ===== Rust builder ===== FROM ubuntu:22.04 as rust-builder @@ -62,13 +63,14 @@ yarn install COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json /polkadot-launch/launch-config.json -COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet +COPY --from=builder-unique /unique_parachain/.docker/xcm-config/6validators.jsonnet /polkadot-launch/6validators.jsonnet COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/ COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/ COPY --from=moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/ COPY --from=cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus COPY --from=acala /unique_parachain/Acala/target/production/acala /acala/target/release/ +COPY --from=astar /unique_parachain/Astar/target/production/astar /astar/target/release/ COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/ EXPOSE 9844 @@ -76,6 +78,7 @@ EXPOSE 9946 EXPOSE 9947 EXPOSE 9948 +EXPOSE 9949 CMD export NVM_DIR="$HOME/.nvm" PATH="$PATH:/chainql/target/release" && \ [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \ --- a/.docker/additional/xcm-rococo/docker-compose-xcm-quartz-rococo.yml +++ b/.docker/additional/xcm-rococo/docker-compose-xcm-quartz-rococo.yml @@ -13,10 +13,12 @@ - 9946 - 9947 - 9948 + - 9949 ports: - 127.0.0.1:9844:9844 - 127.0.0.1:9944:9944 - 127.0.0.1:9946:9946 - 127.0.0.1:9947:9947 - 127.0.0.1:9948:9948 + - 127.0.0.1:9949:9949 --- a/.docker/additional/xcm-rococo/docker-compose-xcm-unique-rococo.yml +++ b/.docker/additional/xcm-rococo/docker-compose-xcm-unique-rococo.yml @@ -13,10 +13,12 @@ - 9946 - 9947 - 9948 + - 9949 ports: - 127.0.0.1:9844:9844 - 127.0.0.1:9944:9944 - 127.0.0.1:9946:9946 - 127.0.0.1:9947:9947 - 127.0.0.1:9948:9948 + - 127.0.0.1:9949:9949 --- a/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json +++ b/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json @@ -5,7 +5,7 @@ "chainInitializer": [ "chainql", "--tla-code=spec=import '${spec}'", - "5validators.jsonnet" + "6validators.jsonnet" ], "nodes": [ { @@ -62,8 +62,18 @@ "--unsafe-ws-external", "-lparachain::candidate_validation=debug" ] + }, + { + "name": "ferdie", + "wsPort": 9899, + "rpcPort": 9898, + "port": 30999, + "flags": [ + "--unsafe-rpc-external", + "--unsafe-ws-external", + "-lparachain::candidate_validation=debug" + ] } - ], "genesis": { "runtime": { @@ -155,6 +165,23 @@ ] } ] + }, + { + "bin": "/astar/target/release/astar", + "id": "2007", + "chain": "shiden-dev", + "balance": "1000000000000000000000000", + "nodes": [ + { + "wsPort": 9949, + "port": 31205, + "name": "alice", + "flags": [ + "--unsafe-rpc-external", + "--unsafe-ws-external" + ] + } + ] } ], "simpleParachains": [], @@ -194,7 +221,19 @@ "recipient": 2095, "maxCapacity": 8, "maxMessageSize": 512 - } + }, + { + "sender": 2007, + "recipient": 2095, + "maxCapacity": 8, + "maxMessageSize": 512 + }, + { + "sender": 2095, + "recipient": 2007, + "maxCapacity": 8, + "maxMessageSize": 512 + } ], "finalization": false } --- a/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json +++ b/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json @@ -5,7 +5,7 @@ "chainInitializer": [ "chainql", "--tla-code=spec=import '${spec}'", - "5validators.jsonnet" + "6validators.jsonnet" ], "nodes": [ { @@ -62,8 +62,18 @@ "--unsafe-ws-external", "-lparachain::candidate_validation=debug" ] + }, + { + "name": "ferdie", + "wsPort": 9899, + "rpcPort": 9898, + "port": 30999, + "flags": [ + "--unsafe-rpc-external", + "--unsafe-ws-external", + "-lparachain::candidate_validation=debug" + ] } - ], "genesis": { "runtime": { @@ -155,6 +165,23 @@ ] } ] + }, + { + "bin": "/astar/target/release/astar", + "id": "2006", + "chain": "astar-dev", + "balance": "1000000000000000000000000", + "nodes": [ + { + "wsPort": 9949, + "port": 31205, + "name": "alice", + "flags": [ + "--unsafe-rpc-external", + "--unsafe-ws-external" + ] + } + ] } ], "simpleParachains": [], @@ -194,7 +221,19 @@ "recipient": 2037, "maxCapacity": 8, "maxMessageSize": 512 - } + }, + { + "sender": 2006, + "recipient": 2037, + "maxCapacity": 8, + "maxMessageSize": 512 + }, + { + "sender": 2037, + "recipient": 2006, + "maxCapacity": 8, + "maxMessageSize": 512 + } ], "finalization": false } -- gitstuff