Skip to content

Commit 4129f96

Browse files
committed
Merge remote-tracking branch 'origin' into george/identity-pallet-generic-3
Signed-off-by: georgepisaltu <[email protected]>
2 parents 63dbc74 + 1dc935c commit 4129f96

File tree

728 files changed

+17037
-45660
lines changed

Some content is hidden

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

728 files changed

+17037
-45660
lines changed

.github/review-bot.yml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
rules:
2+
- name: CI files
3+
condition:
4+
include:
5+
- ^\.gitlab-ci\.yml
6+
- ^docker/.*
7+
- ^\.github/.*
8+
- ^\.gitlab/.*
9+
- ^\.config/nextest.toml
10+
- ^\.cargo/.*
11+
exclude:
12+
- ^./gitlab/pipeline/zombienet.*
13+
minApprovals: 2
14+
type: basic
15+
teams:
16+
- ci
17+
- release-engineering
18+
19+
- name: Audit rules
20+
type: basic
21+
condition:
22+
include:
23+
- ^polkadot/runtime\/(kusama|polkadot|common)\/.*
24+
- ^polkadot/primitives/src\/.+\.rs$
25+
- ^substrate/primitives/.*
26+
- ^substrate/frame/.*
27+
exclude:
28+
- ^polkadot/runtime\/(kusama|polkadot)\/src\/weights\/.+\.rs$
29+
- ^substrate\/frame\/.+\.md$
30+
minApprovals: 1
31+
allowedToSkipRule:
32+
teams:
33+
- core-devs
34+
teams:
35+
- srlabs
36+
37+
- name: Core developers
38+
countAuthor: true
39+
condition:
40+
include:
41+
- .*
42+
# excluding files from 'Runtime files' and 'CI files' rules
43+
exclude:
44+
- ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
45+
- ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
46+
- ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
47+
- ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
48+
- ^cumulus/parachains/common/src/[^/]+\.rs$
49+
- ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
50+
- ^polkadot/runtime/(kusama|polkadot)/src/[^/]+\.rs$
51+
- ^\.gitlab-ci\.yml
52+
- ^docker/.*
53+
- ^\.github/.*
54+
- ^\.gitlab/.*
55+
- ^\.config/nextest.toml
56+
- ^\.cargo/.*
57+
minApprovals: 2
58+
type: basic
59+
teams:
60+
- core-devs
61+
62+
# cumulus
63+
- name: Runtime files cumulus
64+
countAuthor: true
65+
condition:
66+
include:
67+
- ^cumulus/parachains/runtimes/assets/(asset-hub-kusama|asset-hub-polkadot)/src/[^/]+\.rs$
68+
- ^cumulus/parachains/runtimes/bridge-hubs/(bridge-hub-kusama|bridge-hub-polkadot)/src/[^/]+\.rs$
69+
- ^cumulus/parachains/runtimes/collectives/collectives-polkadot/src/[^/]+\.rs$
70+
- ^cumulus/parachains/common/src/[^/]+\.rs$
71+
type: and-distinct
72+
reviewers:
73+
- minApprovals: 1
74+
teams:
75+
- locks-review
76+
- minApprovals: 1
77+
teams:
78+
- polkadot-review
79+
80+
# if there are any changes in the bridges subtree (in case of backport changes back to bridges repo)
81+
- name: Bridges subtree files
82+
type: basic
83+
condition:
84+
include:
85+
- ^bridges/.*
86+
minApprovals: 1
87+
teams:
88+
- bridges-core
89+
90+
# substrate
91+
92+
- name: FRAME coders substrate
93+
condition:
94+
include:
95+
- ^substrate/frame/(?!.*(nfts/.*|uniques/.*|babe/.*|grandpa/.*|beefy|merkle-mountain-range/.*|contracts/.*|election|nomination-pools/.*|staking/.*|aura/.*))
96+
type: "and"
97+
reviewers:
98+
- minApprovals: 2
99+
teams:
100+
- core-devs
101+
- minApprovals: 1
102+
teams:
103+
- frame-coders
104+
105+
# Protection of THIS file
106+
- name: Review Bot
107+
condition:
108+
include:
109+
- review-bot\.yml
110+
type: "and"
111+
reviewers:
112+
- minApprovals: 1
113+
teams:
114+
- opstooling
115+
- minApprovals: 1
116+
teams:
117+
- locks-review
118+
- minApprovals: 1
119+
teams:
120+
- ci

.github/workflows/check-licenses.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1515
steps:
1616
- name: Checkout sources
17-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
17+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1818
- uses: actions/[email protected]
1919
with:
2020
node-version: "18.x"

.github/workflows/check-markdown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: Checkout sources
16-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
16+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1717

1818
- uses: actions/[email protected]
1919
with:

.github/workflows/check-prdoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
4141
- name: Checkout repo
4242
if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}
43-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
43+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 #v4.1.0
4444

4545
- name: PRdoc check for PR#${{ github.event.pull_request.number }}
4646
if: ${{ !contains(steps.get-labels.outputs.labels, 'R0') }}

.github/workflows/fmt-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
container:
1717
image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
1818
steps:
19-
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
19+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2020

2121
- name: Cargo fmt
2222
run: cargo +nightly fmt --all -- --check

.github/workflows/release-50_publish-docker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
steps:
8181
- name: Checkout sources
82-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
82+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
8383

8484
#TODO: this step will be needed when automated triggering will work
8585
#this step runs only if the workflow is triggered automatically when new release is published
@@ -117,7 +117,7 @@ jobs:
117117

118118
steps:
119119
- name: Checkout sources
120-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
120+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
121121

122122
- name: Get artifacts from cache
123123
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
@@ -239,7 +239,7 @@ jobs:
239239
needs: fetch-latest-debian-package-version
240240
steps:
241241
- name: Checkout sources
242-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
242+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
243243

244244
- name: Set up Docker Buildx
245245
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0

.github/workflows/review-bot.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Review PR
2+
on:
3+
pull_request_target:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
- review_requested
9+
- review_request_removed
10+
- ready_for_review
11+
pull_request_review:
12+
13+
permissions:
14+
contents: read
15+
16+
jobs:
17+
review-approvals:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Generate token
21+
id: team_token
22+
uses: tibdex/github-app-token@v1
23+
with:
24+
app_id: ${{ secrets.REVIEW_APP_ID }}
25+
private_key: ${{ secrets.REVIEW_APP_KEY }}
26+
- name: "Evaluates PR reviews and assigns reviewers"
27+
uses: paritytech/[email protected]
28+
with:
29+
repo-token: ${{ secrets.GITHUB_TOKEN }}
30+
team-token: ${{ steps.team_token.outputs.token }}
31+
checks-token: ${{ steps.team_token.outputs.token }}

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
3131
NEXTEST_FAILURE_OUTPUT: immediate-final
3232
NEXTEST_SUCCESS_OUTPUT: final
33-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.67"
33+
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.69"
3434
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
3535

3636
default:

.gitlab/pipeline/build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@ build-linux-stable:
1919
RUN_UI_TESTS: 1
2020
script:
2121
- time cargo build --locked --profile testnet --features pyroscope,fast-runtime --bin polkadot --bin polkadot-prepare-worker --bin polkadot-execute-worker
22+
- time ROCOCO_EPOCH_DURATION=10 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-10/
23+
- time ROCOCO_EPOCH_DURATION=100 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-100/
24+
- time ROCOCO_EPOCH_DURATION=600 ./polkadot/scripts/build-only-wasm.sh rococo-runtime $(pwd)/runtimes/rococo-runtime-600/
25+
- pwd
26+
- ls -alR runtimes
2227
# pack artifacts
2328
- mkdir -p ./artifacts
2429
- VERSION="${CI_COMMIT_REF_NAME}" # will be tag or branch name
2530
- mv ./target/testnet/polkadot ./artifacts/.
2631
- mv ./target/testnet/polkadot-prepare-worker ./artifacts/.
2732
- mv ./target/testnet/polkadot-execute-worker ./artifacts/.
33+
- mv ./runtimes/ ./artifacts/.
2834
- pushd artifacts
2935
- sha256sum polkadot | tee polkadot.sha256
3036
- shasum -c polkadot.sha256

.gitlab/pipeline/check.yml

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,16 @@ test-rust-feature-propagation:
113113
script:
114114
- |
115115
export RUST_LOG=remote-ext=debug,runtime=debug
116-
echo "---------- Running try-runtime for ${NETWORK} ----------"
117-
time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --rev a93c9b5abe5d31a4cf1936204f7e5c489184b521
118-
time cargo build --release --locked -p "$NETWORK"-runtime --features try-runtime
116+
echo "---------- Installing try-runtime-cli ----------"
117+
time cargo install --locked --git https://github.com/paritytech/try-runtime-cli --tag v0.3.0
118+
echo "---------- Building ${PACKAGE} runtime ----------"
119+
time cargo build --release --locked -p "$PACKAGE" --features try-runtime
120+
echo "---------- Executing `on-runtime-upgrade` for ${NETWORK} ----------"
119121
time try-runtime \
120-
--runtime ./target/release/wbuild/"$NETWORK"-runtime/target/wasm32-unknown-unknown/release/"$NETWORK"_runtime.wasm \
121-
on-runtime-upgrade --checks=pre-and-post live --uri wss://${NETWORK}-try-runtime-node.parity-chains.parity.io:443
122+
--runtime ./target/release/wbuild/"$PACKAGE"/"$WASM" \
123+
on-runtime-upgrade --checks=pre-and-post ${EXTRA_ARGS} live --uri ${URI}
122124
125+
# Check runtime migrations for Parity managed relay chains
123126
check-runtime-migration-westend:
124127
stage: check
125128
extends:
@@ -128,19 +131,61 @@ check-runtime-migration-westend:
128131
- .check-runtime-migration
129132
variables:
130133
NETWORK: "westend"
134+
PACKAGE: "westend-runtime"
135+
WASM: "westend_runtime.compact.compressed.wasm"
136+
URI: "wss://westend-try-runtime-node.parity-chains.parity.io:443"
137+
EXTRA_ARGS: "--no-weight-warnings"
131138

132139
check-runtime-migration-rococo:
133140
stage: check
134-
# DAG
135-
needs:
136-
- job: check-runtime-migration-westend
137-
artifacts: false
138141
extends:
139142
- .docker-env
140143
- .test-pr-refs
141144
- .check-runtime-migration
142145
variables:
143146
NETWORK: "rococo"
147+
PACKAGE: "rococo-runtime"
148+
WASM: "rococo_runtime.compact.compressed.wasm"
149+
URI: "wss://rococo-try-runtime-node.parity-chains.parity.io:443"
150+
EXTRA_ARGS: "--no-weight-warnings"
151+
152+
# Check runtime migrations for Parity managed asset hub chains
153+
check-runtime-migration-asset-hub-westend:
154+
stage: check
155+
extends:
156+
- .docker-env
157+
- .test-pr-refs
158+
- .check-runtime-migration
159+
variables:
160+
NETWORK: "asset-hub-westend"
161+
PACKAGE: "asset-hub-westend-runtime"
162+
WASM: "asset_hub_westend_runtime.compact.compressed.wasm"
163+
URI: "wss://westend-asset-hub-rpc.polkadot.io:443"
164+
165+
check-runtime-migration-bridge-hub-rococo:
166+
stage: check
167+
extends:
168+
- .docker-env
169+
- .test-pr-refs
170+
- .check-runtime-migration
171+
variables:
172+
NETWORK: "bridge-hub-rococo"
173+
PACKAGE: "bridge-hub-rococo-runtime"
174+
WASM: "bridge_hub_rococo_runtime.compact.compressed.wasm"
175+
URI: "wss://rococo-bridge-hub-rpc.polkadot.io:443"
176+
177+
# Check runtime migrations for Parity managed contract chains
178+
check-runtime-migration-contracts-rococo:
179+
stage: check
180+
extends:
181+
- .docker-env
182+
- .test-pr-refs
183+
- .check-runtime-migration
184+
variables:
185+
NETWORK: "contracts-rococo"
186+
PACKAGE: "contracts-rococo-runtime"
187+
WASM: "contracts_rococo_runtime.compact.compressed.wasm"
188+
URI: "wss://rococo-contracts-rpc.polkadot.io:443"
144189

145190
find-fail-ci-phrase:
146191
stage: check

.gitlab/pipeline/short-benchmarks.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ short-benchmark-westend: &short-bench
1515
artifacts: true
1616
variables:
1717
RUNTIME: westend
18+
# Enable debug assertions since we are running optimized builds for testing
19+
# but still want to have debug assertions.
20+
RUSTFLAGS: "-C debug-assertions -D warnings"
21+
RUST_BACKTRACE: "full"
22+
WASM_BUILD_NO_COLOR: 1
23+
WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
1824
tags:
1925
- benchmark
2026
script:
@@ -32,6 +38,12 @@ short-benchmark-westend: &short-bench
3238
artifacts: true
3339
variables:
3440
RUNTIME_CHAIN: benchmarked-runtime-chain
41+
# Enable debug assertions since we are running optimized builds for testing
42+
# but still want to have debug assertions.
43+
RUSTFLAGS: "-C debug-assertions -D warnings"
44+
RUST_BACKTRACE: "full"
45+
WASM_BUILD_NO_COLOR: 1
46+
WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
3547
tags:
3648
- benchmark
3749
script:

.gitlab/pipeline/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,12 @@ test-deterministic-wasm:
229229
artifacts: false
230230
script:
231231
# build runtime
232-
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p staging-kusama-runtime -p polkadot-runtime -p westend-runtime
232+
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
233233
# make checksum
234234
- sha256sum target/release/wbuild/*-runtime/target/wasm32-unknown-unknown/release/*.wasm > checksum.sha256
235235
- cargo clean
236236
# build again
237-
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p staging-kusama-runtime -p polkadot-runtime -p westend-runtime
237+
- WASM_BUILD_NO_COLOR=1 cargo build -q --locked --release -p westend-runtime -p rococo-runtime
238238
# confirm checksum
239239
- sha256sum -c checksum.sha256
240240

@@ -314,8 +314,8 @@ node-bench-regression-guard:
314314
--compare-with artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
315315
after_script: [""]
316316

317-
# if this fails (especially after rust version upgrade) run
318-
# ./substrate/.maintain/update-rust-stable.sh <rust_version>
317+
# if this fails run `bot update-ui` in the Pull Request or "./scripts/update-ui-tests.sh" locally
318+
# see ./docs/CONTRIBUTING.md#ui-tests
319319
test-frame-ui:
320320
stage: test
321321
extends:

.gitlab/pipeline/zombienet/cumulus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
before_script:
66
- echo "Zombie-net Tests Config"
77
- echo "${ZOMBIENET_IMAGE}"
8-
- echo "${RELAY_IMAGE}"
8+
- echo "${POLKADOT_IMAGE}"
99
- echo "${COL_IMAGE}"
1010
- echo "${GH_DIR}"
1111
- echo "${LOCAL_DIR}"

0 commit comments

Comments
 (0)