Skip to content

Commit

Permalink
Merge pull request #885 from UniqueNetwork/release-v937053
Browse files Browse the repository at this point in the history
Release v937053
  • Loading branch information
kozyrevdev authored Mar 10, 2023
2 parents 7b6dc6f + 611bb8a commit 86290e7
Show file tree
Hide file tree
Showing 158 changed files with 10,427 additions and 4,779 deletions.
2 changes: 0 additions & 2 deletions .docker/Dockerfile-xcm.j2
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ WORKDIR /unique_parachain

COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json
COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet
COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet

RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
cd unique-chain && \
Expand Down Expand Up @@ -51,7 +50,6 @@ RUN export NVM_DIR="$HOME/.nvm" && \

COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/
COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet
COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet

COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ RUN export NVM_DIR="$HOME/.nvm" && \

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/minBondFix.jsonnet /polkadot-launch/minBondFix.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/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ RUN export NVM_DIR="$HOME/.nvm" && \

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/minBondFix.jsonnet /polkadot-launch/minBondFix.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/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,7 @@
"id": 2023,
"balance": "1000000000000000000000",
"chain": "moonriver-local",
"chainInitializer": [
"chainql",
"--tla-code=spec=import '${spec}'",
"minBondFix.jsonnet"
],
"specNamePrefix": "moonriver-local-",
"nodes": [
{
"wsPort": 9947,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
"id": "2004",
"balance": "1000000000000000000000",
"chain": "moonbeam-local",
"specNamePrefix": "moonbeam-local-",
"nodes": [
{
"wsPort": 9947,
Expand Down
6 changes: 1 addition & 5 deletions .docker/xcm-config/launch-config-xcm-quartz.j2
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,7 @@
"id": 2023,
"balance": "1000000000000000000000",
"chain": "moonriver-local",
"chainInitializer": [
"chainql",
"--tla-code=spec=import '${spec}'",
"minBondFix.jsonnet"
],
"specNamePrefix": "moonriver-local-",
"nodes": [
{
"wsPort": 9947,
Expand Down
1 change: 1 addition & 0 deletions .docker/xcm-config/launch-config-xcm-unique.j2
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
"id": "2004",
"balance": "1000000000000000000000",
"chain": "moonbeam-local",
"specNamePrefix": "moonbeam-local-",
"nodes": [
{
"wsPort": 9947,
Expand Down
10 changes: 0 additions & 10 deletions .docker/xcm-config/minBondFix.jsonnet

This file was deleted.

10 changes: 5 additions & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ POLKADOT_BUILD_BRANCH=release-v0.9.37
POLKADOT_LAUNCH_BRANCH=unique-network
RELAY_CHAIN_TYPE=westend

POLKADOT_MAINNET_BRANCH=release-v0.9.34
POLKADOT_MAINNET_BRANCH=release-v0.9.36
STATEMINT_BUILD_BRANCH=release-parachains-v9360
ACALA_BUILD_BRANCH=2.12.0
MOONBEAM_BUILD_BRANCH=runtime-2000
Expand All @@ -13,15 +13,15 @@ UNIQUE_REPLICA_FROM=wss://ws.unique.network:443
KUSAMA_MAINNET_BRANCH=release-v0.9.37
STATEMINE_BUILD_BRANCH=release-parachains-v9360
KARURA_BUILD_BRANCH=release-karura-2.12.0
MOONRIVER_BUILD_BRANCH=runtime-2000
MOONRIVER_BUILD_BRANCH=runtime-2100
QUARTZ_MAINNET_BRANCH=release-v930034-fix-gas-price
QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443

UNIQUEWEST_MAINNET_BRANCH=release-v0.9.37
UNIQUEWEST_MAINNET_BRANCH=release-v0.9.36
WESTMINT_BUILD_BRANCH=parachains-v9370
OPAL_MAINNET_BRANCH=release-v936050
OPAL_MAINNET_BRANCH=release-v937052
OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443

UNIQUEEAST_MAINNET_BRANCH=release-v0.9.32
SAPPHIRE_MAINNET_BRANCH=release-v936040
SAPPHIRE_MAINNET_BRANCH=release-v937052
SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443
4 changes: 4 additions & 0 deletions .github/workflows/xcm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,10 @@ jobs:
reporter: mochawesome-json
fail-on-error: 'false'

- name: Show container logs
if: always() # run this step always
run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" logs

- name: Stop running containers
if: always() # run this step always
run: docker-compose -f ".docker/docker-compose.xcm-tests.${{ matrix.network }}.yml" down
Expand Down
9 changes: 8 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,12 @@
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
}
},
"rust-analyzer.cargo.extraEnv": {
"SKIP_WASM_BUILD": "1"
},
"rust-analyzer.cargo.features": [
"runtime-benchmarks",
"try-runtime"
]
}
25 changes: 15 additions & 10 deletions Cargo.lock

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

Loading

0 comments on commit 86290e7

Please sign in to comment.