Skip to content

Commit 0a1a3b4

Browse files
authored
Merge pull request #935 from UniqueNetwork/release-v941056
Release v941056
2 parents 6221fea + 6bf78d1 commit 0a1a3b4

91 files changed

Lines changed: 3194 additions & 1232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.docker/Dockerfile-parachain-upgrade-data.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ARG POLKADOT_BUILD_BRANCH
21
FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot
32

43
# ===== Rust builder =====

.docker/Dockerfile-parachain-upgrade.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ARG POLKADOT_BUILD_BRANCH
21
FROM uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} as polkadot
32

43
# ===== Rust builder =====

.docker/Dockerfile-xcm.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-
5858
COPY --from=uniquenetwork/builder-polkadot:{{ POLKADOT_BUILD_BRANCH }} /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
5959
COPY --from=uniquenetwork/builder-moonbeam:{{ MOONBEAM_BUILD_BRANCH }} /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
6060
COPY --from=uniquenetwork/builder-cumulus:{{ CUMULUS_BUILD_BRANCH }} /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
61-
COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/Acala/target/production/acala /acala/target/release/
61+
COPY --from=uniquenetwork/builder-acala:{{ ACALA_BUILD_BRANCH }} /unique_parachain/acala/target/production/acala /acala/target/release/
6262
COPY --from=uniquenetwork/builder-astar:{{ ASTAR_BUILD_BRANCH }} /unique_parachain/astar/target/release/astar /astar/target/release/
6363
COPY --from=uniquenetwork/builder-chainql:{{ CHAINQL }} /chainql/target/release/chainql /chainql/target/release/
6464

.env

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
RUST_TOOLCHAIN=nightly-2022-11-15
2-
POLKADOT_BUILD_BRANCH=release-v0.9.37
32
POLKADOT_LAUNCH_BRANCH=unique-network
43
RELAY_CHAIN_TYPE=westend
54
CHAINQL=v0.3.1
65

76
POLKADOT_MAINNET_BRANCH=release-v0.9.37
87
STATEMINT_BUILD_BRANCH=release-parachains-v9370
9-
ACALA_BUILD_BRANCH=2.12.0
10-
MOONBEAM_BUILD_BRANCH=runtime-2201
11-
ASTAR_BUILD_BRANCH=v5.3.0
12-
UNIQUE_MAINNET_BRANCH=release-v937053
8+
ACALA_BUILD_BRANCH=2.17.0
9+
MOONBEAM_BUILD_BRANCH=runtime-2302
10+
ASTAR_BUILD_BRANCH=v5.4.0
11+
UNIQUE_MAINNET_BRANCH=release-v941055
1312
UNIQUE_REPLICA_FROM=wss://ws.unique.network:443
1413

1514
KUSAMA_MAINNET_BRANCH=release-v0.9.38
1615
STATEMINE_BUILD_BRANCH=release-parachains-v9382
17-
KARURA_BUILD_BRANCH=release-karura-2.15.0
18-
MOONRIVER_BUILD_BRANCH=runtime-2201
19-
SHIDEN_BUILD_BRANCH=v4.49.0
20-
QUARTZ_MAINNET_BRANCH=release-v937053
16+
KARURA_BUILD_BRANCH=release-karura-2.17.0
17+
MOONRIVER_BUILD_BRANCH=runtime-2302
18+
SHIDEN_BUILD_BRANCH=v5.4.0
19+
QUARTZ_MAINNET_BRANCH=release-v941055
2120
QUARTZ_REPLICA_FROM=wss://ws-quartz.unique.network:443
2221

23-
UNIQUEWEST_MAINNET_BRANCH=release-v0.9.40
24-
WESTMINT_BUILD_BRANCH=parachains-v9400
25-
OPAL_MAINNET_BRANCH=release-v937053
22+
UNIQUEWEST_MAINNET_BRANCH=release-v0.9.42
23+
WESTMINT_BUILD_BRANCH=parachains-v9420
24+
OPAL_MAINNET_BRANCH=release-v941055
2625
OPAL_REPLICA_FROM=wss://ws-opal.unique.network:443
2726

28-
UNIQUEEAST_MAINNET_BRANCH=release-v0.9.32
29-
SAPPHIRE_MAINNET_BRANCH=release-v937053
27+
UNIQUEEAST_MAINNET_BRANCH=release-v0.9.42
28+
SAPPHIRE_MAINNET_BRANCH=release-v941055
3029
SAPPHIRE_REPLICA_FROM=wss://ws-sapphire.unique.network:443

.github/workflows/collator-selection.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
output_file: .docker/docker-compose.collators.${{ matrix.network }}.yml
6868
variables: |
6969
RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
70-
POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
70+
POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
7171
POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
7272
NETWORK=${{ matrix.network }}
7373
BRANCH=${{ github.head_ref }}

.github/workflows/make-bench.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ jobs:
4242
run: |
4343
time make bench
4444
45+
- name: Run node dev mode in background
46+
working-directory: ./
47+
run: |
48+
./target/release/unique-collator --dev &
49+
4550
- name: RUN Calibrate
4651
working-directory: ./tests
4752
run: |
4853
yarn install
49-
yarn ts-node src/calibrate.ts
50-
yarn ts-node src/calibrateApply.ts
54+
yarn ts-node --esm src/calibrate.ts
55+
yarn ts-node --esm src/calibrateApply.ts
5156
5257
- name: show git diff
5358
run: |

.github/workflows/market-test.yml

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,37 @@ on:
1111
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1212
jobs:
1313

14+
prepare-execution-marix:
15+
16+
name: Prepare execution matrix
17+
18+
runs-on: [self-hosted-ci]
19+
outputs:
20+
matrix: ${{ steps.create_matrix.outputs.matrix }}
21+
22+
steps:
23+
24+
- name: Clean Workspace
25+
uses: AutoModality/action-clean@v1.1.0
26+
27+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
28+
- uses: actions/checkout@v3.1.0
29+
with:
30+
ref: ${{ github.head_ref }} #Checking out head commit
31+
32+
- name: Read .env file
33+
uses: xom9ikk/dotenv@v2
34+
35+
- name: Create Execution matrix
36+
uses: CertainLach/create-matrix-action@v4
37+
id: create_matrix
38+
with:
39+
matrix: |
40+
network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
41+
42+
1443
market_test:
44+
needs: prepare-execution-marix
1545
# The type of runner that the job will run on
1646
runs-on: [self-hosted-ci,large]
1747
timeout-minutes: 360
@@ -22,8 +52,7 @@ jobs:
2252

2353
strategy:
2454
matrix:
25-
include:
26-
- network: "opal"
55+
include: ${{fromJson(needs.prepare-execution-marix.outputs.matrix)}}
2756

2857
steps:
2958
- name: Clean Workspace
@@ -58,7 +87,7 @@ jobs:
5887
variables: |
5988
REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
6089
RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
61-
POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
90+
POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
6291
POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
6392
NETWORK=${{ matrix.network }}
6493
BRANCH=${{ github.head_ref }}

.github/workflows/testnet-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
id: create_matrix
4141
with:
4242
matrix: |
43-
network {opal}
44-
network {quartz}
45-
network {unique}
43+
network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
44+
network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
45+
network {unique}, relay_branch {${{ env.POLKADOT_MAINNET_BRANCH }}}
4646
4747
testnet-build:
4848
needs: prepare-execution-marix
@@ -83,7 +83,7 @@ jobs:
8383
variables: |
8484
RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
8585
NETWORK=${{ matrix.network }}
86-
POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
86+
POLKADOT_BUILD_BRANCH=${{ matrix.relay_branch }}
8787
POLKADOT_LAUNCH_BRANCH=${{ env.POLKADOT_LAUNCH_BRANCH }}
8888
NETWORK=${{ matrix.network }}
8989
BRANCH=${{ github.head_ref }}
@@ -109,7 +109,7 @@ jobs:
109109
password: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
110110

111111
- name: Pull polkadot docker image
112-
run: docker pull uniquenetwork/builder-polkadot:${{ env.POLKADOT_BUILD_BRANCH }}
112+
run: docker pull uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}
113113

114114
- name: Build the stack
115115
run: cd .docker/ && docker build --file ./Dockerfile-testnet.${{ matrix.network }}.yml --tag uniquenetwork/${{ matrix.network }}-testnet-local-nightly:nightly-${{ steps.branchname.outputs.value }}-${{ github.sha }} .

Cargo.lock

Lines changed: 43 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)