Skip to content

Commit

Permalink
Merge branch 'master' into ao-fix-parainclusion-weight-overestimation
Browse files Browse the repository at this point in the history
* master:
  Bump slotmap from 1.0.6 to 1.0.7 (#5096)
  feat: introduce pallet-parameters to Westend to parameterize inflation (#4938)
  Bump openssl from 0.10.64 to 0.10.66 (#5107)
  Bump lycheeverse/lychee-action from 1.9.1 to 1.10.0 (#5094)
  docs: remove the duplicate word (#5095)
  Prepare PVFs if node is a validator in the next session (#4791)
  Update parity publish (#5105)
  • Loading branch information
ordian committed Jul 23, 2024
2 parents f920d3b + ac98bc3 commit 9c7d1b5
Show file tree
Hide file tree
Showing 24 changed files with 1,579 additions and 86 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.0 (22. Sep 2023)

- name: Lychee link checker
uses: lycheeverse/lychee-action@c3089c702fbb949e3f7a8122be0c33c017904f9b # for v1.9.1 (10. Jan 2024)
uses: lycheeverse/lychee-action@2b973e86fc7b1f6b36a93795fe2c9c6ae1118621 # for v1.9.1 (10. Jan 2024)
with:
args: >-
--config .config/lychee.toml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-semver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
paths:
- prdoc/*.prdoc
env:
TOOLCHAIN: nightly-2024-03-01
TOOLCHAIN: nightly-2024-06-01

jobs:
check-semver:
Expand All @@ -22,7 +22,7 @@ jobs:
cache-on-failure: true

- name: install parity-publish
run: cargo install parity-publish@0.6.0
run: cargo install parity-publish@0.7.0

- name: Rust compilation prerequisites
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-check-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cache-on-failure: true

- name: install parity-publish
run: cargo install parity-publish@0.6.0
run: cargo install parity-publish@0.7.0

- name: parity-publish check
run: parity-publish --color always check --allow-unpublished
2 changes: 1 addition & 1 deletion .github/workflows/publish-claim-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
cache-on-failure: true

- name: install parity-publish
run: cargo install parity-publish@0.6.0
run: cargo install parity-publish@0.7.0

- name: parity-publish claim
env:
Expand Down
8 changes: 8 additions & 0 deletions .gitlab/pipeline/zombienet/polkadot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,14 @@ zombienet-polkadot-smoke-0004-coretime-smoke-test:
--local-dir="${LOCAL_DIR}/smoke"
--test="0004-coretime-smoke-test.zndsl"

zombienet-polkadot-smoke-0005-precompile-pvf-smoke:
extends:
- .zombienet-polkadot-common
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
--local-dir="${LOCAL_DIR}/smoke"
--test="0005-precompile-pvf-smoke.zndsl"

zombienet-polkadot-misc-0001-parachains-paritydb:
extends:
- .zombienet-polkadot-common
Expand Down
16 changes: 9 additions & 7 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion docs/sdk/src/reference_docs/blockchain_state_machines.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#![doc = simple_mermaid::mermaid!("../../../mermaid/stf.mmd")]
//!
//! In essence, the state of the blockchain at block N is the outcome of applying the state
//! transition function to the the previous state, and the current block as input. This can be
//! transition function to the previous state, and the current block as input. This can be
//! mathematically represented as:
//!
//! ```math
Expand Down
2 changes: 2 additions & 0 deletions polkadot/node/core/candidate-validation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ futures = { workspace = true }
futures-timer = { workspace = true }
gum = { workspace = true, default-features = true }

sp-keystore = { workspace = true }
sp-application-crypto = { workspace = true }
sp-maybe-compressed-blob = { workspace = true, default-features = true }
codec = { features = ["bit-vec", "derive"], workspace = true }

Expand Down
Loading

0 comments on commit 9c7d1b5

Please sign in to comment.