From a538ac10ab90c7532c62619770004c91ea1bdc09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:37:27 +0200
Subject: [PATCH 01/20] Bump the known_good_semver group across 1 directory
 with 3 updates (#6145)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps the known_good_semver group with 3 updates in the / directory:
[impl-serde](https://github.com/paritytech/parity-common),
[serde_json](https://github.com/serde-rs/json) and
[syn](https://github.com/dtolnay/syn).

Updates `impl-serde` from 0.4.0 to 0.5.0
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/paritytech/parity-common/commit/63c5afbf8e0e903439d3c127c59b0e4a7991000b"><code>63c5afb</code></a>
Bump versions (<a
href="https://redirect.github.com/paritytech/parity-common/issues/860">#860</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/0db43ee6a258f02894bbc873be08126331691012"><code>0db43ee</code></a>
Remove From [u8; n] impl for uint types (<a
href="https://redirect.github.com/paritytech/parity-common/issues/859">#859</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/701148e9afc7aa03a0eb2b66ce0309875810a1c3"><code>701148e</code></a>
Update syn to 2 (<a
href="https://redirect.github.com/paritytech/parity-common/issues/855">#855</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/2f1866d2e1b6d1a09b82396404c9e9e5c79fbae4"><code>2f1866d</code></a>
Upgrade rocksdb to 0.22 (<a
href="https://redirect.github.com/paritytech/parity-common/issues/853">#853</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/9ff9316a53d03e14c267aa6dcc45c478bfb2b12a"><code>9ff9316</code></a>
fix compile errors with new Rust (<a
href="https://redirect.github.com/paritytech/parity-common/issues/854">#854</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/757e2bdd02fd7515545b8fe52226ff36e3cee14e"><code>757e2bd</code></a>
primitive-types: add repository URL to Cargo.toml (<a
href="https://redirect.github.com/paritytech/parity-common/issues/844">#844</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/d5e9c1d5b52e7a43f843855a0f4fbc319929a681"><code>d5e9c1d</code></a>
Add more comment (<a
href="https://redirect.github.com/paritytech/parity-common/issues/827">#827</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/dbf46bada7e1e796899b24155fa0fc9b7d2f3ab6"><code>dbf46ba</code></a>
Release 0.2.0 (<a
href="https://redirect.github.com/paritytech/parity-common/issues/825">#825</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/314bda627a590de8e43a4611e6e8a3a33cc3f1a3"><code>314bda6</code></a>
build(deps): bump Swatinem/rust-cache from 2.7.2 to 2.7.3 (<a
href="https://redirect.github.com/paritytech/parity-common/issues/824">#824</a>)</li>
<li><a
href="https://github.com/paritytech/parity-common/commit/2241f644e02e6e91072a7087eb056ffb0085c711"><code>2241f64</code></a>
build(deps): bump Swatinem/rust-cache from 2.7.1 to 2.7.2 (<a
href="https://redirect.github.com/paritytech/parity-common/issues/823">#823</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/paritytech/parity-common/compare/impl-serde-v0.4.0...impl-serde-v0.5.0">compare
view</a></li>
</ul>
</details>
<br />

Updates `serde_json` from 1.0.128 to 1.0.132
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/serde-rs/json/releases">serde_json's
releases</a>.</em></p>
<blockquote>
<h2>1.0.132</h2>
<ul>
<li>Improve binary size and compile time for JSON array and JSON object
deserialization by about 50% (<a
href="https://redirect.github.com/serde-rs/json/issues/1205">#1205</a>)</li>
<li>Improve performance of JSON array and JSON object deserialization by
about 8% (<a
href="https://redirect.github.com/serde-rs/json/issues/1206">#1206</a>)</li>
</ul>
<h2>1.0.131</h2>
<ul>
<li>Implement Deserializer and IntoDeserializer for <code>Map&lt;String,
Value&gt;</code> and <code>&amp;Map&lt;String, Value&gt;</code> (<a
href="https://redirect.github.com/serde-rs/json/issues/1135">#1135</a>,
thanks <a
href="https://github.com/swlynch99"><code>@​swlynch99</code></a>)</li>
</ul>
<h2>1.0.130</h2>
<ul>
<li>Support converting and deserializing <code>Number</code> from i128
and u128 (<a
href="https://redirect.github.com/serde-rs/json/issues/1141">#1141</a>,
thanks <a
href="https://github.com/druide"><code>@​druide</code></a>)</li>
</ul>
<h2>1.0.129</h2>
<ul>
<li>Add <a
href="https://docs.rs/serde_json/1/serde_json/struct.Map.html#method.sort_keys"><code>serde_json::Map::sort_keys</code></a>
and <a
href="https://docs.rs/serde_json/1/serde_json/enum.Value.html#method.sort_all_objects"><code>serde_json::Value::sort_all_objects</code></a>
(<a
href="https://redirect.github.com/serde-rs/json/issues/1199">#1199</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/serde-rs/json/commit/86d933cfd7b5665270e66296694468286794ae44"><code>86d933c</code></a>
Release 1.0.132</li>
<li><a
href="https://github.com/serde-rs/json/commit/f45b422a3ba435722753a2ad7ad32e2a7e2d0596"><code>f45b422</code></a>
Merge pull request <a
href="https://redirect.github.com/serde-rs/json/issues/1206">#1206</a>
from dtolnay/hasnext</li>
<li><a
href="https://github.com/serde-rs/json/commit/f2082d2a04b3b5d72503ac89e2182a5833bb2a1e"><code>f2082d2</code></a>
Clearer order of comparisons</li>
<li><a
href="https://github.com/serde-rs/json/commit/0f54a1a0df5045aee4a2d2f8656c365d835095e5"><code>0f54a1a</code></a>
Handle early return sooner on eof in seq or map</li>
<li><a
href="https://github.com/serde-rs/json/commit/2a4cb44f7cc591a4542cbb1a73ca5bdc8a02c0d7"><code>2a4cb44</code></a>
Rearrange 'match peek'</li>
<li><a
href="https://github.com/serde-rs/json/commit/4cb90ce66de2e0b52572d40ab518ad6d634e43d1"><code>4cb90ce</code></a>
Merge pull request <a
href="https://redirect.github.com/serde-rs/json/issues/1205">#1205</a>
from dtolnay/hasnext</li>
<li><a
href="https://github.com/serde-rs/json/commit/b71ccd2d8f6aabaa0ac6cb889f8e18989038d968"><code>b71ccd2</code></a>
Reduce duplicative instantiation of logic in SeqAccess and
MapAccess</li>
<li><a
href="https://github.com/serde-rs/json/commit/a810ba985095ecd5bb3f8741f0e6d71e36975cb6"><code>a810ba9</code></a>
Release 1.0.131</li>
<li><a
href="https://github.com/serde-rs/json/commit/0d084c50380a91b0b83ee96eb5e8ae04de7baaf5"><code>0d084c5</code></a>
Touch up PR 1135</li>
<li><a
href="https://github.com/serde-rs/json/commit/b4954a95613fcf5b5b9e830582c0ba5f24a0dd60"><code>b4954a9</code></a>
Merge pull request <a
href="https://redirect.github.com/serde-rs/json/issues/1135">#1135</a>
from swlynch99/map-deserializer</li>
<li>Additional commits viewable in <a
href="https://github.com/serde-rs/json/compare/1.0.128...1.0.132">compare
view</a></li>
</ul>
</details>
<br />

Updates `syn` from 2.0.79 to 2.0.82
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/syn/releases">syn's
releases</a>.</em></p>
<blockquote>
<h2>2.0.82</h2>
<ul>
<li>Provide <code>Parse</code> impls for PreciseCapture and
CapturedParam (<a
href="https://redirect.github.com/dtolnay/syn/issues/1757">#1757</a>, <a
href="https://redirect.github.com/dtolnay/syn/issues/1758">#1758</a>)</li>
<li>Support parsing <code>unsafe</code> attributes (<a
href="https://redirect.github.com/dtolnay/syn/issues/1759">#1759</a>)</li>
<li>Add Fold and VisitMut methods for Vec&lt;Attribute&gt; (<a
href="https://redirect.github.com/dtolnay/syn/issues/1762">#1762</a>)</li>
</ul>
<h2>2.0.81</h2>
<ul>
<li>Add TypeParamBound::PreciseCapture to represent precise capture
syntax <code>impl Trait + use&lt;'a, T&gt;</code> (<a
href="https://redirect.github.com/dtolnay/syn/issues/1752">#1752</a>, <a
href="https://redirect.github.com/dtolnay/syn/issues/1753">#1753</a>, <a
href="https://redirect.github.com/dtolnay/syn/issues/1754">#1754</a>)</li>
</ul>
<h2>2.0.80</h2>
<ul>
<li>Add <code>Expr::RawAddr</code> (<a
href="https://redirect.github.com/dtolnay/syn/issues/1743">#1743</a>)</li>
<li>Reject precise captures and ~const in inappropriate syntax positions
(<a
href="https://redirect.github.com/dtolnay/syn/issues/1747">#1747</a>)</li>
<li>Reject trait bound containing only precise capture (<a
href="https://redirect.github.com/dtolnay/syn/issues/1748">#1748</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dtolnay/syn/commit/76092cf236bba9311d953887fff5c3391420803e"><code>76092cf</code></a>
Release 2.0.82</li>
<li><a
href="https://github.com/dtolnay/syn/commit/937dbcb95c875f4d1d39fabb032ac318ad58ace5"><code>937dbcb</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/syn/issues/1762">#1762</a>
from dtolnay/vecattr</li>
<li><a
href="https://github.com/dtolnay/syn/commit/386ae9da289a83402ad8c6e8493b667e6876153d"><code>386ae9d</code></a>
Add Fold and VisitMut methods for Vec&lt;Attribute&gt;</li>
<li><a
href="https://github.com/dtolnay/syn/commit/4c7f82e6fc334400420ad93df489d863050c28f0"><code>4c7f82e</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/syn/issues/1759">#1759</a>
from dtolnay/unsafeattr</li>
<li><a
href="https://github.com/dtolnay/syn/commit/a45af00fdfbaf0e686f0b7e45259caf4ac3fcadc"><code>a45af00</code></a>
Parse unsafe attributes</li>
<li><a
href="https://github.com/dtolnay/syn/commit/e011ba794aba6aaa0d5c96368bf6cf686581ee96"><code>e011ba7</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/syn/issues/1758">#1758</a>
from dtolnay/precisecapture</li>
<li><a
href="https://github.com/dtolnay/syn/commit/c25900d5f4949fb04890f8507d9b1dd5be18de5a"><code>c25900d</code></a>
Implement Parse for CapturedParam</li>
<li><a
href="https://github.com/dtolnay/syn/commit/fc22fcea08252e34738e5adc2c605da379bebed5"><code>fc22fce</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/syn/issues/1757">#1757</a>
from dtolnay/precisecapture</li>
<li><a
href="https://github.com/dtolnay/syn/commit/3a45d69b8bd51c4f0608303fe4068840b064b8b6"><code>3a45d69</code></a>
Implement Parse for PreciseCapture</li>
<li><a
href="https://github.com/dtolnay/syn/commit/c9bdfacf92c578b9af50f6528fc9f73e79d013bd"><code>c9bdfac</code></a>
Tweak parsing logic for TypeParamBound</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/syn/compare/2.0.79...2.0.82">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 198 ++++++++++++++++++++++++++---------------------------
 Cargo.toml |   6 +-
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c8f828e85e6a..864ba5e8047e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -168,7 +168,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
  "syn-solidity",
  "tiny-keccak",
 ]
@@ -295,7 +295,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -753,7 +753,7 @@ checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
  "synstructure 0.13.1",
 ]
 
@@ -776,7 +776,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -1384,7 +1384,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -1401,7 +1401,7 @@ checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -1616,7 +1616,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -3040,7 +3040,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -4398,7 +4398,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -4951,7 +4951,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -4991,7 +4991,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "scratch",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5008,7 +5008,7 @@ checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5056,7 +5056,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "strsim 0.11.1",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5078,7 +5078,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5195,7 +5195,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5206,7 +5206,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5217,7 +5217,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5325,7 +5325,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5386,7 +5386,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "regex",
- "syn 2.0.79",
+ "syn 2.0.82",
  "termcolor",
  "toml 0.8.12",
  "walkdir",
@@ -5618,7 +5618,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5638,7 +5638,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5649,7 +5649,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5864,7 +5864,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -5936,7 +5936,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -6279,7 +6279,7 @@ dependencies = [
  "quote 1.0.37",
  "scale-info",
  "sp-arithmetic 23.0.0",
- "syn 2.0.79",
+ "syn 2.0.82",
  "trybuild",
 ]
 
@@ -6494,7 +6494,7 @@ dependencies = [
  "sp-metadata-ir 0.6.0",
  "sp-runtime 31.0.1",
  "static_assertions",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -6505,7 +6505,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -6514,7 +6514,7 @@ version = "11.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -6768,7 +6768,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -8249,7 +8249,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -8981,7 +8981,7 @@ dependencies = [
  "proc-macro-warning 0.4.2",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -9389,7 +9389,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -9403,7 +9403,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -9414,7 +9414,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -9425,7 +9425,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -9762,7 +9762,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -10366,7 +10366,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -10542,7 +10542,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -11314,7 +11314,7 @@ version = "18.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -12433,7 +12433,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -12678,7 +12678,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "sp-runtime 31.0.1",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -13693,7 +13693,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -13734,7 +13734,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16202,7 +16202,7 @@ dependencies = [
  "polkavm-common 0.8.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16214,7 +16214,7 @@ dependencies = [
  "polkavm-common 0.9.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16226,7 +16226,7 @@ dependencies = [
  "polkavm-common 0.12.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16236,7 +16236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66"
 dependencies = [
  "polkavm-derive-impl 0.8.0",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16246,7 +16246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
  "polkavm-derive-impl 0.9.0",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16256,7 +16256,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd35472599d35d90e24afe9eb39ae6ee6cb1b924f0c03b277ef8b5f174a63853"
 dependencies = [
  "polkavm-derive-impl 0.12.0",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16473,7 +16473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62"
 dependencies = [
  "proc-macro2 1.0.86",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16578,7 +16578,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16589,7 +16589,7 @@ checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16670,7 +16670,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16752,7 +16752,7 @@ dependencies = [
  "prost 0.12.6",
  "prost-types 0.12.4",
  "regex",
- "syn 2.0.79",
+ "syn 2.0.82",
  "tempfile",
 ]
 
@@ -16773,7 +16773,7 @@ dependencies = [
  "prost 0.13.2",
  "prost-types 0.13.2",
  "regex",
- "syn 2.0.79",
+ "syn 2.0.82",
  "tempfile",
 ]
 
@@ -16800,7 +16800,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -16813,7 +16813,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -17282,7 +17282,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -17892,7 +17892,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version 0.4.0",
- "syn 2.0.79",
+ "syn 2.0.82",
  "unicode-ident",
 ]
 
@@ -18420,7 +18420,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -19782,7 +19782,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -19965,7 +19965,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "scale-info",
- "syn 2.0.79",
+ "syn 2.0.82",
  "thiserror",
 ]
 
@@ -20281,7 +20281,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -20306,9 +20306,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
 dependencies = [
  "indexmap 2.2.3",
  "itoa",
@@ -20383,7 +20383,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -21354,7 +21354,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -21369,7 +21369,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -21708,7 +21708,7 @@ dependencies = [
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "impl-serde 0.4.0",
+ "impl-serde 0.5.0",
  "itertools 0.11.0",
  "k256",
  "libsecp256k1",
@@ -21979,7 +21979,7 @@ version = "0.1.0"
 dependencies = [
  "quote 1.0.37",
  "sp-crypto-hashing 0.1.0",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -21990,7 +21990,7 @@ checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b"
 dependencies = [
  "quote 1.0.37",
  "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22008,7 +22008,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf5
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22017,7 +22017,7 @@ version = "14.0.0"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22028,7 +22028,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22590,7 +22590,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22602,7 +22602,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22616,7 +22616,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -22824,7 +22824,7 @@ dependencies = [
 name = "sp-storage"
 version = "19.0.0"
 dependencies = [
- "impl-serde 0.4.0",
+ "impl-serde 0.5.0",
  "parity-scale-codec",
  "ref-cast",
  "serde",
@@ -23052,7 +23052,7 @@ dependencies = [
 name = "sp-version"
 version = "29.0.0"
 dependencies = [
- "impl-serde 0.4.0",
+ "impl-serde 0.5.0",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
@@ -23091,7 +23091,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "sp-version 29.0.0",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -23103,7 +23103,7 @@ dependencies = [
  "parity-scale-codec",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -23569,7 +23569,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -23582,7 +23582,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24071,7 +24071,7 @@ dependencies = [
  "scale-info",
  "scale-typegen",
  "subxt-metadata",
- "syn 2.0.79",
+ "syn 2.0.82",
  "thiserror",
  "tokio",
 ]
@@ -24134,7 +24134,7 @@ dependencies = [
  "quote 1.0.37",
  "scale-typegen",
  "subxt-codegen",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24287,9 +24287,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -24305,7 +24305,7 @@ dependencies = [
  "paste",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24334,7 +24334,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24464,7 +24464,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24639,7 +24639,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -24801,7 +24801,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -25077,7 +25077,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -25119,7 +25119,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -25771,7 +25771,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
  "wasm-bindgen-shared",
 ]
 
@@ -25805,7 +25805,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -26940,7 +26940,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "staging-xcm",
- "syn 2.0.79",
+ "syn 2.0.82",
  "trybuild",
 ]
 
@@ -27111,7 +27111,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -27131,7 +27131,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.79",
+ "syn 2.0.82",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 77586ae9d8e3..363155fadf23 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -807,7 +807,7 @@ hyper-rustls = { version = "0.24.2" }
 hyper-util = { version = "0.1.5", default-features = false }
 # TODO: remove hyper v0.14 https://github.com/paritytech/polkadot-sdk/issues/4896
 hyperv14 = { package = "hyper", version = "0.14.29", default-features = false }
-impl-serde = { version = "0.4.0", default-features = false }
+impl-serde = { version = "0.5.0", default-features = false }
 impl-trait-for-tuples = { version = "0.2.2" }
 indexmap = { version = "2.0.0" }
 indicatif = { version = "0.17.7" }
@@ -1194,7 +1194,7 @@ separator = { version = "0.4.1" }
 serde = { version = "1.0.210", default-features = false }
 serde-big-array = { version = "0.3.2" }
 serde_derive = { version = "1.0.117" }
-serde_json = { version = "1.0.128", default-features = false }
+serde_json = { version = "1.0.132", default-features = false }
 serde_yaml = { version = "0.9" }
 serial_test = { version = "2.0.0" }
 sha1 = { version = "0.10.6" }
@@ -1305,7 +1305,7 @@ substrate-test-utils = { path = "substrate/test-utils" }
 substrate-wasm-builder = { path = "substrate/utils/wasm-builder", default-features = false }
 subxt = { version = "0.37", default-features = false }
 subxt-signer = { version = "0.37" }
-syn = { version = "2.0.79" }
+syn = { version = "2.0.82" }
 sysinfo = { version = "0.30" }
 tar = { version = "0.4" }
 tempfile = { version = "3.8.1" }

From 95483a884dac76d077ffe2097c40dc21e548ae4d Mon Sep 17 00:00:00 2001
From: Andrii <ndk@parity.io>
Date: Mon, 21 Oct 2024 16:54:21 +0300
Subject: [PATCH 02/20] Improved TrustedQueryAPI signatures (#6129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changed returned type of API methods from `Result<bool,
xcm_runtime_apis::trusted_query::Error>` to a typed one `type
XcmTrustedQueryResult = Result<bool,
xcm_runtime_apis::trusted_query::Error>;`
Follow-up of
[PR-6039](https://github.com/paritytech/polkadot-sdk/pull/6039)

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
---
 .../assets/asset-hub-rococo/src/lib.rs        |  6 ++--
 .../assets/asset-hub-westend/src/lib.rs       |  4 +--
 .../bridge-hubs/bridge-hub-rococo/src/lib.rs  |  4 +--
 .../bridge-hubs/bridge-hub-westend/src/lib.rs |  4 +--
 .../collectives-westend/src/lib.rs            |  4 +--
 .../contracts/contracts-rococo/src/lib.rs     |  4 +--
 .../coretime/coretime-rococo/src/lib.rs       |  4 +--
 .../coretime/coretime-westend/src/lib.rs      |  4 +--
 .../runtimes/people/people-rococo/src/lib.rs  |  4 +--
 .../runtimes/people/people-westend/src/lib.rs |  4 +--
 .../runtimes/testing/penpal/src/lib.rs        |  4 +--
 .../xcm/xcm-runtime-apis/src/trusted_query.rs |  7 ++--
 prdoc/pr_6129.prdoc                           | 32 +++++++++++++++++++
 13 files changed, 59 insertions(+), 26 deletions(-)
 create mode 100644 prdoc/pr_6129.prdoc

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index 64fdf4883720..2f25fa0ec1d6 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -1103,8 +1103,6 @@ pub type Executive = frame_executive::Executive<
 	Migrations,
 >;
 
-type XcmTrustedQueryResult = Result<bool, xcm_runtime_apis::trusted_query::Error>;
-
 #[cfg(feature = "runtime-benchmarks")]
 pub struct AssetConversionTxHelper;
 
@@ -1877,10 +1875,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> XcmTrustedQueryResult {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> XcmTrustedQueryResult {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 32d121749534..14f24228d0a2 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1976,10 +1976,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
index 259b0355916e..f63e1f8fcf65 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -1530,10 +1530,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
index 85be26d11704..1d7cd5de40eb 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs
@@ -1346,10 +1346,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
index 030ed930ed5c..8cb2e42cb31b 100644
--- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs
@@ -1173,10 +1173,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
index 0111b3d8522d..2fc3fe4f3141 100644
--- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs
@@ -885,10 +885,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
index 1ce980fa5492..f2ccb9c552e3 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs
@@ -1153,10 +1153,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
index 632f2c657cf0..2f944e79fe00 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs
@@ -1146,10 +1146,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
index af8e72fa0944..f9499f9d1ebe 100644
--- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs
@@ -1064,10 +1064,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
index d0b0bec2e87f..7e3cd1670fe5 100644
--- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs
@@ -1062,10 +1062,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
index 2dff159f7ee6..136592c56026 100644
--- a/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
+++ b/cumulus/parachains/runtimes/testing/penpal/src/lib.rs
@@ -1165,10 +1165,10 @@ impl_runtime_apis! {
 	}
 
 	impl xcm_runtime_apis::trusted_query::TrustedQueryApi<Block> for Runtime {
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_reserve(asset, location)
 		}
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, xcm_runtime_apis::trusted_query::Error> {
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> xcm_runtime_apis::trusted_query::XcmTrustedQueryResult {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
diff --git a/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs b/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
index a0c4416c8318..e75af54ad2fd 100644
--- a/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
+++ b/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
@@ -20,6 +20,9 @@ use codec::{Decode, Encode};
 use frame_support::pallet_prelude::TypeInfo;
 use xcm::{VersionedAsset, VersionedLocation};
 
+/// Result of [`TrustedQueryApi`] functions.
+pub type XcmTrustedQueryResult = Result<bool, Error>;
+
 sp_api::decl_runtime_apis! {
 	// API for querying trusted reserves and trusted teleporters.
 	pub trait TrustedQueryApi {
@@ -28,13 +31,13 @@ sp_api::decl_runtime_apis! {
 		/// # Arguments
 		/// * `asset`: `VersionedAsset`.
 		/// * `location`: `VersionedLocation`.
-		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, Error>;
+		fn is_trusted_reserve(asset: VersionedAsset, location: VersionedLocation) -> XcmTrustedQueryResult;
 		/// Returns if the asset can be teleported to the location.
 		///
 		/// # Arguments
 		/// * `asset`: `VersionedAsset`.
 		/// * `location`: `VersionedLocation`.
-		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> Result<bool, Error>;
+		fn is_trusted_teleporter(asset: VersionedAsset, location: VersionedLocation) -> XcmTrustedQueryResult;
 	}
 }
 
diff --git a/prdoc/pr_6129.prdoc b/prdoc/pr_6129.prdoc
new file mode 100644
index 000000000000..61719c213e8d
--- /dev/null
+++ b/prdoc/pr_6129.prdoc
@@ -0,0 +1,32 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "Improved TrustedQueryAPI signatures."
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Changed returned type of API methods from `Result<bool, xcm_runtime_apis::trusted_query::Error>` to a typed one:
+      `type XcmTrustedQueryResult = Result<bool, xcm_runtime_apis::trusted_query::Error>`
+
+crates:
+  - name: asset-hub-westend-runtime
+    bump: patch
+  - name: bridge-hub-rococo-runtime
+    bump: patch
+  - name: bridge-hub-westend-runtime
+    bump: patch
+  - name: collectives-westend-runtime
+    bump: patch
+  - name: contracts-rococo-runtime
+    bump: patch
+  - name: coretime-rococo-runtime
+    bump: patch
+  - name: coretime-westend-runtime
+    bump: patch
+  - name: people-rococo-runtime
+    bump: patch
+  - name: people-westend-runtime
+    bump: patch
+  - name: penpal-runtime
+    bump: patch

From 9f515e024587648b8315c4a0e7feb81b2f91986e Mon Sep 17 00:00:00 2001
From: Serban Iorga <serban@parity.io>
Date: Mon, 21 Oct 2024 17:08:00 +0300
Subject: [PATCH 03/20] Fix and re-enable
 `zombienet-substrate-0002-validators-warp-sync` (#6154)

Closes https://github.com/paritytech/polkadot-sdk/issues/5974

Fixed as per
https://github.com/paritytech/polkadot-sdk/issues/5974#issuecomment-2426463359
---
 .gitlab/pipeline/zombienet/substrate.yml                  | 6 +++---
 .../test-validators-warp-sync.toml                        | 4 ++--
 .../test-validators-warp-sync.zndsl                       | 8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitlab/pipeline/zombienet/substrate.yml b/.gitlab/pipeline/zombienet/substrate.yml
index 030a0a3f50a9..52118307e6a0 100644
--- a/.gitlab/pipeline/zombienet/substrate.yml
+++ b/.gitlab/pipeline/zombienet/substrate.yml
@@ -70,11 +70,11 @@ zombienet-substrate-0001-basic-warp-sync:
       --local-dir="${LOCAL_DIR}/0001-basic-warp-sync"
       --test="test-warp-sync.zndsl"
 
-.zombienet-substrate-0002-validators-warp-sync:
+zombienet-substrate-0002-validators-warp-sync:
   extends:
     - .zombienet-substrate-warp-sync-common
   before_script:
-    - !reference [.zombienet-substrate-warp-sync-common, before_script]
+    - !reference [ .zombienet-substrate-warp-sync-common, before_script ]
     - cp --remove-destination ${LOCAL_DIR}/0001-basic-warp-sync/chain-spec.json ${LOCAL_DIR}/0002-validators-warp-sync
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
@@ -85,7 +85,7 @@ zombienet-substrate-0003-block-building-warp-sync:
   extends:
     - .zombienet-substrate-warp-sync-common
   before_script:
-    - !reference [.zombienet-substrate-warp-sync-common, before_script]
+    - !reference [ .zombienet-substrate-warp-sync-common, before_script ]
     - cp --remove-destination ${LOCAL_DIR}/0001-basic-warp-sync/chain-spec.json ${LOCAL_DIR}/0003-block-building-warp-sync
   script:
     - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
diff --git a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
index e388af7c94f8..2f0fc7b9fe3b 100644
--- a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
+++ b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.toml
@@ -11,12 +11,12 @@ chain_spec_path = "chain-spec.json"
   [[relaychain.nodes]]
   name = "alice"
   validator = true
-  args = ["--sync warp"]
+  args = ["--log=beefy=debug", "--sync warp"]
 
   [[relaychain.nodes]]
   name = "bob"
   validator = true
-  args = ["--sync warp"]
+  args = ["--log=beefy=debug", "--sync warp"]
 
   # we need at least 3 nodes for warp sync
   [[relaychain.nodes]]
diff --git a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.zndsl b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.zndsl
index b68bce508c00..bc587b044774 100644
--- a/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.zndsl
+++ b/substrate/zombienet/0002-validators-warp-sync/test-validators-warp-sync.zndsl
@@ -31,11 +31,9 @@ bob: log line matches "Block history download is complete" within 120 seconds
 alice: reports block height is at least {{DB_BLOCK_HEIGHT}} within 10 seconds
 bob: reports block height is at least {{DB_BLOCK_HEIGHT}} within 10 seconds
 
-alice: reports substrate_beefy_best_block is at least {{DB_BLOCK_HEIGHT}} within 180 seconds
-bob: reports substrate_beefy_best_block is at least {{DB_BLOCK_HEIGHT}} within 180 seconds
-
-alice: reports substrate_beefy_best_block is greater than {{DB_BLOCK_HEIGHT}} within 180 seconds
-bob: reports substrate_beefy_best_block is greater than {{DB_BLOCK_HEIGHT}} within 180 seconds
+# In the worst case scenario, the validators should vote on 1 mandatory block each 6 seconds. And 1 era = 200 blocks.
+alice: reports substrate_beefy_best_block is at least {{200*180/6}} within 180 seconds
+bob: reports substrate_beefy_best_block is at least {{200*180/6}} within 180 seconds
 
 alice: count of log lines containing "error" is 0 within 10 seconds
 bob: count of log lines containing "verification failed" is 0 within 10 seconds

From 69b929f59a54538279807b9493af0d85feb223c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 14:44:18 +0000
Subject: [PATCH 04/20] Bump thiserror from 1.0.61 to 1.0.64 (#6143)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.61 to
1.0.64.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/thiserror/releases">thiserror's
releases</a>.</em></p>
<blockquote>
<h2>1.0.64</h2>
<ul>
<li>Exclude derived impls from coverage instrumentation (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/322">#322</a>,
thanks <a
href="https://github.com/oxalica"><code>@​oxalica</code></a>)</li>
</ul>
<h2>1.0.63</h2>
<ul>
<li>Documentation improvements</li>
</ul>
<h2>1.0.62</h2>
<ul>
<li>Support referring to nested tuple struct fields inside
<code>#[error(&quot;…&quot;, …)]</code> attribute (<a
href="https://redirect.github.com/dtolnay/thiserror/issues/309">#309</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/dtolnay/thiserror/commit/84484bc75c20d63ec63299354b463407f3d59f68"><code>84484bc</code></a>
Release 1.0.64</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/023f036de4515542d0c55aa5c580bc9352a077d1"><code>023f036</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/thiserror/issues/322">#322</a>
from oxalica/feat/mark-auto-derived</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/ae1f47e3e5d6705b6b12997bd036fd97303d71d7"><code>ae1f47e</code></a>
Mark #[automatically_derived] for generated impls</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/ab5b5e375b26971850b134abc7bbfe8a67da0fe3"><code>ab5b5e3</code></a>
Upload CI Cargo.lock for reproducing failures</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/00b3c1405e5df26f9c6408e5fd43f52fa12e8e07"><code>00b3c14</code></a>
Work around new dead code warning in test</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/915c75e8a3b679588e6eac03dccbba5d38c764a8"><code>915c75e</code></a>
Release 1.0.63</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/3d5ec25464d2d71f09f480666e240d3446a44a19"><code>3d5ec25</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/thiserror/issues/312">#312</a>
from dtolnay/backtracedoc</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/de8a1e54d420514250d9d4081d41723192cf0dfa"><code>de8a1e5</code></a>
Update documentation of #[from] and #[backtrace] attributes</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/0bf6e3dd781409b62cbcf0816ffa1bb970d24833"><code>0bf6e3d</code></a>
Release 1.0.62</li>
<li><a
href="https://github.com/dtolnay/thiserror/commit/497793283934d9e514d903a14278af6babbfbb65"><code>4977932</code></a>
Merge pull request <a
href="https://redirect.github.com/dtolnay/thiserror/issues/310">#310</a>
from dtolnay/nestedtuple</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/thiserror/compare/1.0.61...1.0.64">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=thiserror&package-manager=cargo&previous-version=1.0.61&new-version=1.0.64)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 864ba5e8047e..5edc66847ac9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24604,9 +24604,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
@@ -24633,9 +24633,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
diff --git a/Cargo.toml b/Cargo.toml
index 363155fadf23..ecab9c308474 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1316,7 +1316,7 @@ test-parachain-halt = { path = "polkadot/parachain/test-parachains/halt" }
 test-parachain-undying = { path = "polkadot/parachain/test-parachains/undying" }
 test-runtime-constants = { path = "polkadot/runtime/test-runtime/constants", default-features = false }
 testnet-parachains-constants = { path = "cumulus/parachains/runtimes/constants", default-features = false }
-thiserror = { version = "1.0.48" }
+thiserror = { version = "1.0.64" }
 thousands = { version = "0.2.0" }
 threadpool = { version = "1.7" }
 tikv-jemalloc-ctl = { version = "0.5.0" }

From 4387d0f8252ce71177f96cfaed97ea05ba08cc72 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:40:39 +0100
Subject: [PATCH 05/20] include more external links and resources (#5758)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
---
 README.md                          |  6 +++---
 docs/mermaid/IA.mmd                |  4 ++--
 docs/sdk/src/external_resources.rs | 14 ++++++++++++++
 docs/sdk/src/lib.rs                |  7 ++++---
 docs/sdk/src/polkadot_sdk/mod.rs   |  3 ++-
 5 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 docs/sdk/src/external_resources.rs

diff --git a/README.md b/README.md
index 8016b6b37301..6c0dfbb2e7e4 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ forks](https://img.shields.io/github/forks/paritytech/polkadot-sdk)
 
 ## ⚡ Quickstart
 If you want to get an example node running quickly you can execute the following getting started script:
+
 ```
 curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/scripts/getting-started.sh | bash
 ```
@@ -31,9 +32,8 @@ curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/paritytec
   * [Guides](https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/guides/index.html),
 	namely how to build your first FRAME pallet
   * [Templates](https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/polkadot_sdk/templates/index.html)
-    for starting a new project
-* Other resources:
-  * [Polkadot Wiki -> Build](https://wiki.polkadot.network/docs/build-guide)
+    for starting a new project.
+  * [External Resources](https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/external_resources/index.html)
 
 ## 🚀 Releases
 
diff --git a/docs/mermaid/IA.mmd b/docs/mermaid/IA.mmd
index 37417497e1f8..0f14e200df9c 100644
--- a/docs/mermaid/IA.mmd
+++ b/docs/mermaid/IA.mmd
@@ -1,13 +1,13 @@
 flowchart
     parity[paritytech.github.io] --> devhub[polkadot_sdk_docs]
-	polkadot_network[polkadot.network] --> devhub[polkadot_sdk_docs]
 
     devhub --> polkadot_sdk
     devhub --> reference_docs
     devhub --> guides
+	devhub --> external_resources
 
     polkadot_sdk --> substrate
     polkadot_sdk --> frame
-    polkadot_sdk --> cumulus
     polkadot_sdk --> polkadot[polkadot node]
     polkadot_sdk --> xcm
+	polkadot_sdk --> templates
diff --git a/docs/sdk/src/external_resources.rs b/docs/sdk/src/external_resources.rs
new file mode 100644
index 000000000000..939874d12f13
--- /dev/null
+++ b/docs/sdk/src/external_resources.rs
@@ -0,0 +1,14 @@
+//! # External Resources
+//!
+//! A non-exhaustive, un-opinionated list of external resources about Polkadot SDK.
+//!
+//! Unlike [`crate::guides`], or [`crate::polkadot_sdk::templates`] that contain material directly
+//! maintained in the `polkadot-sdk` repository, the list of resources here are maintained by
+//! third-parties, and are therefore subject to more variability. Any further resources may be added
+//! by opening a pull request to the `polkadot-sdk` repository.
+//!
+//! - [Polkadot NFT Marketplace Tutorial by Polkadot Fellow Shawn Tabrizi](https://www.shawntabrizi.com/substrate-collectables-workshop/)
+//! - [DOT Code School](https://dotcodeschool.com/)
+//! - [Polkadot Developers](https://github.com/polkadot-developers/)
+//! - [Polkadot Blockchain Academy](https://github.com/Polkadot-Blockchain-Academy)
+//! - [Polkadot Wiki: Build](https://wiki.polkadot.network/docs/build-guide)
diff --git a/docs/sdk/src/lib.rs b/docs/sdk/src/lib.rs
index 35f73c290bf2..86ca677d7cef 100644
--- a/docs/sdk/src/lib.rs
+++ b/docs/sdk/src/lib.rs
@@ -5,9 +5,6 @@
 //! This crate is a *minimal*, but *always-accurate* source of information for those wishing to
 //! build on the Polkadot SDK.
 //!
-//! > **Work in Progress**: This crate is under heavy development. Expect content to be moved and
-//! > changed. Do not use links to this crate yet. See [`meta_contributing`] for more information.
-//!
 //! ## Getting Started
 //!
 //! We suggest the following reading sequence:
@@ -35,9 +32,13 @@
 /// how one can contribute to it.
 pub mod meta_contributing;
 
+/// A list of external resources and learning material about Polkadot SDK.
+pub mod external_resources;
+
 /// In-depth guides about the most common components of the Polkadot SDK. They are slightly more
 /// high level and broad than [`reference_docs`].
 pub mod guides;
+
 /// An introduction to the Polkadot SDK. Read this module to learn about the structure of the SDK,
 /// the tools that are provided as a part of it, and to gain a high level understanding of each.
 pub mod polkadot_sdk;
diff --git a/docs/sdk/src/polkadot_sdk/mod.rs b/docs/sdk/src/polkadot_sdk/mod.rs
index 32cad72fba7e..c089b6729ce5 100644
--- a/docs/sdk/src/polkadot_sdk/mod.rs
+++ b/docs/sdk/src/polkadot_sdk/mod.rs
@@ -106,9 +106,10 @@
 //! A list of projects and tools in the blockchain ecosystem that one way or another use parts of
 //! the Polkadot SDK:
 //!
-//! * [Polygon's spin-off, Avail](https://github.com/availproject/avail)
+//! * [Avail](https://github.com/availproject/avail)
 //! * [Cardano Partner Chains](https://iohk.io/en/blog/posts/2023/11/03/partner-chains-are-coming-to-cardano/)
 //! * [Starknet's Madara Sequencer](https://github.com/keep-starknet-strange/madara)
+//! * [Polymesh](https://polymesh.network/)
 //!
 //! [`substrate`]: crate::polkadot_sdk::substrate
 //! [`frame`]: crate::polkadot_sdk::frame_runtime

From dbaa428ccc5ff33f48980f1a6ada7f454d2d9ce3 Mon Sep 17 00:00:00 2001
From: Javier Viola <363911+pepoviola@users.noreply.github.com>
Date: Mon, 21 Oct 2024 12:40:54 -0300
Subject: [PATCH 06/20] fix js oom `js-scripts` (#6139)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix `oom` failures (`FATAL ERROR: Ineffective mark-compacts near heap
limit Allocation failed - JavaScript heap out of memory`), like:

https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7602589
https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7602594

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
---
 .gitlab/pipeline/zombienet.yml         | 1 +
 .gitlab/pipeline/zombienet/bridges.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml
index 08bfed2e24ce..5aa37f783a0a 100644
--- a/.gitlab/pipeline/zombienet.yml
+++ b/.gitlab/pipeline/zombienet.yml
@@ -9,6 +9,7 @@
     RUN_IN_CI: "1"
     KUBERNETES_CPU_REQUEST: "512m"
     KUBERNETES_MEMORY_REQUEST: "1Gi"
+    NODE_OPTIONS: "--max-old-space-size=8192"
   timeout: 60m
 
 include:
diff --git a/.gitlab/pipeline/zombienet/bridges.yml b/.gitlab/pipeline/zombienet/bridges.yml
index 070bfc8472d5..0472601a6a2b 100644
--- a/.gitlab/pipeline/zombienet/bridges.yml
+++ b/.gitlab/pipeline/zombienet/bridges.yml
@@ -47,6 +47,8 @@
     - cp -r /tmp/bridges-tests-run-*/bridge_hub_rococo_local_network/*.log ./zombienet-logs/
     # copy logs of westend nodes
     - cp -r /tmp/bridges-tests-run-*/bridge_hub_westend_local_network/*.log ./zombienet-logs/
+  tags:
+    - zombienet-polkadot-integration-test
 
 zombienet-bridges-0001-asset-transfer-works:
   extends:

From a3bca4bb65fdbfef99b52b06181779c0f681d3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=B3nal=20Murray?= <donal.murray@parity.io>
Date: Mon, 21 Oct 2024 19:19:22 +0200
Subject: [PATCH 07/20] [Coretime chain] Add high assignment count mitigation
 to testnets (#6022)

Fixed in Polkadot and Kusama in
https://github.com/polkadot-fellows/runtimes/pull/434 and this PR just
adds to testnets.

We can handle a maximum of 28 assignments inside one XCM, while it's
possible to have 80 (if a region is interlaced 79 times).
This can be chunked on the coretime chain side but currently the
scheduler on the relay makes assumptions that means we can't send more
than one chunk for a given core.

This just truncates the additional assignments until we can extend the
relay to support this. This means that the first 27 assignments are
taken, the final 28th is used to pad with idle to complete the mask (the
relay also assumes that every schedule is complete). Any other
assignments are dropped.

---------

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
---
 .../src/tests/coretime_interface.rs           |  2 +-
 .../src/tests/coretime_interface.rs           |  2 +-
 .../coretime/coretime-rococo/src/coretime.rs  | 30 ++++++++++++++++
 .../coretime/coretime-westend/src/coretime.rs | 34 +++++++++++++++++--
 prdoc/pr_6022.prdoc                           | 14 ++++++++
 5 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 prdoc/pr_6022.prdoc

diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/src/tests/coretime_interface.rs b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/src/tests/coretime_interface.rs
index 584bce8f1df7..9915b1753ef6 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/src/tests/coretime_interface.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-rococo/src/tests/coretime_interface.rs
@@ -46,7 +46,7 @@ fn transact_hardcoded_weights_are_sane() {
 
 		// Create and populate schedule with the worst case assignment on this core.
 		let mut schedule = Vec::new();
-		for i in 0..27 {
+		for i in 0..80 {
 			schedule.push(ScheduleItem {
 				mask: CoreMask::void().set(i),
 				assignment: CoreAssignment::Task(2000 + i),
diff --git a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/src/tests/coretime_interface.rs b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/src/tests/coretime_interface.rs
index f61bc4285a0c..00530f80b958 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/src/tests/coretime_interface.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/coretime/coretime-westend/src/tests/coretime_interface.rs
@@ -46,7 +46,7 @@ fn transact_hardcoded_weights_are_sane() {
 
 		// Create and populate schedule with the worst case assignment on this core.
 		let mut schedule = Vec::new();
-		for i in 0..27 {
+		for i in 0..80 {
 			schedule.push(ScheduleItem {
 				mask: CoreMask::void().set(i),
 				assignment: CoreAssignment::Task(2000 + i),
diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/coretime.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/coretime.rs
index 76ee06a87e8d..3910a747e9bb 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/coretime.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/coretime.rs
@@ -218,6 +218,36 @@ impl CoretimeInterface for CoretimeAllocator {
 		end_hint: Option<RCBlockNumberOf<Self>>,
 	) {
 		use crate::coretime::CoretimeProviderCalls::AssignCore;
+
+		// The relay chain currently only allows `assign_core` to be called with a complete mask
+		// and only ever with increasing `begin`. The assignments must be truncated to avoid
+		// dropping that core's assignment completely.
+
+		// This shadowing of `assignment` is temporary and can be removed when the relay can accept
+		// multiple messages to assign a single core.
+		let assignment = if assignment.len() > 28 {
+			let mut total_parts = 0u16;
+			// Account for missing parts with a new `Idle` assignment at the start as
+			// `assign_core` on the relay assumes this is sorted. We'll add the rest of the
+			// assignments and sum the parts in one pass, so this is just initialized to 0.
+			let mut assignment_truncated = vec![(CoreAssignment::Idle, 0)];
+			// Truncate to first 27 non-idle assignments.
+			assignment_truncated.extend(
+				assignment
+					.into_iter()
+					.filter(|(a, _)| *a != CoreAssignment::Idle)
+					.take(27)
+					.inspect(|(_, parts)| total_parts += *parts)
+					.collect::<Vec<_>>(),
+			);
+
+			// Set the parts of the `Idle` assignment we injected at the start of the vec above.
+			assignment_truncated[0].1 = 57_600u16.saturating_sub(total_parts);
+			assignment_truncated
+		} else {
+			assignment
+		};
+
 		let assign_core_call =
 			RelayRuntimePallets::Coretime(AssignCore(core, begin, assignment, end_hint));
 
diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/coretime.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/coretime.rs
index 865ff68d4c65..86769cb2da11 100644
--- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/coretime.rs
+++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/coretime.rs
@@ -224,8 +224,6 @@ impl CoretimeInterface for CoretimeAllocator {
 		end_hint: Option<RCBlockNumberOf<Self>>,
 	) {
 		use crate::coretime::CoretimeProviderCalls::AssignCore;
-		let assign_core_call =
-			RelayRuntimePallets::Coretime(AssignCore(core, begin, assignment, end_hint));
 
 		// Weight for `assign_core` from westend benchmarks:
 		// `ref_time` = 10177115 + (1 * 25000000) + (2 * 100000000) + (57600 * 13932) = 937660315
@@ -233,6 +231,38 @@ impl CoretimeInterface for CoretimeAllocator {
 		// Add 5% to each component and round to 2 significant figures.
 		let call_weight = Weight::from_parts(980_000_000, 3800);
 
+		// The relay chain currently only allows `assign_core` to be called with a complete mask
+		// and only ever with increasing `begin`. The assignments must be truncated to avoid
+		// dropping that core's assignment completely.
+
+		// This shadowing of `assignment` is temporary and can be removed when the relay can accept
+		// multiple messages to assign a single core.
+		let assignment = if assignment.len() > 28 {
+			let mut total_parts = 0u16;
+			// Account for missing parts with a new `Idle` assignment at the start as
+			// `assign_core` on the relay assumes this is sorted. We'll add the rest of the
+			// assignments and sum the parts in one pass, so this is just initialized to 0.
+			let mut assignment_truncated = vec![(CoreAssignment::Idle, 0)];
+			// Truncate to first 27 non-idle assignments.
+			assignment_truncated.extend(
+				assignment
+					.into_iter()
+					.filter(|(a, _)| *a != CoreAssignment::Idle)
+					.take(27)
+					.inspect(|(_, parts)| total_parts += *parts)
+					.collect::<Vec<_>>(),
+			);
+
+			// Set the parts of the `Idle` assignment we injected at the start of the vec above.
+			assignment_truncated[0].1 = 57_600u16.saturating_sub(total_parts);
+			assignment_truncated
+		} else {
+			assignment
+		};
+
+		let assign_core_call =
+			RelayRuntimePallets::Coretime(AssignCore(core, begin, assignment, end_hint));
+
 		let message = Xcm(vec![
 			Instruction::UnpaidExecution {
 				weight_limit: WeightLimit::Unlimited,
diff --git a/prdoc/pr_6022.prdoc b/prdoc/pr_6022.prdoc
new file mode 100644
index 000000000000..804d46af6613
--- /dev/null
+++ b/prdoc/pr_6022.prdoc
@@ -0,0 +1,14 @@
+title: '[Coretime chain] Add high assignment count mitigation to testnets'
+doc:
+- audience: Runtime User
+  description: |
+    We can handle a maximum of 28 assignments inside one XCM, while it's possible to have 80 (if a
+    region is interlaced 79 times). This can be chunked on the coretime chain side but currently the
+    relay does not support this. This PR truncates the additional assignments on Rococo and Westend
+    to mitigate this until the relay is fixed. The first 27 assignments are taken, the final 28th is
+    used to pad with idle to complete the mask. Any other assignments are dropped.
+crates:
+- name: coretime-rococo-runtime
+  bump: patch
+- name: coretime-westend-runtime
+  bump: patch

From 13d3f58e35c047b3bbcc6c2ef3bffeb5c11222b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:35:26 +0200
Subject: [PATCH 08/20] Bump prost-build from 0.12.4 to 0.13.2 (#6144)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [prost-build](https://github.com/tokio-rs/prost) from 0.12.4 to
0.13.2.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/tokio-rs/prost/blob/master/CHANGELOG.md">prost-build's
changelog</a>.</em></p>
<blockquote>
<h1>Prost version 0.13.2</h1>
<p><em>PROST!</em> is a <a
href="https://developers.google.com/protocol-buffers/">Protocol
Buffers</a> implementation for the <a
href="https://www.rust-lang.org/">Rust Language</a>. <code>prost</code>
generates simple, idiomatic Rust code from <code>proto2</code> and
<code>proto3</code> files.</p>
<h2>Features</h2>
<ul>
<li>prost-build: Add protoc executable path to Config (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1126">#1126</a>)</li>
<li>prost-build: Extract file descriptor loading from compile_protos()
(<a
href="https://redirect.github.com/tokio-rs/prost/issues/1067">#1067</a>)</li>
</ul>
<h2>Bug Fixes</h2>
<ul>
<li>prost-types: Fix date-time parsing (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1096">#1096</a>)</li>
<li>prost-types: '+' is not a numeric digit (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1104">#1104</a>)</li>
<li>prost-types: Converting DateTime to Timestamp is fallible (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1095">#1095</a>)</li>
<li>prost-types: Parse timestamp with long second fraction (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1106">#1106</a>)</li>
<li>prost-types: Format negative fractional duration (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1110">#1110</a>)</li>
<li>prost-types: Allow unknown local time offset (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1109">#1109</a>)</li>
</ul>
<h2>Styling</h2>
<ul>
<li>Remove use of legacy numeric constants (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1089">#1089</a>)</li>
<li>Move encoding functions into separate modules (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1111">#1111</a>)</li>
<li>Remove needless borrow (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1122">#1122</a>)</li>
</ul>
<h2>Testing</h2>
<ul>
<li>Add tests for public interface of DecodeError (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1120">#1120</a>)</li>
<li>Add <code>parse_date</code> fuzzing target (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1127">#1127</a>)</li>
<li>Fix build without std (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1134">#1134</a>)</li>
<li>Change some proptest to kani proofs (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1133">#1133</a>)</li>
<li>Add <code>parse_duration</code> fuzzing target (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1129">#1129</a>)</li>
<li>fuzz: Fix building of fuzzing targets (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1107">#1107</a>)</li>
<li>fuzz: Add fuzz targets to workspace (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1117">#1117</a>)</li>
</ul>
<h2>Miscellaneous Tasks</h2>
<ul>
<li>Move old protobuf benchmark into prost (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1100">#1100</a>)</li>
<li>Remove allow clippy::derive_partial_eq_without_eq (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1115">#1115</a>)</li>
<li>Run <code>cargo test</code> without <code>all-targets</code> (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1118">#1118</a>)</li>
<li>dependabot: Add github actions (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1121">#1121</a>)</li>
<li>Update to cargo clippy version 1.80 (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1128">#1128</a>)</li>
</ul>
<h2>Build</h2>
<ul>
<li>Use <code>proc-macro</code> in Cargo.toml (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1102">#1102</a>)</li>
<li>Ignore missing features in <code>tests</code> crates (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1101">#1101</a>)</li>
<li>Use separated build directory for protobuf (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1103">#1103</a>)</li>
<li>protobuf: Don't install unused test proto (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1116">#1116</a>)</li>
<li>protobuf: Use crate <code>cmake</code> (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1137">#1137</a>)</li>
<li>deps: Update devcontainer to Debian Bookworm release (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1114">#1114</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/tokio-rs/prost/commit/57e794203106db483e5115e7e67502ef6f2c7ad8"><code>57e7942</code></a>
chore: Release version 0.13.2 (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1139">#1139</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/8424775d78b13239df3cf3fe888236770a0cd839"><code>8424775</code></a>
build(protobuf): Use crate <code>cmake</code> (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1137">#1137</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/21208abf667313866f79d3d1438310c4dc20bdff"><code>21208ab</code></a>
build(deps): bump model-checking/kani-github-action from 0.32 to 1.1 (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1125">#1125</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/0c79864443621f20d92f9acc78a6ab0e7821dab0"><code>0c79864</code></a>
tests(fuzz): Add <code>parse_duration</code> fuzzing target (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1129">#1129</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/52046b943fdf6f79461725027245f890c7b4f514"><code>52046b9</code></a>
tests: Change some proptest to kani proofs (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1133">#1133</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/ee59dd5a9fe0935ad50e6ddbea5d23e3c6419468"><code>ee59dd5</code></a>
tests: Fix build without std (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1134">#1134</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/e773f5f6d38f74d0efff876011a2fd0d002aed4c"><code>e773f5f</code></a>
feat(prost-build): Add protoc executable path to Config (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1126">#1126</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/753bd92a85a3aa305d9d96b5c6363dc58d6356e6"><code>753bd92</code></a>
ci(clippy): Update to cargo clippy version 1.80 (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1128">#1128</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/df3e58e5d113a0dcf8b6735a5d04cde2d74e5df3"><code>df3e58e</code></a>
tests(fuzz): Add <code>parse_date</code> fuzzing target (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1127">#1127</a>)</li>
<li><a
href="https://github.com/tokio-rs/prost/commit/409b93214ed8d98fbb364031ccf330ce4e7caa32"><code>409b932</code></a>
style: Remove needless borrow (<a
href="https://redirect.github.com/tokio-rs/prost/issues/1122">#1122</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/tokio-rs/prost/compare/v0.12.4...v0.13.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=prost-build&package-manager=cargo&previous-version=0.12.4&new-version=0.13.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
---
 Cargo.lock | 52 +++++++++++-----------------------------------------
 Cargo.toml |  2 +-
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5edc66847ac9..e2cce7278567 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9265,7 +9265,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "pin-project",
  "prost 0.12.6",
- "prost-build 0.13.2",
+ "prost-build",
  "rand",
  "rcgen",
  "ring 0.16.20",
@@ -16735,27 +16735,6 @@ dependencies = [
  "prost-derive 0.13.2",
 ]
 
-[[package]]
-name = "prost-build"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
-dependencies = [
- "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
- "log",
- "multimap",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost 0.12.6",
- "prost-types 0.12.4",
- "regex",
- "syn 2.0.82",
- "tempfile",
-]
-
 [[package]]
 name = "prost-build"
 version = "0.13.2"
@@ -16763,15 +16742,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
+ "heck 0.4.1",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
  "petgraph",
  "prettyplease",
  "prost 0.13.2",
- "prost-types 0.13.2",
+ "prost-types",
  "regex",
  "syn 2.0.82",
  "tempfile",
@@ -16797,7 +16776,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
@@ -16810,21 +16789,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
 ]
 
-[[package]]
-name = "prost-types"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe"
-dependencies = [
- "prost 0.12.6",
-]
-
 [[package]]
 name = "prost-types"
 version = "0.13.2"
@@ -18322,7 +18292,7 @@ dependencies = [
  "multihash 0.19.1",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.4",
+ "prost-build",
  "quickcheck",
  "rand",
  "sc-client-api",
@@ -19138,7 +19108,7 @@ dependencies = [
  "partial_sort",
  "pin-project",
  "prost 0.12.6",
- "prost-build 0.12.4",
+ "prost-build",
  "rand",
  "sc-block-builder",
  "sc-client-api",
@@ -19183,7 +19153,7 @@ dependencies = [
  "futures",
  "libp2p-identity",
  "parity-scale-codec",
- "prost-build 0.12.4",
+ "prost-build",
  "sc-consensus",
  "sc-network-types",
  "sp-consensus",
@@ -19225,7 +19195,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.4",
+ "prost-build",
  "sc-client-api",
  "sc-network",
  "sc-network-types",
@@ -19268,7 +19238,7 @@ dependencies = [
  "mockall 0.11.4",
  "parity-scale-codec",
  "prost 0.12.6",
- "prost-build 0.12.4",
+ "prost-build",
  "quickcheck",
  "sc-block-builder",
  "sc-client-api",
diff --git a/Cargo.toml b/Cargo.toml
index ecab9c308474..049de32b54cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1092,7 +1092,7 @@ prometheus = { version = "0.13.0", default-features = false }
 prometheus-endpoint = { path = "substrate/utils/prometheus", default-features = false, package = "substrate-prometheus-endpoint" }
 prometheus-parse = { version = "0.2.2" }
 prost = { version = "0.12.4" }
-prost-build = { version = "0.12.4" }
+prost-build = { version = "0.13.2" }
 pyroscope = { version = "0.5.7" }
 pyroscope_pprofrs = { version = "0.2.7" }
 quick_cache = { version = "0.3" }

From 225536c9f57c9ff4425aa94e275648ce334eb4cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:40:42 +0000
Subject: [PATCH 09/20] Bump the ci_dependencies group across 1 directory with
 5 updates (#6035)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps the ci_dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
|
[lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action)
| `1.10.0` | `2.0.1` |
| [Swatinem/rust-cache](https://github.com/swatinem/rust-cache) |
`2.7.3` | `2.7.5` |
|
[docker/setup-buildx-action](https://github.com/docker/setup-buildx-action)
| `3.6.1` | `3.7.1` |
|
[docker/build-push-action](https://github.com/docker/build-push-action)
| `6.8.0` | `6.9.0` |
|
[actions-rust-lang/setup-rust-toolchain](https://github.com/actions-rust-lang/setup-rust-toolchain)
| `1.10.0` | `1.10.1` |


Updates `lycheeverse/lychee-action` from 1.10.0 to 2.0.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/lycheeverse/lychee-action/releases">lycheeverse/lychee-action's
releases</a>.</em></p>
<blockquote>
<h2>Version 2.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Don't remove the lychee config file by <a
href="https://github.com/dmathieu"><code>@​dmathieu</code></a> in <a
href="https://redirect.github.com/lycheeverse/lychee-action/pull/255">lycheeverse/lychee-action#255</a></li>
<li>Bump lycheeverse/lychee-action from 1 to 2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://redirect.github.com/lycheeverse/lychee-action/pull/252">lycheeverse/lychee-action#252</a></li>
<li>Fix variable name in docs by <a
href="https://github.com/kdeldycke"><code>@​kdeldycke</code></a> in <a
href="https://redirect.github.com/lycheeverse/lychee-action/pull/253">lycheeverse/lychee-action#253</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/dmathieu"><code>@​dmathieu</code></a>
made their first contribution in <a
href="https://redirect.github.com/lycheeverse/lychee-action/pull/255">lycheeverse/lychee-action#255</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/lycheeverse/lychee-action/compare/v2...v2.0.1">https://github.com/lycheeverse/lychee-action/compare/v2...v2.0.1</a></p>
<h2>Version 2.0.0</h2>
<h2>Breaking Changes</h2>
<p><strong>Note:</strong> This release improves the action's robustness
by changing default behaviors. Changes are only required if you want to
opt out of the new failure conditions. Most users won't need to modify
their existing configurations.</p>
<h3>Fail pipeline on error by default</h3>
<p>We've changed the default behavior: pipelines will now fail on broken
links automatically. This addresses user feedback that not failing on
broken links was unexpected (see [issue <a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/71">#71</a>](<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/71">lycheeverse/lychee-action#71</a>)).</p>
<p><strong>What you need to do:</strong></p>
<ul>
<li>Update to version 2 of this action to apply this change.</li>
<li>Users of the <code>lychee-action@master</code> branch don't need to
make any changes, as <code>fail: true</code> has been the default there
for a while.</li>
<li>If you prefer the old behavior, explicitly set <code>fail</code> to
<code>false</code> when updating:</li>
</ul>
<pre lang="yaml"><code>- name: Link Checker
  id: lychee
  uses: lycheeverse/lychee-action@v2
  with:
    fail: false  # Don't fail action on broken links
</code></pre>
<h3>Fail pipeline if no links were found</h3>
<p>Similar to the above change, we now fail the pipeline if no links are
found during a run. This helps warn users about potential configuration
issues.</p>
<p><strong>What you need to do:</strong></p>
<ul>
<li>If you expect links to be found in your pipeline run, you don't need
to do anything.</li>
<li>If you expect no links in your pipeline run, you can opt out like
this:</li>
</ul>
<pre lang="yaml"><code>- name: Link Checker
  id: lychee
  uses: lycheeverse/lychee-action@v2
  with:
    failIfEmpty: false  # Don't fail action if no links were found
</code></pre>
<p>For a more detailed description of the technical aspects behind these
changes, please see the full changelog below.</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/2bb232618be239862e31382c5c0eaeba12e5e966"><code>2bb2326</code></a>
don't remove the lychee config file (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/255">#255</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/731bf1a2affebd80fab6515ba61d2648a76929a4"><code>731bf1a</code></a>
Fix variable name (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/253">#253</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/e360f3c89142a5391e094404ea45e5494f1317dd"><code>e360f3c</code></a>
Bump lycheeverse/lychee-action from 1 to 2 (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/252">#252</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/f87f0a62993c2647717456af92593666acb3a500"><code>f87f0a6</code></a>
Update version to <code>lycheeverse/lychee-action@v2</code> in docs</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/7da8ec1fc4e01b5a12062ac6c589c10a4ce70d67"><code>7da8ec1</code></a>
Test latest lychee version tag (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/236">#236</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/6cba5a96c25bf6571c0dc0d1521a2ddbae78ea59"><code>6cba5a9</code></a>
Bump version to 0.16.x, respect new tag names (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/249">#249</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/e71a9a10faeb8c75aa21760b2f706f7831adadc7"><code>e71a9a1</code></a>
Split up steps in action (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/248">#248</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/897f08a07f689df1a43076f4374af272f66a6dd1"><code>897f08a</code></a>
action.yml: fix failing CI (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/246">#246</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/22c8e46b8f296cda676f8f92c634c4a87b436779"><code>22c8e46</code></a>
Set exit_code correctly as output (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/245">#245</a>)</li>
<li><a
href="https://github.com/lycheeverse/lychee-action/commit/5047c2a4052946424ce139fe111135f6d7c0fe0b"><code>5047c2a</code></a>
README: update actions/cache to v4 (<a
href="https://redirect.github.com/lycheeverse/lychee-action/issues/243">#243</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/lycheeverse/lychee-action/compare/2b973e86fc7b1f6b36a93795fe2c9c6ae1118621...2bb232618be239862e31382c5c0eaeba12e5e966">compare
view</a></li>
</ul>
</details>
<br />

Updates `Swatinem/rust-cache` from 2.7.3 to 2.7.5
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/swatinem/rust-cache/releases">Swatinem/rust-cache's
releases</a>.</em></p>
<blockquote>
<h2>v2.7.5</h2>
<h2>What's Changed</h2>
<ul>
<li>Upgrade checkout action from version 3 to 4 by <a
href="https://github.com/carsten-wenderdel"><code>@​carsten-wenderdel</code></a>
in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/190">Swatinem/rust-cache#190</a></li>
<li>fix: usage of <code>deprecated</code> version of <code>node</code>
by <a href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a>
in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/197">Swatinem/rust-cache#197</a></li>
<li>Only run macOsWorkaround() on macOS by <a
href="https://github.com/heksesang"><code>@​heksesang</code></a> in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/206">Swatinem/rust-cache#206</a></li>
<li>Support Cargo.lock format cargo-lock v4 by <a
href="https://github.com/NobodyXu"><code>@​NobodyXu</code></a> in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/211">Swatinem/rust-cache#211</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/carsten-wenderdel"><code>@​carsten-wenderdel</code></a>
made their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/190">Swatinem/rust-cache#190</a></li>
<li><a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> made
their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/197">Swatinem/rust-cache#197</a></li>
<li><a href="https://github.com/heksesang"><code>@​heksesang</code></a>
made their first contribution in <a
href="https://redirect.github.com/Swatinem/rust-cache/pull/206">Swatinem/rust-cache#206</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/Swatinem/rust-cache/compare/v2.7.3...v2.7.5">https://github.com/Swatinem/rust-cache/compare/v2.7.3...v2.7.5</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/82a92a6e8fbeee089604da2575dc567ae9ddeaab"><code>82a92a6</code></a>
2.7.5</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/598fe25fa107b2fd526fc6471f6e48de7cd12083"><code>598fe25</code></a>
update dependencies, rebuild</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/8f842c2d455cfe3d0d5a4b28f53f5389b51b71bf"><code>8f842c2</code></a>
Support Cargo.lock format cargo-lock v4 (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/211">#211</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/96a8d65dbafbc7d145a9b2b6c3b12ee335738cd2"><code>96a8d65</code></a>
Only run macOsWorkaround() on macOS (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/206">#206</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/9bdad043e88c75890e36ad3bbc8d27f0090dd609"><code>9bdad04</code></a>
fix: usage of <code>deprecated</code> version of <code>node</code> (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/197">#197</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/f7a52f691454d93c6ce0dff6666a5cb399b8d06e"><code>f7a52f6</code></a>
&quot;add jsonpath test&quot;</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/2bceda39122b2cc71e6e26ad729b92b44d101f4b"><code>2bceda3</code></a>
&quot;update dependencies&quot;</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/640a22190e7a783d4c409684cea558f081f92012"><code>640a221</code></a>
Upgrade checkout action from version 3 to 4 (<a
href="https://redirect.github.com/swatinem/rust-cache/issues/190">#190</a>)</li>
<li><a
href="https://github.com/Swatinem/rust-cache/commit/158274163087d4d4d49dfcc6a39806493e413240"><code>1582741</code></a>
update dependencies</li>
<li>See full diff in <a
href="https://github.com/swatinem/rust-cache/compare/23bce251a8cd2ffc3c1075eaa2367cf899916d84...82a92a6e8fbeee089604da2575dc567ae9ddeaab">compare
view</a></li>
</ul>
</details>
<br />

Updates `docker/setup-buildx-action` from 3.6.1 to 3.7.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/setup-buildx-action/releases">docker/setup-buildx-action's
releases</a>.</em></p>
<blockquote>
<h2>v3.7.1</h2>
<ul>
<li>Switch back to <code>uuid</code> package by <a
href="https://github.com/crazy-max"><code>@​crazy-max</code></a> in <a
href="https://redirect.github.com/docker/setup-buildx-action/pull/369">docker/setup-buildx-action#369</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/setup-buildx-action/compare/v3.7.0...v3.7.1">https://github.com/docker/setup-buildx-action/compare/v3.7.0...v3.7.1</a></p>
<h2>v3.7.0</h2>
<ul>
<li>Always set <code>buildkitd-flags</code> if opt-in by <a
href="https://github.com/crazy-max"><code>@​crazy-max</code></a> in <a
href="https://redirect.github.com/docker/setup-buildx-action/pull/363">docker/setup-buildx-action#363</a></li>
<li>Remove <code>uuid</code> package and switch to <code>crypto</code>
by <a href="https://github.com/crazy-max"><code>@​crazy-max</code></a>
in <a
href="https://redirect.github.com/docker/setup-buildx-action/pull/366">docker/setup-buildx-action#366</a></li>
<li>Bump <code>@​docker/actions-toolkit</code> from 0.35.0 to 0.39.0 in
<a
href="https://redirect.github.com/docker/setup-buildx-action/pull/362">docker/setup-buildx-action#362</a></li>
<li>Bump path-to-regexp from 6.2.2 to 6.3.0 in <a
href="https://redirect.github.com/docker/setup-buildx-action/pull/354">docker/setup-buildx-action#354</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/setup-buildx-action/compare/v3.6.1...v3.7.0">https://github.com/docker/setup-buildx-action/compare/v3.6.1...v3.7.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/c47758b77c9736f4b2ef4073d4d51994fabfe349"><code>c47758b</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/setup-buildx-action/issues/369">#369</a>
from crazy-max/revert-crypto</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/8fea3825134d99989287350b6429e3e86fa5d320"><code>8fea382</code></a>
chore: update generated content</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/2874e980e877332a8fe575054d8c083109b8fede"><code>2874e98</code></a>
switch back to uuid package</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/8026d2bc3645ea78b0d2544766a1225eb5691f89"><code>8026d2b</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/setup-buildx-action/issues/362">#362</a>
from docker/dependabot/npm_and_yarn/docker/actions-to...</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/e51aab53e9e6264bc11f62da6fbc352686b2147f"><code>e51aab5</code></a>
chore: update generated content</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/fd7390e14dc77aa9df3fbc8a021cf91ac9fe7aa5"><code>fd7390e</code></a>
build(deps): bump <code>@​docker/actions-toolkit</code> from 0.35.0 to
0.39.0</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/910a3040053b5bd9636a487f0054cfe150829ae7"><code>910a304</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/setup-buildx-action/issues/366">#366</a>
from crazy-max/remove-uuid</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/3623ee443e01d4daf9e9107d28e162a058c52ca8"><code>3623ee4</code></a>
chore: update generated content</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/e0e5ecf670bf33d756abc55962778de1286f70e1"><code>e0e5ecf</code></a>
remove uuid package and switch to crypto</li>
<li><a
href="https://github.com/docker/setup-buildx-action/commit/5334dd0cdd27e0ac92d6c98d35f3398fcc13195f"><code>5334dd0</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/setup-buildx-action/issues/363">#363</a>
from crazy-max/set-buildkitd-flags-optin</li>
<li>Additional commits viewable in <a
href="https://github.com/docker/setup-buildx-action/compare/988b5a0280414f521da01fcc63a27aeeb4b104db...c47758b77c9736f4b2ef4073d4d51994fabfe349">compare
view</a></li>
</ul>
</details>
<br />

Updates `docker/build-push-action` from 6.8.0 to 6.9.0
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/build-push-action/releases">docker/build-push-action's
releases</a>.</em></p>
<blockquote>
<h2>v6.9.0</h2>
<ul>
<li>Bump <code>@​docker/actions-toolkit</code> from 0.38.0 to 0.39.0 in
<a
href="https://redirect.github.com/docker/build-push-action/pull/1234">docker/build-push-action#1234</a></li>
<li>Bump path-to-regexp from 6.2.2 to 6.3.0 in <a
href="https://redirect.github.com/docker/build-push-action/pull/1232">docker/build-push-action#1232</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v6.8.0...v6.9.0">https://github.com/docker/build-push-action/compare/v6.8.0...v6.9.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/docker/build-push-action/commit/4f58ea79222b3b9dc2c8bbdd6debcef730109a75"><code>4f58ea7</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/build-push-action/issues/1234">#1234</a>
from docker/dependabot/npm_and_yarn/docker/actions-t...</li>
<li><a
href="https://github.com/docker/build-push-action/commit/49b5ea61c60477d214908bb6e23ce05c074ef04e"><code>49b5ea6</code></a>
chore: update generated content</li>
<li><a
href="https://github.com/docker/build-push-action/commit/13c9fddd72db0ce3cd9d87eb53e0480d2a32a77b"><code>13c9fdd</code></a>
chore(deps): Bump <code>@​docker/actions-toolkit</code> from 0.38.0 to
0.39.0</li>
<li><a
href="https://github.com/docker/build-push-action/commit/e44afff3590e1d4f93b6adc72376512edb012a7c"><code>e44afff</code></a>
Merge pull request <a
href="https://redirect.github.com/docker/build-push-action/issues/1232">#1232</a>
from docker/dependabot/npm_and_yarn/path-to-regexp-6...</li>
<li><a
href="https://github.com/docker/build-push-action/commit/67ebad331f4ca45e39184b280dbacb11eb3beae0"><code>67ebad3</code></a>
chore(deps): Bump path-to-regexp from 6.2.2 to 6.3.0</li>
<li>See full diff in <a
href="https://github.com/docker/build-push-action/compare/32945a339266b759abcbdc89316275140b0fc960...4f58ea79222b3b9dc2c8bbdd6debcef730109a75">compare
view</a></li>
</ul>
</details>
<br />

Updates `actions-rust-lang/setup-rust-toolchain` from 1.10.0 to 1.10.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/releases">actions-rust-lang/setup-rust-toolchain's
releases</a>.</em></p>
<blockquote>
<h2>v1.10.1</h2>
<ul>
<li>Fix problem matcher for rustfmt output.
The format has changed since <a
href="https://redirect.github.com/rust-lang/rustfmt/pull/5971">rust-lang/rustfmt#5971</a>
and now follows the form &quot;filename:line&quot;.
Thanks to <a
href="https://github.com/0xcypher02"><code>@​0xcypher02</code></a> for
pointing out the problem.</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.1">https://github.com/actions-rust-lang/setup-rust-toolchain/compare/v1...v1.10.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/CHANGELOG.md">actions-rust-lang/setup-rust-toolchain's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<p>All notable changes to this project will be documented in this
file.</p>
<p>The format is based on <a
href="https://keepachangelog.com/en/1.0.0/">Keep a Changelog</a>,
and this project adheres to <a
href="https://semver.org/spec/v2.0.0.html">Semantic Versioning</a>.</p>
<h2>[Unreleased]</h2>
<h2>[1.10.1] - 2024-10-01</h2>
<ul>
<li>Fix problem matcher for rustfmt output.
The format has changed since <a
href="https://redirect.github.com/rust-lang/rustfmt/pull/5971">rust-lang/rustfmt#5971</a>
and now follows the form &quot;filename:line&quot;.
Thanks to <a
href="https://github.com/0xcypher02"><code>@​0xcypher02</code></a> for
pointing out the problem.</li>
</ul>
<h2>[1.10.0] - 2024-09-23</h2>
<ul>
<li>Add new parameter <code>cache-directories</code> that is propagated
to <code>Swatinem/rust-cache</code> (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/44">#44</a>
by <a
href="https://github.com/pranc1ngpegasus"><code>@​pranc1ngpegasus</code></a>)</li>
<li>Add new parameter <code>cache-key</code> that is propagated to
<code>Swatinem/rust-cache</code> as <code>key</code> (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/41">#41</a>
by <a
href="https://github.com/iainlane"><code>@​iainlane</code></a>)</li>
<li>Make rustup toolchain installation more robust in light of planned
changes <a
href="https://redirect.github.com/rust-lang/rustup/issues/3635">rust-lang/rustup#3635</a>
and <a
href="https://redirect.github.com/rust-lang/rustup/pull/3985">rust-lang/rustup#3985</a></li>
<li>Allow installing multiple Rust toolchains by specifying multiple
versions in the <code>toolchain</code> input parameter.</li>
<li>Configure the <code>rustup override</code> behavior via the new
<code>override</code> input. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/38">#38</a>)</li>
</ul>
<h2>[1.9.0] - 2024-06-08</h2>
<ul>
<li>Add extra argument <code>cache-on-failure</code> and forward it to
<code>Swatinem/rust-cache</code>. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/39">#39</a>
by <a
href="https://github.com/samuelhnrq"><code>@​samuelhnrq</code></a>)<br
/>
Set the default the value to true.
This will result in more caching than previously.
This helps when large dependencies are compiled only for testing to
fail.</li>
</ul>
<h2>[1.8.0] - 2024-01-13</h2>
<ul>
<li>Allow specifying subdirectories for cache.</li>
<li>Fix toolchain file overriding.</li>
</ul>
<h2>[1.7.0] - 2024-01-11</h2>
<ul>
<li>Allow overriding the toolchain file with explicit
<code>toolchain</code> input. (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/26">#26</a>)</li>
</ul>
<h2>[1.6.0] - 2023-12-04</h2>
<h3>Added</h3>
<ul>
<li>Allow disabling problem matchers (<a
href="https://redirect.github.com/actions-rust-lang/setup-rust-toolchain/issues/27">#27</a>)
This can be useful when having a matrix of jobs, that produce the same
errors.</li>
</ul>
<h2>[1.5.0] - 2023-05-29</h2>
<h3>Added</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/commit/11df97af8e8102fd60b60a77dfbf58d40cd843b8"><code>11df97a</code></a>
Update the rustfmt problem matcher</li>
<li>See full diff in <a
href="https://github.com/actions-rust-lang/setup-rust-toolchain/compare/4d1965c9142484e48d40c19de54b5cba84953a06...11df97af8e8102fd60b60a77dfbf58d40cd843b8">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 .github/workflows/check-links.yml               | 2 +-
 .github/workflows/check-semver.yml              | 2 +-
 .github/workflows/publish-check-crates.yml      | 2 +-
 .github/workflows/publish-claim-crates.yml      | 2 +-
 .github/workflows/release-50_publish-docker.yml | 4 ++--
 .github/workflows/tests-misc.yml                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
index baf8cd5b1555..3bbb9baba46e 100644
--- a/.github/workflows/check-links.yml
+++ b/.github/workflows/check-links.yml
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.0 (22. Sep 2023)
 
       - name: Lychee link checker
-        uses: lycheeverse/lychee-action@2b973e86fc7b1f6b36a93795fe2c9c6ae1118621 # for v1.9.1 (10. Jan 2024)
+        uses: lycheeverse/lychee-action@2bb232618be239862e31382c5c0eaeba12e5e966 # for v1.9.1 (10. Jan 2024)
         with:
           args: >-
             --config .config/lychee.toml
diff --git a/.github/workflows/check-semver.yml b/.github/workflows/check-semver.yml
index 24050d9e0981..65f3339b7ac7 100644
--- a/.github/workflows/check-semver.yml
+++ b/.github/workflows/check-semver.yml
@@ -62,7 +62,7 @@ jobs:
           echo "PRDOC_EXTRA_ARGS=--max-bump minor" >> $GITHUB_ENV
 
       - name: Rust Cache
-        uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+        uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           cache-on-failure: true
 
diff --git a/.github/workflows/publish-check-crates.yml b/.github/workflows/publish-check-crates.yml
index a5af04118572..3fad3b641474 100644
--- a/.github/workflows/publish-check-crates.yml
+++ b/.github/workflows/publish-check-crates.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
 
       - name: Rust Cache
-        uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+        uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           cache-on-failure: true
 
diff --git a/.github/workflows/publish-claim-crates.yml b/.github/workflows/publish-claim-crates.yml
index f9bc6ce4daea..37bf06bb82d8 100644
--- a/.github/workflows/publish-claim-crates.yml
+++ b/.github/workflows/publish-claim-crates.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
 
       - name: Rust Cache
-        uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
+        uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
         with:
           cache-on-failure: true
 
diff --git a/.github/workflows/release-50_publish-docker.yml b/.github/workflows/release-50_publish-docker.yml
index 1fe68441a62f..6e0e8f20aa5e 100644
--- a/.github/workflows/release-50_publish-docker.yml
+++ b/.github/workflows/release-50_publish-docker.yml
@@ -322,7 +322,7 @@ jobs:
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
       - name: Cache Docker layers
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
@@ -346,7 +346,7 @@ jobs:
 
       - name: Build and push
         id:   docker_build
-        uses: docker/build-push-action@32945a339266b759abcbdc89316275140b0fc960 #  v6.8.0
+        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 #  v6.9.0
         with:
           push: true
           file: docker/dockerfiles/polkadot/polkadot_injected_debian.Dockerfile
diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index b51f2c249d84..cca32650b106 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -348,7 +348,7 @@ jobs:
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@1ccc07ccd54b6048295516a3eb89b192c35057dc # master from 12.09.2024
       - name: Install rust ${{ env.RUST_VERSION }}
-        uses: actions-rust-lang/setup-rust-toolchain@4d1965c9142484e48d40c19de54b5cba84953a06 # v1.10.0
+        uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
         with:
           cache: false
           toolchain: ${{ env.RUST_VERSION }}

From ee803b74056fac5101c06ec5998586fa6eaac470 Mon Sep 17 00:00:00 2001
From: Alin Dima <alin@parity.io>
Date: Mon, 21 Oct 2024 22:05:03 +0300
Subject: [PATCH 10/20] runtime: remove ttl (#5461)

Resolves https://github.com/paritytech/polkadot-sdk/issues/4776

This will enable proper core-sharing between paras, even if one of them
is not producing blocks.

TODO:
- [x] duplicate first entry in the claim queue if the queue used to be
empty
- [x] don't back anything if at the end of the block there'll be a
session change
- [x] write migration for removing the availability core storage
- [x] update and write unit tests
- [x] prdoc
- [x] add zombienet test for synchronous backing
- [x] add zombienet test for core-sharing paras where one of them is not
producing any blocks

_Important note:_
The `ttl` and `max_availability_timeouts` fields of the
HostConfiguration are not removed in this PR, due to #64.
Adding the workaround with the storage version check for every use of
the active HostConfiguration in all runtime APIs would be insane, as
it's used in almost all runtime APIs.

So even though the ttl and max_availability_timeouts fields will now be
unused, they will remain part of the host configuration.

These will be removed in a separate PR once #64 is fixed. Tracked by
https://github.com/paritytech/polkadot-sdk/issues/6067

---------

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>
Co-authored-by: Andrei Sandu <andrei-mihail@parity.io>
Co-authored-by: Andrei Sandu <54316454+sandreim@users.noreply.github.com>
Co-authored-by: command-bot <>
---
 .gitlab/pipeline/zombienet/polkadot.yml       |   19 +
 polkadot/primitives/src/v8/mod.rs             |   11 +-
 .../parachains/src/assigner_coretime/mod.rs   |    9 +-
 .../parachains/src/assigner_coretime/tests.rs |    3 +-
 .../parachains/src/assigner_parachains.rs     |    4 +-
 .../src/assigner_parachains/tests.rs          |    3 +-
 polkadot/runtime/parachains/src/builder.rs    |  131 +--
 .../runtime/parachains/src/configuration.rs   |   33 +-
 .../src/configuration/migration/v12.rs        |   12 +-
 .../parachains/src/configuration/tests.rs     |    8 +-
 .../parachains/src/coretime/migration.rs      |    5 +-
 polkadot/runtime/parachains/src/disputes.rs   |    8 +
 .../runtime/parachains/src/inclusion/mod.rs   |   74 +-
 .../runtime/parachains/src/inclusion/tests.rs |   80 +-
 .../runtime/parachains/src/initializer.rs     |   20 +-
 polkadot/runtime/parachains/src/mock.rs       |   21 +-
 .../runtime/parachains/src/on_demand/mod.rs   |    5 +
 .../runtime/parachains/src/on_demand/tests.rs |    3 +-
 .../src/paras_inherent/benchmarking.rs        |    3 +-
 .../parachains/src/paras_inherent/mod.rs      |  287 +++--
 .../parachains/src/paras_inherent/tests.rs    |  430 ++++---
 .../parachains/src/runtime_api_impl/v11.rs    |  120 +-
 polkadot/runtime/parachains/src/scheduler.rs  |  517 ++-------
 .../parachains/src/scheduler/common.rs        |    9 +-
 .../parachains/src/scheduler/migration.rs     |   88 +-
 .../runtime/parachains/src/scheduler/tests.rs | 1014 +++++------------
 .../runtime/parachains/src/session_info.rs    |    6 +-
 polkadot/runtime/parachains/src/shared.rs     |    6 +
 .../runtime/parachains/src/shared/tests.rs    |   18 +-
 polkadot/runtime/rococo/src/lib.rs            |    3 +-
 ...kadot_runtime_parachains_paras_inherent.rs |  155 ++-
 polkadot/runtime/test-runtime/src/lib.rs      |   74 +-
 polkadot/runtime/westend/src/lib.rs           |    1 +
 ...kadot_runtime_parachains_paras_inherent.rs |  153 ++-
 .../0015-coretime-shared-core.zndsl           |    4 +-
 .../functional/0017-sync-backing.toml         |   48 +
 .../functional/0017-sync-backing.zndsl        |   22 +
 .../0018-shared-core-idle-parachain.toml      |   39 +
 .../0018-shared-core-idle-parachain.zndsl     |   11 +
 ...ister-paras.js => force-register-paras.js} |    0
 prdoc/pr_5461.prdoc                           |   20 +
 41 files changed, 1510 insertions(+), 1967 deletions(-)
 create mode 100644 polkadot/zombienet_tests/functional/0017-sync-backing.toml
 create mode 100644 polkadot/zombienet_tests/functional/0017-sync-backing.zndsl
 create mode 100644 polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.toml
 create mode 100644 polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.zndsl
 rename polkadot/zombienet_tests/functional/{0015-force-register-paras.js => force-register-paras.js} (100%)
 create mode 100644 prdoc/pr_5461.prdoc

diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index d17380839942..60870caf26c8 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -233,6 +233,25 @@ zombienet-polkadot-functional-0016-approval-voting-parallel:
       --local-dir="${LOCAL_DIR}/functional"
       --test="0016-approval-voting-parallel.zndsl"
 
+zombienet-polkadot-functional-0017-sync-backing:
+  extends:
+    - .zombienet-polkadot-common
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0017-sync-backing.zndsl"
+
+zombienet-polkadot-functional-0018-shared-core-idle-parachain:
+  extends:
+    - .zombienet-polkadot-common
+  before_script:
+    - !reference [ .zombienet-polkadot-common, before_script ]
+    - cp --remove-destination ${LOCAL_DIR}/assign-core.js ${LOCAL_DIR}/functional
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}/functional"
+      --test="0018-shared-core-idle-parachain.zndsl"
+
 zombienet-polkadot-smoke-0001-parachains-smoke-test:
   extends:
     - .zombienet-polkadot-common
diff --git a/polkadot/primitives/src/v8/mod.rs b/polkadot/primitives/src/v8/mod.rs
index a51ee0bd99bf..cca327df42c9 100644
--- a/polkadot/primitives/src/v8/mod.rs
+++ b/polkadot/primitives/src/v8/mod.rs
@@ -2093,7 +2093,9 @@ pub struct SchedulerParams<BlockNumber> {
 	pub lookahead: u32,
 	/// How many cores are managed by the coretime chain.
 	pub num_cores: u32,
-	/// The max number of times a claim can time out in availability.
+	/// Deprecated and no longer used by the runtime.
+	/// Removal is tracked by <https://github.com/paritytech/polkadot-sdk/issues/6067>.
+	#[deprecated]
 	pub max_availability_timeouts: u32,
 	/// The maximum queue size of the pay as you go module.
 	pub on_demand_queue_max_size: u32,
@@ -2104,13 +2106,14 @@ pub struct SchedulerParams<BlockNumber> {
 	pub on_demand_fee_variability: Perbill,
 	/// The minimum amount needed to claim a slot in the spot pricing queue.
 	pub on_demand_base_fee: Balance,
-	/// The number of blocks a claim stays in the scheduler's claim queue before getting cleared.
-	/// This number should go reasonably higher than the number of blocks in the async backing
-	/// lookahead.
+	/// Deprecated and no longer used by the runtime.
+	/// Removal is tracked by <https://github.com/paritytech/polkadot-sdk/issues/6067>.
+	#[deprecated]
 	pub ttl: BlockNumber,
 }
 
 impl<BlockNumber: Default + From<u32>> Default for SchedulerParams<BlockNumber> {
+	#[allow(deprecated)]
 	fn default() -> Self {
 		Self {
 			group_rotation_frequency: 1u32.into(),
diff --git a/polkadot/runtime/parachains/src/assigner_coretime/mod.rs b/polkadot/runtime/parachains/src/assigner_coretime/mod.rs
index 7ee76600b42c..33a36a1bb2ea 100644
--- a/polkadot/runtime/parachains/src/assigner_coretime/mod.rs
+++ b/polkadot/runtime/parachains/src/assigner_coretime/mod.rs
@@ -318,9 +318,12 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 		Assignment::Bulk(para_id)
 	}
 
-	fn session_core_count() -> u32 {
-		let config = configuration::ActiveConfig::<T>::get();
-		config.scheduler_params.num_cores
+	fn assignment_duplicated(assignment: &Assignment) {
+		match assignment {
+			Assignment::Pool { para_id, core_index } =>
+				on_demand::Pallet::<T>::assignment_duplicated(*para_id, *core_index),
+			Assignment::Bulk(_) => {},
+		}
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/assigner_coretime/tests.rs b/polkadot/runtime/parachains/src/assigner_coretime/tests.rs
index e7994b8ef820..25007f0eed6a 100644
--- a/polkadot/runtime/parachains/src/assigner_coretime/tests.rs
+++ b/polkadot/runtime/parachains/src/assigner_coretime/tests.rs
@@ -26,7 +26,6 @@ use crate::{
 	paras::{ParaGenesisArgs, ParaKind},
 	scheduler::common::Assignment,
 };
-use alloc::collections::btree_map::BTreeMap;
 use frame_support::{assert_noop, assert_ok, pallet_prelude::*, traits::Currency};
 use pallet_broker::TaskId;
 use polkadot_primitives::{BlockNumber, Id as ParaId, SessionIndex, ValidationCode};
@@ -78,7 +77,7 @@ fn run_to_block(
 		OnDemand::on_initialize(b + 1);
 
 		// In the real runtime this is expected to be called by the `InclusionInherent` pallet.
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), b + 1);
+		Scheduler::advance_claim_queue(&Default::default());
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/assigner_parachains.rs b/polkadot/runtime/parachains/src/assigner_parachains.rs
index 3c735b999cf2..53edae5c32fc 100644
--- a/polkadot/runtime/parachains/src/assigner_parachains.rs
+++ b/polkadot/runtime/parachains/src/assigner_parachains.rs
@@ -63,7 +63,5 @@ impl<T: Config> AssignmentProvider<BlockNumberFor<T>> for Pallet<T> {
 		Assignment::Bulk(para_id)
 	}
 
-	fn session_core_count() -> u32 {
-		paras::Parachains::<T>::decode_len().unwrap_or(0) as u32
-	}
+	fn assignment_duplicated(_: &Assignment) {}
 }
diff --git a/polkadot/runtime/parachains/src/assigner_parachains/tests.rs b/polkadot/runtime/parachains/src/assigner_parachains/tests.rs
index 817e43a7138d..6e8e185bb48d 100644
--- a/polkadot/runtime/parachains/src/assigner_parachains/tests.rs
+++ b/polkadot/runtime/parachains/src/assigner_parachains/tests.rs
@@ -23,7 +23,6 @@ use crate::{
 	},
 	paras::{ParaGenesisArgs, ParaKind},
 };
-use alloc::collections::btree_map::BTreeMap;
 use frame_support::{assert_ok, pallet_prelude::*};
 use polkadot_primitives::{BlockNumber, Id as ParaId, SessionIndex, ValidationCode};
 
@@ -71,7 +70,7 @@ fn run_to_block(
 		Scheduler::initializer_initialize(b + 1);
 
 		// In the real runtime this is expected to be called by the `InclusionInherent` pallet.
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), b + 1);
+		Scheduler::advance_claim_queue(&Default::default());
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/builder.rs b/polkadot/runtime/parachains/src/builder.rs
index 1654590d109e..fa9497f8ccd5 100644
--- a/polkadot/runtime/parachains/src/builder.rs
+++ b/polkadot/runtime/parachains/src/builder.rs
@@ -18,7 +18,10 @@ use crate::{
 	configuration, inclusion, initializer, paras,
 	paras::ParaKind,
 	paras_inherent,
-	scheduler::{self, common::AssignmentProvider, CoreOccupied, ParasEntry},
+	scheduler::{
+		self,
+		common::{Assignment, AssignmentProvider},
+	},
 	session_info, shared,
 };
 use alloc::{
@@ -138,8 +141,6 @@ pub(crate) struct BenchBuilder<T: paras_inherent::Config> {
 	/// Make every candidate include a code upgrade by setting this to `Some` where the interior
 	/// value is the byte length of the new code.
 	code_upgrade: Option<u32>,
-	/// Specifies whether the claimqueue should be filled.
-	fill_claimqueue: bool,
 	/// Cores which should not be available when being populated with pending candidates.
 	unavailable_cores: Vec<u32>,
 	/// Use v2 candidate descriptor.
@@ -178,7 +179,6 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 			backed_in_inherent_paras: Default::default(),
 			elastic_paras: Default::default(),
 			code_upgrade: None,
-			fill_claimqueue: true,
 			unavailable_cores: vec![],
 			candidate_descriptor_v2: false,
 			candidate_modifier: None,
@@ -322,13 +322,6 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		self.max_validators() / self.max_validators_per_core()
 	}
 
-	/// Set whether the claim queue should be filled.
-	#[cfg(not(feature = "runtime-benchmarks"))]
-	pub(crate) fn set_fill_claimqueue(mut self, f: bool) -> Self {
-		self.fill_claimqueue = f;
-		self
-	}
-
 	/// Get the minimum number of validity votes in order for a backed candidate to be included.
 	#[cfg(feature = "runtime-benchmarks")]
 	pub(crate) fn fallback_min_backing_votes() -> u32 {
@@ -340,10 +333,13 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		HeadData(vec![0xFF; max_head_size as usize])
 	}
 
-	fn candidate_descriptor_mock(candidate_descriptor_v2: bool) -> CandidateDescriptorV2<T::Hash> {
+	fn candidate_descriptor_mock(
+		para_id: ParaId,
+		candidate_descriptor_v2: bool,
+	) -> CandidateDescriptorV2<T::Hash> {
 		if candidate_descriptor_v2 {
 			CandidateDescriptorV2::new(
-				0.into(),
+				para_id,
 				Default::default(),
 				CoreIndex(200),
 				2,
@@ -356,7 +352,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		} else {
 			// Convert v1 to v2.
 			CandidateDescriptor::<T::Hash> {
-				para_id: 0.into(),
+				para_id,
 				relay_parent: Default::default(),
 				collator: junk_collator(),
 				persisted_validation_data_hash: Default::default(),
@@ -373,6 +369,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 
 	/// Create a mock of `CandidatePendingAvailability`.
 	fn candidate_availability_mock(
+		para_id: ParaId,
 		group_idx: GroupIndex,
 		core_idx: CoreIndex,
 		candidate_hash: CandidateHash,
@@ -381,15 +378,16 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		candidate_descriptor_v2: bool,
 	) -> inclusion::CandidatePendingAvailability<T::Hash, BlockNumberFor<T>> {
 		inclusion::CandidatePendingAvailability::<T::Hash, BlockNumberFor<T>>::new(
-			core_idx,                                                 // core
-			candidate_hash,                                           // hash
-			Self::candidate_descriptor_mock(candidate_descriptor_v2), // candidate descriptor
-			commitments,                                              // commitments
-			availability_votes,                                       // availability votes
-			Default::default(),                                       // backers
-			Zero::zero(),                                             // relay parent
-			One::one(),                                               /* relay chain block this
-			                                                           * was backed in */
+			core_idx,                                                          // core
+			candidate_hash,                                                    // hash
+			Self::candidate_descriptor_mock(para_id, candidate_descriptor_v2), /* candidate descriptor */
+			commitments,                                                       // commitments
+			availability_votes,                                                /* availability
+			                                                                    * votes */
+			Default::default(), // backers
+			Zero::zero(),       // relay parent
+			One::one(),         /* relay chain block this
+			                     * was backed in */
 			group_idx, // backing group
 		)
 	}
@@ -416,6 +414,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 			hrmp_watermark: 0u32.into(),
 		};
 		let candidate_availability = Self::candidate_availability_mock(
+			para_id,
 			group_idx,
 			core_idx,
 			candidate_hash,
@@ -886,14 +885,11 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 			extra_cores;
 
 		assert!(used_cores <= max_cores);
-		let fill_claimqueue = self.fill_claimqueue;
 
 		// NOTE: there is an n+2 session delay for these actions to take effect.
 		// We are currently in Session 0, so these changes will take effect in Session 2.
 		Self::setup_para_ids(used_cores - extra_cores);
-		configuration::ActiveConfig::<T>::mutate(|c| {
-			c.scheduler_params.num_cores = used_cores as u32;
-		});
+		configuration::Pallet::<T>::set_coretime_cores_unchecked(used_cores as u32).unwrap();
 
 		let validator_ids = generate_validator_pairs::<T>(self.max_validators());
 		let target_session = SessionIndex::from(self.target_session);
@@ -902,7 +898,7 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 		let bitfields = builder.create_availability_bitfields(
 			&builder.backed_and_concluding_paras,
 			&builder.elastic_paras,
-			used_cores,
+			scheduler::Pallet::<T>::num_availability_cores(),
 		);
 
 		let mut backed_in_inherent = BTreeMap::new();
@@ -930,66 +926,57 @@ impl<T: paras_inherent::Config> BenchBuilder<T> {
 
 		assert_eq!(inclusion::PendingAvailability::<T>::iter().count(), used_cores - extra_cores);
 
-		// Mark all the used cores as occupied. We expect that there are
-		// `backed_and_concluding_paras` that are pending availability and that there are
-		// `used_cores - backed_and_concluding_paras ` which are about to be disputed.
-		let now = frame_system::Pallet::<T>::block_number() + One::one();
-
+		// Sanity check that the occupied cores reported by the inclusion module are what we expect
+		// to be.
 		let mut core_idx = 0u32;
 		let elastic_paras = &builder.elastic_paras;
-		// Assign potentially multiple cores to same parachains,
-		let cores = all_cores
+
+		let mut occupied_cores = inclusion::Pallet::<T>::get_occupied_cores()
+			.map(|(core, candidate)| (core, candidate.candidate_descriptor().para_id()))
+			.collect::<Vec<_>>();
+		occupied_cores.sort_by(|(core_a, _), (core_b, _)| core_a.0.cmp(&core_b.0));
+
+		let mut expected_cores = all_cores
 			.iter()
 			.flat_map(|(para_id, _)| {
 				(0..elastic_paras.get(&para_id).cloned().unwrap_or(1))
 					.map(|_para_local_core_idx| {
-						let ttl = configuration::ActiveConfig::<T>::get().scheduler_params.ttl;
-						// Load an assignment into provider so that one is present to pop
-						let assignment =
-							<T as scheduler::Config>::AssignmentProvider::get_mock_assignment(
-								CoreIndex(core_idx),
-								ParaId::from(*para_id),
-							);
+						let old_core_idx = core_idx;
 						core_idx += 1;
-						CoreOccupied::Paras(ParasEntry::new(assignment, now + ttl))
+						(CoreIndex(old_core_idx), ParaId::from(*para_id))
 					})
-					.collect::<Vec<CoreOccupied<_>>>()
+					.collect::<Vec<_>>()
 			})
-			.collect::<Vec<CoreOccupied<_>>>();
+			.collect::<Vec<_>>();
 
-		scheduler::AvailabilityCores::<T>::set(cores);
+		expected_cores.sort_by(|(core_a, _), (core_b, _)| core_a.0.cmp(&core_b.0));
 
-		core_idx = 0u32;
+		assert_eq!(expected_cores, occupied_cores);
 
 		// We need entries in the claim queue for those:
 		all_cores.append(&mut builder.backed_in_inherent_paras.clone());
 
-		if fill_claimqueue {
-			let cores = all_cores
-				.keys()
-				.flat_map(|para_id| {
-					(0..elastic_paras.get(&para_id).cloned().unwrap_or(1))
-						.map(|_para_local_core_idx| {
-							let ttl = configuration::ActiveConfig::<T>::get().scheduler_params.ttl;
-							// Load an assignment into provider so that one is present to pop
-							let assignment =
-								<T as scheduler::Config>::AssignmentProvider::get_mock_assignment(
-									CoreIndex(core_idx),
-									ParaId::from(*para_id),
-								);
-
-							core_idx += 1;
-							(
-								CoreIndex(core_idx - 1),
-								[ParasEntry::new(assignment, now + ttl)].into(),
-							)
-						})
-						.collect::<Vec<(CoreIndex, VecDeque<ParasEntry<_>>)>>()
-				})
-				.collect::<BTreeMap<CoreIndex, VecDeque<ParasEntry<_>>>>();
+		let mut core_idx = 0u32;
+		let cores = all_cores
+			.keys()
+			.flat_map(|para_id| {
+				(0..elastic_paras.get(&para_id).cloned().unwrap_or(1))
+					.map(|_para_local_core_idx| {
+						// Load an assignment into provider so that one is present to pop
+						let assignment =
+							<T as scheduler::Config>::AssignmentProvider::get_mock_assignment(
+								CoreIndex(core_idx),
+								ParaId::from(*para_id),
+							);
 
-			scheduler::ClaimQueue::<T>::set(cores);
-		}
+						core_idx += 1;
+						(CoreIndex(core_idx - 1), [assignment].into())
+					})
+					.collect::<Vec<(CoreIndex, VecDeque<Assignment>)>>()
+			})
+			.collect::<BTreeMap<CoreIndex, VecDeque<Assignment>>>();
+
+		scheduler::ClaimQueue::<T>::set(cores);
 
 		Bench::<T> {
 			data: ParachainsInherentData {
diff --git a/polkadot/runtime/parachains/src/configuration.rs b/polkadot/runtime/parachains/src/configuration.rs
index 36888247580e..e5cf7c4d276e 100644
--- a/polkadot/runtime/parachains/src/configuration.rs
+++ b/polkadot/runtime/parachains/src/configuration.rs
@@ -337,8 +337,6 @@ pub enum InconsistentError<BlockNumber> {
 	ZeroMinimumBackingVotes,
 	/// `executor_params` are inconsistent.
 	InconsistentExecutorParams { inner: ExecutorParamError },
-	/// TTL should be bigger than lookahead
-	LookaheadExceedsTTL,
 	/// Lookahead is zero, while it must be at least 1 for parachains to work.
 	LookaheadZero,
 	/// Passed in queue size for on-demand was too large.
@@ -434,10 +432,6 @@ where
 			return Err(InconsistentExecutorParams { inner })
 		}
 
-		if self.scheduler_params.ttl < self.scheduler_params.lookahead.into() {
-			return Err(LookaheadExceedsTTL)
-		}
-
 		if self.scheduler_params.lookahead == 0 {
 			return Err(LookaheadZero)
 		}
@@ -686,18 +680,7 @@ pub mod pallet {
 			Self::set_coretime_cores_unchecked(new)
 		}
 
-		/// Set the max number of times a claim may timeout on a core before it is abandoned
-		#[pallet::call_index(7)]
-		#[pallet::weight((
-			T::WeightInfo::set_config_with_u32(),
-			DispatchClass::Operational,
-		))]
-		pub fn set_max_availability_timeouts(origin: OriginFor<T>, new: u32) -> DispatchResult {
-			ensure_root(origin)?;
-			Self::schedule_config_update(|config| {
-				config.scheduler_params.max_availability_timeouts = new;
-			})
-		}
+		// Call index 7 used to be `set_max_availability_timeouts`, which was removed.
 
 		/// Set the parachain validator-group rotation frequency
 		#[pallet::call_index(8)]
@@ -1193,18 +1176,8 @@ pub mod pallet {
 				config.scheduler_params.on_demand_target_queue_utilization = new;
 			})
 		}
-		/// Set the on demand (parathreads) ttl in the claimqueue.
-		#[pallet::call_index(51)]
-		#[pallet::weight((
-			T::WeightInfo::set_config_with_block_number(),
-			DispatchClass::Operational
-		))]
-		pub fn set_on_demand_ttl(origin: OriginFor<T>, new: BlockNumberFor<T>) -> DispatchResult {
-			ensure_root(origin)?;
-			Self::schedule_config_update(|config| {
-				config.scheduler_params.ttl = new;
-			})
-		}
+
+		// Call index 51 used to be `set_on_demand_ttl`, which was removed.
 
 		/// Set the minimum backing votes threshold.
 		#[pallet::call_index(52)]
diff --git a/polkadot/runtime/parachains/src/configuration/migration/v12.rs b/polkadot/runtime/parachains/src/configuration/migration/v12.rs
index 111b1a199966..d1e0cf10a0ff 100644
--- a/polkadot/runtime/parachains/src/configuration/migration/v12.rs
+++ b/polkadot/runtime/parachains/src/configuration/migration/v12.rs
@@ -143,6 +143,7 @@ fn migrate_to_v12<T: Config>() -> Weight {
 					minimum_backing_votes                    : pre.minimum_backing_votes,
 					node_features                            : pre.node_features,
 					approval_voting_params                   : pre.approval_voting_params,
+					#[allow(deprecated)]
 					scheduler_params: SchedulerParams {
 							group_rotation_frequency             : pre.group_rotation_frequency,
 							paras_availability_period            : pre.paras_availability_period,
@@ -231,7 +232,10 @@ mod tests {
 		assert_eq!(v12.scheduler_params.paras_availability_period, 4);
 		assert_eq!(v12.scheduler_params.lookahead, 1);
 		assert_eq!(v12.scheduler_params.num_cores, 1);
-		assert_eq!(v12.scheduler_params.max_availability_timeouts, 0);
+		#[allow(deprecated)]
+		{
+			assert_eq!(v12.scheduler_params.max_availability_timeouts, 0);
+		}
 		assert_eq!(v12.scheduler_params.on_demand_queue_max_size, 10_000);
 		assert_eq!(
 			v12.scheduler_params.on_demand_target_queue_utilization,
@@ -239,7 +243,10 @@ mod tests {
 		);
 		assert_eq!(v12.scheduler_params.on_demand_fee_variability, Perbill::from_percent(3));
 		assert_eq!(v12.scheduler_params.on_demand_base_fee, 10_000_000);
-		assert_eq!(v12.scheduler_params.ttl, 5);
+		#[allow(deprecated)]
+		{
+			assert_eq!(v12.scheduler_params.ttl, 5);
+		}
 	}
 
 	#[test]
@@ -282,6 +289,7 @@ mod tests {
 
 			for (_, v12) in configs_to_check {
 				#[rustfmt::skip]
+				#[allow(deprecated)]
 				{
 					assert_eq!(v11.max_code_size                            , v12.max_code_size);
 					assert_eq!(v11.max_head_data_size                       , v12.max_head_data_size);
diff --git a/polkadot/runtime/parachains/src/configuration/tests.rs b/polkadot/runtime/parachains/src/configuration/tests.rs
index 0d20399e471b..a8689a04fe04 100644
--- a/polkadot/runtime/parachains/src/configuration/tests.rs
+++ b/polkadot/runtime/parachains/src/configuration/tests.rs
@@ -316,13 +316,14 @@ fn setting_pending_config_members() {
 			approval_voting_params: ApprovalVotingParams { max_approval_coalesce_count: 1 },
 			minimum_backing_votes: 5,
 			node_features: bitvec![u8, Lsb0; 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1],
+			#[allow(deprecated)]
 			scheduler_params: SchedulerParams {
 				group_rotation_frequency: 20,
 				paras_availability_period: 10,
 				max_validators_per_core: None,
 				lookahead: 3,
 				num_cores: 2,
-				max_availability_timeouts: 5,
+				max_availability_timeouts: 0,
 				on_demand_queue_max_size: 10_000u32,
 				on_demand_base_fee: 10_000_000u128,
 				on_demand_fee_variability: Perbill::from_percent(3),
@@ -355,11 +356,6 @@ fn setting_pending_config_members() {
 			new_config.scheduler_params.num_cores,
 		)
 		.unwrap();
-		Configuration::set_max_availability_timeouts(
-			RuntimeOrigin::root(),
-			new_config.scheduler_params.max_availability_timeouts,
-		)
-		.unwrap();
 		Configuration::set_group_rotation_frequency(
 			RuntimeOrigin::root(),
 			new_config.scheduler_params.group_rotation_frequency,
diff --git a/polkadot/runtime/parachains/src/coretime/migration.rs b/polkadot/runtime/parachains/src/coretime/migration.rs
index d4be135aad65..52189be3d247 100644
--- a/polkadot/runtime/parachains/src/coretime/migration.rs
+++ b/polkadot/runtime/parachains/src/coretime/migration.rs
@@ -19,8 +19,6 @@
 pub use v_coretime::{GetLegacyLease, MigrateToCoretime};
 
 mod v_coretime {
-	#[cfg(feature = "try-runtime")]
-	use crate::scheduler::common::AssignmentProvider;
 	use crate::{
 		assigner_coretime, configuration,
 		coretime::{mk_coretime_call, Config, PartsOf57600, WeightInfo},
@@ -142,7 +140,8 @@ mod v_coretime {
 
 			let dmp_queue_size =
 				crate::dmp::Pallet::<T>::dmq_contents(T::BrokerId::get().into()).len() as u32;
-			let new_core_count = assigner_coretime::Pallet::<T>::session_core_count();
+			let config = configuration::ActiveConfig::<T>::get();
+			let new_core_count = config.scheduler_params.num_cores;
 			ensure!(new_core_count == prev_core_count, "Total number of cores need to not change.");
 			ensure!(
 				dmp_queue_size > prev_dmp_queue_size,
diff --git a/polkadot/runtime/parachains/src/disputes.rs b/polkadot/runtime/parachains/src/disputes.rs
index f86573dadf56..d5a3f31e5943 100644
--- a/polkadot/runtime/parachains/src/disputes.rs
+++ b/polkadot/runtime/parachains/src/disputes.rs
@@ -1309,3 +1309,11 @@ fn check_signature(
 
 	res
 }
+
+#[cfg(all(not(feature = "runtime-benchmarks"), test))]
+// Test helper for clearing the on-chain dispute data.
+pub(crate) fn clear_dispute_storage<T: Config>() {
+	let _ = Disputes::<T>::clear(u32::MAX, None);
+	let _ = BackersOnDisputes::<T>::clear(u32::MAX, None);
+	let _ = Included::<T>::clear(u32::MAX, None);
+}
diff --git a/polkadot/runtime/parachains/src/inclusion/mod.rs b/polkadot/runtime/parachains/src/inclusion/mod.rs
index 36f874b8db1e..ea3a5d3cdda9 100644
--- a/polkadot/runtime/parachains/src/inclusion/mod.rs
+++ b/polkadot/runtime/parachains/src/inclusion/mod.rs
@@ -50,7 +50,7 @@ use polkadot_primitives::{
 		CandidateReceiptV2 as CandidateReceipt,
 		CommittedCandidateReceiptV2 as CommittedCandidateReceipt,
 	},
-	well_known_keys, CandidateCommitments, CandidateHash, CoreIndex, GroupIndex, Hash, HeadData,
+	well_known_keys, CandidateCommitments, CandidateHash, CoreIndex, GroupIndex, HeadData,
 	Id as ParaId, SignedAvailabilityBitfields, SigningContext, UpwardMessage, ValidatorId,
 	ValidatorIndex, ValidityAttestation,
 };
@@ -161,16 +161,6 @@ impl<H, N> CandidatePendingAvailability<H, N> {
 		self.relay_parent_number.clone()
 	}
 
-	/// Get the candidate backing group.
-	pub(crate) fn backing_group(&self) -> GroupIndex {
-		self.backing_group
-	}
-
-	/// Get the candidate's backers.
-	pub(crate) fn backers(&self) -> &BitVec<u8, BitOrderLsb0> {
-		&self.backers
-	}
-
 	#[cfg(any(feature = "runtime-benchmarks", test))]
 	pub(crate) fn new(
 		core: CoreIndex,
@@ -207,24 +197,6 @@ pub trait RewardValidators {
 	fn reward_bitfields(validators: impl IntoIterator<Item = ValidatorIndex>);
 }
 
-/// Helper return type for `process_candidates`.
-#[derive(Encode, Decode, PartialEq, TypeInfo)]
-#[cfg_attr(test, derive(Debug))]
-pub(crate) struct ProcessedCandidates<H = Hash> {
-	pub(crate) core_indices: Vec<(CoreIndex, ParaId)>,
-	pub(crate) candidate_receipt_with_backing_validator_indices:
-		Vec<(CandidateReceipt<H>, Vec<(ValidatorIndex, ValidityAttestation)>)>,
-}
-
-impl<H> Default for ProcessedCandidates<H> {
-	fn default() -> Self {
-		Self {
-			core_indices: Vec::new(),
-			candidate_receipt_with_backing_validator_indices: Vec::new(),
-		}
-	}
-}
-
 /// Reads the footprint of queues for a specific origin type.
 pub trait QueueFootprinter {
 	type Origin;
@@ -514,6 +486,14 @@ impl<T: Config> Pallet<T> {
 		T::MessageQueue::sweep_queue(AggregateMessageOrigin::Ump(UmpQueueId::Para(para)));
 	}
 
+	pub(crate) fn get_occupied_cores(
+	) -> impl Iterator<Item = (CoreIndex, CandidatePendingAvailability<T::Hash, BlockNumberFor<T>>)>
+	{
+		PendingAvailability::<T>::iter_values().flat_map(|pending_candidates| {
+			pending_candidates.into_iter().map(|c| (c.core, c.clone()))
+		})
+	}
+
 	/// Extract the freed cores based on cores that became available.
 	///
 	/// Bitfields are expected to have been sanitized already. E.g. via `sanitize_bitfields`!
@@ -640,12 +620,15 @@ impl<T: Config> Pallet<T> {
 		candidates: &BTreeMap<ParaId, Vec<(BackedCandidate<T::Hash>, CoreIndex)>>,
 		group_validators: GV,
 		core_index_enabled: bool,
-	) -> Result<ProcessedCandidates<T::Hash>, DispatchError>
+	) -> Result<
+		Vec<(CandidateReceipt<T::Hash>, Vec<(ValidatorIndex, ValidityAttestation)>)>,
+		DispatchError,
+	>
 	where
 		GV: Fn(GroupIndex) -> Option<Vec<ValidatorIndex>>,
 	{
 		if candidates.is_empty() {
-			return Ok(ProcessedCandidates::default())
+			return Ok(Default::default())
 		}
 
 		let now = frame_system::Pallet::<T>::block_number();
@@ -654,7 +637,6 @@ impl<T: Config> Pallet<T> {
 		// Collect candidate receipts with backers.
 		let mut candidate_receipt_with_backing_validator_indices =
 			Vec::with_capacity(candidates.len());
-		let mut core_indices = Vec::with_capacity(candidates.len());
 
 		for (para_id, para_candidates) in candidates {
 			let mut latest_head_data = match Self::para_latest_head_data(para_id) {
@@ -708,7 +690,6 @@ impl<T: Config> Pallet<T> {
 				latest_head_data = candidate.candidate().commitments.head_data.clone();
 				candidate_receipt_with_backing_validator_indices
 					.push((candidate.receipt(), backer_idx_and_attestation));
-				core_indices.push((*core, *para_id));
 
 				// Update storage now
 				PendingAvailability::<T>::mutate(&para_id, |pending_availability| {
@@ -743,10 +724,7 @@ impl<T: Config> Pallet<T> {
 			}
 		}
 
-		Ok(ProcessedCandidates::<T::Hash> {
-			core_indices,
-			candidate_receipt_with_backing_validator_indices,
-		})
+		Ok(candidate_receipt_with_backing_validator_indices)
 	}
 
 	// Get the latest backed output head data of this para (including pending availability).
@@ -1173,7 +1151,9 @@ impl<T: Config> Pallet<T> {
 
 	/// Returns the first `CommittedCandidateReceipt` pending availability for the para provided, if
 	/// any.
-	pub(crate) fn candidate_pending_availability(
+	/// A para_id could have more than one candidates pending availability, if it's using elastic
+	/// scaling. These candidates form a chain. This function returns the first in the chain.
+	pub(crate) fn first_candidate_pending_availability(
 		para: ParaId,
 	) -> Option<CommittedCandidateReceipt<T::Hash>> {
 		PendingAvailability::<T>::get(&para).and_then(|p| {
@@ -1201,24 +1181,6 @@ impl<T: Config> Pallet<T> {
 			})
 			.unwrap_or_default()
 	}
-
-	/// Returns the metadata around the first candidate pending availability for the
-	/// para provided, if any.
-	pub(crate) fn pending_availability(
-		para: ParaId,
-	) -> Option<CandidatePendingAvailability<T::Hash, BlockNumberFor<T>>> {
-		PendingAvailability::<T>::get(&para).and_then(|p| p.get(0).cloned())
-	}
-
-	/// Returns the metadata around the candidate pending availability occupying the supplied core,
-	/// if any.
-	pub(crate) fn pending_availability_with_core(
-		para: ParaId,
-		core: CoreIndex,
-	) -> Option<CandidatePendingAvailability<T::Hash, BlockNumberFor<T>>> {
-		PendingAvailability::<T>::get(&para)
-			.and_then(|p| p.iter().find(|c| c.core == core).cloned())
-	}
 }
 
 const fn availability_threshold(n_validators: usize) -> usize {
diff --git a/polkadot/runtime/parachains/src/inclusion/tests.rs b/polkadot/runtime/parachains/src/inclusion/tests.rs
index 87d21e209a49..188ba4995d83 100644
--- a/polkadot/runtime/parachains/src/inclusion/tests.rs
+++ b/polkadot/runtime/parachains/src/inclusion/tests.rs
@@ -1267,7 +1267,7 @@ fn candidate_checks() {
 				&group_validators,
 				false
 			),
-			Ok(ProcessedCandidates::default())
+			Ok(Default::default())
 		);
 
 		// Check candidate ordering
@@ -1563,20 +1563,16 @@ fn candidate_checks() {
 				None,
 			);
 
-			let ProcessedCandidates {
-				core_indices: occupied_cores,
-				candidate_receipt_with_backing_validator_indices,
-			} = ParaInclusion::process_candidates(
-				&allowed_relay_parents,
-				&vec![(thread_a_assignment.0, vec![(backed.clone(), thread_a_assignment.1)])]
-					.into_iter()
-					.collect(),
-				&group_validators,
-				false,
-			)
-			.expect("candidate is accepted with bad collator signature");
-
-			assert_eq!(occupied_cores, vec![(CoreIndex::from(2), thread_a)]);
+			let candidate_receipt_with_backing_validator_indices =
+				ParaInclusion::process_candidates(
+					&allowed_relay_parents,
+					&vec![(thread_a_assignment.0, vec![(backed.clone(), thread_a_assignment.1)])]
+						.into_iter()
+						.collect(),
+					&group_validators,
+					false,
+				)
+				.expect("candidate is accepted with bad collator signature");
 
 			let mut expected = std::collections::HashMap::<
 				CandidateHash,
@@ -1924,10 +1920,7 @@ fn backing_works() {
 			}
 		};
 
-		let ProcessedCandidates {
-			core_indices: occupied_cores,
-			candidate_receipt_with_backing_validator_indices,
-		} = ParaInclusion::process_candidates(
+		let candidate_receipt_with_backing_validator_indices = ParaInclusion::process_candidates(
 			&allowed_relay_parents,
 			&backed_candidates,
 			&group_validators,
@@ -1935,15 +1928,6 @@ fn backing_works() {
 		)
 		.expect("candidates scheduled, in order, and backed");
 
-		assert_eq!(
-			occupied_cores,
-			vec![
-				(CoreIndex::from(0), chain_a),
-				(CoreIndex::from(1), chain_b),
-				(CoreIndex::from(2), thread_a)
-			]
-		);
-
 		// Transform the votes into the setup we expect
 		let expected = {
 			let mut intermediate = std::collections::HashMap::<
@@ -2224,10 +2208,7 @@ fn backing_works_with_elastic_scaling_mvp() {
 			}
 		};
 
-		let ProcessedCandidates {
-			core_indices: occupied_cores,
-			candidate_receipt_with_backing_validator_indices,
-		} = ParaInclusion::process_candidates(
+		let candidate_receipt_with_backing_validator_indices = ParaInclusion::process_candidates(
 			&allowed_relay_parents,
 			&backed_candidates,
 			&group_validators,
@@ -2235,16 +2216,6 @@ fn backing_works_with_elastic_scaling_mvp() {
 		)
 		.expect("candidates scheduled, in order, and backed");
 
-		// Both b candidates will be backed.
-		assert_eq!(
-			occupied_cores,
-			vec![
-				(CoreIndex::from(0), chain_a),
-				(CoreIndex::from(1), chain_b),
-				(CoreIndex::from(2), chain_b),
-			]
-		);
-
 		// Transform the votes into the setup we expect
 		let mut expected = std::collections::HashMap::<
 			CandidateHash,
@@ -2420,18 +2391,15 @@ fn can_include_candidate_with_ok_code_upgrade() {
 			None,
 		);
 
-		let ProcessedCandidates { core_indices: occupied_cores, .. } =
-			ParaInclusion::process_candidates(
-				&allowed_relay_parents,
-				&vec![(chain_a_assignment.0, vec![(backed_a, chain_a_assignment.1)])]
-					.into_iter()
-					.collect::<BTreeMap<_, _>>(),
-				group_validators,
-				false,
-			)
-			.expect("candidates scheduled, in order, and backed");
-
-		assert_eq!(occupied_cores, vec![(CoreIndex::from(0), chain_a)]);
+		let _ = ParaInclusion::process_candidates(
+			&allowed_relay_parents,
+			&vec![(chain_a_assignment.0, vec![(backed_a, chain_a_assignment.1)])]
+				.into_iter()
+				.collect::<BTreeMap<_, _>>(),
+			group_validators,
+			false,
+		)
+		.expect("candidates scheduled, in order, and backed");
 
 		let backers = {
 			let num_backers = effective_minimum_backing_votes(
@@ -2846,7 +2814,7 @@ fn para_upgrade_delay_scheduled_from_inclusion() {
 			None,
 		);
 
-		let ProcessedCandidates { core_indices: occupied_cores, .. } =
+		let _ =
 			ParaInclusion::process_candidates(
 				&allowed_relay_parents,
 				&vec![(chain_a_assignment.0, vec![(backed_a, chain_a_assignment.1)])]
@@ -2857,8 +2825,6 @@ fn para_upgrade_delay_scheduled_from_inclusion() {
 			)
 			.expect("candidates scheduled, in order, and backed");
 
-		assert_eq!(occupied_cores, vec![(CoreIndex::from(0), chain_a)]);
-
 		// Run a couple of blocks before the inclusion.
 		run_to_block(7, |_| None);
 
diff --git a/polkadot/runtime/parachains/src/initializer.rs b/polkadot/runtime/parachains/src/initializer.rs
index 340f727097b5..6ee245fb5230 100644
--- a/polkadot/runtime/parachains/src/initializer.rs
+++ b/polkadot/runtime/parachains/src/initializer.rs
@@ -87,10 +87,10 @@ impl<BlockNumber: Default + From<u32>> Default for SessionChangeNotification<Blo
 }
 
 #[derive(Encode, Decode, TypeInfo)]
-struct BufferedSessionChange {
-	validators: Vec<ValidatorId>,
-	queued: Vec<ValidatorId>,
-	session_index: SessionIndex,
+pub(crate) struct BufferedSessionChange {
+	pub validators: Vec<ValidatorId>,
+	pub queued: Vec<ValidatorId>,
+	pub session_index: SessionIndex,
 }
 
 pub trait WeightInfo {
@@ -149,7 +149,7 @@ pub mod pallet {
 	#[pallet::storage]
 	pub(super) type HasInitialized<T: Config> = StorageValue<_, ()>;
 
-	/// Buffered session changes along with the block number at which they should be applied.
+	/// Buffered session changes.
 	///
 	/// Typically this will be empty or one element long. Apart from that this item never hits
 	/// the storage.
@@ -157,7 +157,7 @@ pub mod pallet {
 	/// However this is a `Vec` regardless to handle various edge cases that may occur at runtime
 	/// upgrade boundaries or if governance intervenes.
 	#[pallet::storage]
-	pub(super) type BufferedSessionChanges<T: Config> =
+	pub(crate) type BufferedSessionChanges<T: Config> =
 		StorageValue<_, Vec<BufferedSessionChange>, ValueQuery>;
 
 	#[pallet::hooks]
@@ -254,9 +254,6 @@ impl<T: Config> Pallet<T> {
 			buf
 		};
 
-		// inform about upcoming new session
-		scheduler::Pallet::<T>::pre_new_session();
-
 		let configuration::SessionChangeOutcome { prev_config, new_config } =
 			configuration::Pallet::<T>::initializer_on_new_session(&session_index);
 		let new_config = new_config.unwrap_or_else(|| prev_config.clone());
@@ -328,6 +325,11 @@ impl<T: Config> Pallet<T> {
 	{
 		Self::on_new_session(changed, session_index, validators, queued)
 	}
+
+	/// Return whether at the end of this block a new session will be initialized.
+	pub(crate) fn upcoming_session_change() -> bool {
+		!BufferedSessionChanges::<T>::get().is_empty()
+	}
 }
 
 impl<T: Config> sp_runtime::BoundToRuntimeAppPublic for Pallet<T> {
diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs
index 80751a2b7a02..c23918708b21 100644
--- a/polkadot/runtime/parachains/src/mock.rs
+++ b/polkadot/runtime/parachains/src/mock.rs
@@ -520,9 +520,6 @@ pub mod mock_assigner {
 		#[pallet::storage]
 		pub(super) type MockAssignmentQueue<T: Config> =
 			StorageValue<_, VecDeque<Assignment>, ValueQuery>;
-
-		#[pallet::storage]
-		pub(super) type MockCoreCount<T: Config> = StorageValue<_, u32, OptionQuery>;
 	}
 
 	impl<T: Config> Pallet<T> {
@@ -531,12 +528,6 @@ pub mod mock_assigner {
 		pub fn add_test_assignment(assignment: Assignment) {
 			MockAssignmentQueue::<T>::mutate(|queue| queue.push_back(assignment));
 		}
-
-		// Allows for customized core count in scheduler tests, rather than a core count
-		// derived from on-demand config + parachain count.
-		pub fn set_core_count(count: u32) {
-			MockCoreCount::<T>::set(Some(count));
-		}
 	}
 
 	impl<T: Config> AssignmentProvider<BlockNumber> for Pallet<T> {
@@ -554,20 +545,18 @@ pub mod mock_assigner {
 		}
 
 		// We don't care about core affinity in the test assigner
-		fn report_processed(_assignment: Assignment) {}
+		fn report_processed(_: Assignment) {}
 
-		// The results of this are tested in on_demand tests. No need to represent it
-		// in the mock assigner.
-		fn push_back_assignment(_assignment: Assignment) {}
+		fn push_back_assignment(assignment: Assignment) {
+			Self::add_test_assignment(assignment);
+		}
 
 		#[cfg(any(feature = "runtime-benchmarks", test))]
 		fn get_mock_assignment(_: CoreIndex, para_id: ParaId) -> Assignment {
 			Assignment::Bulk(para_id)
 		}
 
-		fn session_core_count() -> u32 {
-			MockCoreCount::<T>::get().unwrap_or(5)
-		}
+		fn assignment_duplicated(_: &Assignment) {}
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/on_demand/mod.rs b/polkadot/runtime/parachains/src/on_demand/mod.rs
index dc046c194fd0..66400eb00fd9 100644
--- a/polkadot/runtime/parachains/src/on_demand/mod.rs
+++ b/polkadot/runtime/parachains/src/on_demand/mod.rs
@@ -317,6 +317,11 @@ where
 		Some(assignment)
 	}
 
+	/// Report that an assignment was duplicated by the scheduler.
+	pub fn assignment_duplicated(para_id: ParaId, core_index: CoreIndex) {
+		Pallet::<T>::increase_affinity(para_id, core_index);
+	}
+
 	/// Report that the `para_id` & `core_index` combination was processed.
 	///
 	/// This should be called once it is clear that the assignment won't get pushed back anymore.
diff --git a/polkadot/runtime/parachains/src/on_demand/tests.rs b/polkadot/runtime/parachains/src/on_demand/tests.rs
index 974295411810..7da16942c7ad 100644
--- a/polkadot/runtime/parachains/src/on_demand/tests.rs
+++ b/polkadot/runtime/parachains/src/on_demand/tests.rs
@@ -30,7 +30,6 @@ use crate::{
 	},
 	paras::{ParaGenesisArgs, ParaKind},
 };
-use alloc::collections::btree_map::BTreeMap;
 use core::cmp::{Ord, Ordering};
 use frame_support::{assert_noop, assert_ok};
 use pallet_balances::Error as BalancesError;
@@ -86,7 +85,7 @@ fn run_to_block(
 		OnDemand::on_initialize(b + 1);
 
 		// In the real runtime this is expected to be called by the `InclusionInherent` pallet.
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), b + 1);
+		Scheduler::advance_claim_queue(&Default::default());
 	}
 }
 
diff --git a/polkadot/runtime/parachains/src/paras_inherent/benchmarking.rs b/polkadot/runtime/parachains/src/paras_inherent/benchmarking.rs
index 266860061bed..485e7211c1d2 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/benchmarking.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/benchmarking.rs
@@ -43,7 +43,8 @@ benchmarks! {
 	// Variant over `v`, the number of dispute statements in a dispute statement set. This gives the
 	// weight of a single dispute statement set.
 	enter_variable_disputes {
-		let v in 10..BenchBuilder::<T>::fallback_max_validators();
+		// The number of statements needs to be at least a third of the validator set size.
+		let v in 400..BenchBuilder::<T>::fallback_max_validators();
 
 		let scenario = BenchBuilder::<T>::new()
 			.set_dispute_sessions(&[2])
diff --git a/polkadot/runtime/parachains/src/paras_inherent/mod.rs b/polkadot/runtime/parachains/src/paras_inherent/mod.rs
index 2aca0f2c728a..4c1394fd1347 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/mod.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/mod.rs
@@ -27,8 +27,7 @@ use crate::{
 	inclusion::{self, CandidateCheckContext},
 	initializer,
 	metrics::METRICS,
-	paras,
-	scheduler::{self, FreedReason},
+	paras, scheduler,
 	shared::{self, AllowedRelayParentsTracker},
 	ParaId,
 };
@@ -38,6 +37,7 @@ use alloc::{
 	vec::Vec,
 };
 use bitvec::prelude::BitVec;
+use core::result::Result;
 use frame_support::{
 	defensive,
 	dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo},
@@ -105,15 +105,6 @@ impl DisputedBitfield {
 	}
 }
 
-/// The context in which the inherent data is checked or processed.
-#[derive(PartialEq)]
-pub enum ProcessInherentDataContext {
-	/// Enables filtering/limits weight of inherent up to maximum block weight.
-	/// Invariant: InherentWeight <= BlockWeight.
-	ProvideInherent,
-	/// Checks the InherentWeight invariant.
-	Enter,
-}
 pub use pallet::*;
 
 #[frame_support::pallet]
@@ -140,11 +131,9 @@ pub mod pallet {
 		/// The hash of the submitted parent header doesn't correspond to the saved block hash of
 		/// the parent.
 		InvalidParentHeader,
-		/// The data given to the inherent will result in an overweight block.
-		InherentOverweight,
-		/// A candidate was filtered during inherent execution. This should have only been done
+		/// Inherent data was filtered during execution. This should have only been done
 		/// during creation.
-		CandidatesFilteredDuringExecution,
+		InherentDataFilteredDuringExecution,
 		/// Too many candidates supplied.
 		UnscheduledCandidate,
 	}
@@ -253,9 +242,12 @@ pub mod pallet {
 
 			ensure!(!Included::<T>::exists(), Error::<T>::TooManyInclusionInherents);
 			Included::<T>::set(Some(()));
+			let initial_data = data.clone();
 
-			Self::process_inherent_data(data, ProcessInherentDataContext::Enter)
-				.map(|(_processed, post_info)| post_info)
+			Self::process_inherent_data(data).and_then(|(processed, post_info)| {
+				ensure!(initial_data == processed, Error::<T>::InherentDataFilteredDuringExecution);
+				Ok(post_info)
+			})
 		}
 	}
 }
@@ -273,10 +265,7 @@ impl<T: Config> Pallet<T> {
 				return None
 			},
 		};
-		match Self::process_inherent_data(
-			parachains_inherent_data,
-			ProcessInherentDataContext::ProvideInherent,
-		) {
+		match Self::process_inherent_data(parachains_inherent_data) {
 			Ok((processed, _)) => Some(processed),
 			Err(err) => {
 				log::warn!(target: LOG_TARGET, "Processing inherent data failed: {:?}", err);
@@ -290,21 +279,12 @@ impl<T: Config> Pallet<T> {
 	/// The given inherent data is processed and state is altered accordingly. If any data could
 	/// not be applied (inconsistencies, weight limit, ...) it is removed.
 	///
-	/// When called from `create_inherent` the `context` must be set to
-	/// `ProcessInherentDataContext::ProvideInherent` so it guarantees the invariant that inherent
-	/// is not overweight.
-	/// It is **mandatory** that calls from `enter` set `context` to
-	/// `ProcessInherentDataContext::Enter` to ensure the weight invariant is checked.
-	///
 	/// Returns: Result containing processed inherent data and weight, the processed inherent would
 	/// consume.
 	fn process_inherent_data(
 		data: ParachainsInherentData<HeaderFor<T>>,
-		context: ProcessInherentDataContext,
-	) -> core::result::Result<
-		(ParachainsInherentData<HeaderFor<T>>, PostDispatchInfo),
-		DispatchErrorWithPostInfo,
-	> {
+	) -> Result<(ParachainsInherentData<HeaderFor<T>>, PostDispatchInfo), DispatchErrorWithPostInfo>
+	{
 		#[cfg(feature = "runtime-metrics")]
 		sp_io::init_tracing();
 
@@ -333,6 +313,27 @@ impl<T: Config> Pallet<T> {
 		let now = frame_system::Pallet::<T>::block_number();
 		let config = configuration::ActiveConfig::<T>::get();
 
+		// Before anything else, update the allowed relay-parents.
+		{
+			let parent_number = now - One::one();
+			let parent_storage_root = *parent_header.state_root();
+
+			shared::AllowedRelayParents::<T>::mutate(|tracker| {
+				tracker.update(
+					parent_hash,
+					parent_storage_root,
+					scheduler::ClaimQueue::<T>::get()
+						.into_iter()
+						.map(|(core_index, paras)| {
+							(core_index, paras.into_iter().map(|e| e.para_id()).collect())
+						})
+						.collect(),
+					parent_number,
+					config.async_backing_params.allowed_ancestry_len,
+				);
+			});
+		}
+
 		let candidates_weight = backed_candidates_weight::<T>(&backed_candidates);
 		let bitfields_weight = signed_bitfields_weight::<T>(&bitfields);
 		let disputes_weight = multi_dispute_statement_sets_weight::<T>(&disputes);
@@ -345,7 +346,7 @@ impl<T: Config> Pallet<T> {
 		log::debug!(target: LOG_TARGET, "Time weight before filter: {}, candidates + bitfields: {}, disputes: {}", weight_before_filtering.ref_time(), candidates_weight.ref_time() + bitfields_weight.ref_time(), disputes_weight.ref_time());
 
 		let current_session = shared::CurrentSessionIndex::<T>::get();
-		let expected_bits = scheduler::AvailabilityCores::<T>::get().len();
+		let expected_bits = scheduler::Pallet::<T>::num_availability_cores();
 		let validator_public = shared::ActiveValidatorKeys::<T>::get();
 
 		// We are assuming (incorrectly) to have all the weight (for the mandatory class or even
@@ -390,7 +391,7 @@ impl<T: Config> Pallet<T> {
 			T::DisputesHandler::filter_dispute_data(set, post_conclusion_acceptance_period)
 		};
 
-		// Limit the disputes first, since the following statements depend on the votes include
+		// Limit the disputes first, since the following statements depend on the votes included
 		// here.
 		let (checked_disputes_sets, checked_disputes_sets_consumed_weight) =
 			limit_and_sanitize_disputes::<T, _>(
@@ -399,7 +400,7 @@ impl<T: Config> Pallet<T> {
 				max_block_weight,
 			);
 
-		let mut all_weight_after = if context == ProcessInherentDataContext::ProvideInherent {
+		let mut all_weight_after = {
 			// Assure the maximum block weight is adhered, by limiting bitfields and backed
 			// candidates. Dispute statement sets were already limited before.
 			let non_disputes_weight = apply_weight_limit::<T>(
@@ -427,23 +428,6 @@ impl<T: Config> Pallet<T> {
 				log::warn!(target: LOG_TARGET, "Post weight limiting weight is still too large, time: {}, size: {}", all_weight_after.ref_time(), all_weight_after.proof_size());
 			}
 			all_weight_after
-		} else {
-			// This check is performed in the context of block execution. Ensures inherent weight
-			// invariants guaranteed by `create_inherent_data` for block authorship.
-			if weight_before_filtering.any_gt(max_block_weight) {
-				log::error!(
-					"Overweight para inherent data reached the runtime {:?}: {} > {}",
-					parent_hash,
-					weight_before_filtering,
-					max_block_weight
-				);
-			}
-
-			ensure!(
-				weight_before_filtering.all_lte(max_block_weight),
-				Error::<T>::InherentOverweight
-			);
-			weight_before_filtering
 		};
 
 		// Note that `process_checked_multi_dispute_data` will iterate and import each
@@ -567,98 +551,9 @@ impl<T: Config> Pallet<T> {
 			log::debug!(target: LOG_TARGET, "Evicted timed out cores: {:?}", freed_timeout);
 		}
 
-		// We'll schedule paras again, given freed cores, and reasons for freeing.
-		let freed = freed_concluded
-			.into_iter()
-			.map(|(c, _hash)| (c, FreedReason::Concluded))
-			.chain(freed_disputed.into_iter().map(|core| (core, FreedReason::Concluded)))
-			.chain(freed_timeout.into_iter().map(|c| (c, FreedReason::TimedOut)))
-			.collect::<BTreeMap<CoreIndex, FreedReason>>();
-		scheduler::Pallet::<T>::free_cores_and_fill_claim_queue(freed, now);
-
-		METRICS.on_candidates_processed_total(backed_candidates.len() as u64);
-
-		// After freeing cores and filling claims, but before processing backed candidates
-		// we update the allowed relay-parents.
-		{
-			let parent_number = now - One::one();
-			let parent_storage_root = *parent_header.state_root();
-
-			shared::AllowedRelayParents::<T>::mutate(|tracker| {
-				tracker.update(
-					parent_hash,
-					parent_storage_root,
-					scheduler::ClaimQueue::<T>::get()
-						.into_iter()
-						.map(|(core_index, paras)| {
-							(core_index, paras.into_iter().map(|e| e.para_id()).collect())
-						})
-						.collect(),
-					parent_number,
-					config.async_backing_params.allowed_ancestry_len,
-				);
-			});
-		}
-		let allowed_relay_parents = shared::AllowedRelayParents::<T>::get();
-
-		let core_index_enabled = configuration::ActiveConfig::<T>::get()
-			.node_features
-			.get(FeatureIndex::ElasticScalingMVP as usize)
-			.map(|b| *b)
-			.unwrap_or(false);
-
-		let allow_v2_receipts = configuration::ActiveConfig::<T>::get()
-			.node_features
-			.get(FeatureIndex::CandidateReceiptV2 as usize)
-			.map(|b| *b)
-			.unwrap_or(false);
-
-		let mut eligible: BTreeMap<ParaId, BTreeSet<CoreIndex>> = BTreeMap::new();
-		let mut total_eligible_cores = 0;
-
-		for (core_idx, para_id) in scheduler::Pallet::<T>::eligible_paras() {
-			total_eligible_cores += 1;
-			log::trace!(target: LOG_TARGET, "Found eligible para {:?} on core {:?}", para_id, core_idx);
-			eligible.entry(para_id).or_default().insert(core_idx);
-		}
-
-		let initial_candidate_count = backed_candidates.len();
-		let backed_candidates_with_core = sanitize_backed_candidates::<T>(
-			backed_candidates,
-			&allowed_relay_parents,
-			concluded_invalid_hashes,
-			eligible,
-			core_index_enabled,
-			allow_v2_receipts,
-		);
-		let count = count_backed_candidates(&backed_candidates_with_core);
-
-		ensure!(count <= total_eligible_cores, Error::<T>::UnscheduledCandidate);
-
-		METRICS.on_candidates_sanitized(count as u64);
-
-		// In `Enter` context (invoked during execution) no more candidates should be filtered,
-		// because they have already been filtered during `ProvideInherent` context. Abort in such
-		// cases.
-		if context == ProcessInherentDataContext::Enter {
-			ensure!(
-				initial_candidate_count == count,
-				Error::<T>::CandidatesFilteredDuringExecution
-			);
-		}
-
-		// Process backed candidates according to scheduled cores.
-		let inclusion::ProcessedCandidates::<<HeaderFor<T> as HeaderT>::Hash> {
-			core_indices: occupied,
-			candidate_receipt_with_backing_validator_indices,
-		} = inclusion::Pallet::<T>::process_candidates(
-			&allowed_relay_parents,
-			&backed_candidates_with_core,
-			scheduler::Pallet::<T>::group_validators,
-			core_index_enabled,
-		)?;
-		// Note which of the scheduled cores were actually occupied by a backed candidate.
-		scheduler::Pallet::<T>::occupied(occupied.into_iter().map(|e| (e.0, e.1)).collect());
+		// Back candidates.
+		let (candidate_receipt_with_backing_validator_indices, backed_candidates_with_core) =
+			Self::back_candidates(concluded_invalid_hashes, backed_candidates)?;
 
 		set_scrapable_on_chain_backings::<T>(
 			current_session,
@@ -672,6 +567,7 @@ impl<T: Config> Pallet<T> {
 
 		let bitfields = bitfields.into_iter().map(|v| v.into_unchecked()).collect();
 
+		let count = backed_candidates_with_core.len();
 		let processed = ParachainsInherentData {
 			bitfields,
 			backed_candidates: backed_candidates_with_core.into_iter().fold(
@@ -686,6 +582,104 @@ impl<T: Config> Pallet<T> {
 		};
 		Ok((processed, Some(all_weight_after).into()))
 	}
+
+	fn back_candidates(
+		concluded_invalid_hashes: BTreeSet<CandidateHash>,
+		backed_candidates: Vec<BackedCandidate<T::Hash>>,
+	) -> Result<
+		(
+			Vec<(CandidateReceipt<T::Hash>, Vec<(ValidatorIndex, ValidityAttestation)>)>,
+			BTreeMap<ParaId, Vec<(BackedCandidate<T::Hash>, CoreIndex)>>,
+		),
+		DispatchErrorWithPostInfo,
+	> {
+		let allowed_relay_parents = shared::AllowedRelayParents::<T>::get();
+		let upcoming_new_session = initializer::Pallet::<T>::upcoming_session_change();
+
+		METRICS.on_candidates_processed_total(backed_candidates.len() as u64);
+
+		if !upcoming_new_session {
+			let occupied_cores =
+				inclusion::Pallet::<T>::get_occupied_cores().map(|(core, _)| core).collect();
+
+			let mut eligible: BTreeMap<ParaId, BTreeSet<CoreIndex>> = BTreeMap::new();
+			let mut total_eligible_cores = 0;
+
+			for (core_idx, para_id) in Self::eligible_paras(&occupied_cores) {
+				total_eligible_cores += 1;
+				log::trace!(target: LOG_TARGET, "Found eligible para {:?} on core {:?}", para_id, core_idx);
+				eligible.entry(para_id).or_default().insert(core_idx);
+			}
+
+			let node_features = configuration::ActiveConfig::<T>::get().node_features;
+			let core_index_enabled = node_features
+				.get(FeatureIndex::ElasticScalingMVP as usize)
+				.map(|b| *b)
+				.unwrap_or(false);
+
+			let allow_v2_receipts = node_features
+				.get(FeatureIndex::CandidateReceiptV2 as usize)
+				.map(|b| *b)
+				.unwrap_or(false);
+
+			let backed_candidates_with_core = sanitize_backed_candidates::<T>(
+				backed_candidates,
+				&allowed_relay_parents,
+				concluded_invalid_hashes,
+				eligible,
+				core_index_enabled,
+				allow_v2_receipts,
+			);
+			let count = count_backed_candidates(&backed_candidates_with_core);
+
+			ensure!(count <= total_eligible_cores, Error::<T>::UnscheduledCandidate);
+
+			METRICS.on_candidates_sanitized(count as u64);
+
+			// Process backed candidates according to scheduled cores.
+			let candidate_receipt_with_backing_validator_indices =
+				inclusion::Pallet::<T>::process_candidates(
+					&allowed_relay_parents,
+					&backed_candidates_with_core,
+					scheduler::Pallet::<T>::group_validators,
+					core_index_enabled,
+				)?;
+
+			// We need to advance the claim queue on all cores, except for the ones that did not
+			// get freed in this block. The ones that did not get freed also cannot be newly
+			// occupied.
+			scheduler::Pallet::<T>::advance_claim_queue(&occupied_cores);
+
+			Ok((candidate_receipt_with_backing_validator_indices, backed_candidates_with_core))
+		} else {
+			log::debug!(
+				target: LOG_TARGET,
+				"Upcoming session change, not backing any new candidates."
+			);
+			// If we'll initialize a new session at the end of the block, we don't want to
+			// advance the claim queue.
+
+			Ok((vec![], BTreeMap::new()))
+		}
+	}
+
+	/// Paras that may get backed on cores.
+	///
+	/// 1. The para must be scheduled on core.
+	/// 2. Core needs to be free, otherwise backing is not possible.
+	///
+	/// We get a set of the occupied cores as input.
+	pub(crate) fn eligible_paras<'a>(
+		occupied_cores: &'a BTreeSet<CoreIndex>,
+	) -> impl Iterator<Item = (CoreIndex, ParaId)> + 'a {
+		scheduler::ClaimQueue::<T>::get().into_iter().filter_map(|(core_idx, queue)| {
+			if occupied_cores.contains(&core_idx) {
+				return None
+			}
+			let next_scheduled = queue.front()?;
+			Some((core_idx, next_scheduled.para_id()))
+		})
+	}
 }
 
 /// Derive a bitfield from dispute
@@ -1144,10 +1138,7 @@ fn sanitize_backed_candidates<T: crate::inclusion::Config>(
 }
 
 fn count_backed_candidates<B>(backed_candidates: &BTreeMap<ParaId, Vec<B>>) -> usize {
-	backed_candidates.iter().fold(0, |mut count, (_id, candidates)| {
-		count += candidates.len();
-		count
-	})
+	backed_candidates.values().map(|c| c.len()).sum()
 }
 
 /// Derive entropy from babe provided per block randomness.
diff --git a/polkadot/runtime/parachains/src/paras_inherent/tests.rs b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
index f5c3d5077764..2c65298baf01 100644
--- a/polkadot/runtime/parachains/src/paras_inherent/tests.rs
+++ b/polkadot/runtime/parachains/src/paras_inherent/tests.rs
@@ -49,11 +49,10 @@ mod enter {
 
 	use crate::{
 		builder::{junk_collator, junk_collator_signature, Bench, BenchBuilder, CandidateModifier},
+		disputes::clear_dispute_storage,
+		initializer::BufferedSessionChange,
 		mock::{mock_assigner, new_test_ext, BlockLength, BlockWeights, RuntimeOrigin, Test},
-		scheduler::{
-			common::{Assignment, AssignmentProvider},
-			ParasEntry,
-		},
+		scheduler::common::{Assignment, AssignmentProvider},
 		session_info,
 	};
 	use alloc::collections::btree_map::BTreeMap;
@@ -73,7 +72,6 @@ mod enter {
 		backed_and_concluding: BTreeMap<u32, u32>,
 		num_validators_per_core: u32,
 		code_upgrade: Option<u32>,
-		fill_claimqueue: bool,
 		elastic_paras: BTreeMap<u32, u8>,
 		unavailable_cores: Vec<u32>,
 		v2_descriptor: bool,
@@ -87,7 +85,6 @@ mod enter {
 			backed_and_concluding,
 			num_validators_per_core,
 			code_upgrade,
-			fill_claimqueue,
 			elastic_paras,
 			unavailable_cores,
 			v2_descriptor,
@@ -108,14 +105,11 @@ mod enter {
 			.set_dispute_statements(dispute_statements)
 			.set_backed_and_concluding_paras(backed_and_concluding.clone())
 			.set_dispute_sessions(&dispute_sessions[..])
-			.set_fill_claimqueue(fill_claimqueue)
 			.set_unavailable_cores(unavailable_cores)
 			.set_candidate_descriptor_v2(v2_descriptor)
 			.set_candidate_modifier(candidate_modifier);
 
 		// Setup some assignments as needed:
-		mock_assigner::Pallet::<Test>::set_core_count(builder.max_cores());
-
 		(0..(builder.max_cores() as usize - extra_cores)).for_each(|para_id| {
 			(0..elastic_paras.get(&(para_id as u32)).cloned().unwrap_or(1)).for_each(
 				|_para_local_core_idx| {
@@ -164,7 +158,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor,
@@ -188,6 +181,7 @@ mod enter {
 			inherent_data
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 
 			// Nothing is filtered out (including the backed candidates.)
 			assert_eq!(
@@ -272,7 +266,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 3)].into_iter().collect(),
 				unavailable_cores: vec![],
 				v2_descriptor,
@@ -293,6 +286,7 @@ mod enter {
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
 
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 			assert!(pallet::OnChainVotes::<Test>::get().is_none());
 
 			// Nothing is filtered out (including the backed candidates.)
@@ -375,7 +369,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 4)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: false,
@@ -527,6 +520,101 @@ mod enter {
 		});
 	}
 
+	#[test]
+	// Test that no new candidates are backed if there's an upcoming session change scheduled at the
+	// end of the block. Claim queue will also not be advanced.
+	fn session_change() {
+		let config = MockGenesisConfig::default();
+		assert!(config.configuration.config.scheduler_params.lookahead > 0);
+
+		new_test_ext(config).execute_with(|| {
+			let dispute_statements = BTreeMap::new();
+
+			let mut backed_and_concluding = BTreeMap::new();
+			backed_and_concluding.insert(0, 1);
+			backed_and_concluding.insert(1, 1);
+
+			let scenario = make_inherent_data(TestConfig {
+				dispute_statements,
+				dispute_sessions: vec![], // No disputes
+				backed_and_concluding,
+				num_validators_per_core: 1,
+				code_upgrade: None,
+				elastic_paras: BTreeMap::new(),
+				unavailable_cores: vec![],
+				v2_descriptor: false,
+				candidate_modifier: None,
+			});
+
+			let prev_claim_queue = scheduler::ClaimQueue::<Test>::get();
+
+			assert_eq!(inclusion::PendingAvailability::<Test>::iter().count(), 2);
+			assert_eq!(
+				inclusion::PendingAvailability::<Test>::get(ParaId::from(0)).unwrap().len(),
+				1
+			);
+			assert_eq!(
+				inclusion::PendingAvailability::<Test>::get(ParaId::from(1)).unwrap().len(),
+				1
+			);
+
+			// We expect the scenario to have cores 0 & 1 with pending availability. The backed
+			// candidates are also created for cores 0 & 1. The pending available candidates will
+			// become available but the new candidates will not be backed since there is an upcoming
+			// session change.
+			let mut expected_para_inherent_data = scenario.data.clone();
+			expected_para_inherent_data.backed_candidates.clear();
+
+			// Check the para inherent data is as expected:
+			// * 1 bitfield per validator (2 validators)
+			assert_eq!(expected_para_inherent_data.bitfields.len(), 2);
+			// * 0 disputes.
+			assert_eq!(expected_para_inherent_data.disputes.len(), 0);
+			let mut inherent_data = InherentData::new();
+			inherent_data
+				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
+				.unwrap();
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
+
+			// Simulate a session change scheduled to happen at the end of the block.
+			initializer::BufferedSessionChanges::<Test>::put(vec![BufferedSessionChange {
+				validators: vec![],
+				queued: vec![],
+				session_index: 3,
+			}]);
+
+			// Only backed candidates are filtered out.
+			assert_eq!(
+				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap(),
+				expected_para_inherent_data
+			);
+
+			assert_eq!(
+				// No candidates backed.
+				OnChainVotes::<Test>::get().unwrap().backing_validators_per_candidate.len(),
+				0
+			);
+
+			assert_eq!(
+				// The session of the on chain votes should equal the current session, which is 2
+				OnChainVotes::<Test>::get().unwrap().session,
+				2
+			);
+
+			// No pending availability candidates.
+			assert_eq!(inclusion::PendingAvailability::<Test>::iter().count(), 2);
+			assert!(inclusion::PendingAvailability::<Test>::get(ParaId::from(0))
+				.unwrap()
+				.is_empty());
+			assert!(inclusion::PendingAvailability::<Test>::get(ParaId::from(1))
+				.unwrap()
+				.is_empty());
+
+			// The claim queue should not have been advanced.
+			assert_eq!(prev_claim_queue, scheduler::ClaimQueue::<Test>::get());
+		});
+	}
+
 	#[test]
 	fn test_session_is_tracked_in_on_chain_scraping() {
 		use crate::disputes::run_to_block;
@@ -633,7 +721,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -655,8 +742,7 @@ mod enter {
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
 
-			// The current schedule is empty prior to calling `create_inherent_enter`.
-			assert!(scheduler::Pallet::<Test>::claim_queue_is_empty());
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 
 			let multi_dispute_inherent_data =
 				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap();
@@ -671,6 +757,8 @@ mod enter {
 				&expected_para_inherent_data.disputes[..2],
 			);
 
+			clear_dispute_storage::<Test>();
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
 				multi_dispute_inherent_data,
@@ -708,7 +796,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 6,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -729,8 +816,7 @@ mod enter {
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
 
-			// The current schedule is empty prior to calling `create_inherent_enter`.
-			assert!(scheduler::Pallet::<Test>::claim_queue_is_empty());
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 
 			let limit_inherent_data =
 				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap();
@@ -742,6 +828,8 @@ mod enter {
 			assert_eq!(limit_inherent_data.disputes[0].session, 1);
 			assert_eq!(limit_inherent_data.disputes[1].session, 2);
 
+			clear_dispute_storage::<Test>();
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
 				limit_inherent_data,
@@ -781,7 +869,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 4,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -803,8 +890,7 @@ mod enter {
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
 
-			// The current schedule is empty prior to calling `create_inherent_enter`.
-			assert!(scheduler::Pallet::<Test>::claim_queue_is_empty());
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 
 			// Nothing is filtered out (including the backed candidates.)
 			let limit_inherent_data =
@@ -826,6 +912,8 @@ mod enter {
 			// over weight
 			assert_eq!(limit_inherent_data.backed_candidates.len(), 0);
 
+			clear_dispute_storage::<Test>();
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
 				limit_inherent_data,
@@ -870,7 +958,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -892,10 +979,8 @@ mod enter {
 				.put_data(PARACHAINS_INHERENT_IDENTIFIER, &expected_para_inherent_data)
 				.unwrap();
 
-			// The current schedule is empty prior to calling `create_inherent_enter`.
-			assert!(scheduler::Pallet::<Test>::claim_queue_is_empty());
+			assert!(!scheduler::Pallet::<Test>::claim_queue_is_empty());
 
-			// Nothing is filtered out (including the backed candidates.)
 			let limit_inherent_data =
 				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap();
 			assert_ne!(limit_inherent_data, expected_para_inherent_data);
@@ -916,9 +1001,11 @@ mod enter {
 			// over weight
 			assert_eq!(limit_inherent_data.backed_candidates.len(), 0);
 
+			clear_dispute_storage::<Test>();
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
-				limit_inherent_data,
+				limit_inherent_data
 			));
 
 			assert_eq!(
@@ -959,7 +1046,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1020,7 +1106,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1043,6 +1128,21 @@ mod enter {
 				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap();
 			assert!(limit_inherent_data == expected_para_inherent_data);
 
+			// Cores were scheduled. We should put the assignments back, before calling enter().
+			let cores = (0..num_candidates)
+				.into_iter()
+				.map(|i| {
+					// Load an assignment into provider so that one is present to pop
+					let assignment =
+						<Test as scheduler::Config>::AssignmentProvider::get_mock_assignment(
+							CoreIndex(i),
+							ParaId::from(i),
+						);
+					(CoreIndex(i), [assignment].into())
+				})
+				.collect();
+			scheduler::ClaimQueue::<Test>::set(cores);
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
 				limit_inherent_data,
@@ -1108,7 +1208,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1166,24 +1265,23 @@ mod enter {
 			);
 
 			// One core was scheduled. We should put the assignment back, before calling enter().
-			let now = frame_system::Pallet::<Test>::block_number() + 1;
 			let used_cores = 5;
 			let cores = (0..used_cores)
 				.into_iter()
 				.map(|i| {
-					let SchedulerParams { ttl, .. } =
-						configuration::ActiveConfig::<Test>::get().scheduler_params;
 					// Load an assignment into provider so that one is present to pop
 					let assignment =
 						<Test as scheduler::Config>::AssignmentProvider::get_mock_assignment(
 							CoreIndex(i),
 							ParaId::from(i),
 						);
-					(CoreIndex(i), [ParasEntry::new(assignment, now + ttl)].into())
+					(CoreIndex(i), [assignment].into())
 				})
 				.collect();
 			scheduler::ClaimQueue::<Test>::set(cores);
 
+			clear_dispute_storage::<Test>();
+
 			assert_ok!(Pallet::<Test>::enter(
 				frame_system::RawOrigin::None.into(),
 				limit_inherent_data,
@@ -1217,7 +1315,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1287,7 +1384,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1355,7 +1451,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1446,7 +1541,6 @@ mod enter {
 	}
 
 	// Ensure that overweight parachain inherents are always rejected by the runtime.
-	// Runtime should panic and return `InherentOverweight` error.
 	#[rstest]
 	#[case(true)]
 	#[case(false)]
@@ -1479,7 +1573,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor,
@@ -1548,7 +1641,6 @@ mod enter {
 	}
 
 	// Ensure that overweight parachain inherents are always rejected by the runtime.
-	// Runtime should panic and return `InherentOverweight` error.
 	#[test]
 	fn inherent_create_weight_invariant() {
 		new_test_ext(MockGenesisConfig::default()).execute_with(|| {
@@ -1570,7 +1662,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: false,
 				elastic_paras: BTreeMap::new(),
 				unavailable_cores: vec![],
 				v2_descriptor: false,
@@ -1600,7 +1691,7 @@ mod enter {
 			.unwrap_err()
 			.error;
 
-			assert_eq!(dispatch_error, Error::<Test>::InherentOverweight.into());
+			assert_eq!(dispatch_error, Error::<Test>::InherentDataFilteredDuringExecution.into());
 		});
 	}
 
@@ -1630,7 +1721,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 5,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 8)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -1670,7 +1760,7 @@ mod enter {
 
 			// We expect `enter` to fail because the inherent data contains backed candidates with
 			// v2 descriptors.
-			assert_eq!(dispatch_error, Error::<Test>::CandidatesFilteredDuringExecution.into());
+			assert_eq!(dispatch_error, Error::<Test>::InherentDataFilteredDuringExecution.into());
 		});
 	}
 
@@ -1698,9 +1788,8 @@ mod enter {
 				dispute_statements: BTreeMap::new(),
 				dispute_sessions: vec![], // No disputes
 				backed_and_concluding,
-				num_validators_per_core: 5,
+				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 8)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -1719,8 +1808,8 @@ mod enter {
 			let unfiltered_para_inherent_data = scenario.data.clone();
 
 			// Check the para inherent data is as expected:
-			// * 1 bitfield per validator (5 validators per core, 10 backed candidates)
-			assert_eq!(unfiltered_para_inherent_data.bitfields.len(), 50);
+			// * 1 bitfield per validator (1 validators per core, 10 backed candidates)
+			assert_eq!(unfiltered_para_inherent_data.bitfields.len(), 10);
 			// * 10 v2 candidate descriptors.
 			assert_eq!(unfiltered_para_inherent_data.backed_candidates.len(), 10);
 
@@ -1738,7 +1827,7 @@ mod enter {
 
 			// We expect `enter` to fail because the inherent data contains backed candidates with
 			// v2 descriptors.
-			assert_eq!(dispatch_error, Error::<Test>::CandidatesFilteredDuringExecution.into());
+			assert_eq!(dispatch_error, Error::<Test>::InherentDataFilteredDuringExecution.into());
 		});
 	}
 
@@ -1766,9 +1855,8 @@ mod enter {
 				dispute_statements: BTreeMap::new(),
 				dispute_sessions: vec![], // No disputes
 				backed_and_concluding,
-				num_validators_per_core: 5,
+				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 8)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -1787,8 +1875,8 @@ mod enter {
 			let unfiltered_para_inherent_data = scenario.data.clone();
 
 			// Check the para inherent data is as expected:
-			// * 1 bitfield per validator (5 validators per core, 10 backed candidates)
-			assert_eq!(unfiltered_para_inherent_data.bitfields.len(), 50);
+			// * 1 bitfield per validator (1 validator per core, 10 backed candidates)
+			assert_eq!(unfiltered_para_inherent_data.bitfields.len(), 10);
 			// * 10 v2 candidate descriptors.
 			assert_eq!(unfiltered_para_inherent_data.backed_candidates.len(), 10);
 
@@ -1806,7 +1894,7 @@ mod enter {
 
 			// We expect `enter` to fail because the inherent data contains backed candidates with
 			// v2 descriptors.
-			assert_eq!(dispatch_error, Error::<Test>::CandidatesFilteredDuringExecution.into());
+			assert_eq!(dispatch_error, Error::<Test>::InherentDataFilteredDuringExecution.into());
 		});
 	}
 	#[test]
@@ -1843,7 +1931,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 3)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -1898,7 +1985,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 3)].into_iter().collect(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -1985,7 +2071,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: Default::default(),
 				unavailable_cores: unavailable_cores.clone(),
 				v2_descriptor: true,
@@ -2040,7 +2125,6 @@ mod enter {
 				backed_and_concluding,
 				num_validators_per_core: 1,
 				code_upgrade: None,
-				fill_claimqueue: true,
 				elastic_paras: [(2, 3)].into_iter().collect(),
 				unavailable_cores,
 				v2_descriptor: true,
@@ -2372,7 +2456,7 @@ mod sanitizers {
 	mod candidates {
 		use crate::{
 			mock::{set_disabled_validators, RuntimeOrigin},
-			scheduler::{common::Assignment, ParasEntry},
+			scheduler::common::Assignment,
 			util::{make_persisted_validation_data, make_persisted_validation_data_with_parent},
 		};
 		use alloc::collections::vec_deque::VecDeque;
@@ -2453,17 +2537,17 @@ mod sanitizers {
 			scheduler::Pallet::<Test>::set_claim_queue(BTreeMap::from([
 				(
 					CoreIndex::from(0),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(0) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(0),
+					}]),
 				),
 				(
 					CoreIndex::from(1),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(1) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(1),
+					}]),
 				),
 			]));
 
@@ -2545,7 +2629,7 @@ mod sanitizers {
 
 			// State sanity checks
 			assert_eq!(
-				scheduler::Pallet::<Test>::scheduled_paras().collect::<Vec<_>>(),
+				Pallet::<Test>::eligible_paras(&Default::default()).collect::<Vec<_>>(),
 				vec![(CoreIndex(0), ParaId::from(1)), (CoreIndex(1), ParaId::from(2))]
 			);
 			assert_eq!(
@@ -2641,73 +2725,73 @@ mod sanitizers {
 			scheduler::Pallet::<Test>::set_claim_queue(BTreeMap::from([
 				(
 					CoreIndex::from(0),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(0) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(0),
+					}]),
 				),
 				(
 					CoreIndex::from(1),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(1) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(1),
+					}]),
 				),
 				(
 					CoreIndex::from(2),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(2) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(2),
+					}]),
 				),
 				(
 					CoreIndex::from(3),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(3) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(3),
+					}]),
 				),
 				(
 					CoreIndex::from(4),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 3.into(), core_index: CoreIndex(4) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 3.into(),
+						core_index: CoreIndex(4),
+					}]),
 				),
 				(
 					CoreIndex::from(5),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 4.into(), core_index: CoreIndex(5) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 4.into(),
+						core_index: CoreIndex(5),
+					}]),
 				),
 				(
 					CoreIndex::from(6),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 5.into(), core_index: CoreIndex(6) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 5.into(),
+						core_index: CoreIndex(6),
+					}]),
 				),
 				(
 					CoreIndex::from(7),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 7.into(), core_index: CoreIndex(7) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 7.into(),
+						core_index: CoreIndex(7),
+					}]),
 				),
 				(
 					CoreIndex::from(8),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 7.into(), core_index: CoreIndex(8) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 7.into(),
+						core_index: CoreIndex(8),
+					}]),
 				),
 				(
 					CoreIndex::from(9),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 8.into(), core_index: CoreIndex(9) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 8.into(),
+						core_index: CoreIndex(9),
+					}]),
 				),
 			]));
 
@@ -3087,7 +3171,7 @@ mod sanitizers {
 
 			// State sanity checks
 			assert_eq!(
-				scheduler::Pallet::<Test>::scheduled_paras().collect::<Vec<_>>(),
+				Pallet::<Test>::eligible_paras(&Default::default()).collect::<Vec<_>>(),
 				vec![
 					(CoreIndex(0), ParaId::from(1)),
 					(CoreIndex(1), ParaId::from(1)),
@@ -3102,7 +3186,7 @@ mod sanitizers {
 				]
 			);
 			let mut scheduled: BTreeMap<ParaId, BTreeSet<CoreIndex>> = BTreeMap::new();
-			for (core_idx, para_id) in scheduler::Pallet::<Test>::scheduled_paras() {
+			for (core_idx, para_id) in Pallet::<Test>::eligible_paras(&Default::default()) {
 				scheduled.entry(para_id).or_default().insert(core_idx);
 			}
 
@@ -3186,66 +3270,66 @@ mod sanitizers {
 			scheduler::Pallet::<Test>::set_claim_queue(BTreeMap::from([
 				(
 					CoreIndex::from(0),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(0) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(0),
+					}]),
 				),
 				(
 					CoreIndex::from(1),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(1) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(1),
+					}]),
 				),
 				(
 					CoreIndex::from(2),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(2) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(2),
+					}]),
 				),
 				(
 					CoreIndex::from(3),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(3) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(3),
+					}]),
 				),
 				(
 					CoreIndex::from(4),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(4) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(4),
+					}]),
 				),
 				(
 					CoreIndex::from(5),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 3.into(), core_index: CoreIndex(5) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 3.into(),
+						core_index: CoreIndex(5),
+					}]),
 				),
 				(
 					CoreIndex::from(6),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 3.into(), core_index: CoreIndex(6) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 3.into(),
+						core_index: CoreIndex(6),
+					}]),
 				),
 				(
 					CoreIndex::from(7),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 4.into(), core_index: CoreIndex(7) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 4.into(),
+						core_index: CoreIndex(7),
+					}]),
 				),
 				(
 					CoreIndex::from(8),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 4.into(), core_index: CoreIndex(8) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 4.into(),
+						core_index: CoreIndex(8),
+					}]),
 				),
 			]));
 
@@ -3575,7 +3659,7 @@ mod sanitizers {
 
 			// State sanity checks
 			assert_eq!(
-				scheduler::Pallet::<Test>::scheduled_paras().collect::<Vec<_>>(),
+				Pallet::<Test>::eligible_paras(&Default::default()).collect::<Vec<_>>(),
 				vec![
 					(CoreIndex(0), ParaId::from(1)),
 					(CoreIndex(1), ParaId::from(1)),
@@ -3589,7 +3673,7 @@ mod sanitizers {
 				]
 			);
 			let mut scheduled: BTreeMap<ParaId, BTreeSet<CoreIndex>> = BTreeMap::new();
-			for (core_idx, para_id) in scheduler::Pallet::<Test>::scheduled_paras() {
+			for (core_idx, para_id) in Pallet::<Test>::eligible_paras(&Default::default()) {
 				scheduled.entry(para_id).or_default().insert(core_idx);
 			}
 
@@ -3710,45 +3794,45 @@ mod sanitizers {
 			scheduler::Pallet::<Test>::set_claim_queue(BTreeMap::from([
 				(
 					CoreIndex::from(0),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(0) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(0),
+					}]),
 				),
 				(
 					CoreIndex::from(1),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(1) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(1),
+					}]),
 				),
 				(
 					CoreIndex::from(2),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 1.into(), core_index: CoreIndex(2) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 1.into(),
+						core_index: CoreIndex(2),
+					}]),
 				),
 				(
 					CoreIndex::from(3),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(3) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(3),
+					}]),
 				),
 				(
 					CoreIndex::from(4),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(4) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(4),
+					}]),
 				),
 				(
 					CoreIndex::from(5),
-					VecDeque::from([ParasEntry::new(
-						Assignment::Pool { para_id: 2.into(), core_index: CoreIndex(5) },
-						RELAY_PARENT_NUM,
-					)]),
+					VecDeque::from([Assignment::Pool {
+						para_id: 2.into(),
+						core_index: CoreIndex(5),
+					}]),
 				),
 			]));
 
@@ -3996,7 +4080,7 @@ mod sanitizers {
 
 			// State sanity checks
 			assert_eq!(
-				scheduler::Pallet::<Test>::scheduled_paras().collect::<Vec<_>>(),
+				Pallet::<Test>::eligible_paras(&Default::default()).collect::<Vec<_>>(),
 				vec![
 					(CoreIndex(0), ParaId::from(1)),
 					(CoreIndex(1), ParaId::from(1)),
@@ -4007,7 +4091,7 @@ mod sanitizers {
 				]
 			);
 			let mut scheduled: BTreeMap<ParaId, BTreeSet<CoreIndex>> = BTreeMap::new();
-			for (core_idx, para_id) in scheduler::Pallet::<Test>::scheduled_paras() {
+			for (core_idx, para_id) in Pallet::<Test>::eligible_paras(&Default::default()) {
 				scheduled.entry(para_id).or_default().insert(core_idx);
 			}
 
diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v11.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v11.rs
index a0996d5df0ee..e9327bc7641a 100644
--- a/polkadot/runtime/parachains/src/runtime_api_impl/v11.rs
+++ b/polkadot/runtime/parachains/src/runtime_api_impl/v11.rs
@@ -18,8 +18,7 @@
 //! functions.
 
 use crate::{
-	configuration, disputes, dmp, hrmp, inclusion, initializer, paras, paras_inherent,
-	scheduler::{self, CoreOccupied},
+	configuration, disputes, dmp, hrmp, inclusion, initializer, paras, paras_inherent, scheduler,
 	session_info, shared,
 };
 use alloc::{
@@ -67,15 +66,6 @@ pub fn validator_groups<T: initializer::Config>(
 
 /// Implementation for the `availability_cores` function of the runtime API.
 pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, BlockNumberFor<T>>> {
-	let cores = scheduler::AvailabilityCores::<T>::get();
-	let now = frame_system::Pallet::<T>::block_number() + One::one();
-
-	// This explicit update is only strictly required for session boundaries:
-	//
-	// At the end of a session we clear the claim queues: Without this update call, nothing would be
-	// scheduled to the client.
-	scheduler::Pallet::<T>::free_cores_and_fill_claim_queue(Vec::new(), now);
-
 	let time_out_for = scheduler::Pallet::<T>::availability_timeout_predicate();
 
 	let group_responsible_for =
@@ -95,76 +85,42 @@ pub fn availability_cores<T: initializer::Config>() -> Vec<CoreState<T::Hash, Bl
 			},
 		};
 
-	let scheduled: BTreeMap<_, _> = scheduler::Pallet::<T>::scheduled_paras().collect();
-
-	cores
-		.into_iter()
-		.enumerate()
-		.map(|(i, core)| match core {
-			CoreOccupied::Paras(entry) => {
-				// Due to https://github.com/paritytech/polkadot-sdk/issues/64, using the new storage types would cause
-				// this runtime API to panic. We explicitly handle the storage for version 0 to
-				// prevent that. When removing the inclusion v0 -> v1 migration, this bit of code
-				// can also be removed.
-				let pending_availability = if inclusion::Pallet::<T>::on_chain_storage_version() ==
-					StorageVersion::new(0)
-				{
-					inclusion::migration::v0::PendingAvailability::<T>::get(entry.para_id())
-						.expect("Occupied core always has pending availability; qed")
-				} else {
-					let candidate = inclusion::Pallet::<T>::pending_availability_with_core(
-						entry.para_id(),
-						CoreIndex(i as u32),
-					)
-					.expect("Occupied core always has pending availability; qed");
-
-					// Translate to the old candidate format, as we don't need the commitments now.
-					inclusion::migration::v0::CandidatePendingAvailability {
-						core: candidate.core_occupied(),
-						hash: candidate.candidate_hash(),
-						descriptor: candidate.candidate_descriptor().clone(),
-						availability_votes: candidate.availability_votes().clone(),
-						backers: candidate.backers().clone(),
-						relay_parent_number: candidate.relay_parent_number(),
-						backed_in_number: candidate.backed_in_number(),
-						backing_group: candidate.backing_group(),
-					}
-				};
-
-				let backed_in_number = pending_availability.backed_in_number;
+	let claim_queue = scheduler::Pallet::<T>::get_claim_queue();
+	let occupied_cores: BTreeMap<CoreIndex, inclusion::CandidatePendingAvailability<_, _>> =
+		inclusion::Pallet::<T>::get_occupied_cores().collect();
+	let n_cores = scheduler::Pallet::<T>::num_availability_cores();
 
+	(0..n_cores)
+		.map(|core_idx| {
+			let core_idx = CoreIndex(core_idx as u32);
+			if let Some(pending_availability) = occupied_cores.get(&core_idx) {
 				// Use the same block number for determining the responsible group as what the
 				// backing subsystem would use when it calls validator_groups api.
 				let backing_group_allocation_time =
-					pending_availability.relay_parent_number + One::one();
+					pending_availability.relay_parent_number() + One::one();
 				CoreState::Occupied(OccupiedCore {
-					next_up_on_available: scheduler::Pallet::<T>::next_up_on_available(CoreIndex(
-						i as u32,
-					)),
-					occupied_since: backed_in_number,
-					time_out_at: time_out_for(backed_in_number).live_until,
-					next_up_on_time_out: scheduler::Pallet::<T>::next_up_on_time_out(CoreIndex(
-						i as u32,
-					)),
-					availability: pending_availability.availability_votes.clone(),
+					next_up_on_available: scheduler::Pallet::<T>::next_up_on_available(core_idx),
+					occupied_since: pending_availability.backed_in_number(),
+					time_out_at: time_out_for(pending_availability.backed_in_number()).live_until,
+					next_up_on_time_out: scheduler::Pallet::<T>::next_up_on_available(core_idx),
+					availability: pending_availability.availability_votes().clone(),
 					group_responsible: group_responsible_for(
 						backing_group_allocation_time,
-						pending_availability.core,
+						pending_availability.core_occupied(),
 					),
-					candidate_hash: pending_availability.hash,
-					candidate_descriptor: pending_availability.descriptor,
+					candidate_hash: pending_availability.candidate_hash(),
+					candidate_descriptor: pending_availability.candidate_descriptor().clone(),
 				})
-			},
-			CoreOccupied::Free => {
-				if let Some(para_id) = scheduled.get(&CoreIndex(i as _)).cloned() {
+			} else {
+				if let Some(assignment) = claim_queue.get(&core_idx).and_then(|q| q.front()) {
 					CoreState::Scheduled(polkadot_primitives::ScheduledCore {
-						para_id,
+						para_id: assignment.para_id(),
 						collator: None,
 					})
 				} else {
 					CoreState::Free
 				}
-			},
+			}
 		})
 		.collect()
 }
@@ -195,13 +151,12 @@ where
 			build()
 		},
 		OccupiedCoreAssumption::TimedOut => build(),
-		OccupiedCoreAssumption::Free => {
-			if <inclusion::Pallet<Config>>::pending_availability(para_id).is_some() {
+		OccupiedCoreAssumption::Free =>
+			if !<inclusion::Pallet<Config>>::candidates_pending_availability(para_id).is_empty() {
 				None
 			} else {
 				build()
-			}
-		},
+			},
 	}
 }
 
@@ -240,10 +195,12 @@ pub fn assumed_validation_data<T: initializer::Config>(
 	let persisted_validation_data = make_validation_data().or_else(|| {
 		// Try again with force enacting the pending candidates. This check only makes sense if
 		// there are any pending candidates.
-		inclusion::Pallet::<T>::pending_availability(para_id).and_then(|_| {
-			inclusion::Pallet::<T>::force_enact(para_id);
-			make_validation_data()
-		})
+		(!inclusion::Pallet::<T>::candidates_pending_availability(para_id).is_empty())
+			.then_some(())
+			.and_then(|_| {
+				inclusion::Pallet::<T>::force_enact(para_id);
+				make_validation_data()
+			})
 	});
 	// If we were successful, also query current validation code hash.
 	persisted_validation_data.zip(paras::CurrentCodeHash::<T>::get(&para_id))
@@ -319,7 +276,7 @@ pub fn validation_code<T: initializer::Config>(
 pub fn candidate_pending_availability<T: initializer::Config>(
 	para_id: ParaId,
 ) -> Option<CommittedCandidateReceipt<T::Hash>> {
-	inclusion::Pallet::<T>::candidate_pending_availability(para_id)
+	inclusion::Pallet::<T>::first_candidate_pending_availability(para_id)
 }
 
 /// Implementation for the `candidate_events` function of the runtime API.
@@ -568,23 +525,12 @@ pub fn approval_voting_params<T: initializer::Config>() -> ApprovalVotingParams
 
 /// Returns the claimqueue from the scheduler
 pub fn claim_queue<T: scheduler::Config>() -> BTreeMap<CoreIndex, VecDeque<ParaId>> {
-	let now = <frame_system::Pallet<T>>::block_number() + One::one();
-
-	// This is needed so that the claim queue always has the right size (equal to
-	// scheduling_lookahead). Otherwise, if a candidate is backed in the same block where the
-	// previous candidate is included, the claim queue will have already pop()-ed the next item
-	// from the queue and the length would be `scheduling_lookahead - 1`.
-	<scheduler::Pallet<T>>::free_cores_and_fill_claim_queue(Vec::new(), now);
 	let config = configuration::ActiveConfig::<T>::get();
 	// Extra sanity, config should already never be smaller than 1:
 	let n_lookahead = config.scheduler_params.lookahead.max(1);
-
-	scheduler::ClaimQueue::<T>::get()
+	scheduler::Pallet::<T>::get_claim_queue()
 		.into_iter()
 		.map(|(core_index, entries)| {
-			// on cores timing out internal claim queue size may be temporarily longer than it
-			// should be as the timed out assignment might got pushed back to an already full claim
-			// queue:
 			(
 				core_index,
 				entries.into_iter().map(|e| e.para_id()).take(n_lookahead as usize).collect(),
diff --git a/polkadot/runtime/parachains/src/scheduler.rs b/polkadot/runtime/parachains/src/scheduler.rs
index 445583d929ab..329df3a8a9de 100644
--- a/polkadot/runtime/parachains/src/scheduler.rs
+++ b/polkadot/runtime/parachains/src/scheduler.rs
@@ -36,14 +36,9 @@
 //! number of groups as availability cores. Validator groups will be assigned to different
 //! availability cores over time.
 
-use core::iter::Peekable;
-
 use crate::{configuration, initializer::SessionChangeNotification, paras};
 use alloc::{
-	collections::{
-		btree_map::{self, BTreeMap},
-		vec_deque::VecDeque,
-	},
+	collections::{btree_map::BTreeMap, btree_set::BTreeSet, vec_deque::VecDeque},
 	vec::Vec,
 };
 use frame_support::{pallet_prelude::*, traits::Defensive};
@@ -71,7 +66,7 @@ pub mod migration;
 pub mod pallet {
 	use super::*;
 
-	const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
+	const STORAGE_VERSION: StorageVersion = StorageVersion::new(3);
 
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
@@ -93,47 +88,6 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type ValidatorGroups<T> = StorageValue<_, Vec<Vec<ValidatorIndex>>, ValueQuery>;
 
-	/// One entry for each availability core. The i'th parachain belongs to the i'th core, with the
-	/// remaining cores all being on demand parachain multiplexers.
-	///
-	/// Bounded by the maximum of either of these two values:
-	///   * The number of parachains and parathread multiplexers
-	///   * The number of validators divided by `configuration.max_validators_per_core`.
-	#[pallet::storage]
-	pub type AvailabilityCores<T: Config> = StorageValue<_, Vec<CoreOccupiedType<T>>, ValueQuery>;
-
-	/// Representation of a core in `AvailabilityCores`.
-	///
-	/// This is not to be confused with `CoreState` which is an enriched variant of this and exposed
-	/// to the node side. It also provides information about scheduled/upcoming assignments for
-	/// example and is computed on the fly in the `availability_cores` runtime call.
-	#[derive(Encode, Decode, TypeInfo, RuntimeDebug, PartialEq)]
-	pub enum CoreOccupied<N> {
-		/// No candidate is waiting availability on this core right now (the core is not occupied).
-		Free,
-		/// A para is currently waiting for availability/inclusion on this core.
-		Paras(ParasEntry<N>),
-	}
-
-	/// Convenience type alias for `CoreOccupied`.
-	pub type CoreOccupiedType<T> = CoreOccupied<BlockNumberFor<T>>;
-
-	impl<N> CoreOccupied<N> {
-		/// Is core free?
-		pub fn is_free(&self) -> bool {
-			matches!(self, Self::Free)
-		}
-	}
-
-	/// Reasons a core might be freed.
-	#[derive(Clone, Copy)]
-	pub enum FreedReason {
-		/// The core's work concluded and the parablock assigned to it is considered available.
-		Concluded,
-		/// The core's work timed out.
-		TimedOut,
-	}
-
 	/// The block number where the session start occurred. Used to track how many group rotations
 	/// have occurred.
 	///
@@ -145,40 +99,9 @@ pub mod pallet {
 	pub type SessionStartBlock<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
 	/// One entry for each availability core. The `VecDeque` represents the assignments to be
-	/// scheduled on that core. The value contained here will not be valid after the end of
-	/// a block. Runtime APIs should be used to determine scheduled cores for the upcoming block.
+	/// scheduled on that core.
 	#[pallet::storage]
-	pub type ClaimQueue<T: Config> =
-		StorageValue<_, BTreeMap<CoreIndex, VecDeque<ParasEntryType<T>>>, ValueQuery>;
-
-	/// Assignments as tracked in the claim queue.
-	#[derive(Encode, Decode, TypeInfo, RuntimeDebug, PartialEq, Clone)]
-	pub struct ParasEntry<N> {
-		/// The underlying [`Assignment`].
-		pub assignment: Assignment,
-		/// The number of times the entry has timed out in availability already.
-		pub availability_timeouts: u32,
-		/// The block height until this entry needs to be backed.
-		///
-		/// If missed the entry will be removed from the claim queue without ever having occupied
-		/// the core.
-		pub ttl: N,
-	}
-
-	/// Convenience type declaration for `ParasEntry`.
-	pub type ParasEntryType<T> = ParasEntry<BlockNumberFor<T>>;
-
-	impl<N> ParasEntry<N> {
-		/// Create a new `ParasEntry`.
-		pub fn new(assignment: Assignment, now: N) -> Self {
-			ParasEntry { assignment, availability_timeouts: 0, ttl: now }
-		}
-
-		/// Return `Id` from the underlying `Assignment`.
-		pub fn para_id(&self) -> ParaId {
-			self.assignment.para_id()
-		}
-	}
+	pub type ClaimQueue<T> = StorageValue<_, BTreeMap<CoreIndex, VecDeque<Assignment>>, ValueQuery>;
 
 	/// Availability timeout status of a core.
 	pub(crate) struct AvailabilityTimeoutStatus<BlockNumber> {
@@ -195,30 +118,6 @@ pub mod pallet {
 	}
 }
 
-type PositionInClaimQueue = u32;
-
-struct ClaimQueueIterator<E> {
-	next_idx: u32,
-	queue: Peekable<btree_map::IntoIter<CoreIndex, VecDeque<E>>>,
-}
-
-impl<E> Iterator for ClaimQueueIterator<E> {
-	type Item = (CoreIndex, VecDeque<E>);
-
-	fn next(&mut self) -> Option<Self::Item> {
-		let (idx, _) = self.queue.peek()?;
-		let val = if idx != &CoreIndex(self.next_idx) {
-			log::trace!(target: LOG_TARGET, "idx did not match claim queue idx: {:?} vs {:?}", idx, self.next_idx);
-			(CoreIndex(self.next_idx), VecDeque::new())
-		} else {
-			let (idx, q) = self.queue.next()?;
-			(idx, q)
-		};
-		self.next_idx += 1;
-		Some(val)
-	}
-}
-
 impl<T: Config> Pallet<T> {
 	/// Called by the initializer to initialize the scheduler pallet.
 	pub(crate) fn initializer_initialize(_now: BlockNumberFor<T>) -> Weight {
@@ -228,31 +127,22 @@ impl<T: Config> Pallet<T> {
 	/// Called by the initializer to finalize the scheduler pallet.
 	pub(crate) fn initializer_finalize() {}
 
-	/// Called before the initializer notifies of a new session.
-	pub(crate) fn pre_new_session() {
-		Self::push_claim_queue_items_to_assignment_provider();
-		Self::push_occupied_cores_to_assignment_provider();
-	}
-
 	/// Called by the initializer to note that a new session has started.
 	pub(crate) fn initializer_on_new_session(
 		notification: &SessionChangeNotification<BlockNumberFor<T>>,
 	) {
-		let SessionChangeNotification { validators, new_config, .. } = notification;
+		let SessionChangeNotification { validators, new_config, prev_config, .. } = notification;
 		let config = new_config;
+		let assigner_cores = config.scheduler_params.num_cores;
 
 		let n_cores = core::cmp::max(
-			T::AssignmentProvider::session_core_count(),
+			assigner_cores,
 			match config.scheduler_params.max_validators_per_core {
 				Some(x) if x != 0 => validators.len() as u32 / x,
 				_ => 0,
 			},
 		);
 
-		AvailabilityCores::<T>::mutate(|cores| {
-			cores.resize_with(n_cores as _, || CoreOccupied::Free);
-		});
-
 		// shuffle validators into groups.
 		if n_cores == 0 || validators.is_empty() {
 			ValidatorGroups::<T>::set(Vec::new());
@@ -295,151 +185,24 @@ impl<T: Config> Pallet<T> {
 			ValidatorGroups::<T>::set(groups);
 		}
 
+		// Resize and populate claim queue.
+		Self::maybe_resize_claim_queue(prev_config.scheduler_params.num_cores, assigner_cores);
+		Self::populate_claim_queue_after_session_change();
+
 		let now = frame_system::Pallet::<T>::block_number() + One::one();
 		SessionStartBlock::<T>::set(now);
 	}
 
-	/// Free unassigned cores. Provide a list of cores that should be considered newly-freed along
-	/// with the reason for them being freed. Returns a tuple of concluded and timedout paras.
-	fn free_cores(
-		just_freed_cores: impl IntoIterator<Item = (CoreIndex, FreedReason)>,
-	) -> (BTreeMap<CoreIndex, Assignment>, BTreeMap<CoreIndex, ParasEntryType<T>>) {
-		let mut timedout_paras: BTreeMap<CoreIndex, ParasEntryType<T>> = BTreeMap::new();
-		let mut concluded_paras = BTreeMap::new();
-
-		AvailabilityCores::<T>::mutate(|cores| {
-			let c_len = cores.len();
-
-			just_freed_cores
-				.into_iter()
-				.filter(|(freed_index, _)| (freed_index.0 as usize) < c_len)
-				.for_each(|(freed_index, freed_reason)| {
-					match core::mem::replace(&mut cores[freed_index.0 as usize], CoreOccupied::Free)
-					{
-						CoreOccupied::Free => {},
-						CoreOccupied::Paras(entry) => {
-							match freed_reason {
-								FreedReason::Concluded => {
-									concluded_paras.insert(freed_index, entry.assignment);
-								},
-								FreedReason::TimedOut => {
-									timedout_paras.insert(freed_index, entry);
-								},
-							};
-						},
-					};
-				})
-		});
-
-		(concluded_paras, timedout_paras)
-	}
-
-	/// Get an iterator into the claim queues.
-	///
-	/// This iterator will have an item for each and every core index up to the maximum core index
-	/// found in the claim queue. In other words there will be no holes/missing core indices,
-	/// between core 0 and the maximum, even if the claim queue was missing entries for particular
-	/// indices in between. (The iterator will return an empty `VecDeque` for those indices.
-	fn claim_queue_iterator() -> impl Iterator<Item = (CoreIndex, VecDeque<ParasEntryType<T>>)> {
-		let queues = ClaimQueue::<T>::get();
-		return ClaimQueueIterator::<ParasEntryType<T>> {
-			next_idx: 0,
-			queue: queues.into_iter().peekable(),
-		}
-	}
-
-	/// Note that the given cores have become occupied. Update the claim queue accordingly.
-	/// This will not push a new entry onto the claim queue, so the length after this call will be
-	/// the expected length - 1. The claim_queue runtime API will take care of adding another entry
-	/// here, to ensure the right lookahead.
-	pub(crate) fn occupied(
-		now_occupied: BTreeMap<CoreIndex, ParaId>,
-	) -> BTreeMap<CoreIndex, PositionInClaimQueue> {
-		let mut availability_cores = AvailabilityCores::<T>::get();
-
-		log::debug!(target: LOG_TARGET, "[occupied] now_occupied {:?}", now_occupied);
-
-		let pos_mapping: BTreeMap<CoreIndex, PositionInClaimQueue> = now_occupied
-			.iter()
-			.flat_map(|(core_idx, para_id)| {
-				match Self::remove_from_claim_queue(*core_idx, *para_id) {
-					Err(e) => {
-						log::debug!(
-							target: LOG_TARGET,
-							"[occupied] error on remove_from_claim queue {}",
-							e
-						);
-						None
-					},
-					Ok((pos_in_claim_queue, pe)) => {
-						availability_cores[core_idx.0 as usize] = CoreOccupied::Paras(pe);
-
-						Some((*core_idx, pos_in_claim_queue))
-					},
-				}
-			})
-			.collect();
-
-		// Drop expired claims after processing now_occupied.
-		Self::drop_expired_claims_from_claim_queue();
-
-		AvailabilityCores::<T>::set(availability_cores);
-
-		pos_mapping
-	}
-
-	/// Iterates through every element in all claim queues and tries to add new assignments from the
-	/// `AssignmentProvider`. A claim is considered expired if it's `ttl` field is lower than the
-	/// current block height.
-	fn drop_expired_claims_from_claim_queue() {
-		let now = frame_system::Pallet::<T>::block_number();
-		let availability_cores = AvailabilityCores::<T>::get();
-		let ttl = configuration::ActiveConfig::<T>::get().scheduler_params.ttl;
-
-		ClaimQueue::<T>::mutate(|cq| {
-			for (idx, _) in (0u32..).zip(availability_cores) {
-				let core_idx = CoreIndex(idx);
-				if let Some(core_claim_queue) = cq.get_mut(&core_idx) {
-					let mut i = 0;
-					let mut num_dropped = 0;
-					while i < core_claim_queue.len() {
-						let maybe_dropped = if let Some(entry) = core_claim_queue.get(i) {
-							if entry.ttl < now {
-								core_claim_queue.remove(i)
-							} else {
-								None
-							}
-						} else {
-							None
-						};
-
-						if let Some(dropped) = maybe_dropped {
-							num_dropped += 1;
-							T::AssignmentProvider::report_processed(dropped.assignment);
-						} else {
-							i += 1;
-						}
-					}
-
-					for _ in 0..num_dropped {
-						// For all claims dropped due to TTL, attempt to pop a new entry to
-						// the back of the claim queue.
-						if let Some(assignment) =
-							T::AssignmentProvider::pop_assignment_for_core(core_idx)
-						{
-							core_claim_queue.push_back(ParasEntry::new(assignment, now + ttl));
-						}
-					}
-				}
-			}
-		});
-	}
-
 	/// Get the validators in the given group, if the group index is valid for this session.
 	pub(crate) fn group_validators(group_index: GroupIndex) -> Option<Vec<ValidatorIndex>> {
 		ValidatorGroups::<T>::get().get(group_index.0 as usize).map(|g| g.clone())
 	}
 
+	/// Get the number of cores.
+	pub(crate) fn num_availability_cores() -> usize {
+		ValidatorGroups::<T>::decode_len().unwrap_or(0)
+	}
+
 	/// Get the group assigned to a specific core by index at the current block number. Result
 	/// undefined if the core index is unknown or the block number is less than the session start
 	/// index.
@@ -531,183 +294,137 @@ impl<T: Config> Pallet<T> {
 	/// Return the next thing that will be scheduled on this core assuming it is currently
 	/// occupied and the candidate occupying it became available.
 	pub(crate) fn next_up_on_available(core: CoreIndex) -> Option<ScheduledCore> {
-		ClaimQueue::<T>::get()
-			.get(&core)
-			.and_then(|a| a.front().map(|pe| Self::paras_entry_to_scheduled_core(pe)))
+		// Since this is being called from a runtime API, we need to workaround for #64.
+		if Self::on_chain_storage_version() == StorageVersion::new(2) {
+			migration::v2::ClaimQueue::<T>::get()
+				.get(&core)
+				.and_then(|a| a.front().map(|entry| entry.assignment.para_id()))
+		} else {
+			ClaimQueue::<T>::get()
+				.get(&core)
+				.and_then(|a| a.front().map(|assignment| assignment.para_id()))
+		}
+		.map(|para_id| ScheduledCore { para_id, collator: None })
 	}
 
-	fn paras_entry_to_scheduled_core(pe: &ParasEntryType<T>) -> ScheduledCore {
-		ScheduledCore { para_id: pe.para_id(), collator: None }
+	// Since this is being called from a runtime API, we need to workaround for #64.
+	pub(crate) fn get_claim_queue() -> BTreeMap<CoreIndex, VecDeque<Assignment>> {
+		if Self::on_chain_storage_version() == StorageVersion::new(2) {
+			migration::v2::ClaimQueue::<T>::get()
+				.into_iter()
+				.map(|(core_index, entries)| {
+					(core_index, entries.into_iter().map(|e| e.assignment).collect())
+				})
+				.collect()
+		} else {
+			ClaimQueue::<T>::get()
+		}
 	}
 
-	/// Return the next thing that will be scheduled on this core assuming it is currently
-	/// occupied and the candidate occupying it times out.
-	pub(crate) fn next_up_on_time_out(core: CoreIndex) -> Option<ScheduledCore> {
-		let max_availability_timeouts = configuration::ActiveConfig::<T>::get()
-			.scheduler_params
-			.max_availability_timeouts;
-		Self::next_up_on_available(core).or_else(|| {
-			// Or, if none, the claim currently occupying the core,
-			// as it would be put back on the queue after timing out if number of retries is not at
-			// the maximum.
-			let cores = AvailabilityCores::<T>::get();
-			cores.get(core.0 as usize).and_then(|c| match c {
-				CoreOccupied::Free => None,
-				CoreOccupied::Paras(pe) =>
-					if pe.availability_timeouts < max_availability_timeouts {
-						Some(Self::paras_entry_to_scheduled_core(pe))
-					} else {
-						None
-					},
-			})
-		})
-	}
+	/// For each core that isn't part of the `except_for` set, pop the first item of the claim queue
+	/// and fill the queue from the assignment provider.
+	pub(crate) fn advance_claim_queue(except_for: &BTreeSet<CoreIndex>) {
+		let config = configuration::ActiveConfig::<T>::get();
+		let num_assigner_cores = config.scheduler_params.num_cores;
+		// Extra sanity, config should already never be smaller than 1:
+		let n_lookahead = config.scheduler_params.lookahead.max(1);
+
+		for core_idx in 0..num_assigner_cores {
+			let core_idx = CoreIndex::from(core_idx);
+
+			if !except_for.contains(&core_idx) {
+				let core_idx = CoreIndex::from(core_idx);
 
-	/// Pushes occupied cores to the assignment provider.
-	fn push_occupied_cores_to_assignment_provider() {
-		AvailabilityCores::<T>::mutate(|cores| {
-			for core in cores.iter_mut() {
-				match core::mem::replace(core, CoreOccupied::Free) {
-					CoreOccupied::Free => continue,
-					CoreOccupied::Paras(entry) => {
-						Self::maybe_push_assignment(entry);
-					},
+				if let Some(dropped_para) = Self::pop_front_of_claim_queue(&core_idx) {
+					T::AssignmentProvider::report_processed(dropped_para);
 				}
-			}
-		});
-	}
 
-	// on new session
-	fn push_claim_queue_items_to_assignment_provider() {
-		for (_, claim_queue) in ClaimQueue::<T>::take() {
-			// Push back in reverse order so that when we pop from the provider again,
-			// the entries in the claim queue are in the same order as they are right now.
-			for para_entry in claim_queue.into_iter().rev() {
-				Self::maybe_push_assignment(para_entry);
+				Self::fill_claim_queue(core_idx, n_lookahead);
 			}
 		}
 	}
 
-	/// Push assignments back to the provider on session change unless the paras
-	/// timed out on availability before.
-	fn maybe_push_assignment(pe: ParasEntryType<T>) {
-		if pe.availability_timeouts == 0 {
-			T::AssignmentProvider::push_back_assignment(pe.assignment);
+	// on new session
+	fn maybe_resize_claim_queue(old_core_count: u32, new_core_count: u32) {
+		if new_core_count < old_core_count {
+			ClaimQueue::<T>::mutate(|cq| {
+				let to_remove: Vec<_> = cq
+					.range(CoreIndex(new_core_count)..CoreIndex(old_core_count))
+					.map(|(k, _)| *k)
+					.collect();
+				for key in to_remove {
+					if let Some(dropped_assignments) = cq.remove(&key) {
+						Self::push_back_to_assignment_provider(dropped_assignments.into_iter());
+					}
+				}
+			});
 		}
 	}
 
-	/// Frees cores and fills the free claim queue spots by popping from the `AssignmentProvider`.
-	pub fn free_cores_and_fill_claim_queue(
-		just_freed_cores: impl IntoIterator<Item = (CoreIndex, FreedReason)>,
-		now: BlockNumberFor<T>,
-	) {
-		let (mut concluded_paras, mut timedout_paras) = Self::free_cores(just_freed_cores);
-
-		// This can only happen on new sessions at which we move all assignments back to the
-		// provider. Hence, there's nothing we need to do here.
-		if ValidatorGroups::<T>::decode_len().map_or(true, |l| l == 0) {
-			return
-		}
-		let n_session_cores = T::AssignmentProvider::session_core_count();
-		let cq = ClaimQueue::<T>::get();
+	// Populate the claim queue. To be called on new session, after all the other modules were
+	// initialized.
+	fn populate_claim_queue_after_session_change() {
 		let config = configuration::ActiveConfig::<T>::get();
 		// Extra sanity, config should already never be smaller than 1:
 		let n_lookahead = config.scheduler_params.lookahead.max(1);
-		let max_availability_timeouts = config.scheduler_params.max_availability_timeouts;
-		let ttl = config.scheduler_params.ttl;
+		let new_core_count = config.scheduler_params.num_cores;
 
-		for core_idx in 0..n_session_cores {
+		for core_idx in 0..new_core_count {
 			let core_idx = CoreIndex::from(core_idx);
+			Self::fill_claim_queue(core_idx, n_lookahead);
+		}
+	}
 
-			let n_lookahead_used = cq.get(&core_idx).map_or(0, |v| v.len() as u32);
-
-			// add previously timedout paras back into the queue
-			if let Some(mut entry) = timedout_paras.remove(&core_idx) {
-				if entry.availability_timeouts < max_availability_timeouts {
-					// Increment the timeout counter.
-					entry.availability_timeouts += 1;
-					if n_lookahead_used < n_lookahead {
-						entry.ttl = now + ttl;
-					} else {
-						// Over max capacity, we need to bump ttl (we exceeded the claim queue
-						// size, so otherwise the entry might get dropped before reaching the top):
-						entry.ttl = now + ttl + One::one();
-					}
-					Self::add_to_claim_queue(core_idx, entry);
-					// The claim has been added back into the claim queue.
-					// Do not pop another assignment for the core.
-					continue
-				} else {
-					// Consider timed out assignments for on demand parachains as concluded for
-					// the assignment provider
-					let ret = concluded_paras.insert(core_idx, entry.assignment);
-					debug_assert!(ret.is_none());
+	/// Push some assignments back to the provider.
+	fn push_back_to_assignment_provider(
+		assignments: impl core::iter::DoubleEndedIterator<Item = Assignment>,
+	) {
+		// Push back in reverse order so that when we pop from the provider again,
+		// the entries in the claim queue are in the same order as they are right
+		// now.
+		for assignment in assignments.rev() {
+			T::AssignmentProvider::push_back_assignment(assignment);
+		}
+	}
+
+	fn fill_claim_queue(core_idx: CoreIndex, n_lookahead: u32) {
+		ClaimQueue::<T>::mutate(|la| {
+			let cq = la.entry(core_idx).or_default();
+
+			let mut n_lookahead_used = cq.len() as u32;
+
+			// If the claim queue used to be empty, we need to double the first assignment.
+			// Otherwise, the para will only be able to get the collation in right at the next block
+			// (synchronous backing).
+			// Only do this if the configured lookahead is greater than 1. Otherwise, it doesn't
+			// make sense.
+			if n_lookahead_used == 0 && n_lookahead > 1 {
+				if let Some(assignment) = T::AssignmentProvider::pop_assignment_for_core(core_idx) {
+					T::AssignmentProvider::assignment_duplicated(&assignment);
+					cq.push_back(assignment.clone());
+					cq.push_back(assignment);
+					n_lookahead_used += 2;
 				}
 			}
 
-			if let Some(concluded_para) = concluded_paras.remove(&core_idx) {
-				T::AssignmentProvider::report_processed(concluded_para);
-			}
 			for _ in n_lookahead_used..n_lookahead {
 				if let Some(assignment) = T::AssignmentProvider::pop_assignment_for_core(core_idx) {
-					Self::add_to_claim_queue(core_idx, ParasEntry::new(assignment, now + ttl));
+					cq.push_back(assignment);
+				} else {
+					break
 				}
 			}
-		}
 
-		debug_assert!(timedout_paras.is_empty());
-		debug_assert!(concluded_paras.is_empty());
-	}
-
-	fn add_to_claim_queue(core_idx: CoreIndex, pe: ParasEntryType<T>) {
-		ClaimQueue::<T>::mutate(|la| {
-			la.entry(core_idx).or_default().push_back(pe);
+			// If we didn't end up pushing anything, remove the entry. We don't want to waste the
+			// space if we've no assignments.
+			if cq.is_empty() {
+				la.remove(&core_idx);
+			}
 		});
 	}
 
-	/// Returns `ParasEntry` with `para_id` at `core_idx` if found.
-	fn remove_from_claim_queue(
-		core_idx: CoreIndex,
-		para_id: ParaId,
-	) -> Result<(PositionInClaimQueue, ParasEntryType<T>), &'static str> {
-		ClaimQueue::<T>::mutate(|cq| {
-			let core_claims = cq.get_mut(&core_idx).ok_or("core_idx not found in lookahead")?;
-
-			let pos = core_claims
-				.iter()
-				.position(|pe| pe.para_id() == para_id)
-				.ok_or("para id not found at core_idx lookahead")?;
-
-			let pe = core_claims.remove(pos).ok_or("remove returned None")?;
-
-			Ok((pos as u32, pe))
-		})
-	}
-
-	/// Paras scheduled next in the claim queue.
-	pub(crate) fn scheduled_paras() -> impl Iterator<Item = (CoreIndex, ParaId)> {
-		let claim_queue = ClaimQueue::<T>::get();
-		claim_queue
-			.into_iter()
-			.filter_map(|(core_idx, v)| v.front().map(|e| (core_idx, e.assignment.para_id())))
-	}
-
-	/// Paras that may get backed on cores.
-	///
-	/// 1. The para must be scheduled on core.
-	/// 2. Core needs to be free, otherwise backing is not possible.
-	pub(crate) fn eligible_paras() -> impl Iterator<Item = (CoreIndex, ParaId)> {
-		let availability_cores = AvailabilityCores::<T>::get();
-
-		Self::claim_queue_iterator().zip(availability_cores.into_iter()).filter_map(
-			|((core_idx, queue), core)| {
-				if core != CoreOccupied::Free {
-					return None
-				}
-				let next_scheduled = queue.front()?;
-				Some((core_idx, next_scheduled.assignment.para_id()))
-			},
-		)
+	fn pop_front_of_claim_queue(core_idx: &CoreIndex) -> Option<Assignment> {
+		ClaimQueue::<T>::mutate(|cq| cq.get_mut(core_idx)?.pop_front())
 	}
 
 	#[cfg(any(feature = "try-runtime", test))]
@@ -726,7 +443,7 @@ impl<T: Config> Pallet<T> {
 	}
 
 	#[cfg(test)]
-	pub(crate) fn set_claim_queue(claim_queue: BTreeMap<CoreIndex, VecDeque<ParasEntryType<T>>>) {
+	pub(crate) fn set_claim_queue(claim_queue: BTreeMap<CoreIndex, VecDeque<Assignment>>) {
 		ClaimQueue::<T>::set(claim_queue);
 	}
 }
diff --git a/polkadot/runtime/parachains/src/scheduler/common.rs b/polkadot/runtime/parachains/src/scheduler/common.rs
index 114cd4b940bc..bf8a2bee74e3 100644
--- a/polkadot/runtime/parachains/src/scheduler/common.rs
+++ b/polkadot/runtime/parachains/src/scheduler/common.rs
@@ -77,11 +77,6 @@ pub trait AssignmentProvider<BlockNumber> {
 	#[cfg(any(feature = "runtime-benchmarks", test))]
 	fn get_mock_assignment(core_idx: CoreIndex, para_id: ParaId) -> Assignment;
 
-	/// How many cores are allocated to this provider.
-	///
-	/// As the name suggests the core count has to be session buffered:
-	///
-	/// - Core count has to be predetermined for the next session in the current session.
-	/// - Core count must not change during a session.
-	fn session_core_count() -> u32;
+	/// Report that an assignment was duplicated by the scheduler.
+	fn assignment_duplicated(assignment: &Assignment);
 }
diff --git a/polkadot/runtime/parachains/src/scheduler/migration.rs b/polkadot/runtime/parachains/src/scheduler/migration.rs
index 125f105ef706..e741711cad6d 100644
--- a/polkadot/runtime/parachains/src/scheduler/migration.rs
+++ b/polkadot/runtime/parachains/src/scheduler/migration.rs
@@ -268,7 +268,7 @@ pub type MigrateV0ToV1<T> = VersionedMigration<
 	<T as frame_system::Config>::DbWeight,
 >;
 
-mod v2 {
+pub(crate) mod v2 {
 	use super::*;
 	use crate::scheduler;
 
@@ -406,3 +406,89 @@ pub type MigrateV1ToV2<T> = VersionedMigration<
 	Pallet<T>,
 	<T as frame_system::Config>::DbWeight,
 >;
+
+/// Migration for TTL and availability timeout retries removal.
+/// AvailabilityCores storage is removed and ClaimQueue now holds `Assignment`s instead of
+/// `ParasEntryType`
+mod v3 {
+	use super::*;
+	use crate::scheduler;
+
+	#[storage_alias]
+	pub(crate) type ClaimQueue<T: Config> =
+		StorageValue<Pallet<T>, BTreeMap<CoreIndex, VecDeque<Assignment>>, ValueQuery>;
+	/// Migration to V3
+	pub struct UncheckedMigrateToV3<T>(core::marker::PhantomData<T>);
+
+	impl<T: Config> UncheckedOnRuntimeUpgrade for UncheckedMigrateToV3<T> {
+		fn on_runtime_upgrade() -> Weight {
+			let mut weight: Weight = Weight::zero();
+
+			// Migrate ClaimQueuee to new format.
+
+			let old = v2::ClaimQueue::<T>::take();
+			let new = old
+				.into_iter()
+				.map(|(k, v)| {
+					(
+						k,
+						v.into_iter()
+							.map(|paras_entry| paras_entry.assignment)
+							.collect::<VecDeque<_>>(),
+					)
+				})
+				.collect::<BTreeMap<CoreIndex, VecDeque<Assignment>>>();
+
+			v3::ClaimQueue::<T>::put(new);
+
+			// Clear AvailabilityCores storage
+			v2::AvailabilityCores::<T>::kill();
+
+			weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 2));
+
+			log::info!(target: scheduler::LOG_TARGET, "Migrating para scheduler storage to v3");
+
+			weight
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::DispatchError> {
+			log::trace!(
+				target: crate::scheduler::LOG_TARGET,
+				"ClaimQueue before migration: {}",
+				v2::ClaimQueue::<T>::get().len()
+			);
+
+			let bytes = u32::to_be_bytes(v2::ClaimQueue::<T>::get().len() as u32);
+
+			Ok(bytes.to_vec())
+		}
+
+		#[cfg(feature = "try-runtime")]
+		fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::DispatchError> {
+			log::trace!(target: crate::scheduler::LOG_TARGET, "Running post_upgrade()");
+
+			let old_len = u32::from_be_bytes(state.try_into().unwrap());
+			ensure!(
+				v3::ClaimQueue::<T>::get().len() as u32 == old_len,
+				"Old ClaimQueue completely moved to new ClaimQueue after migration"
+			);
+
+			ensure!(
+				!v2::AvailabilityCores::<T>::exists(),
+				"AvailabilityCores storage should have been completely killed"
+			);
+
+			Ok(())
+		}
+	}
+}
+
+/// Migrate `V2` to `V3` of the storage format.
+pub type MigrateV2ToV3<T> = VersionedMigration<
+	2,
+	3,
+	v3::UncheckedMigrateToV3<T>,
+	Pallet<T>,
+	<T as frame_system::Config>::DbWeight,
+>;
diff --git a/polkadot/runtime/parachains/src/scheduler/tests.rs b/polkadot/runtime/parachains/src/scheduler/tests.rs
index 5f80114b5963..5be7e084f3bc 100644
--- a/polkadot/runtime/parachains/src/scheduler/tests.rs
+++ b/polkadot/runtime/parachains/src/scheduler/tests.rs
@@ -16,7 +16,7 @@
 
 use super::*;
 
-use alloc::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
+use alloc::collections::btree_map::BTreeMap;
 use frame_support::assert_ok;
 use polkadot_primitives::{
 	BlockNumber, SchedulerParams, SessionIndex, ValidationCode, ValidatorId,
@@ -27,14 +27,14 @@ use crate::{
 	configuration::HostConfiguration,
 	initializer::SessionChangeNotification,
 	mock::{
-		new_test_ext, MockAssigner, MockGenesisConfig, Paras, ParasShared, RuntimeOrigin,
-		Scheduler, System, Test,
+		new_test_ext, Configuration, MockAssigner, MockGenesisConfig, Paras, ParasShared,
+		RuntimeOrigin, Scheduler, System, Test,
 	},
 	paras::{ParaGenesisArgs, ParaKind},
 	scheduler::{self, common::Assignment, ClaimQueue},
 };
 
-fn schedule_blank_para(id: ParaId) {
+fn register_para(id: ParaId) {
 	let validation_code: ValidationCode = vec![1, 2, 3].into();
 	assert_ok!(Paras::schedule_para_initialize(
 		id,
@@ -58,17 +58,18 @@ fn run_to_block(
 		Scheduler::initializer_finalize();
 		Paras::initializer_finalize(b);
 
-		if let Some(notification) = new_session(b + 1) {
-			let mut notification_with_session_index = notification;
+		if let Some(mut notification) = new_session(b + 1) {
 			// We will make every session change trigger an action queue. Normally this may require
 			// 2 or more session changes.
-			if notification_with_session_index.session_index == SessionIndex::default() {
-				notification_with_session_index.session_index = ParasShared::scheduled_session();
+			if notification.session_index == SessionIndex::default() {
+				notification.session_index = ParasShared::scheduled_session();
 			}
-			Scheduler::pre_new_session();
 
-			Paras::initializer_on_new_session(&notification_with_session_index);
-			Scheduler::initializer_on_new_session(&notification_with_session_index);
+			Configuration::force_set_active_config(notification.new_config.clone());
+
+			Paras::initializer_on_new_session(&notification);
+
+			Scheduler::initializer_on_new_session(&notification);
 		}
 
 		System::on_finalize(b);
@@ -79,28 +80,8 @@ fn run_to_block(
 		Paras::initializer_initialize(b + 1);
 		Scheduler::initializer_initialize(b + 1);
 
-		// In the real runtime this is expected to be called by the `InclusionInherent` pallet.
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), b + 1);
-	}
-}
-
-fn run_to_end_of_block(
-	to: BlockNumber,
-	new_session: impl Fn(BlockNumber) -> Option<SessionChangeNotification<BlockNumber>>,
-) {
-	run_to_block(to, &new_session);
-
-	Scheduler::initializer_finalize();
-	Paras::initializer_finalize(to);
-
-	if let Some(notification) = new_session(to + 1) {
-		Scheduler::pre_new_session();
-
-		Paras::initializer_on_new_session(&notification);
-		Scheduler::initializer_on_new_session(&notification);
+		Scheduler::advance_claim_queue(&Default::default());
 	}
-
-	System::on_finalize(to);
 }
 
 fn default_config() -> HostConfiguration<BlockNumber> {
@@ -110,6 +91,7 @@ fn default_config() -> HostConfiguration<BlockNumber> {
 		// `minimum_validation_upgrade_delay` is greater than `chain_availability_period` and
 		// `thread_availability_period`.
 		minimum_validation_upgrade_delay: 6,
+		#[allow(deprecated)]
 		scheduler_params: SchedulerParams {
 			group_rotation_frequency: 10,
 			paras_availability_period: 3,
@@ -129,172 +111,27 @@ fn genesis_config(config: &HostConfiguration<BlockNumber>) -> MockGenesisConfig
 	}
 }
 
-fn claimqueue_contains_para_ids<T: Config>(pids: Vec<ParaId>) -> bool {
-	let set: BTreeSet<ParaId> = ClaimQueue::<T>::get()
+/// Internal access to assignments at the top of the claim queue.
+fn next_assignments() -> impl Iterator<Item = (CoreIndex, Assignment)> {
+	let claim_queue = ClaimQueue::<Test>::get();
+	claim_queue
 		.into_iter()
-		.flat_map(|(_, paras_entries)| paras_entries.into_iter().map(|pe| pe.assignment.para_id()))
-		.collect();
-
-	pids.into_iter().all(|pid| set.contains(&pid))
-}
-
-fn availability_cores_contains_para_ids<T: Config>(pids: Vec<ParaId>) -> bool {
-	let set: BTreeSet<ParaId> = AvailabilityCores::<T>::get()
-		.into_iter()
-		.filter_map(|core| match core {
-			CoreOccupied::Free => None,
-			CoreOccupied::Paras(entry) => Some(entry.para_id()),
-		})
-		.collect();
-
-	pids.into_iter().all(|pid| set.contains(&pid))
-}
-
-/// Internal access to entries at the top of the claim queue.
-fn scheduled_entries() -> impl Iterator<Item = (CoreIndex, ParasEntry<BlockNumberFor<Test>>)> {
-	let claimqueue = ClaimQueue::<Test>::get();
-	claimqueue
-		.into_iter()
-		.filter_map(|(core_idx, v)| v.front().map(|e| (core_idx, e.clone())))
-}
-
-#[test]
-fn claim_queue_iterator_handles_holes_correctly() {
-	let mut queue = BTreeMap::new();
-	queue.insert(CoreIndex(1), ["abc"].into_iter().collect());
-	queue.insert(CoreIndex(4), ["cde"].into_iter().collect());
-	let queue = queue.into_iter().peekable();
-	let mut i = ClaimQueueIterator { next_idx: 0, queue };
-
-	let (idx, e) = i.next().unwrap();
-	assert_eq!(idx, CoreIndex(0));
-	assert!(e.is_empty());
-
-	let (idx, e) = i.next().unwrap();
-	assert_eq!(idx, CoreIndex(1));
-	assert!(e.len() == 1);
-
-	let (idx, e) = i.next().unwrap();
-	assert_eq!(idx, CoreIndex(2));
-	assert!(e.is_empty());
-
-	let (idx, e) = i.next().unwrap();
-	assert_eq!(idx, CoreIndex(3));
-	assert!(e.is_empty());
-
-	let (idx, e) = i.next().unwrap();
-	assert_eq!(idx, CoreIndex(4));
-	assert!(e.len() == 1);
-
-	assert!(i.next().is_none());
+		.filter_map(|(core_idx, v)| v.front().map(|a| (core_idx, a.clone())))
 }
 
 #[test]
-fn claimqueue_ttl_drop_fn_works() {
+fn session_change_shuffles_validators() {
 	let mut config = default_config();
-	config.scheduler_params.lookahead = 3;
+	// Need five cores for this test
+	config.scheduler_params.num_cores = 5;
 	let genesis_config = genesis_config(&config);
 
-	let para_id = ParaId::from(100);
-	let core_idx = CoreIndex::from(0);
-	let mut now = 10;
-
 	new_test_ext(genesis_config).execute_with(|| {
-		assert!(config.scheduler_params.ttl == 5);
-		// Register and run to a blockheight where the para is in a valid state.
-		schedule_blank_para(para_id);
-		run_to_block(now, |n| if n == now { Some(Default::default()) } else { None });
-
-		// Add a claim on core 0 with a ttl in the past.
-		let paras_entry = ParasEntry::new(Assignment::Bulk(para_id), now - 5 as u32);
-		Scheduler::add_to_claim_queue(core_idx, paras_entry.clone());
-
-		// Claim is in queue prior to call.
-		assert!(claimqueue_contains_para_ids::<Test>(vec![para_id]));
-
-		// Claim is dropped post call.
-		Scheduler::drop_expired_claims_from_claim_queue();
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_id]));
-
-		// Add a claim on core 0 with a ttl in the future (15).
-		let paras_entry = ParasEntry::new(Assignment::Bulk(para_id), now + 5);
-		Scheduler::add_to_claim_queue(core_idx, paras_entry.clone());
-
-		// Claim is in queue post call.
-		Scheduler::drop_expired_claims_from_claim_queue();
-		assert!(claimqueue_contains_para_ids::<Test>(vec![para_id]));
-
-		now = now + 6;
-		run_to_block(now, |_| None);
-
-		// Claim is dropped
-		Scheduler::drop_expired_claims_from_claim_queue();
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_id]));
+		assert!(ValidatorGroups::<Test>::get().is_empty());
 
-		// Add a claim on core 0 with a ttl == now (16)
-		let paras_entry = ParasEntry::new(Assignment::Bulk(para_id), now);
-		Scheduler::add_to_claim_queue(core_idx, paras_entry.clone());
-
-		// Claim is in queue post call.
-		Scheduler::drop_expired_claims_from_claim_queue();
-		assert!(claimqueue_contains_para_ids::<Test>(vec![para_id]));
-
-		now = now + 1;
-		run_to_block(now, |_| None);
-
-		// Drop expired claim.
-		Scheduler::drop_expired_claims_from_claim_queue();
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_id]));
-
-		// Add a claim on core 0 with a ttl == now (17)
-		let paras_entry_non_expired = ParasEntry::new(Assignment::Bulk(para_id), now);
-		let paras_entry_expired = ParasEntry::new(Assignment::Bulk(para_id), now - 2);
-		// ttls = [17, 15, 17]
-		Scheduler::add_to_claim_queue(core_idx, paras_entry_non_expired.clone());
-		Scheduler::add_to_claim_queue(core_idx, paras_entry_expired.clone());
-		Scheduler::add_to_claim_queue(core_idx, paras_entry_non_expired.clone());
-		let cq = scheduler::ClaimQueue::<Test>::get();
-		assert_eq!(cq.get(&core_idx).unwrap().len(), 3);
-
-		// Add a claim to the test assignment provider.
-		let assignment = Assignment::Bulk(para_id);
-
-		MockAssigner::add_test_assignment(assignment.clone());
-
-		// Drop expired claim.
-		Scheduler::drop_expired_claims_from_claim_queue();
-
-		let cq = scheduler::ClaimQueue::<Test>::get();
-		let cqc = cq.get(&core_idx).unwrap();
-		// Same number of claims, because a new claim is popped from `MockAssigner` instead of the
-		// expired one
-		assert_eq!(cqc.len(), 3);
-
-		// The first 2 claims in the queue should have a ttl of 17,
-		// being the ones set up prior in this test as claims 1 and 3.
-		// The third claim is popped from the assignment provider and
-		// has a new ttl set by the scheduler of now +
-		// assignment_provider_ttl. ttls = [17, 17, 22]
-		assert!(cqc.iter().enumerate().all(|(index, entry)| {
-			match index {
-				0 | 1 => entry.clone().ttl == 17,
-				2 => entry.clone().ttl == 22,
-				_ => false,
-			}
-		}))
-	});
-}
-
-#[test]
-fn session_change_shuffles_validators() {
-	let genesis_config = genesis_config(&default_config());
-
-	new_test_ext(genesis_config).execute_with(|| {
-		// Need five cores for this test
-		MockAssigner::set_core_count(5);
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
@@ -328,6 +165,8 @@ fn session_change_shuffles_validators() {
 fn session_change_takes_only_max_per_core() {
 	let config = {
 		let mut config = default_config();
+		// Simulate 2 cores between all usage types
+		config.scheduler_params.num_cores = 2;
 		config.scheduler_params.max_validators_per_core = Some(1);
 		config
 	};
@@ -335,9 +174,6 @@ fn session_change_takes_only_max_per_core() {
 	let genesis_config = genesis_config(&config);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		// Simulate 2 cores between all usage types
-		MockAssigner::set_core_count(2);
-
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
 				new_config: config.clone(),
@@ -367,8 +203,12 @@ fn session_change_takes_only_max_per_core() {
 }
 
 #[test]
-fn fill_claimqueue_fills() {
-	let config = default_config();
+// Test that `advance_claim_queue` doubles the first assignment only for a core that didn't use to
+// have any assignments.
+fn advance_claim_queue_doubles_assignment_only_if_empty() {
+	let mut config = default_config();
+	config.scheduler_params.lookahead = 3;
+	config.scheduler_params.num_cores = 2;
 	let genesis_config = genesis_config(&config);
 
 	let para_a = ParaId::from(3_u32);
@@ -380,18 +220,15 @@ fn fill_claimqueue_fills() {
 	let assignment_c = Assignment::Bulk(para_c);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(2);
-		let coretime_ttl = config.scheduler_params.ttl;
-
 		// Add 3 paras
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
-		schedule_blank_para(para_c);
+		register_para(para_a);
+		register_para(para_b);
+		register_para(para_c);
 
 		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
@@ -406,224 +243,108 @@ fn fill_claimqueue_fills() {
 		MockAssigner::add_test_assignment(assignment_b.clone());
 		MockAssigner::add_test_assignment(assignment_c.clone());
 
+		// This will call advance_claim_queue
 		run_to_block(2, |_| None);
 
 		{
-			assert_eq!(Scheduler::claim_queue_len(), 3);
-			let scheduled: BTreeMap<_, _> = scheduled_entries().collect();
+			assert_eq!(Scheduler::claim_queue_len(), 5);
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
 
-			// Was added a block later, note the TTL.
-			assert_eq!(
-				scheduled.get(&CoreIndex(0)).unwrap(),
-				&ParasEntry {
-					assignment: assignment_a.clone(),
-					availability_timeouts: 0,
-					ttl: 2 + coretime_ttl
-				},
-			);
-			// Sits on the same core as `para_a`
+			// Because the claim queue used to be empty, the first assignment is doubled for every
+			// core so that the first para gets a fair shot at backing something.
 			assert_eq!(
-				scheduler::ClaimQueue::<Test>::get().get(&CoreIndex(0)).unwrap()[1],
-				ParasEntry {
-					assignment: assignment_b.clone(),
-					availability_timeouts: 0,
-					ttl: 2 + coretime_ttl
-				}
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a.clone(), assignment_a, assignment_b]
+					.into_iter()
+					.collect::<VecDeque<_>>()
 			);
 			assert_eq!(
-				scheduled.get(&CoreIndex(1)).unwrap(),
-				&ParasEntry {
-					assignment: assignment_c.clone(),
-					availability_timeouts: 0,
-					ttl: 2 + coretime_ttl
-				},
+				claim_queue.remove(&CoreIndex(1)).unwrap(),
+				[assignment_c.clone(), assignment_c].into_iter().collect::<VecDeque<_>>()
 			);
 		}
 	});
 }
 
 #[test]
-fn schedule_schedules_including_just_freed() {
+// Test that `advance_claim_queue` doesn't populate for cores which have no assignments.
+fn advance_claim_queue_no_entry_if_empty() {
 	let mut config = default_config();
-	// NOTE: This test expects on demand cores to each get slotted on to a different core
-	// and not fill up the claimqueue of each core first.
-	config.scheduler_params.lookahead = 1;
+	config.scheduler_params.lookahead = 3;
+	config.scheduler_params.num_cores = 2;
 	let genesis_config = genesis_config(&config);
 
 	let para_a = ParaId::from(3_u32);
-	let para_b = ParaId::from(4_u32);
-	let para_c = ParaId::from(5_u32);
-	let para_d = ParaId::from(6_u32);
-	let para_e = ParaId::from(7_u32);
-
 	let assignment_a = Assignment::Bulk(para_a);
-	let assignment_b = Assignment::Bulk(para_b);
-	let assignment_c = Assignment::Bulk(para_c);
-	let assignment_d = Assignment::Bulk(para_d);
-	let assignment_e = Assignment::Bulk(para_e);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(3);
-
-		// add 5 paras
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
-		schedule_blank_para(para_c);
-		schedule_blank_para(para_d);
-		schedule_blank_para(para_e);
+		// Add 1 para
+		register_para(para_a);
 
-		// start a new session to activate, 3 validators for 3 cores.
+		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
-					ValidatorId::from(Sr25519Keyring::Charlie.public()),
 				],
 				..Default::default()
 			}),
 			_ => None,
 		});
 
-		// add a couple of para claims now that paras are live
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_c.clone());
-
-		let mut now = 2;
-		run_to_block(now, |_| None);
-
-		assert_eq!(Scheduler::scheduled_paras().collect::<Vec<_>>().len(), 2);
-
-		// cores 0, 1 should be occupied. mark them as such.
-		let mut occupied_map: BTreeMap<CoreIndex, ParaId> = BTreeMap::new();
-		occupied_map.insert(CoreIndex(0), para_a);
-		occupied_map.insert(CoreIndex(1), para_c);
-		Scheduler::occupied(occupied_map);
-
-		{
-			let cores = AvailabilityCores::<Test>::get();
-
-			// cores 0, 1 are `CoreOccupied::Paras(ParasEntry...)`
-			assert!(cores[0] != CoreOccupied::Free);
-			assert!(cores[1] != CoreOccupied::Free);
-
-			// core 2 is free
-			assert!(cores[2] == CoreOccupied::Free);
-
-			assert!(Scheduler::scheduled_paras().collect::<Vec<_>>().is_empty());
-
-			// All `core_queue`s should be empty
-			scheduler::ClaimQueue::<Test>::get()
-				.iter()
-				.for_each(|(_core_idx, core_queue)| assert_eq!(core_queue.len(), 0))
-		}
-
 		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_c.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
-		MockAssigner::add_test_assignment(assignment_d.clone());
-		MockAssigner::add_test_assignment(assignment_e.clone());
-		now = 3;
-		run_to_block(now, |_| None);
 
-		{
-			let scheduled: BTreeMap<_, _> = scheduled_entries().collect();
-
-			assert_eq!(scheduled.len(), 3);
-			assert_eq!(
-				scheduled.get(&CoreIndex(2)).unwrap(),
-				&ParasEntry {
-					assignment: Assignment::Bulk(para_b),
-					availability_timeouts: 0,
-					ttl: 8
-				},
-			);
-		}
-
-		// now note that cores 0 and 1 were freed.
-		let just_updated: BTreeMap<CoreIndex, FreedReason> = vec![
-			(CoreIndex(0), FreedReason::Concluded),
-			(CoreIndex(1), FreedReason::TimedOut), // should go back on queue.
-		]
-		.into_iter()
-		.collect();
-		Scheduler::free_cores_and_fill_claim_queue(just_updated, now);
+		// This will call advance_claim_queue
+		run_to_block(3, |_| None);
 
 		{
-			let scheduled: BTreeMap<_, _> = scheduled_entries().collect();
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
 
-			// 1 thing scheduled before, + 2 cores freed.
-			assert_eq!(scheduled.len(), 3);
-			assert_eq!(
-				scheduled.get(&CoreIndex(0)).unwrap(),
-				&ParasEntry {
-					// Next entry in queue is `a` again:
-					assignment: Assignment::Bulk(para_a),
-					availability_timeouts: 0,
-					ttl: 8
-				},
-			);
-			// Although C was descheduled, the core `2` was occupied so C goes back to the queue.
 			assert_eq!(
-				scheduler::ClaimQueue::<Test>::get()[&CoreIndex(1)][1],
-				ParasEntry {
-					assignment: Assignment::Bulk(para_c),
-					// End of the queue should be the pushed back entry:
-					availability_timeouts: 1,
-					// ttl 1 higher:
-					ttl: 9
-				},
-			);
-			assert_eq!(
-				scheduled.get(&CoreIndex(1)).unwrap(),
-				&ParasEntry {
-					assignment: Assignment::Bulk(para_c),
-					availability_timeouts: 0,
-					ttl: 8
-				},
-			);
-			assert_eq!(
-				scheduled.get(&CoreIndex(2)).unwrap(),
-				&ParasEntry {
-					assignment: Assignment::Bulk(para_b),
-					availability_timeouts: 0,
-					ttl: 8
-				},
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a].into_iter().collect::<VecDeque<_>>()
 			);
 
-			assert!(claimqueue_contains_para_ids::<Test>(vec![para_c]));
-			assert!(!availability_cores_contains_para_ids::<Test>(vec![para_a, para_c]));
+			// Even though core 1 exists, there's no assignment for it so it's not present in the
+			// claim queue.
+			assert!(claim_queue.remove(&CoreIndex(1)).is_none());
 		}
 	});
 }
 
 #[test]
-fn schedule_clears_availability_cores() {
+// Test that `advance_claim_queue` only advances for cores that are not part of the `except_for`
+// set.
+fn advance_claim_queue_except_for() {
 	let mut config = default_config();
+	// NOTE: This test expects on demand cores to each get slotted on to a different core
+	// and not fill up the claimqueue of each core first.
 	config.scheduler_params.lookahead = 1;
+	config.scheduler_params.num_cores = 3;
+
 	let genesis_config = genesis_config(&config);
 
 	let para_a = ParaId::from(1_u32);
 	let para_b = ParaId::from(2_u32);
 	let para_c = ParaId::from(3_u32);
+	let para_d = ParaId::from(4_u32);
+	let para_e = ParaId::from(5_u32);
 
 	let assignment_a = Assignment::Bulk(para_a);
 	let assignment_b = Assignment::Bulk(para_b);
 	let assignment_c = Assignment::Bulk(para_c);
+	let assignment_d = Assignment::Bulk(para_d);
+	let assignment_e = Assignment::Bulk(para_e);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(3);
-
-		// register 3 paras
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
-		schedule_blank_para(para_c);
-
-		// Adding assignments then running block to populate claim queue
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
-		MockAssigner::add_test_assignment(assignment_c.clone());
+		// add 5 paras
+		register_para(para_a);
+		register_para(para_b);
+		register_para(para_c);
+		register_para(para_d);
+		register_para(para_e);
 
 		// start a new session to activate, 3 validators for 3 cores.
 		run_to_block(1, |number| match number {
@@ -639,91 +360,69 @@ fn schedule_clears_availability_cores() {
 			_ => None,
 		});
 
-		run_to_block(2, |_| None);
-
-		assert_eq!(scheduler::ClaimQueue::<Test>::get().len(), 3);
-
-		// cores 0, 1, and 2 should be occupied. mark them as such.
-		Scheduler::occupied(
-			vec![(CoreIndex(0), para_a), (CoreIndex(1), para_b), (CoreIndex(2), para_c)]
-				.into_iter()
-				.collect(),
-		);
+		// add a couple of para claims now that paras are live
+		MockAssigner::add_test_assignment(assignment_a.clone());
+		MockAssigner::add_test_assignment(assignment_c.clone());
 
-		{
-			let cores = AvailabilityCores::<Test>::get();
+		run_to_block(2, |_| None);
 
-			assert_eq!(cores[0].is_free(), false);
-			assert_eq!(cores[1].is_free(), false);
-			assert_eq!(cores[2].is_free(), false);
+		Scheduler::advance_claim_queue(&Default::default());
 
-			// All `core_queue`s should be empty
-			scheduler::ClaimQueue::<Test>::get()
-				.iter()
-				.for_each(|(_core_idx, core_queue)| assert!(core_queue.len() == 0))
-		}
+		// Queues of all cores should be empty
+		assert_eq!(Scheduler::claim_queue_len(), 0);
 
-		// Add more assignments
 		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
 		MockAssigner::add_test_assignment(assignment_c.clone());
+		MockAssigner::add_test_assignment(assignment_b.clone());
+		MockAssigner::add_test_assignment(assignment_d.clone());
+		MockAssigner::add_test_assignment(assignment_e.clone());
 
 		run_to_block(3, |_| None);
 
-		// now note that cores 0 and 2 were freed.
-		Scheduler::free_cores_and_fill_claim_queue(
-			vec![(CoreIndex(0), FreedReason::Concluded), (CoreIndex(2), FreedReason::Concluded)]
-				.into_iter()
-				.collect::<Vec<_>>(),
-			3,
-		);
+		{
+			let scheduled: BTreeMap<_, _> = next_assignments().collect();
+
+			assert_eq!(scheduled.len(), 3);
+			assert_eq!(scheduled.get(&CoreIndex(0)).unwrap(), &Assignment::Bulk(para_a));
+			assert_eq!(scheduled.get(&CoreIndex(1)).unwrap(), &Assignment::Bulk(para_c));
+			assert_eq!(scheduled.get(&CoreIndex(2)).unwrap(), &Assignment::Bulk(para_b));
+		}
+
+		// now note that cores 0 and 1 were freed.
+		Scheduler::advance_claim_queue(&std::iter::once(CoreIndex(2)).collect());
 
 		{
-			let claimqueue = ClaimQueue::<Test>::get();
-			let claimqueue_0 = claimqueue.get(&CoreIndex(0)).unwrap().clone();
-			let claimqueue_2 = claimqueue.get(&CoreIndex(2)).unwrap().clone();
-			let entry_ttl = 8;
-			assert_eq!(claimqueue_0.len(), 1);
-			assert_eq!(claimqueue_2.len(), 1);
-			let queue_0_expectation: VecDeque<ParasEntryType<Test>> =
-				vec![ParasEntry::new(assignment_a, entry_ttl as u32)].into_iter().collect();
-			let queue_2_expectation: VecDeque<ParasEntryType<Test>> =
-				vec![ParasEntry::new(assignment_c, entry_ttl as u32)].into_iter().collect();
-			assert_eq!(claimqueue_0, queue_0_expectation);
-			assert_eq!(claimqueue_2, queue_2_expectation);
-
-			// The freed cores should be `Free` in `AvailabilityCores`.
-			let cores = AvailabilityCores::<Test>::get();
-			assert!(cores[0].is_free());
-			assert!(cores[2].is_free());
+			let scheduled: BTreeMap<_, _> = next_assignments().collect();
+
+			// 1 thing scheduled before, + 2 cores freed.
+			assert_eq!(scheduled.len(), 3);
+			assert_eq!(scheduled.get(&CoreIndex(0)).unwrap(), &Assignment::Bulk(para_d));
+			assert_eq!(scheduled.get(&CoreIndex(1)).unwrap(), &Assignment::Bulk(para_e));
+			assert_eq!(scheduled.get(&CoreIndex(2)).unwrap(), &Assignment::Bulk(para_b));
 		}
 	});
 }
 
 #[test]
 fn schedule_rotates_groups() {
+	let on_demand_cores = 2;
 	let config = {
 		let mut config = default_config();
 		config.scheduler_params.lookahead = 1;
+		config.scheduler_params.num_cores = on_demand_cores;
 		config
 	};
 
 	let rotation_frequency = config.scheduler_params.group_rotation_frequency;
-	let on_demand_cores = 2;
 
 	let genesis_config = genesis_config(&config);
 
 	let para_a = ParaId::from(1_u32);
 	let para_b = ParaId::from(2_u32);
 
-	let assignment_a = Assignment::Bulk(para_a);
-	let assignment_b = Assignment::Bulk(para_b);
-
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(on_demand_cores);
-
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
+		register_para(para_a);
+		register_para(para_b);
 
 		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
@@ -741,15 +440,10 @@ fn schedule_rotates_groups() {
 		let session_start_block = scheduler::SessionStartBlock::<Test>::get();
 		assert_eq!(session_start_block, 1);
 
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
-
 		let mut now = 2;
 		run_to_block(now, |_| None);
 
 		let assert_groups_rotated = |rotations: u32, now: &BlockNumberFor<Test>| {
-			let scheduled: BTreeMap<_, _> = Scheduler::scheduled_paras().collect();
-			assert_eq!(scheduled.len(), 2);
 			assert_eq!(
 				Scheduler::group_assigned_to_core(CoreIndex(0), *now).unwrap(),
 				GroupIndex((0u32 + rotations) % on_demand_cores)
@@ -764,7 +458,7 @@ fn schedule_rotates_groups() {
 
 		// one block before first rotation.
 		now = rotation_frequency;
-		run_to_block(rotation_frequency, |_| None);
+		run_to_block(now, |_| None);
 
 		assert_groups_rotated(0, &now);
 
@@ -785,134 +479,6 @@ fn schedule_rotates_groups() {
 	});
 }
 
-#[test]
-fn on_demand_claims_are_pruned_after_timing_out() {
-	let max_timeouts = 20;
-	let mut config = default_config();
-	config.scheduler_params.lookahead = 1;
-	// Need more timeouts for this test
-	config.scheduler_params.max_availability_timeouts = max_timeouts;
-	config.scheduler_params.ttl = BlockNumber::from(5u32);
-	let genesis_config = genesis_config(&config);
-
-	let para_a = ParaId::from(1_u32);
-
-	let assignment_a = Assignment::Bulk(para_a);
-
-	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(2);
-		schedule_blank_para(para_a);
-
-		// #1
-		let mut now = 1;
-		run_to_block(now, |number| match number {
-			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
-				validators: vec![
-					ValidatorId::from(Sr25519Keyring::Alice.public()),
-					ValidatorId::from(Sr25519Keyring::Eve.public()),
-				],
-				..Default::default()
-			}),
-			_ => None,
-		});
-
-		MockAssigner::add_test_assignment(assignment_a.clone());
-
-		// #2
-		now += 1;
-		run_to_block(now, |_| None);
-		assert_eq!(scheduler::ClaimQueue::<Test>::get().len(), 1);
-		// ParaId a is in the claimqueue.
-		assert!(claimqueue_contains_para_ids::<Test>(vec![para_a]));
-
-		Scheduler::occupied(vec![(CoreIndex(0), para_a)].into_iter().collect());
-		// ParaId a is no longer in the claimqueue.
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_a]));
-		// It is in availability cores.
-		assert!(availability_cores_contains_para_ids::<Test>(vec![para_a]));
-
-		// #3
-		now += 1;
-		// Run to block #n over the max_retries value.
-		// In this case, both validator groups with time out on availability and
-		// the assignment will be dropped.
-		for n in now..=(now + max_timeouts + 1) {
-			// #n
-			run_to_block(n, |_| None);
-			// Time out on core 0.
-			let just_updated: BTreeMap<CoreIndex, FreedReason> = vec![
-				(CoreIndex(0), FreedReason::TimedOut), // should go back on queue.
-			]
-			.into_iter()
-			.collect();
-			Scheduler::free_cores_and_fill_claim_queue(just_updated, now);
-
-			// ParaId a exists in the claim queue until max_retries is reached.
-			if n < max_timeouts + now {
-				assert!(claimqueue_contains_para_ids::<Test>(vec![para_a]));
-			} else {
-				assert!(!claimqueue_contains_para_ids::<Test>(vec![para_a]));
-			}
-
-			let core_assignments = Scheduler::scheduled_paras().collect();
-			Scheduler::occupied(core_assignments);
-		}
-
-		// ParaId a does not exist in the claimqueue/availability_cores after
-		// threshold has been reached.
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_a]));
-		assert!(!availability_cores_contains_para_ids::<Test>(vec![para_a]));
-
-		// #25
-		now += max_timeouts + 2;
-
-		// Add assignment back to the mix.
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		run_to_block(now, |_| None);
-
-		assert!(claimqueue_contains_para_ids::<Test>(vec![para_a]));
-
-		// #26
-		now += 1;
-		// Run to block #n but this time have group 1 conclude the availability.
-		for n in now..=(now + max_timeouts + 1) {
-			// #n
-			run_to_block(n, |_| None);
-			// Time out core 0 if group 0 is assigned to it, if group 1 is assigned, conclude.
-			let mut just_updated: BTreeMap<CoreIndex, FreedReason> = BTreeMap::new();
-			if let Some(group) = Scheduler::group_assigned_to_core(CoreIndex(0), n) {
-				match group {
-					GroupIndex(0) => {
-						just_updated.insert(CoreIndex(0), FreedReason::TimedOut); // should go back on queue.
-					},
-					GroupIndex(1) => {
-						just_updated.insert(CoreIndex(0), FreedReason::Concluded);
-					},
-					_ => panic!("Should only have 2 groups here"),
-				}
-			}
-
-			Scheduler::free_cores_and_fill_claim_queue(just_updated, now);
-
-			// ParaId a exists in the claim queue until groups are rotated.
-			if n < 31 {
-				assert!(claimqueue_contains_para_ids::<Test>(vec![para_a]));
-			} else {
-				assert!(!claimqueue_contains_para_ids::<Test>(vec![para_a]));
-			}
-
-			let core_assignments = Scheduler::scheduled_paras().collect();
-			Scheduler::occupied(core_assignments);
-		}
-
-		// ParaId a does not exist in the claimqueue/availability_cores after
-		// being concluded
-		assert!(!claimqueue_contains_para_ids::<Test>(vec![para_a]));
-		assert!(!availability_cores_contains_para_ids::<Test>(vec![para_a]));
-	});
-}
-
 #[test]
 fn availability_predicate_works() {
 	let genesis_config = genesis_config(&default_config());
@@ -948,20 +514,21 @@ fn availability_predicate_works() {
 
 #[test]
 fn next_up_on_available_uses_next_scheduled_or_none() {
-	let genesis_config = genesis_config(&default_config());
+	let mut config = default_config();
+	config.scheduler_params.num_cores = 1;
+	let genesis_config = genesis_config(&config);
 
 	let para_a = ParaId::from(1_u32);
 	let para_b = ParaId::from(2_u32);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(1);
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
+		register_para(para_a);
+		register_para(para_b);
 
 		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Eve.public()),
@@ -971,69 +538,57 @@ fn next_up_on_available_uses_next_scheduled_or_none() {
 			_ => None,
 		});
 
-		let entry_a = ParasEntry {
-			assignment: Assignment::Bulk(para_a),
-			availability_timeouts: 0 as u32,
-			ttl: 5 as u32,
-		};
-		let entry_b = ParasEntry {
-			assignment: Assignment::Bulk(para_b),
-			availability_timeouts: 0 as u32,
-			ttl: 5 as u32,
-		};
-
-		Scheduler::add_to_claim_queue(CoreIndex(0), entry_a.clone());
+		MockAssigner::add_test_assignment(Assignment::Bulk(para_a));
 
 		run_to_block(2, |_| None);
 
 		{
-			assert_eq!(Scheduler::claim_queue_len(), 1);
-			assert_eq!(scheduler::AvailabilityCores::<Test>::get().len(), 1);
-
-			let mut map = BTreeMap::new();
-			map.insert(CoreIndex(0), para_a);
-			Scheduler::occupied(map);
+			// Two assignments for A on core 0, because the claim queue used to be empty.
+			assert_eq!(Scheduler::claim_queue_len(), 2);
 
-			let cores = scheduler::AvailabilityCores::<Test>::get();
-			match &cores[0] {
-				CoreOccupied::Paras(entry) => assert_eq!(entry, &entry_a),
-				_ => panic!("There should only be one test assigner core"),
-			}
-
-			assert!(Scheduler::next_up_on_available(CoreIndex(0)).is_none());
+			assert!(Scheduler::next_up_on_available(CoreIndex(1)).is_none());
 
-			Scheduler::add_to_claim_queue(CoreIndex(0), entry_b);
+			assert_eq!(
+				Scheduler::next_up_on_available(CoreIndex(0)).unwrap(),
+				ScheduledCore { para_id: para_a, collator: None }
+			);
 
+			Scheduler::advance_claim_queue(&Default::default());
 			assert_eq!(
 				Scheduler::next_up_on_available(CoreIndex(0)).unwrap(),
-				ScheduledCore { para_id: para_b, collator: None }
+				ScheduledCore { para_id: para_a, collator: None }
 			);
+
+			Scheduler::advance_claim_queue(&Default::default());
+			assert!(Scheduler::next_up_on_available(CoreIndex(0)).is_none());
 		}
 	});
 }
 
 #[test]
-fn next_up_on_time_out_reuses_claim_if_nothing_queued() {
-	let genesis_config = genesis_config(&default_config());
+fn session_change_increasing_number_of_cores() {
+	let mut config = default_config();
+	config.scheduler_params.num_cores = 2;
+	let genesis_config = genesis_config(&config);
 
-	let para_a = ParaId::from(1_u32);
-	let para_b = ParaId::from(2_u32);
+	let para_a = ParaId::from(3_u32);
+	let para_b = ParaId::from(4_u32);
 
 	let assignment_a = Assignment::Bulk(para_a);
 	let assignment_b = Assignment::Bulk(para_b);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		MockAssigner::set_core_count(1);
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
+		// Add 2 paras
+		register_para(para_a);
+		register_para(para_b);
 
 		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
-					ValidatorId::from(Sr25519Keyring::Eve.public()),
+					ValidatorId::from(Sr25519Keyring::Bob.public()),
 				],
 				..Default::default()
 			}),
@@ -1041,193 +596,236 @@ fn next_up_on_time_out_reuses_claim_if_nothing_queued() {
 		});
 
 		MockAssigner::add_test_assignment(assignment_a.clone());
+		MockAssigner::add_test_assignment(assignment_b.clone());
 
+		// This will call advance_claim_queue
 		run_to_block(2, |_| None);
 
 		{
-			assert_eq!(scheduler::ClaimQueue::<Test>::get().len(), 1);
-			assert_eq!(scheduler::AvailabilityCores::<Test>::get().len(), 1);
-
-			let mut map = BTreeMap::new();
-			map.insert(CoreIndex(0), para_a);
-			Scheduler::occupied(map);
-
-			let cores = scheduler::AvailabilityCores::<Test>::get();
-			match cores.get(0).unwrap() {
-				CoreOccupied::Paras(entry) => {
-					assert_eq!(entry.assignment, assignment_a.clone());
-				},
-				_ => panic!("There should only be a single test assigner core"),
-			}
-
-			// There's nothing more to pop for core 0 from the assignment provider.
-			assert!(MockAssigner::pop_assignment_for_core(CoreIndex(0)).is_none());
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
+			assert_eq!(Scheduler::claim_queue_len(), 4);
 
 			assert_eq!(
-				Scheduler::next_up_on_time_out(CoreIndex(0)).unwrap(),
-				ScheduledCore { para_id: para_a, collator: None }
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a.clone(), assignment_a.clone()]
+					.into_iter()
+					.collect::<VecDeque<_>>()
+			);
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(1)).unwrap(),
+				[assignment_b.clone(), assignment_b.clone()]
+					.into_iter()
+					.collect::<VecDeque<_>>()
 			);
+		}
+
+		// Increase number of cores to 4.
+		let old_config = config;
+		let mut new_config = old_config.clone();
+		new_config.scheduler_params.num_cores = 4;
 
-			MockAssigner::add_test_assignment(assignment_b.clone());
+		// add another assignment for para b.
+		MockAssigner::add_test_assignment(assignment_b.clone());
+
+		run_to_block(3, |number| match number {
+			3 => Some(SessionChangeNotification {
+				new_config: new_config.clone(),
+				prev_config: old_config.clone(),
+				validators: vec![
+					ValidatorId::from(Sr25519Keyring::Alice.public()),
+					ValidatorId::from(Sr25519Keyring::Bob.public()),
+					ValidatorId::from(Sr25519Keyring::Charlie.public()),
+					ValidatorId::from(Sr25519Keyring::Dave.public()),
+				],
+				..Default::default()
+			}),
+			_ => None,
+		});
 
-			// Pop assignment_b into the claimqueue
-			Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), 2);
+		{
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
+			assert_eq!(Scheduler::claim_queue_len(), 3);
 
-			//// Now that there is an earlier next-up, we use that.
 			assert_eq!(
-				Scheduler::next_up_on_available(CoreIndex(0)).unwrap(),
-				ScheduledCore { para_id: para_b, collator: None }
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a].into_iter().collect::<VecDeque<_>>()
+			);
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(1)).unwrap(),
+				[assignment_b.clone()].into_iter().collect::<VecDeque<_>>()
+			);
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(2)).unwrap(),
+				[assignment_b.clone()].into_iter().collect::<VecDeque<_>>()
 			);
 		}
 	});
 }
 
 #[test]
-fn session_change_requires_reschedule_dropping_removed_paras() {
+fn session_change_decreasing_number_of_cores() {
 	let mut config = default_config();
-	config.scheduler_params.lookahead = 1;
+	config.scheduler_params.num_cores = 3;
 	let genesis_config = genesis_config(&config);
 
-	let para_a = ParaId::from(1_u32);
-	let para_b = ParaId::from(2_u32);
+	let para_a = ParaId::from(3_u32);
+	let para_b = ParaId::from(4_u32);
 
 	let assignment_a = Assignment::Bulk(para_a);
 	let assignment_b = Assignment::Bulk(para_b);
 
 	new_test_ext(genesis_config).execute_with(|| {
-		// Setting explicit core count
-		MockAssigner::set_core_count(5);
-		let coretime_ttl = configuration::ActiveConfig::<Test>::get().scheduler_params.ttl;
-
-		schedule_blank_para(para_a);
-		schedule_blank_para(para_b);
-
-		// Add assignments
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
+		// Add 2 paras
+		register_para(para_a);
+		register_para(para_b);
 
+		// start a new session to activate, 2 validators for 2 cores.
 		run_to_block(1, |number| match number {
 			1 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
-					ValidatorId::from(Sr25519Keyring::Charlie.public()),
-					ValidatorId::from(Sr25519Keyring::Dave.public()),
-					ValidatorId::from(Sr25519Keyring::Eve.public()),
-					ValidatorId::from(Sr25519Keyring::Ferdie.public()),
-					ValidatorId::from(Sr25519Keyring::One.public()),
 				],
-				random_seed: [99; 32],
 				..Default::default()
 			}),
 			_ => None,
 		});
 
-		assert_eq!(scheduler::ClaimQueue::<Test>::get().len(), 2);
+		scheduler::Pallet::<Test>::set_claim_queue(BTreeMap::from([
+			(CoreIndex::from(0), VecDeque::from([assignment_a.clone()])),
+			// Leave a hole for core 1.
+			(CoreIndex::from(2), VecDeque::from([assignment_b.clone(), assignment_b.clone()])),
+		]));
 
-		let groups = ValidatorGroups::<Test>::get();
-		assert_eq!(groups.len(), 5);
+		// Decrease number of cores to 1.
+		let old_config = config;
+		let mut new_config = old_config.clone();
+		new_config.scheduler_params.num_cores = 1;
 
-		assert_ok!(Paras::schedule_para_cleanup(para_b));
+		// Session change.
+		// Assignment A had its shot already so will be dropped for good.
+		// The two assignments of B will be pushed back to the assignment provider.
+		run_to_block(3, |number| match number {
+			3 => Some(SessionChangeNotification {
+				new_config: new_config.clone(),
+				prev_config: old_config.clone(),
+				validators: vec![ValidatorId::from(Sr25519Keyring::Alice.public())],
+				..Default::default()
+			}),
+			_ => None,
+		});
 
-		// Add assignment
-		MockAssigner::add_test_assignment(assignment_a.clone());
+		let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
+		assert_eq!(Scheduler::claim_queue_len(), 1);
 
-		run_to_end_of_block(2, |number| match number {
-			2 => Some(SessionChangeNotification {
-				new_config: default_config(),
+		// There's only one assignment for B because run_to_block also calls advance_claim_queue at
+		// the end.
+		assert_eq!(
+			claim_queue.remove(&CoreIndex(0)).unwrap(),
+			[assignment_b.clone()].into_iter().collect::<VecDeque<_>>()
+		);
+
+		// No more assignments now.
+		Scheduler::advance_claim_queue(&Default::default());
+		assert_eq!(Scheduler::claim_queue_len(), 0);
+	});
+}
+
+#[test]
+fn session_change_increasing_lookahead() {
+	let mut config = default_config();
+	config.scheduler_params.num_cores = 2;
+	config.scheduler_params.lookahead = 2;
+	let genesis_config = genesis_config(&config);
+
+	let para_a = ParaId::from(3_u32);
+	let para_b = ParaId::from(4_u32);
+
+	let assignment_a = Assignment::Bulk(para_a);
+	let assignment_b = Assignment::Bulk(para_b);
+
+	new_test_ext(genesis_config).execute_with(|| {
+		// Add 2 paras
+		register_para(para_a);
+		register_para(para_b);
+
+		// start a new session to activate, 2 validators for 2 cores.
+		run_to_block(1, |number| match number {
+			1 => Some(SessionChangeNotification {
+				new_config: config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
-					ValidatorId::from(Sr25519Keyring::Charlie.public()),
-					ValidatorId::from(Sr25519Keyring::Dave.public()),
-					ValidatorId::from(Sr25519Keyring::Eve.public()),
-					ValidatorId::from(Sr25519Keyring::Ferdie.public()),
-					ValidatorId::from(Sr25519Keyring::One.public()),
 				],
-				random_seed: [99; 32],
 				..Default::default()
 			}),
 			_ => None,
 		});
 
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), 3);
+		MockAssigner::add_test_assignment(assignment_a.clone());
+		MockAssigner::add_test_assignment(assignment_a.clone());
+		MockAssigner::add_test_assignment(assignment_a.clone());
+		MockAssigner::add_test_assignment(assignment_b.clone());
+		MockAssigner::add_test_assignment(assignment_b.clone());
+		MockAssigner::add_test_assignment(assignment_b.clone());
+
+		// Lookahead is currently 2.
 
-		assert_eq!(
-			scheduler::ClaimQueue::<Test>::get(),
-			vec![(
-				CoreIndex(0),
-				vec![ParasEntry::new(
-					Assignment::Bulk(para_a),
-					// At end of block 2
-					coretime_ttl + 2
-				)]
-				.into_iter()
-				.collect()
-			)]
-			.into_iter()
-			.collect()
-		);
+		run_to_block(2, |_| None);
 
-		// Add para back
-		schedule_blank_para(para_b);
+		{
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
+			assert_eq!(Scheduler::claim_queue_len(), 4);
 
-		// Add assignments
-		MockAssigner::add_test_assignment(assignment_a.clone());
-		MockAssigner::add_test_assignment(assignment_b.clone());
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a.clone(), assignment_a.clone()]
+					.into_iter()
+					.collect::<VecDeque<_>>()
+			);
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(1)).unwrap(),
+				[assignment_a.clone(), assignment_a.clone()]
+					.into_iter()
+					.collect::<VecDeque<_>>()
+			);
+		}
+
+		// Increase lookahead to 4.
+		let old_config = config;
+		let mut new_config = old_config.clone();
+		new_config.scheduler_params.lookahead = 4;
 
 		run_to_block(3, |number| match number {
 			3 => Some(SessionChangeNotification {
-				new_config: default_config(),
+				new_config: new_config.clone(),
+				prev_config: old_config.clone(),
 				validators: vec![
 					ValidatorId::from(Sr25519Keyring::Alice.public()),
 					ValidatorId::from(Sr25519Keyring::Bob.public()),
-					ValidatorId::from(Sr25519Keyring::Charlie.public()),
-					ValidatorId::from(Sr25519Keyring::Dave.public()),
-					ValidatorId::from(Sr25519Keyring::Eve.public()),
-					ValidatorId::from(Sr25519Keyring::Ferdie.public()),
-					ValidatorId::from(Sr25519Keyring::One.public()),
 				],
-				random_seed: [99; 32],
 				..Default::default()
 			}),
 			_ => None,
 		});
 
-		assert_eq!(scheduler::ClaimQueue::<Test>::get().len(), 2);
-
-		let groups = ValidatorGroups::<Test>::get();
-		assert_eq!(groups.len(), 5);
-
-		Scheduler::free_cores_and_fill_claim_queue(BTreeMap::new(), 4);
+		{
+			let mut claim_queue = scheduler::ClaimQueue::<Test>::get();
+			assert_eq!(Scheduler::claim_queue_len(), 6);
 
-		assert_eq!(
-			scheduler::ClaimQueue::<Test>::get(),
-			vec![
-				(
-					CoreIndex(0),
-					vec![ParasEntry::new(
-						Assignment::Bulk(para_a),
-						// At block 3
-						coretime_ttl + 3
-					)]
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(0)).unwrap(),
+				[assignment_a.clone(), assignment_a.clone(), assignment_b.clone()]
 					.into_iter()
-					.collect()
-				),
-				(
-					CoreIndex(1),
-					vec![ParasEntry::new(
-						Assignment::Bulk(para_b),
-						// At block 3
-						coretime_ttl + 3
-					)]
+					.collect::<VecDeque<_>>()
+			);
+			assert_eq!(
+				claim_queue.remove(&CoreIndex(1)).unwrap(),
+				[assignment_a.clone(), assignment_b.clone(), assignment_b.clone()]
 					.into_iter()
-					.collect()
-				),
-			]
-			.into_iter()
-			.collect()
-		);
+					.collect::<VecDeque<_>>()
+			);
+		}
 	});
 }
diff --git a/polkadot/runtime/parachains/src/session_info.rs b/polkadot/runtime/parachains/src/session_info.rs
index ea05c1aacaa9..0ec01755095b 100644
--- a/polkadot/runtime/parachains/src/session_info.rs
+++ b/polkadot/runtime/parachains/src/session_info.rs
@@ -135,8 +135,8 @@ impl<T: Config> Pallet<T> {
 		let assignment_keys = AssignmentKeysUnsafe::<T>::get();
 		let active_set = shared::ActiveValidatorIndices::<T>::get();
 
-		let validator_groups = scheduler::ValidatorGroups::<T>::get().into();
-		let n_cores = scheduler::AvailabilityCores::<T>::get().len() as u32;
+		let validator_groups = scheduler::ValidatorGroups::<T>::get();
+		let n_cores = validator_groups.len() as u32;
 		let zeroth_delay_tranche_width = config.zeroth_delay_tranche_width;
 		let relay_vrf_modulo_samples = config.relay_vrf_modulo_samples;
 		let n_delay_tranches = config.n_delay_tranches;
@@ -177,7 +177,7 @@ impl<T: Config> Pallet<T> {
 			validators, // these are from the notification and are thus already correct.
 			discovery_keys: take_active_subset_and_inactive(&active_set, &discovery_keys),
 			assignment_keys: take_active_subset(&active_set, &assignment_keys),
-			validator_groups,
+			validator_groups: validator_groups.into(),
 			n_cores,
 			zeroth_delay_tranche_width,
 			relay_vrf_modulo_samples,
diff --git a/polkadot/runtime/parachains/src/shared.rs b/polkadot/runtime/parachains/src/shared.rs
index f582bf0d90b5..473c1aba7a06 100644
--- a/polkadot/runtime/parachains/src/shared.rs
+++ b/polkadot/runtime/parachains/src/shared.rs
@@ -80,6 +80,7 @@ impl<Hash: PartialEq + Copy, BlockNumber: AtLeast32BitUnsigned + Copy>
 	/// Add a new relay-parent to the allowed relay parents, along with info about the header.
 	/// Provide a maximum ancestry length for the buffer, which will cause old relay-parents to be
 	/// pruned.
+	/// If the relay parent hash is already present, do nothing.
 	pub(crate) fn update(
 		&mut self,
 		relay_parent: Hash,
@@ -88,6 +89,11 @@ impl<Hash: PartialEq + Copy, BlockNumber: AtLeast32BitUnsigned + Copy>
 		number: BlockNumber,
 		max_ancestry_len: u32,
 	) {
+		if self.buffer.iter().any(|info| info.relay_parent == relay_parent) {
+			// Already present.
+			return
+		}
+
 		let claim_queue = transpose_claim_queue(claim_queue);
 
 		// + 1 for the most recent block, which is always allowed.
diff --git a/polkadot/runtime/parachains/src/shared/tests.rs b/polkadot/runtime/parachains/src/shared/tests.rs
index 6da84e254f05..f7ea5148ce33 100644
--- a/polkadot/runtime/parachains/src/shared/tests.rs
+++ b/polkadot/runtime/parachains/src/shared/tests.rs
@@ -43,7 +43,13 @@ fn tracker_earliest_block_number() {
 	let max_ancestry_len = 4;
 	let now = 4;
 	for i in 1..now {
-		tracker.update(Hash::zero(), Hash::zero(), Default::default(), i, max_ancestry_len);
+		tracker.update(
+			Hash::from([i as u8; 32]),
+			Hash::zero(),
+			Default::default(),
+			i,
+			max_ancestry_len,
+		);
 		assert_eq!(tracker.hypothetical_earliest_block_number(i + 1, max_ancestry_len), 0);
 	}
 
@@ -53,7 +59,7 @@ fn tracker_earliest_block_number() {
 }
 
 #[test]
-fn tracker_claim_queue_remap() {
+fn tracker_claim_queue_transpose() {
 	let mut tracker = AllowedRelayParentsTracker::<Hash, u32>::default();
 
 	let mut claim_queue = BTreeMap::new();
@@ -120,6 +126,14 @@ fn tracker_acquire_info() {
 		Some((s, b)) if s.state_root == state_root && b == 0
 	);
 
+	// Try to push a duplicate. Should be ignored.
+	tracker.update(relay_parent, Hash::repeat_byte(13), Default::default(), 0, max_ancestry_len);
+	assert_eq!(tracker.buffer.len(), 1);
+	assert_matches!(
+		tracker.acquire_info(relay_parent, None),
+		Some((s, b)) if s.state_root == state_root && b == 0
+	);
+
 	let (relay_parent, state_root) = blocks[1];
 	tracker.update(relay_parent, state_root, Default::default(), 1u32, max_ancestry_len);
 	let (relay_parent, state_root) = blocks[2];
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 6266febaa0b2..e94b6666ed07 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -1710,7 +1710,8 @@ pub mod migrations {
         // permanent
         pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
         parachains_inclusion::migration::MigrateToV1<Runtime>,
-        parachains_shared::migration::MigrateToV1<Runtime>,
+		parachains_shared::migration::MigrateToV1<Runtime>,
+        parachains_scheduler::migration::MigrateV2ToV3<Runtime>,
     );
 }
 
diff --git a/polkadot/runtime/rococo/src/weights/polkadot_runtime_parachains_paras_inherent.rs b/polkadot/runtime/rococo/src/weights/polkadot_runtime_parachains_paras_inherent.rs
index b7b3d12d4d92..71a0bb6fc7b2 100644
--- a/polkadot/runtime/rococo/src/weights/polkadot_runtime_parachains_paras_inherent.rs
+++ b/polkadot/runtime/rococo/src/weights/polkadot_runtime_parachains_paras_inherent.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `polkadot_runtime_parachains::paras_inherent`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-08-07, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-10-21, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-696hpswk-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-augrssgt-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -54,10 +54,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:0)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -70,23 +72,21 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParaInclusion::V1` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn enter_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `8967`
-		//  Estimated: `12432`
-		// Minimum execution time: 144_751_000 picoseconds.
-		Weight::from_parts(153_966_000, 0)
-			.saturating_add(Weight::from_parts(0, 12432))
+		//  Measured:  `42760`
+		//  Estimated: `46225`
+		// Minimum execution time: 228_252_000 picoseconds.
+		Weight::from_parts(234_368_000, 0)
+			.saturating_add(Weight::from_parts(0, 46225))
 			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -94,10 +94,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -128,16 +130,14 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Registrar::Paras` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
 	/// Proof: `Hrmp::HrmpWatermarks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::Heads` (r:0 w:1)
@@ -146,19 +146,18 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::UpgradeGoAheadSignal` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::MostRecentContext` (r:0 w:1)
 	/// Proof: `Paras::MostRecentContext` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `v` is `[10, 200]`.
+	/// The range of component `v` is `[400, 1024]`.
 	fn enter_variable_disputes(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `67786`
-		//  Estimated: `73726 + v * (23 ±0)`
-		// Minimum execution time: 972_311_000 picoseconds.
-		Weight::from_parts(645_559_304, 0)
-			.saturating_add(Weight::from_parts(0, 73726))
-			// Standard Error: 53_320
-			.saturating_add(Weight::from_parts(41_795_493, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(25))
-			.saturating_add(T::DbWeight::get().writes(15))
-			.saturating_add(Weight::from_parts(0, 23).saturating_mul(v.into()))
+		//  Measured:  `203155`
+		//  Estimated: `209095`
+		// Minimum execution time: 17_510_015_000 picoseconds.
+		Weight::from_parts(948_178_084, 0)
+			.saturating_add(Weight::from_parts(0, 209095))
+			// Standard Error: 16_345
+			.saturating_add(Weight::from_parts(41_627_958, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(26))
+			.saturating_add(T::DbWeight::get().writes(16))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -166,10 +165,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:0)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -182,25 +183,21 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParaInclusion::V1` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn enter_bitfields() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42374`
-		//  Estimated: `48314`
-		// Minimum execution time: 361_262_000 picoseconds.
-		Weight::from_parts(370_617_000, 0)
-			.saturating_add(Weight::from_parts(0, 48314))
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
+		//  Measured:  `76066`
+		//  Estimated: `82006`
+		// Minimum execution time: 501_266_000 picoseconds.
+		Weight::from_parts(517_989_000, 0)
+			.saturating_add(Weight::from_parts(0, 82006))
+			.saturating_add(T::DbWeight::get().reads(16))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -208,10 +205,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -236,12 +235,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasDisputes::Disputes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::CurrentCodeHash` (r:1 w:0)
 	/// Proof: `Paras::CurrentCodeHash` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::ParaLifecycles` (r:1 w:0)
@@ -252,6 +247,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasDisputes::Included` (r:0 w:1)
 	/// Proof: `ParasDisputes::Included` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
@@ -262,18 +259,18 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::UpgradeGoAheadSignal` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::MostRecentContext` (r:0 w:1)
 	/// Proof: `Paras::MostRecentContext` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `v` is `[101, 200]`.
+	/// The range of component `v` is `[2, 3]`.
 	fn enter_backed_candidates_variable(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42830`
-		//  Estimated: `48770`
-		// Minimum execution time: 1_322_051_000 picoseconds.
-		Weight::from_parts(1_379_846_608, 0)
-			.saturating_add(Weight::from_parts(0, 48770))
-			// Standard Error: 19_959
-			.saturating_add(Weight::from_parts(24_630, 0).saturating_mul(v.into()))
+		//  Measured:  `76842`
+		//  Estimated: `82782`
+		// Minimum execution time: 1_861_799_000 picoseconds.
+		Weight::from_parts(1_891_155_030, 0)
+			.saturating_add(Weight::from_parts(0, 82782))
+			// Standard Error: 2_415_944
+			.saturating_add(Weight::from_parts(7_924_189, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(26))
-			.saturating_add(T::DbWeight::get().writes(15))
+			.saturating_add(T::DbWeight::get().writes(14))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -281,10 +278,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -309,12 +308,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasDisputes::Disputes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::CurrentCodeHash` (r:1 w:0)
 	/// Proof: `Paras::CurrentCodeHash` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::FutureCodeHash` (r:1 w:0)
@@ -329,6 +324,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasDisputes::Included` (r:0 w:1)
 	/// Proof: `ParasDisputes::Included` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
@@ -341,12 +338,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::MostRecentContext` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn enter_backed_candidate_code_upgrade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42843`
-		//  Estimated: `48783`
-		// Minimum execution time: 37_550_515_000 picoseconds.
-		Weight::from_parts(37_886_489_000, 0)
-			.saturating_add(Weight::from_parts(0, 48783))
+		//  Measured:  `76855`
+		//  Estimated: `82795`
+		// Minimum execution time: 37_682_370_000 picoseconds.
+		Weight::from_parts(41_118_445_000, 0)
+			.saturating_add(Weight::from_parts(0, 82795))
 			.saturating_add(T::DbWeight::get().reads(28))
-			.saturating_add(T::DbWeight::get().writes(15))
+			.saturating_add(T::DbWeight::get().writes(14))
 	}
 }
diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs
index 96104ace7d73..9e7ee488af72 100644
--- a/polkadot/runtime/test-runtime/src/lib.rs
+++ b/polkadot/runtime/test-runtime/src/lib.rs
@@ -31,11 +31,11 @@ use codec::Encode;
 use pallet_transaction_payment::FungibleAdapter;
 
 use polkadot_runtime_parachains::{
-	assigner_parachains as parachains_assigner_parachains,
-	configuration as parachains_configuration,
-	configuration::ActiveConfigHrmpChannelSizeAndCapacityRatio, disputes as parachains_disputes,
-	disputes::slashing as parachains_slashing, dmp as parachains_dmp, hrmp as parachains_hrmp,
-	inclusion as parachains_inclusion, initializer as parachains_initializer,
+	assigner_coretime as parachains_assigner_coretime, configuration as parachains_configuration,
+	configuration::ActiveConfigHrmpChannelSizeAndCapacityRatio, coretime,
+	disputes as parachains_disputes, disputes::slashing as parachains_slashing,
+	dmp as parachains_dmp, hrmp as parachains_hrmp, inclusion as parachains_inclusion,
+	initializer as parachains_initializer, on_demand as parachains_on_demand,
 	origin as parachains_origin, paras as parachains_paras,
 	paras_inherent as parachains_paras_inherent, runtime_api_impl::v11 as runtime_impl,
 	scheduler as parachains_scheduler, session_info as parachains_session_info,
@@ -49,8 +49,10 @@ use frame_election_provider_support::{
 use frame_support::{
 	construct_runtime, derive_impl,
 	genesis_builder_helper::{build_state, get_preset},
+	pallet_prelude::Get,
 	parameter_types,
 	traits::{KeyOwnerProofSystem, WithdrawReasons},
+	PalletId,
 };
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
 use pallet_session::historical as session_historical;
@@ -92,6 +94,7 @@ use sp_staking::SessionIndex;
 #[cfg(any(feature = "std", test))]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
+use xcm::v4::{Assets, InteriorLocation, Location, SendError, SendResult, SendXcm, XcmHash};
 
 pub use pallet_balances::Call as BalancesCall;
 #[cfg(feature = "std")]
@@ -559,7 +562,7 @@ impl parachains_initializer::Config for Runtime {
 	type Randomness = pallet_babe::RandomnessFromOneEpochAgo<Runtime>;
 	type ForceOrigin = frame_system::EnsureRoot<AccountId>;
 	type WeightInfo = ();
-	type CoretimeOnNewSession = ();
+	type CoretimeOnNewSession = Coretime;
 }
 
 impl parachains_session_info::Config for Runtime {
@@ -577,15 +580,26 @@ impl parachains_paras::Config for Runtime {
 	type QueueFootprinter = ParaInclusion;
 	type NextSessionRotation = Babe;
 	type OnNewHead = ();
-	type AssignCoretime = ();
+	type AssignCoretime = CoretimeAssignmentProvider;
 }
 
 parameter_types! {
 	pub const BrokerId: u32 = 10u32;
+	pub MaxXcmTransactWeight: Weight = Weight::from_parts(10_000_000, 10_000);
+}
+
+pub struct BrokerPot;
+impl Get<InteriorLocation> for BrokerPot {
+	fn get() -> InteriorLocation {
+		unimplemented!()
+	}
 }
 
 parameter_types! {
 	pub const OnDemandTrafficDefaultValue: FixedU128 = FixedU128::from_u32(1);
+	// Keep 2 timeslices worth of revenue information.
+	pub const MaxHistoricalRevenue: BlockNumber = 2 * 5;
+	pub const OnDemandPalletId: PalletId = PalletId(*b"py/ondmd");
 }
 
 impl parachains_dmp::Config for Runtime {}
@@ -607,10 +621,48 @@ impl parachains_hrmp::Config for Runtime {
 	type WeightInfo = parachains_hrmp::TestWeightInfo;
 }
 
-impl parachains_assigner_parachains::Config for Runtime {}
+impl parachains_on_demand::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = Balances;
+	type TrafficDefaultValue = OnDemandTrafficDefaultValue;
+	type WeightInfo = parachains_on_demand::TestWeightInfo;
+	type MaxHistoricalRevenue = MaxHistoricalRevenue;
+	type PalletId = OnDemandPalletId;
+}
+
+impl parachains_assigner_coretime::Config for Runtime {}
 
 impl parachains_scheduler::Config for Runtime {
-	type AssignmentProvider = ParaAssignmentProvider;
+	type AssignmentProvider = CoretimeAssignmentProvider;
+}
+
+pub struct DummyXcmSender;
+impl SendXcm for DummyXcmSender {
+	type Ticket = ();
+	fn validate(
+		_: &mut Option<Location>,
+		_: &mut Option<xcm::v4::Xcm<()>>,
+	) -> SendResult<Self::Ticket> {
+		Ok(((), Assets::new()))
+	}
+
+	/// Actually carry out the delivery operation for a previously validated message sending.
+	fn deliver(_ticket: Self::Ticket) -> Result<XcmHash, SendError> {
+		Ok([0u8; 32])
+	}
+}
+
+impl coretime::Config for Runtime {
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeEvent = RuntimeEvent;
+	type Currency = pallet_balances::Pallet<Runtime>;
+	type BrokerId = BrokerId;
+	type WeightInfo = crate::coretime::TestWeightInfo;
+	type SendXcm = DummyXcmSender;
+	type MaxXcmTransactWeight = MaxXcmTransactWeight;
+	type BrokerPotLocation = BrokerPot;
+	type AssetTransactor = ();
+	type AccountToLocation = ();
 }
 
 impl paras_sudo_wrapper::Config for Runtime {}
@@ -753,7 +805,9 @@ construct_runtime! {
 		Xcm: pallet_xcm,
 		ParasDisputes: parachains_disputes,
 		ParasSlashing: parachains_slashing,
-		ParaAssignmentProvider: parachains_assigner_parachains,
+		OnDemandAssignmentProvider: parachains_on_demand,
+		CoretimeAssignmentProvider: parachains_assigner_coretime,
+		Coretime: coretime,
 
 		Sudo: pallet_sudo,
 
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index b7dae533224c..461be186ee51 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1805,6 +1805,7 @@ pub mod migrations {
 			MaxAgentsToMigrate,
 		>,
 		parachains_shared::migration::MigrateToV1<Runtime>,
+		parachains_scheduler::migration::MigrateV2ToV3<Runtime>,
 	);
 }
 
diff --git a/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras_inherent.rs b/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras_inherent.rs
index 32f6f28f2426..36aafc1d2f2a 100644
--- a/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras_inherent.rs
+++ b/polkadot/runtime/westend/src/weights/polkadot_runtime_parachains_paras_inherent.rs
@@ -17,9 +17,9 @@
 //! Autogenerated weights for `polkadot_runtime_parachains::paras_inherent`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-08-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-10-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `runner-svzsllib-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! HOSTNAME: `runner-dr4vwrkf-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("westend-dev")`, DB CACHE: 1024
 
 // Executed Command:
@@ -54,10 +54,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:0)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -70,23 +72,21 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParaInclusion::V1` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn enter_empty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `37553`
-		//  Estimated: `41018`
-		// Minimum execution time: 237_414_000 picoseconds.
-		Weight::from_parts(245_039_000, 0)
-			.saturating_add(Weight::from_parts(0, 41018))
+		//  Measured:  `37559`
+		//  Estimated: `41024`
+		// Minimum execution time: 217_257_000 picoseconds.
+		Weight::from_parts(228_878_000, 0)
+			.saturating_add(Weight::from_parts(0, 41024))
 			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -94,10 +94,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -134,16 +136,14 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::FutureCodeUpgrades` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
 	/// Proof: `Hrmp::HrmpWatermarks` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::Heads` (r:0 w:1)
@@ -152,19 +152,18 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::UpgradeGoAheadSignal` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::MostRecentContext` (r:0 w:1)
 	/// Proof: `Paras::MostRecentContext` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `v` is `[10, 1024]`.
+	/// The range of component `v` is `[400, 1024]`.
 	fn enter_variable_disputes(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `199504`
-		//  Estimated: `205444 + v * (5 ±0)`
-		// Minimum execution time: 1_157_489_000 picoseconds.
-		Weight::from_parts(629_243_559, 0)
-			.saturating_add(Weight::from_parts(0, 205444))
-			// Standard Error: 10_997
-			.saturating_add(Weight::from_parts(50_752_930, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(28))
-			.saturating_add(T::DbWeight::get().writes(16))
-			.saturating_add(Weight::from_parts(0, 5).saturating_mul(v.into()))
+		//  Measured:  `117547`
+		//  Estimated: `123487`
+		// Minimum execution time: 21_077_090_000 picoseconds.
+		Weight::from_parts(703_350_265, 0)
+			.saturating_add(Weight::from_parts(0, 123487))
+			// Standard Error: 21_944
+			.saturating_add(Weight::from_parts(51_197_317, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(29))
+			.saturating_add(T::DbWeight::get().writes(17))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -172,10 +171,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:0)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -188,25 +189,21 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParaInclusion::V1` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorIndices` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn enter_bitfields() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `75131`
-		//  Estimated: `81071`
-		// Minimum execution time: 466_928_000 picoseconds.
-		Weight::from_parts(494_342_000, 0)
-			.saturating_add(Weight::from_parts(0, 81071))
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
+		//  Measured:  `74967`
+		//  Estimated: `80907`
+		// Minimum execution time: 487_605_000 picoseconds.
+		Weight::from_parts(506_014_000, 0)
+			.saturating_add(Weight::from_parts(0, 80907))
+			.saturating_add(T::DbWeight::get().reads(16))
+			.saturating_add(T::DbWeight::get().writes(4))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -214,10 +211,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -248,12 +247,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasDisputes::Disputes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::CurrentCodeHash` (r:1 w:0)
 	/// Proof: `Paras::CurrentCodeHash` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::ParaLifecycles` (r:1 w:0)
@@ -264,6 +259,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasDisputes::Included` (r:0 w:1)
 	/// Proof: `ParasDisputes::Included` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
@@ -277,15 +274,15 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// The range of component `v` is `[2, 5]`.
 	fn enter_backed_candidates_variable(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `76369`
-		//  Estimated: `82309`
-		// Minimum execution time: 1_468_919_000 picoseconds.
-		Weight::from_parts(1_433_315_477, 0)
-			.saturating_add(Weight::from_parts(0, 82309))
-			// Standard Error: 419_886
-			.saturating_add(Weight::from_parts(42_880_485, 0).saturating_mul(v.into()))
+		//  Measured:  `76491`
+		//  Estimated: `82431`
+		// Minimum execution time: 1_496_985_000 picoseconds.
+		Weight::from_parts(1_466_448_265, 0)
+			.saturating_add(Weight::from_parts(0, 82431))
+			// Standard Error: 403_753
+			.saturating_add(Weight::from_parts(44_015_233, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(29))
-			.saturating_add(T::DbWeight::get().writes(16))
+			.saturating_add(T::DbWeight::get().writes(15))
 	}
 	/// Storage: `ParaInherent::Included` (r:1 w:1)
 	/// Proof: `ParaInherent::Included` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -293,10 +290,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `System::ParentHash` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
 	/// Storage: `ParasShared::AllowedRelayParents` (r:1 w:1)
 	/// Proof: `ParasShared::AllowedRelayParents` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
+	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
 	/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::AvailabilityCores` (r:1 w:1)
-	/// Proof: `ParaScheduler::AvailabilityCores` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
+	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasShared::ActiveValidatorKeys` (r:1 w:0)
 	/// Proof: `ParasShared::ActiveValidatorKeys` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Babe::AuthorVrfRandomness` (r:1 w:0)
@@ -327,12 +326,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasDisputes::Disputes` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParaScheduler::SessionStartBlock` (r:1 w:0)
 	/// Proof: `ParaScheduler::SessionStartBlock` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ValidatorGroups` (r:1 w:0)
-	/// Proof: `ParaScheduler::ValidatorGroups` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `ParaScheduler::ClaimQueue` (r:1 w:1)
-	/// Proof: `ParaScheduler::ClaimQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
-	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Initializer::BufferedSessionChanges` (r:1 w:0)
+	/// Proof: `Initializer::BufferedSessionChanges` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::CurrentCodeHash` (r:1 w:0)
 	/// Proof: `Paras::CurrentCodeHash` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Paras::FutureCodeHash` (r:1 w:0)
@@ -347,6 +342,8 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `ParasShared::ActiveValidatorIndices` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Session::DisabledValidators` (r:1 w:0)
 	/// Proof: `Session::DisabledValidators` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
+	/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `ParasDisputes::Included` (r:0 w:1)
 	/// Proof: `ParasDisputes::Included` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Hrmp::HrmpWatermarks` (r:0 w:1)
@@ -359,12 +356,12 @@ impl<T: frame_system::Config> polkadot_runtime_parachains::paras_inherent::Weigh
 	/// Proof: `Paras::MostRecentContext` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn enter_backed_candidate_code_upgrade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `76382`
-		//  Estimated: `82322`
-		// Minimum execution time: 34_577_233_000 picoseconds.
-		Weight::from_parts(39_530_352_000, 0)
-			.saturating_add(Weight::from_parts(0, 82322))
+		//  Measured:  `76504`
+		//  Estimated: `82444`
+		// Minimum execution time: 40_136_167_000 picoseconds.
+		Weight::from_parts(41_572_376_000, 0)
+			.saturating_add(Weight::from_parts(0, 82444))
 			.saturating_add(T::DbWeight::get().reads(31))
-			.saturating_add(T::DbWeight::get().writes(16))
+			.saturating_add(T::DbWeight::get().writes(15))
 	}
 }
diff --git a/polkadot/zombienet_tests/functional/0015-coretime-shared-core.zndsl b/polkadot/zombienet_tests/functional/0015-coretime-shared-core.zndsl
index b8b8887df857..8f883dffa5e1 100644
--- a/polkadot/zombienet_tests/functional/0015-coretime-shared-core.zndsl
+++ b/polkadot/zombienet_tests/functional/0015-coretime-shared-core.zndsl
@@ -5,8 +5,8 @@ Creds: config
 validator: reports node_roles is 4
 
 # register paras 2 by 2 to speed up the test. registering all at once will exceed the weight limit.
-validator-0: js-script ./0015-force-register-paras.js with "2000,2001" return is 0 within 600 seconds
-validator-0: js-script ./0015-force-register-paras.js with "2002,2003" return is 0 within 600 seconds
+validator-0: js-script ./force-register-paras.js with "2000,2001" return is 0 within 600 seconds
+validator-0: js-script ./force-register-paras.js with "2002,2003" return is 0 within 600 seconds
 # assign core 0 to be shared by all paras.
 validator-0: js-script ./assign-core.js with "0,2000,14400,2001,14400,2002,14400,2003,14400" return is 0 within 600 seconds
 
diff --git a/polkadot/zombienet_tests/functional/0017-sync-backing.toml b/polkadot/zombienet_tests/functional/0017-sync-backing.toml
new file mode 100644
index 000000000000..2550054c8dad
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0017-sync-backing.toml
@@ -0,0 +1,48 @@
+[settings]
+timeout = 1000
+
+[relaychain]
+default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+chain = "rococo-local"
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config.async_backing_params]
+  max_candidate_depth = 0
+  allowed_ancestry_len = 0
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
+  lookahead = 2
+  group_rotation_frequency = 4
+
+[relaychain.default_resources]
+limits = { memory = "4G", cpu = "2" }
+requests = { memory = "2G", cpu = "1" }
+
+  [[relaychain.node_groups]]
+  name = "alice"
+  args = [ "-lparachain=debug" ]
+  count = 10
+
+[[parachains]]
+id = 2000
+addToGenesis = true
+
+  [parachains.collator]
+  name = "collator01"
+  image = "{{COL_IMAGE}}"
+  command = "adder-collator"
+  args = ["-lparachain=debug"]
+
+[[parachains]]
+id = 2001
+cumulus_based = true
+
+  [parachains.collator]
+  name = "collator02"
+  image = "{{CUMULUS_IMAGE}}"
+  command = "polkadot-parachain"
+  args = ["-lparachain=debug"]
+
+[types.Header]
+number = "u64"
+parent_hash = "Hash"
+post_state = "Hash"
\ No newline at end of file
diff --git a/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl b/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl
new file mode 100644
index 000000000000..a53de784b2d1
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0017-sync-backing.zndsl
@@ -0,0 +1,22 @@
+Description: Test we are producing 12-second parachain blocks if sync backing is configured
+Network: ./0017-sync-backing.toml
+Creds: config
+
+# Check authority status.
+alice: reports node_roles is 4
+
+# Ensure parachains are registered.
+alice: parachain 2000 is registered within 60 seconds
+alice: parachain 2001 is registered within 60 seconds
+
+# Ensure parachains made progress.
+alice: reports substrate_block_height{status="finalized"} is at least 10 within 100 seconds
+
+# This parachains should produce blocks at 12s clip, let's assume an 14s rate, allowing for
+# some slots to be missed on slower machines
+alice: parachain 2000 block height is at least 21 within 300 seconds
+alice: parachain 2000 block height is lower than 25 within 2 seconds
+
+# This should already have produced the needed blocks
+alice: parachain 2001 block height is at least 21 within 10 seconds
+alice: parachain 2001 block height is lower than 25 within 2 seconds
diff --git a/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.toml b/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.toml
new file mode 100644
index 000000000000..745c4f9e24b1
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.toml
@@ -0,0 +1,39 @@
+[settings]
+timeout = 1000
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config.scheduler_params]
+  max_validators_per_core = 2
+  lookahead = 2
+  num_cores = 4
+  group_rotation_frequency = 4
+
+
+[relaychain.genesis.runtimeGenesis.patch.configuration.config.approval_voting_params]
+  needed_approvals = 3
+
+[relaychain]
+default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+chain = "rococo-local"
+command = "polkadot"
+
+  [[relaychain.node_groups]]
+  name = "validator"
+  args = ["-lruntime=debug,parachain=debug"]
+  count = 4
+
+[[parachains]]
+id = 2000
+register_para = false
+onboard_as_parachain = false
+add_to_genesis = false
+chain = "glutton-westend-local-2000"
+    [parachains.genesis.runtimeGenesis.patch.glutton]
+    compute = "50000000"
+    storage = "2500000000"
+    trashDataCount = 5120
+
+    [parachains.collator]
+    name = "collator-2000"
+    image = "{{CUMULUS_IMAGE}}"
+    command = "polkadot-parachain"
+    args = ["-lparachain=debug"]
diff --git a/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.zndsl b/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.zndsl
new file mode 100644
index 000000000000..80ecf6ae1b9b
--- /dev/null
+++ b/polkadot/zombienet_tests/functional/0018-shared-core-idle-parachain.zndsl
@@ -0,0 +1,11 @@
+Description: Test that a parachain can keep producing blocks even if the other parachain with which it's sharing a core doesn't
+Network: ./0018-shared-core-idle-parachain.toml
+Creds: config
+
+validator: reports node_roles is 4
+
+validator-0: js-script ./force-register-paras.js with "2000" return is 0 within 600 seconds
+# assign core 0 to be shared by two paras, but only one exists
+validator-0: js-script ./assign-core.js with "0,2000,28800,2001,28800" return is 0 within 600 seconds
+
+collator-2000: reports block height is at least 10 within 180 seconds
diff --git a/polkadot/zombienet_tests/functional/0015-force-register-paras.js b/polkadot/zombienet_tests/functional/force-register-paras.js
similarity index 100%
rename from polkadot/zombienet_tests/functional/0015-force-register-paras.js
rename to polkadot/zombienet_tests/functional/force-register-paras.js
diff --git a/prdoc/pr_5461.prdoc b/prdoc/pr_5461.prdoc
new file mode 100644
index 000000000000..bf343216e29b
--- /dev/null
+++ b/prdoc/pr_5461.prdoc
@@ -0,0 +1,20 @@
+title: "runtime: remove ttl"
+
+doc:
+  - audience: [Runtime Dev, Node Dev]
+    description: |
+      Resolves https://github.com/paritytech/polkadot-sdk/issues/4776. Removes the scheduling ttl used in the relay chain
+      runtimes, as well as the availability timeout retries. The extrinsics for configuring these two values are also removed.
+      Deprecates the `ttl` and `max_availability_timeouts` fields of the `HostConfiguration` primitive.
+
+crates:
+  - name: polkadot-runtime-parachains
+    bump: major
+  - name: polkadot-primitives
+    bump: major
+  - name: rococo-runtime
+    bump: major
+  - name: westend-runtime
+    bump: major
+  - name: polkadot
+    bump: none

From 03f1d2d646c35239405514cbb73bd376b85636cd Mon Sep 17 00:00:00 2001
From: Dusan Morhac <55763425+dudo50@users.noreply.github.com>
Date: Mon, 21 Oct 2024 23:40:00 +0200
Subject: [PATCH 11/20] [pallet-nfts, pallet_uniques] - Expose private structs
 (#6087)

# Description

This PR exposes pallet_nfts and pallet_uniques structs, so other pallets
can access storage to use it for extending nft functionalities.

In pallet uniques it also exposes collection and asset metadata storage
as they are private.

## Integration

This integration allows nfts and uniques extension pallets to use then
private - now public structs to retrieve and parse storage from
pallet_nfts. We are building cross-chain NFT pallet and in order to
transfer collection that houses multiple NFT owners we need to manually
remove NFTs and Collections from storage without signers. We would also
like to refund deposits on origin chain and we were unable to as struct
data was private.

We have built cross-chain pallet that allows to send nfts or collections
between two pallets in abstract way without having to look which pallet
parachain (If nfts or uniques) implements.

## Review Notes

Code exposes private structs to public structs. No breaking change.

Build runs fine, tests are also ok.
<img width="468" alt="screen1"
src="https://github.com/user-attachments/assets/f31f60b5-390c-4497-b46b-59dd561204ae">
<img width="664" alt="screen2"
src="https://github.com/user-attachments/assets/7e2aa71c-3bc4-49a9-8afc-47d4f45f4359">
<img width="598" alt="screen3"
src="https://github.com/user-attachments/assets/10f4e427-858f-460d-8644-f5750494edb0">



PR is tied with following issue:
Closes #5959

# Checklist

* [x] My PR includes a detailed description as outlined in the
"Description" and its two subsections above.
* [x] My PR follows the [labeling requirements](

https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/CONTRIBUTING.md#Process
) of this project (at minimum one label for `T` required)
* External contributors: ask maintainers to put the right label on your
PR.
* [ ] I have made corresponding changes to the documentation (if
applicable)
* [ ] I have added tests that prove my fix is effective or that my
feature works (if applicable)

---------

Co-authored-by: Branislav Kontur <bkontur@gmail.com>
Co-authored-by: command-bot <>
---
 prdoc/pr_6087.prdoc                  | 12 +++++
 substrate/frame/nfts/src/types.rs    | 77 ++++++++++++++--------------
 substrate/frame/uniques/src/lib.rs   |  4 +-
 substrate/frame/uniques/src/types.rs | 40 +++++++--------
 4 files changed, 72 insertions(+), 61 deletions(-)
 create mode 100644 prdoc/pr_6087.prdoc

diff --git a/prdoc/pr_6087.prdoc b/prdoc/pr_6087.prdoc
new file mode 100644
index 000000000000..db083ba645b9
--- /dev/null
+++ b/prdoc/pr_6087.prdoc
@@ -0,0 +1,12 @@
+title: Expose private structs in pallet_nfts and pallet_uniques.
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      PR changes certain structs in pallet_nfts and pallet_uniques into public. It also changes 2 storages (collection & asset metadata) into public in pallet_uniques.
+
+crates:
+  - name: pallet-nfts
+    bump: patch
+  - name: pallet-uniques
+    bump: patch
diff --git a/substrate/frame/nfts/src/types.rs b/substrate/frame/nfts/src/types.rs
index 60d7c639c88c..d67fb404ea79 100644
--- a/substrate/frame/nfts/src/types.rs
+++ b/substrate/frame/nfts/src/types.rs
@@ -31,49 +31,48 @@ use frame_system::pallet_prelude::BlockNumberFor;
 use scale_info::{build::Fields, meta_type, Path, Type, TypeInfo, TypeParameter};
 
 /// A type alias for handling balance deposits.
-pub(super) type DepositBalanceOf<T, I = ()> =
+pub type DepositBalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 /// A type alias representing the details of a collection.
-pub(super) type CollectionDetailsFor<T, I> =
+pub type CollectionDetailsFor<T, I> =
 	CollectionDetails<<T as SystemConfig>::AccountId, DepositBalanceOf<T, I>>;
 /// A type alias for keeping track of approvals used by a single item.
-pub(super) type ApprovalsOf<T, I = ()> = BoundedBTreeMap<
+pub type ApprovalsOf<T, I = ()> = BoundedBTreeMap<
 	<T as SystemConfig>::AccountId,
 	Option<BlockNumberFor<T>>,
 	<T as Config<I>>::ApprovalsLimit,
 >;
 /// A type alias for keeping track of approvals for an item's attributes.
-pub(super) type ItemAttributesApprovals<T, I = ()> =
+pub type ItemAttributesApprovals<T, I = ()> =
 	BoundedBTreeSet<<T as SystemConfig>::AccountId, <T as Config<I>>::ItemAttributesApprovalsLimit>;
 /// A type that holds the deposit for a single item.
-pub(super) type ItemDepositOf<T, I> =
-	ItemDeposit<DepositBalanceOf<T, I>, <T as SystemConfig>::AccountId>;
+pub type ItemDepositOf<T, I> = ItemDeposit<DepositBalanceOf<T, I>, <T as SystemConfig>::AccountId>;
 /// A type that holds the deposit amount for an item's attribute.
-pub(super) type AttributeDepositOf<T, I> =
+pub type AttributeDepositOf<T, I> =
 	AttributeDeposit<DepositBalanceOf<T, I>, <T as SystemConfig>::AccountId>;
 /// A type that holds the deposit amount for an item's metadata.
-pub(super) type ItemMetadataDepositOf<T, I> =
+pub type ItemMetadataDepositOf<T, I> =
 	ItemMetadataDeposit<DepositBalanceOf<T, I>, <T as SystemConfig>::AccountId>;
 /// A type that holds the details of a single item.
-pub(super) type ItemDetailsFor<T, I> =
+pub type ItemDetailsFor<T, I> =
 	ItemDetails<<T as SystemConfig>::AccountId, ItemDepositOf<T, I>, ApprovalsOf<T, I>>;
 /// A type alias for an accounts balance.
-pub(super) type BalanceOf<T, I = ()> =
+pub type BalanceOf<T, I = ()> =
 	<<T as Config<I>>::Currency as Currency<<T as SystemConfig>::AccountId>>::Balance;
 /// A type alias to represent the price of an item.
-pub(super) type ItemPrice<T, I = ()> = BalanceOf<T, I>;
+pub type ItemPrice<T, I = ()> = BalanceOf<T, I>;
 /// A type alias for the tips held by a single item.
-pub(super) type ItemTipOf<T, I = ()> = ItemTip<
+pub type ItemTipOf<T, I = ()> = ItemTip<
 	<T as Config<I>>::CollectionId,
 	<T as Config<I>>::ItemId,
 	<T as SystemConfig>::AccountId,
 	BalanceOf<T, I>,
 >;
 /// A type alias for the settings configuration of a collection.
-pub(super) type CollectionConfigFor<T, I = ()> =
+pub type CollectionConfigFor<T, I = ()> =
 	CollectionConfig<BalanceOf<T, I>, BlockNumberFor<T>, <T as Config<I>>::CollectionId>;
 /// A type alias for the pre-signed minting configuration for a specified collection.
-pub(super) type PreSignedMintOf<T, I = ()> = PreSignedMint<
+pub type PreSignedMintOf<T, I = ()> = PreSignedMint<
 	<T as Config<I>>::CollectionId,
 	<T as Config<I>>::ItemId,
 	<T as SystemConfig>::AccountId,
@@ -81,7 +80,7 @@ pub(super) type PreSignedMintOf<T, I = ()> = PreSignedMint<
 	BalanceOf<T, I>,
 >;
 /// A type alias for the pre-signed minting configuration on the attribute level of an item.
-pub(super) type PreSignedAttributesOf<T, I = ()> = PreSignedAttributes<
+pub type PreSignedAttributesOf<T, I = ()> = PreSignedAttributes<
 	<T as Config<I>>::CollectionId,
 	<T as Config<I>>::ItemId,
 	<T as SystemConfig>::AccountId,
@@ -92,18 +91,18 @@ pub(super) type PreSignedAttributesOf<T, I = ()> = PreSignedAttributes<
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct CollectionDetails<AccountId, DepositBalance> {
 	/// Collection's owner.
-	pub(super) owner: AccountId,
+	pub owner: AccountId,
 	/// The total balance deposited by the owner for all the storage data associated with this
 	/// collection. Used by `destroy`.
-	pub(super) owner_deposit: DepositBalance,
+	pub owner_deposit: DepositBalance,
 	/// The total number of outstanding items of this collection.
-	pub(super) items: u32,
+	pub items: u32,
 	/// The total number of outstanding item metadata of this collection.
-	pub(super) item_metadatas: u32,
+	pub item_metadatas: u32,
 	/// The total number of outstanding item configs of this collection.
-	pub(super) item_configs: u32,
+	pub item_configs: u32,
 	/// The total number of attributes for this collection.
-	pub(super) attributes: u32,
+	pub attributes: u32,
 }
 
 /// Witness data for the destroy transactions.
@@ -143,21 +142,21 @@ pub struct MintWitness<ItemId, Balance> {
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)]
 pub struct ItemDetails<AccountId, Deposit, Approvals> {
 	/// The owner of this item.
-	pub(super) owner: AccountId,
+	pub owner: AccountId,
 	/// The approved transferrer of this item, if one is set.
-	pub(super) approvals: Approvals,
+	pub approvals: Approvals,
 	/// The amount held in the pallet's default account for this item. Free-hold items will have
 	/// this as zero.
-	pub(super) deposit: Deposit,
+	pub deposit: Deposit,
 }
 
 /// Information about the reserved item deposit.
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct ItemDeposit<DepositBalance, AccountId> {
 	/// A depositor account.
-	pub(super) account: AccountId,
+	pub account: AccountId,
 	/// An amount that gets reserved.
-	pub(super) amount: DepositBalance,
+	pub amount: DepositBalance,
 }
 
 /// Information about the collection's metadata.
@@ -168,11 +167,11 @@ pub struct CollectionMetadata<Deposit, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
 	/// This pays for the data stored in this struct.
-	pub(super) deposit: Deposit,
+	pub deposit: Deposit,
 	/// General information concerning this collection. Limited in length by `StringLimit`. This
 	/// will generally be either a JSON dump or the hash of some JSON which can be found on a
 	/// hash-addressable global publication system such as IPFS.
-	pub(super) data: BoundedVec<u8, StringLimit>,
+	pub data: BoundedVec<u8, StringLimit>,
 }
 
 /// Information about the item's metadata.
@@ -182,11 +181,11 @@ pub struct ItemMetadata<Deposit, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
 	/// This pays for the data stored in this struct.
-	pub(super) deposit: Deposit,
+	pub deposit: Deposit,
 	/// General information concerning this item. Limited in length by `StringLimit`. This will
-	/// generally be either a JSON dump or the hash of some JSON which can be found on a
+	/// generally be either a JSON dump or the hash of some JSON which can be found on
 	/// hash-addressable global publication system such as IPFS.
-	pub(super) data: BoundedVec<u8, StringLimit>,
+	pub data: BoundedVec<u8, StringLimit>,
 }
 
 /// Information about the tip.
@@ -206,31 +205,31 @@ pub struct ItemTip<CollectionId, ItemId, AccountId, Amount> {
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)]
 pub struct PendingSwap<CollectionId, ItemId, ItemPriceWithDirection, Deadline> {
 	/// The collection that contains the item that the user wants to receive.
-	pub(super) desired_collection: CollectionId,
+	pub desired_collection: CollectionId,
 	/// The item the user wants to receive.
-	pub(super) desired_item: Option<ItemId>,
+	pub desired_item: Option<ItemId>,
 	/// A price for the desired `item` with the direction.
-	pub(super) price: Option<ItemPriceWithDirection>,
+	pub price: Option<ItemPriceWithDirection>,
 	/// A deadline for the swap.
-	pub(super) deadline: Deadline,
+	pub deadline: Deadline,
 }
 
 /// Information about the reserved attribute deposit.
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct AttributeDeposit<DepositBalance, AccountId> {
 	/// A depositor account.
-	pub(super) account: Option<AccountId>,
+	pub account: Option<AccountId>,
 	/// An amount that gets reserved.
-	pub(super) amount: DepositBalance,
+	pub amount: DepositBalance,
 }
 
 /// Information about the reserved item's metadata deposit.
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct ItemMetadataDeposit<DepositBalance, AccountId> {
 	/// A depositor account, None means the deposit is collection's owner.
-	pub(super) account: Option<AccountId>,
+	pub account: Option<AccountId>,
 	/// An amount that gets reserved.
-	pub(super) amount: DepositBalance,
+	pub amount: DepositBalance,
 }
 
 /// Specifies whether the tokens will be sent or received.
diff --git a/substrate/frame/uniques/src/lib.rs b/substrate/frame/uniques/src/lib.rs
index dc27c3356234..84f122c08bb7 100644
--- a/substrate/frame/uniques/src/lib.rs
+++ b/substrate/frame/uniques/src/lib.rs
@@ -223,7 +223,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::storage_prefix = "ClassMetadataOf"]
 	/// Metadata of a collection.
-	pub(super) type CollectionMetadataOf<T: Config<I>, I: 'static = ()> = StorageMap<
+	pub type CollectionMetadataOf<T: Config<I>, I: 'static = ()> = StorageMap<
 		_,
 		Blake2_128Concat,
 		T::CollectionId,
@@ -234,7 +234,7 @@ pub mod pallet {
 	#[pallet::storage]
 	#[pallet::storage_prefix = "InstanceMetadataOf"]
 	/// Metadata of an item.
-	pub(super) type ItemMetadataOf<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
+	pub type ItemMetadataOf<T: Config<I>, I: 'static = ()> = StorageDoubleMap<
 		_,
 		Blake2_128Concat,
 		T::CollectionId,
diff --git a/substrate/frame/uniques/src/types.rs b/substrate/frame/uniques/src/types.rs
index a2e804f245f7..e2e170c72f21 100644
--- a/substrate/frame/uniques/src/types.rs
+++ b/substrate/frame/uniques/src/types.rs
@@ -40,26 +40,26 @@ pub(super) type ItemPrice<T, I = ()> =
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct CollectionDetails<AccountId, DepositBalance> {
 	/// Can change `owner`, `issuer`, `freezer` and `admin` accounts.
-	pub(super) owner: AccountId,
+	pub owner: AccountId,
 	/// Can mint tokens.
-	pub(super) issuer: AccountId,
+	pub issuer: AccountId,
 	/// Can thaw tokens, force transfers and burn tokens from any account.
-	pub(super) admin: AccountId,
+	pub admin: AccountId,
 	/// Can freeze tokens.
-	pub(super) freezer: AccountId,
+	pub freezer: AccountId,
 	/// The total balance deposited for the all storage associated with this collection.
 	/// Used by `destroy`.
-	pub(super) total_deposit: DepositBalance,
+	pub total_deposit: DepositBalance,
 	/// If `true`, then no deposit is needed to hold items of this collection.
-	pub(super) free_holding: bool,
+	pub free_holding: bool,
 	/// The total number of outstanding items of this collection.
-	pub(super) items: u32,
+	pub items: u32,
 	/// The total number of outstanding item metadata of this collection.
-	pub(super) item_metadatas: u32,
+	pub item_metadatas: u32,
 	/// The total number of attributes for this collection.
-	pub(super) attributes: u32,
+	pub attributes: u32,
 	/// Whether the collection is frozen for non-admin transfers.
-	pub(super) is_frozen: bool,
+	pub is_frozen: bool,
 }
 
 /// Witness data for the destroy transactions.
@@ -90,14 +90,14 @@ impl<AccountId, DepositBalance> CollectionDetails<AccountId, DepositBalance> {
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)]
 pub struct ItemDetails<AccountId, DepositBalance> {
 	/// The owner of this item.
-	pub(super) owner: AccountId,
+	pub owner: AccountId,
 	/// The approved transferrer of this item, if one is set.
-	pub(super) approved: Option<AccountId>,
+	pub approved: Option<AccountId>,
 	/// Whether the item can be transferred or not.
-	pub(super) is_frozen: bool,
+	pub is_frozen: bool,
 	/// The amount held in the pallet's default account for this item. Free-hold items will have
 	/// this as zero.
-	pub(super) deposit: DepositBalance,
+	pub deposit: DepositBalance,
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)]
@@ -107,13 +107,13 @@ pub struct CollectionMetadata<DepositBalance, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
 	/// This pays for the data stored in this struct.
-	pub(super) deposit: DepositBalance,
+	pub deposit: DepositBalance,
 	/// General information concerning this collection. Limited in length by `StringLimit`. This
 	/// will generally be either a JSON dump or the hash of some JSON which can be found on a
 	/// hash-addressable global publication system such as IPFS.
-	pub(super) data: BoundedVec<u8, StringLimit>,
+	pub data: BoundedVec<u8, StringLimit>,
 	/// Whether the collection's metadata may be changed by a non Force origin.
-	pub(super) is_frozen: bool,
+	pub is_frozen: bool,
 }
 
 #[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, Default, TypeInfo, MaxEncodedLen)]
@@ -123,11 +123,11 @@ pub struct ItemMetadata<DepositBalance, StringLimit: Get<u32>> {
 	/// The balance deposited for this metadata.
 	///
 	/// This pays for the data stored in this struct.
-	pub(super) deposit: DepositBalance,
+	pub deposit: DepositBalance,
 	/// General information concerning this item. Limited in length by `StringLimit`. This will
 	/// generally be either a JSON dump or the hash of some JSON which can be found on a
 	/// hash-addressable global publication system such as IPFS.
-	pub(super) data: BoundedVec<u8, StringLimit>,
+	pub data: BoundedVec<u8, StringLimit>,
 	/// Whether the item metadata may be changed by a non Force origin.
-	pub(super) is_frozen: bool,
+	pub is_frozen: bool,
 }

From d1cf996354342b33bd7ae327ddae68b286784363 Mon Sep 17 00:00:00 2001
From: Egor_P <egor@parity.io>
Date: Tue, 22 Oct 2024 09:25:11 +0200
Subject: [PATCH 12/20] [Backport] Version bumps from stable2409-1 (#6153)

This PR backports regular version bumps and prdocs reordering from the
current stable release back to master
---
 cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs  | 2 +-
 cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs | 2 +-
 polkadot/node/primitives/src/lib.rs                             | 2 +-
 prdoc/{ => 1.16.1}/pr_4803.prdoc                                | 0
 prdoc/{ => 1.16.1}/pr_5599.prdoc                                | 0
 prdoc/{ => 1.16.1}/pr_5753.prdoc                                | 0
 prdoc/{ => 1.16.1}/pr_5887.prdoc                                | 0
 prdoc/{ => 1.16.1}/pr_5913.prdoc                                | 0
 prdoc/{ => 1.16.1}/pr_6031.prdoc                                | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename prdoc/{ => 1.16.1}/pr_4803.prdoc (100%)
 rename prdoc/{ => 1.16.1}/pr_5599.prdoc (100%)
 rename prdoc/{ => 1.16.1}/pr_5753.prdoc (100%)
 rename prdoc/{ => 1.16.1}/pr_5887.prdoc (100%)
 rename prdoc/{ => 1.16.1}/pr_5913.prdoc (100%)
 rename prdoc/{ => 1.16.1}/pr_6031.prdoc (100%)

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index 2f25fa0ec1d6..ae5d2102ff66 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -123,7 +123,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("statemine"),
 	impl_name: create_runtime_str!("statemine"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_016_002,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 14f24228d0a2..0da80098b28f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -123,7 +123,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("westmint"),
 	impl_name: create_runtime_str!("westmint"),
 	authoring_version: 1,
-	spec_version: 1_016_001,
+	spec_version: 1_016_002,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index 99d3a3e515b8..a525b2bc9776 100644
--- a/polkadot/node/primitives/src/lib.rs
+++ b/polkadot/node/primitives/src/lib.rs
@@ -59,7 +59,7 @@ pub use disputes::{
 /// relatively rare.
 ///
 /// The associated worker binaries should use the same version as the node that spawns them.
-pub const NODE_VERSION: &'static str = "1.16.0";
+pub const NODE_VERSION: &'static str = "1.16.1";
 
 // For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node
 // plus some overhead:
diff --git a/prdoc/pr_4803.prdoc b/prdoc/1.16.1/pr_4803.prdoc
similarity index 100%
rename from prdoc/pr_4803.prdoc
rename to prdoc/1.16.1/pr_4803.prdoc
diff --git a/prdoc/pr_5599.prdoc b/prdoc/1.16.1/pr_5599.prdoc
similarity index 100%
rename from prdoc/pr_5599.prdoc
rename to prdoc/1.16.1/pr_5599.prdoc
diff --git a/prdoc/pr_5753.prdoc b/prdoc/1.16.1/pr_5753.prdoc
similarity index 100%
rename from prdoc/pr_5753.prdoc
rename to prdoc/1.16.1/pr_5753.prdoc
diff --git a/prdoc/pr_5887.prdoc b/prdoc/1.16.1/pr_5887.prdoc
similarity index 100%
rename from prdoc/pr_5887.prdoc
rename to prdoc/1.16.1/pr_5887.prdoc
diff --git a/prdoc/pr_5913.prdoc b/prdoc/1.16.1/pr_5913.prdoc
similarity index 100%
rename from prdoc/pr_5913.prdoc
rename to prdoc/1.16.1/pr_5913.prdoc
diff --git a/prdoc/pr_6031.prdoc b/prdoc/1.16.1/pr_6031.prdoc
similarity index 100%
rename from prdoc/pr_6031.prdoc
rename to prdoc/1.16.1/pr_6031.prdoc

From 356386b56881a7a2cb1b0be5628ad2a97678b34d Mon Sep 17 00:00:00 2001
From: Serban Iorga <serban@parity.io>
Date: Tue, 22 Oct 2024 12:18:48 +0300
Subject: [PATCH 13/20] Fix TrustedQueryApi Error (#6170)

Related to https://github.com/paritytech/polkadot-sdk/issues/6161

This seems to fix the `JavaScript heap out of memory` error encountered
in the bridge zombienet tests lately.

This is just a partial fix, since we also need to address
https://github.com/paritytech/polkadot-sdk/issues/6133 in order to fully
fix the bridge zombienet tests
---
 .gitlab/pipeline/zombienet.yml                     | 1 -
 polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs | 2 --
 2 files changed, 3 deletions(-)

diff --git a/.gitlab/pipeline/zombienet.yml b/.gitlab/pipeline/zombienet.yml
index 5aa37f783a0a..08bfed2e24ce 100644
--- a/.gitlab/pipeline/zombienet.yml
+++ b/.gitlab/pipeline/zombienet.yml
@@ -9,7 +9,6 @@
     RUN_IN_CI: "1"
     KUBERNETES_CPU_REQUEST: "512m"
     KUBERNETES_MEMORY_REQUEST: "1Gi"
-    NODE_OPTIONS: "--max-old-space-size=8192"
   timeout: 60m
 
 include:
diff --git a/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs b/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
index e75af54ad2fd..a2e3e1625486 100644
--- a/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
+++ b/polkadot/xcm/xcm-runtime-apis/src/trusted_query.rs
@@ -44,9 +44,7 @@ sp_api::decl_runtime_apis! {
 #[derive(Copy, Clone, Encode, Decode, Eq, PartialEq, Debug, TypeInfo)]
 pub enum Error {
 	/// Converting a versioned Asset structure from one version to another failed.
-	#[codec(index = 1)]
 	VersionedAssetConversionFailed,
 	/// Converting a versioned Location structure from one version to another failed.
-	#[codec(index = 1)]
 	VersionedLocationConversionFailed,
 }

From 21930ed2019219c2ffd57c08c0bf675db467a91f Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Tue, 22 Oct 2024 12:27:30 +0200
Subject: [PATCH 14/20] [pallet-revive] Eth RPC integration (#5866)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR introduces the necessary changes to pallet-revive for
integrating with our Ethereum JSON-RPC.
The RPC proxy itself will be added in a follow up.

## Changes

- A new pallet::call `Call::eth_transact`. This is used as a wrapper to
accept unsigned Ethereum transaction, valid call will be routed to
`Call::call` or `Call::instantiate_with_code`

- A custom UncheckedExtrinsic struct, that wraps the generic one usually
and add the ability to check eth_transact calls sent from an Ethereum
JSON-RPC proxy.
- Generated types and traits to support implementing a JSON-RPC Ethereum
proxy.

## Flow Overview:
- A user submits a transaction via MetaMask or another
Ethereum-compatible wallet.
- The proxy dry run the transaction and add metadata to the call (gas
limit in Weight, storage deposit limit, and length of bytecode and
constructor input for contract instantiation)
- The raw transaction, along with the additional metadata, is submitted
to the node as an unsigned extrinsic.
- On the runtime, our custom UncheckedExtrinsic define a custom
Checkable implementation that converts the unsigned extrinsics into
checked one
 - It recovers the signer
- validates the payload, and injects signed extensions, allowing the
system to increment the nonce and charge the appropriate fees.
- re-route the call to pallet-revive::Call::call or
pallet-revive::Call::instantiateWithCode

## Dependencies

- https://github.com/koute/polkavm/pull/188

## Follow up PRs
- #5926
- #6147 (previously #5953)
- #5502

---------

Co-authored-by: Alexander Theißen <alex.theissen@me.com>
Co-authored-by: Cyrill Leutwiler <cyrill@parity.io>
---
 Cargo.lock                                    | 171 ++++-
 prdoc/pr_5866.prdoc                           |  23 +
 substrate/bin/node/cli/Cargo.toml             |   3 +-
 .../bin/node/cli/benches/block_production.rs  |  10 +-
 substrate/bin/node/cli/src/chain_spec.rs      |  33 +-
 substrate/bin/node/cli/src/service.rs         |  19 +-
 substrate/bin/node/cli/tests/basic.rs         |   8 +-
 substrate/bin/node/cli/tests/fees.rs          |   2 +-
 .../bin/node/cli/tests/submit_transaction.rs  |   9 +-
 substrate/bin/node/runtime/Cargo.toml         |   2 +
 substrate/bin/node/runtime/src/lib.rs         |  79 +-
 substrate/bin/node/testing/Cargo.toml         |   1 +
 substrate/bin/node/testing/src/bench.rs       |  15 +-
 substrate/bin/node/testing/src/keyring.rs     |  15 +-
 substrate/frame/revive/Cargo.toml             |  41 +-
 substrate/frame/revive/fixtures/Cargo.toml    |  11 +-
 substrate/frame/revive/fixtures/build.rs      |   9 +-
 .../frame/revive/fixtures/build/Cargo.toml    |   2 +-
 substrate/frame/revive/fixtures/src/lib.rs    |  23 +-
 .../frame/revive/mock-network/Cargo.toml      |  14 +
 substrate/frame/revive/src/address.rs         |   2 +-
 substrate/frame/revive/src/evm.rs             |  22 +
 substrate/frame/revive/src/evm/api.rs         |  38 +
 substrate/frame/revive/src/evm/api/account.rs |  51 ++
 substrate/frame/revive/src/evm/api/byte.rs    | 154 ++++
 .../frame/revive/src/evm/api/rlp_codec.rs     | 219 ++++++
 .../frame/revive/src/evm/api/rpc_types.rs     |  32 +
 .../frame/revive/src/evm/api/rpc_types_gen.rs | 682 +++++++++++++++++
 .../frame/revive/src/evm/api/signature.rs     |  80 ++
 substrate/frame/revive/src/evm/api/type_id.rs |  95 +++
 substrate/frame/revive/src/evm/runtime.rs     | 685 ++++++++++++++++++
 substrate/frame/revive/src/exec.rs            |  15 +-
 substrate/frame/revive/src/lib.rs             | 271 ++++++-
 substrate/frame/revive/src/primitives.rs      |  21 +-
 .../frame/revive/src/test_utils/builder.rs    |   9 +-
 substrate/frame/revive/src/tests.rs           |  36 +-
 substrate/frame/revive/src/wasm/mod.rs        |   5 +-
 substrate/frame/revive/src/wasm/runtime.rs    |  21 +-
 substrate/frame/revive/uapi/Cargo.toml        |   2 +-
 umbrella/Cargo.toml                           |   2 +-
 40 files changed, 2769 insertions(+), 163 deletions(-)
 create mode 100644 prdoc/pr_5866.prdoc
 create mode 100644 substrate/frame/revive/src/evm.rs
 create mode 100644 substrate/frame/revive/src/evm/api.rs
 create mode 100644 substrate/frame/revive/src/evm/api/account.rs
 create mode 100644 substrate/frame/revive/src/evm/api/byte.rs
 create mode 100644 substrate/frame/revive/src/evm/api/rlp_codec.rs
 create mode 100644 substrate/frame/revive/src/evm/api/rpc_types.rs
 create mode 100644 substrate/frame/revive/src/evm/api/rpc_types_gen.rs
 create mode 100644 substrate/frame/revive/src/evm/api/signature.rs
 create mode 100644 substrate/frame/revive/src/evm/api/type_id.rs
 create mode 100644 substrate/frame/revive/src/evm/runtime.rs

diff --git a/Cargo.lock b/Cargo.lock
index e2cce7278567..a42f5baa4765 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1619,6 +1619,22 @@ dependencies = [
  "syn 2.0.82",
 ]
 
+[[package]]
+name = "bip32"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa13fae8b6255872fd86f7faf4b41168661d7d78609f7bfe6771b85c6739a15b"
+dependencies = [
+ "bs58",
+ "hmac 0.12.1",
+ "k256",
+ "rand_core 0.6.4",
+ "ripemd",
+ "sha2 0.10.8",
+ "subtle 2.5.0",
+ "zeroize",
+]
+
 [[package]]
 name = "bip39"
 version = "2.0.0"
@@ -2571,6 +2587,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
+ "sha2 0.10.8",
  "tinyvec",
 ]
 
@@ -6798,6 +6815,10 @@ name = "futures-timer"
 version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+dependencies = [
+ "gloo-timers",
+ "send_wrapper 0.4.0",
+]
 
 [[package]]
 name = "futures-util"
@@ -6933,6 +6954,27 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9985c9503b412198aa4197559e9a318524ebc4519c229bfa05a535828c950b9d"
 
+[[package]]
+name = "gloo-net"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-sink",
+ "gloo-utils",
+ "http 1.1.0",
+ "js-sys",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "gloo-timers"
 version = "0.2.6"
@@ -6945,6 +6987,19 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gloo-utils"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
+dependencies = [
+ "js-sys",
+ "serde",
+ "serde_json",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "glutton-westend-runtime"
 version = "3.0.0"
@@ -8046,11 +8101,13 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ec465b607a36dc5dd45d48b7689bc83f679f66a3ac6b6b21cc787a11e0f8685"
 dependencies = [
+ "jsonrpsee-client-transport 0.24.3",
  "jsonrpsee-core 0.24.3",
  "jsonrpsee-http-client 0.24.3",
  "jsonrpsee-proc-macros",
  "jsonrpsee-server",
  "jsonrpsee-types 0.24.3",
+ "jsonrpsee-wasm-client",
  "jsonrpsee-ws-client 0.24.3",
  "tokio",
  "tracing",
@@ -8107,7 +8164,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90f0977f9c15694371b8024c35ab58ca043dbbf4b51ccb03db8858a021241df1"
 dependencies = [
  "base64 0.22.1",
+ "futures-channel",
  "futures-util",
+ "gloo-net",
  "http 1.1.0",
  "jsonrpsee-core 0.24.3",
  "pin-project",
@@ -8192,6 +8251,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
+ "wasm-bindgen-futures",
 ]
 
 [[package]]
@@ -8317,6 +8377,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "jsonrpsee-wasm-client"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0470d0ae043ffcb0cd323797a631e637fb4b55fe3eaa6002934819458bba62a7"
+dependencies = [
+ "jsonrpsee-client-transport 0.24.3",
+ "jsonrpsee-core 0.24.3",
+ "jsonrpsee-types 0.24.3",
+]
+
 [[package]]
 name = "jsonrpsee-ws-client"
 version = "0.23.2"
@@ -8380,6 +8451,16 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "keccak-hash"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c"
+dependencies = [
+ "primitive-types 0.12.2",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "keccak-hasher"
 version = "0.16.0"
@@ -8410,6 +8491,7 @@ dependencies = [
  "primitive-types 0.13.1",
  "scale-info",
  "serde_json",
+ "sp-debug-derive 14.0.0",
  "static_assertions",
  "substrate-wasm-builder",
 ]
@@ -9045,7 +9127,7 @@ dependencies = [
  "futures",
  "js-sys",
  "libp2p-core",
- "send_wrapper",
+ "send_wrapper 0.6.0",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
@@ -10235,6 +10317,7 @@ dependencies = [
  "pallet-asset-conversion-tx-payment",
  "pallet-asset-tx-payment",
  "pallet-assets",
+ "pallet-revive",
  "pallet-skip-feeless-payment",
  "parity-scale-codec",
  "sc-block-builder",
@@ -12340,11 +12423,16 @@ dependencies = [
  "array-bytes",
  "assert_matches",
  "bitflags 1.3.2",
+ "derive_more",
  "environmental",
+ "ethereum-types",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "hex",
+ "hex-literal",
  "impl-trait-for-tuples",
+ "jsonrpsee 0.24.3",
  "log",
  "pallet-assets",
  "pallet-balances",
@@ -12354,25 +12442,30 @@ dependencies = [
  "pallet-revive-proc-macro",
  "pallet-revive-uapi",
  "pallet-timestamp",
+ "pallet-transaction-payment",
  "pallet-utility",
  "parity-scale-codec",
  "paste",
- "polkavm 0.12.0",
- "polkavm-common 0.12.0",
+ "polkavm 0.13.0",
+ "polkavm-common 0.13.0",
  "pretty_assertions",
  "rlp 0.6.1",
  "scale-info",
+ "secp256k1",
  "serde",
+ "serde_json",
  "sp-api 26.0.0",
+ "sp-arithmetic 23.0.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
  "sp-keystore 0.34.0",
  "sp-runtime 31.0.1",
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
+ "sp-weights 27.0.0",
  "staging-xcm",
  "staging-xcm-builder",
- "wat",
+ "subxt-signer",
 ]
 
 [[package]]
@@ -12383,7 +12476,7 @@ dependencies = [
  "frame-system",
  "log",
  "parity-wasm",
- "polkavm-linker 0.12.0",
+ "polkavm-linker 0.13.0",
  "sp-core 28.0.0",
  "sp-io 30.0.0",
  "sp-runtime 31.0.1",
@@ -12443,7 +12536,7 @@ dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
  "paste",
- "polkavm-derive 0.12.0",
+ "polkavm-derive 0.13.0",
  "scale-info",
 ]
 
@@ -16111,15 +16204,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27910c5061e4cea6be6c66684b49d0f42b6a05900c9b0da9e7f3dd2d587a8d4"
+checksum = "57e79a14b15ed38cb5b9a1e38d02e933f19e3d180ae5b325fed606c5e5b9177e"
 dependencies = [
  "libc",
  "log",
- "polkavm-assembler 0.12.0",
- "polkavm-common 0.12.0",
- "polkavm-linux-raw 0.12.0",
+ "polkavm-assembler 0.13.0",
+ "polkavm-common 0.13.0",
+ "polkavm-linux-raw 0.13.0",
 ]
 
 [[package]]
@@ -16133,9 +16226,9 @@ dependencies = [
 
 [[package]]
 name = "polkavm-assembler"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f0e374fa043f31459b30d629d7e866247ac4b6c7662ac72e4e5bf50d052b92"
+checksum = "4e8da55465000feb0a61bbf556ed03024db58f3420eca37721fc726b3b2136bf"
 dependencies = [
  "log",
 ]
@@ -16157,13 +16250,13 @@ dependencies = [
 
 [[package]]
 name = "polkavm-common"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e42e082c3d89da2346555baf4d951fe07dcb9208e42a02c272e6d5d0326f9a"
+checksum = "084b4339aae7dfdaaa5aa7d634110afd95970e0737b6fb2a0cb10db8b56b753c"
 dependencies = [
  "blake3",
  "log",
- "polkavm-assembler 0.12.0",
+ "polkavm-assembler 0.13.0",
 ]
 
 [[package]]
@@ -16186,11 +16279,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "540b798393e68a890202d5dc9f86a985b7ea83611e3406d90dc1043e7997b4d1"
+checksum = "f4456b9657b2abd04ac41a61c99e206b7410f93daf0e9b42b49089508d836c40"
 dependencies = [
- "polkavm-derive-impl-macro 0.12.0",
+ "polkavm-derive-impl-macro 0.13.0",
 ]
 
 [[package]]
@@ -16219,11 +16312,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d179eddaaef62ce5960faaa2ec9e8f131c81661c8b9365c4d55b275011688534"
+checksum = "5e4f2c19e7ccc53d8e21429e83b6589bd4139d15481e455a90ba4335a4decb5a"
 dependencies = [
- "polkavm-common 0.12.0",
+ "polkavm-common 0.13.0",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
@@ -16251,11 +16344,11 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd35472599d35d90e24afe9eb39ae6ee6cb1b924f0c03b277ef8b5f174a63853"
+checksum = "e6f3ad876ca1855038c21d48cbe35164552208a54b21f8295a7d76bc33ef1e38"
 dependencies = [
- "polkavm-derive-impl 0.12.0",
+ "polkavm-derive-impl 0.13.0",
  "syn 2.0.82",
 ]
 
@@ -16276,15 +16369,15 @@ dependencies = [
 
 [[package]]
 name = "polkavm-linker"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f917b16db9ab13819a738a321b48a2d0d20d9e32dedcff75054148676afbec4"
+checksum = "4aa6e5a396abf195289d6d63d70182e59a7c27b9b06d0b7361317df05c07c8a8"
 dependencies = [
  "gimli 0.28.0",
  "hashbrown 0.14.5",
  "log",
  "object 0.36.1",
- "polkavm-common 0.12.0",
+ "polkavm-common 0.13.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
 ]
@@ -16297,9 +16390,9 @@ checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
 
 [[package]]
 name = "polkavm-linux-raw"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d280301d5b5a321c732173c969058f4b5726f3a0046f6802f396df2599f3753d"
+checksum = "686c4dd9c9c16cc22565b51bdbb269792318d0fd2e6b966b5f6c788534cad0e9"
 
 [[package]]
 name = "polling"
@@ -17568,6 +17661,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "rle-decode-fast"
 version = "1.0.3"
@@ -20194,6 +20296,12 @@ dependencies = [
  "pest",
 ]
 
+[[package]]
+name = "send_wrapper"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
+
 [[package]]
 name = "send_wrapper"
 version = "0.6.0"
@@ -23293,6 +23401,7 @@ dependencies = [
  "sp-keyring",
  "staging-node-inspect",
  "substrate-cli-test-utils",
+ "subxt-signer",
  "tempfile",
  "tokio",
  "tokio-util",
@@ -24126,10 +24235,12 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f49888ae6ae90fe01b471193528eea5bd4ed52d8eecd2d13f4a2333b87388850"
 dependencies = [
+ "bip32",
  "bip39",
  "cfg-if",
  "hex",
  "hmac 0.12.1",
+ "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
  "regex",
diff --git a/prdoc/pr_5866.prdoc b/prdoc/pr_5866.prdoc
new file mode 100644
index 000000000000..44fffe1d2129
--- /dev/null
+++ b/prdoc/pr_5866.prdoc
@@ -0,0 +1,23 @@
+title: "[pallet-revive] Ethereum JSON-RPC integration"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Related PR: https://github.com/paritytech/revive-ethereum-rpc/pull/5
+
+      Changes Included:
+      -  A new pallet::call  eth_transact.
+      - A custom UncheckedExtrinsic struct to dispatch unsigned eth_transact calls from an Ethereum JSON-RPC proxy.
+      - Generated types and traits to support implementing a JSON-RPC Ethereum proxy.
+crates:
+  - name: pallet-revive
+    bump: major
+  - name: pallet-revive-fixtures
+    bump: patch
+  - name: pallet-revive-mock-network 
+    bump: patch
+  - name: pallet-revive-uapi
+    bump: patch
+  - name: polkadot-sdk
+    bump: patch
+
diff --git a/substrate/bin/node/cli/Cargo.toml b/substrate/bin/node/cli/Cargo.toml
index 2e53c18645f5..933406670e5c 100644
--- a/substrate/bin/node/cli/Cargo.toml
+++ b/substrate/bin/node/cli/Cargo.toml
@@ -46,6 +46,7 @@ futures = { workspace = true }
 log = { workspace = true, default-features = true }
 rand = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
+subxt-signer = { workspace = true, features = ["unstable-eth"] }
 
 # The Polkadot-SDK:
 polkadot-sdk = { features = [
@@ -56,8 +57,6 @@ polkadot-sdk = { features = [
 	"generate-bags",
 	"mmr-gadget",
 	"mmr-rpc",
-	"pallet-contracts-mock-network",
-	"pallet-revive-mock-network",
 	"pallet-transaction-payment-rpc",
 	"sc-allocator",
 	"sc-authority-discovery",
diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs
index d8041ed400c7..da82729dbec0 100644
--- a/substrate/bin/node/cli/benches/block_production.rs
+++ b/substrate/bin/node/cli/benches/block_production.rs
@@ -39,6 +39,7 @@ use sp_blockchain::{ApplyExtrinsicFailed::Validity, Error::ApplyExtrinsicFailed}
 use sp_consensus::BlockOrigin;
 use sp_keyring::Sr25519Keyring;
 use sp_runtime::{
+	generic,
 	transaction_validity::{InvalidTransaction, TransactionValidityError},
 	AccountId32, MultiAddress, OpaqueExtrinsic,
 };
@@ -120,10 +121,11 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase {
 }
 
 fn extrinsic_set_time(now: u64) -> OpaqueExtrinsic {
-	kitchensink_runtime::UncheckedExtrinsic::new_bare(kitchensink_runtime::RuntimeCall::Timestamp(
-		pallet_timestamp::Call::set { now },
-	))
-	.into()
+	let utx: kitchensink_runtime::UncheckedExtrinsic = generic::UncheckedExtrinsic::new_bare(
+		kitchensink_runtime::RuntimeCall::Timestamp(pallet_timestamp::Call::set { now }),
+	)
+	.into();
+	utx.into()
 }
 
 fn import_block(client: &FullClient, built: BuiltBlock<node_primitives::Block>) {
diff --git a/substrate/bin/node/cli/src/chain_spec.rs b/substrate/bin/node/cli/src/chain_spec.rs
index 6cd9adfd7f25..362deacba5f3 100644
--- a/substrate/bin/node/cli/src/chain_spec.rs
+++ b/substrate/bin/node/cli/src/chain_spec.rs
@@ -20,6 +20,7 @@
 
 use polkadot_sdk::*;
 
+use crate::chain_spec::{sc_service::Properties, sp_runtime::AccountId32};
 use kitchensink_runtime::{
 	constants::currency::*, wasm_binary_unwrap, Block, MaxNominations, SessionKeys, StakerStatus,
 };
@@ -291,8 +292,8 @@ fn configure_accounts(
 	usize,
 	Vec<(AccountId, AccountId, Balance, StakerStatus<AccountId>)>,
 ) {
-	let mut endowed_accounts: Vec<AccountId> = endowed_accounts
-		.unwrap_or_else(|| Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect());
+	let mut endowed_accounts: Vec<AccountId> =
+		endowed_accounts.unwrap_or_else(default_endowed_accounts);
 	// endow all authorities and nominators.
 	initial_authorities
 		.iter()
@@ -417,12 +418,40 @@ fn development_config_genesis_json() -> serde_json::Value {
 	)
 }
 
+fn props() -> Properties {
+	let mut properties = Properties::new();
+	properties.insert("tokenDecimals".to_string(), 12.into());
+	properties
+}
+
+fn eth_account(from: subxt_signer::eth::Keypair) -> AccountId32 {
+	let mut account_id = AccountId32::new([0xEE; 32]);
+	<AccountId32 as AsMut<[u8; 32]>>::as_mut(&mut account_id)[..20]
+		.copy_from_slice(&from.account_id().0);
+	account_id
+}
+
+fn default_endowed_accounts() -> Vec<AccountId> {
+	Sr25519Keyring::well_known()
+		.map(|k| k.to_account_id())
+		.chain([
+			eth_account(subxt_signer::eth::dev::alith()),
+			eth_account(subxt_signer::eth::dev::baltathar()),
+			eth_account(subxt_signer::eth::dev::charleth()),
+			eth_account(subxt_signer::eth::dev::dorothy()),
+			eth_account(subxt_signer::eth::dev::ethan()),
+			eth_account(subxt_signer::eth::dev::faith()),
+		])
+		.collect()
+}
+
 /// Development config (single validator Alice).
 pub fn development_config() -> ChainSpec {
 	ChainSpec::builder(wasm_binary_unwrap(), Default::default())
 		.with_name("Development")
 		.with_id("dev")
 		.with_chain_type(ChainType::Development)
+		.with_properties(props())
 		.with_genesis_config_patch(development_config_genesis_json())
 		.build()
 }
diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index 00658b361df9..d71f1304caf5 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -158,12 +158,13 @@ pub fn create_extrinsic(
 	);
 	let signature = raw_payload.using_encoded(|e| sender.sign(e));
 
-	kitchensink_runtime::UncheckedExtrinsic::new_signed(
+	generic::UncheckedExtrinsic::new_signed(
 		function,
 		sp_runtime::AccountId32::from(sender.public()).into(),
 		kitchensink_runtime::Signature::Sr25519(signature),
 		tx_ext,
 	)
+	.into()
 }
 
 /// Creates a new partial node.
@@ -866,7 +867,7 @@ mod tests {
 	use codec::Encode;
 	use kitchensink_runtime::{
 		constants::{currency::CENTS, time::SLOT_DURATION},
-		Address, BalancesCall, RuntimeCall, TxExtension, UncheckedExtrinsic,
+		Address, BalancesCall, RuntimeCall, TxExtension,
 	};
 	use node_primitives::{Block, DigestItem, Signature};
 	use polkadot_sdk::{sc_transaction_pool_api::MaintainedTransactionPool, *};
@@ -883,7 +884,7 @@ mod tests {
 	use sp_keyring::AccountKeyring;
 	use sp_keystore::KeystorePtr;
 	use sp_runtime::{
-		generic::{Digest, Era, SignedPayload},
+		generic::{self, Digest, Era, SignedPayload},
 		key_types::BABE,
 		traits::{Block as BlockT, Header as HeaderT, IdentifyAccount, Verify},
 		RuntimeAppPublic,
@@ -1099,8 +1100,16 @@ mod tests {
 				let signature = raw_payload.using_encoded(|payload| signer.sign(payload));
 				let (function, tx_ext, _) = raw_payload.deconstruct();
 				index += 1;
-				UncheckedExtrinsic::new_signed(function, from.into(), signature.into(), tx_ext)
-					.into()
+				let utx: kitchensink_runtime::UncheckedExtrinsic =
+					generic::UncheckedExtrinsic::new_signed(
+						function,
+						from.into(),
+						signature.into(),
+						tx_ext,
+					)
+					.into();
+
+				utx.into()
 			},
 		);
 	}
diff --git a/substrate/bin/node/cli/tests/basic.rs b/substrate/bin/node/cli/tests/basic.rs
index 616d813f78e3..8f1475fce4f8 100644
--- a/substrate/bin/node/cli/tests/basic.rs
+++ b/substrate/bin/node/cli/tests/basic.rs
@@ -61,14 +61,14 @@ pub fn bloaty_code_unwrap() -> &'static [u8] {
 /// correct multiplier.
 fn transfer_fee(extrinsic: &UncheckedExtrinsic) -> Balance {
 	let mut info = default_transfer_call().get_dispatch_info();
-	info.extension_weight = extrinsic.extension_weight();
+	info.extension_weight = extrinsic.0.extension_weight();
 	TransactionPayment::compute_fee(extrinsic.encode().len() as u32, &info, 0)
 }
 
 /// Default transfer fee, same as `transfer_fee`, but with a weight refund factored in.
 fn transfer_fee_with_refund(extrinsic: &UncheckedExtrinsic, weight_refund: Weight) -> Balance {
 	let mut info = default_transfer_call().get_dispatch_info();
-	info.extension_weight = extrinsic.extension_weight();
+	info.extension_weight = extrinsic.0.extension_weight();
 	let post_info = (Some(info.total_weight().saturating_sub(weight_refund)), info.pays_fee).into();
 	TransactionPayment::compute_actual_fee(extrinsic.encode().len() as u32, &info, &post_info, 0)
 }
@@ -324,7 +324,7 @@ fn full_native_block_import_works() {
 
 	let mut alice_last_known_balance: Balance = Default::default();
 	let mut fees = t.execute_with(|| transfer_fee(&xt()));
-	let extension_weight = xt().extension_weight();
+	let extension_weight = xt().0.extension_weight();
 	let weight_refund = Weight::zero();
 	let fees_after_refund = t.execute_with(|| transfer_fee_with_refund(&xt(), weight_refund));
 
@@ -427,7 +427,7 @@ fn full_native_block_import_works() {
 
 	fees = t.execute_with(|| transfer_fee(&xt()));
 	let pot = t.execute_with(|| Treasury::pot());
-	let extension_weight = xt().extension_weight();
+	let extension_weight = xt().0.extension_weight();
 	let weight_refund = Weight::zero();
 	let fees_after_refund = t.execute_with(|| transfer_fee_with_refund(&xt(), weight_refund));
 
diff --git a/substrate/bin/node/cli/tests/fees.rs b/substrate/bin/node/cli/tests/fees.rs
index 59ade9b8547b..da9d2662408e 100644
--- a/substrate/bin/node/cli/tests/fees.rs
+++ b/substrate/bin/node/cli/tests/fees.rs
@@ -175,7 +175,7 @@ fn transaction_fee_is_correct() {
 		balance_alice -= length_fee;
 
 		let mut info = default_transfer_call().get_dispatch_info();
-		info.extension_weight = xt.extension_weight();
+		info.extension_weight = xt.0.extension_weight();
 		let weight = info.total_weight();
 		let weight_fee = IdentityFee::<Balance>::weight_to_fee(&weight);
 
diff --git a/substrate/bin/node/cli/tests/submit_transaction.rs b/substrate/bin/node/cli/tests/submit_transaction.rs
index 3b7d82dcab16..3672432ae342 100644
--- a/substrate/bin/node/cli/tests/submit_transaction.rs
+++ b/substrate/bin/node/cli/tests/submit_transaction.rs
@@ -23,6 +23,7 @@ use sp_application_crypto::AppCrypto;
 use sp_core::offchain::{testing::TestTransactionPoolExt, TransactionPoolExt};
 use sp_keyring::sr25519::Keyring::Alice;
 use sp_keystore::{testing::MemoryKeystore, Keystore, KeystoreExt};
+use sp_runtime::generic;
 
 pub mod common;
 use self::common::*;
@@ -44,7 +45,7 @@ fn should_submit_unsigned_transaction() {
 		};
 
 		let call = pallet_im_online::Call::heartbeat { heartbeat: heartbeat_data, signature };
-		let xt = UncheckedExtrinsic::new_bare(call.into());
+		let xt = generic::UncheckedExtrinsic::new_bare(call.into()).into();
 		SubmitTransaction::<Runtime, pallet_im_online::Call<Runtime>>::submit_transaction(xt)
 			.unwrap();
 
@@ -130,7 +131,7 @@ fn should_submit_signed_twice_from_the_same_account() {
 		// now check that the transaction nonces are not equal
 		let s = state.read();
 		fn nonce(tx: UncheckedExtrinsic) -> frame_system::CheckNonce<Runtime> {
-			let extra = tx.preamble.to_signed().unwrap().2;
+			let extra = tx.0.preamble.to_signed().unwrap().2;
 			extra.5
 		}
 		let nonce1 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[0]).unwrap());
@@ -179,7 +180,7 @@ fn should_submit_signed_twice_from_all_accounts() {
 		// now check that the transaction nonces are not equal
 		let s = state.read();
 		fn nonce(tx: UncheckedExtrinsic) -> frame_system::CheckNonce<Runtime> {
-			let extra = tx.preamble.to_signed().unwrap().2;
+			let extra = tx.0.preamble.to_signed().unwrap().2;
 			extra.5
 		}
 		let nonce1 = nonce(UncheckedExtrinsic::decode(&mut &*s.transactions[0]).unwrap());
@@ -236,7 +237,7 @@ fn submitted_transaction_should_be_valid() {
 		let source = TransactionSource::External;
 		let extrinsic = UncheckedExtrinsic::decode(&mut &*tx0).unwrap();
 		// add balance to the account
-		let author = extrinsic.preamble.clone().to_signed().clone().unwrap().0;
+		let author = extrinsic.0.preamble.clone().to_signed().clone().unwrap().0;
 		let address = Indices::lookup(author).unwrap();
 		let data = pallet_balances::AccountData { free: 5_000_000_000_000, ..Default::default() };
 		let account = frame_system::AccountInfo { providers: 1, data, ..Default::default() };
diff --git a/substrate/bin/node/runtime/Cargo.toml b/substrate/bin/node/runtime/Cargo.toml
index 6310e16d5a14..7acf4294c51b 100644
--- a/substrate/bin/node/runtime/Cargo.toml
+++ b/substrate/bin/node/runtime/Cargo.toml
@@ -27,6 +27,7 @@ scale-info = { features = ["derive", "serde"], workspace = true }
 static_assertions = { workspace = true, default-features = true }
 log = { workspace = true }
 serde_json = { features = ["alloc", "arbitrary_precision"], workspace = true }
+sp-debug-derive = { workspace = true, features = ["force-debug"] }
 
 # pallet-asset-conversion: turn on "num-traits" feature
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
@@ -56,6 +57,7 @@ std = [
 	"primitive-types/std",
 	"scale-info/std",
 	"serde_json/std",
+	"sp-debug-derive/std",
 	"substrate-wasm-builder",
 ]
 runtime-benchmarks = [
diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
index a2112e5977f4..d6a17856e470 100644
--- a/substrate/bin/node/runtime/src/lib.rs
+++ b/substrate/bin/node/runtime/src/lib.rs
@@ -76,6 +76,7 @@ use pallet_identity::legacy::IdentityInfo;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use pallet_nfts::PalletFeatures;
 use pallet_nis::WithMaximumOf;
+use pallet_revive::evm::runtime::EthExtra;
 use pallet_session::historical as pallet_session_historical;
 // Can't use `FungibleAdapter` here until Treasury pallet migrates to fungibles
 // <https://github.com/paritytech/polkadot-sdk/issues/226>
@@ -1449,7 +1450,7 @@ where
 	type Extension = TxExtension;
 
 	fn create_transaction(call: RuntimeCall, extension: TxExtension) -> UncheckedExtrinsic {
-		UncheckedExtrinsic::new_transaction(call, extension)
+		generic::UncheckedExtrinsic::new_transaction(call, extension).into()
 	}
 }
 
@@ -1499,7 +1500,8 @@ where
 		let signature = raw_payload.using_encoded(|payload| C::sign(payload, public))?;
 		let address = Indices::unlookup(account);
 		let (call, tx_ext, _) = raw_payload.deconstruct();
-		let transaction = UncheckedExtrinsic::new_signed(call, address, signature, tx_ext);
+		let transaction =
+			generic::UncheckedExtrinsic::new_signed(call, address, signature, tx_ext).into();
 		Some(transaction)
 	}
 }
@@ -1509,7 +1511,7 @@ where
 	RuntimeCall: From<LocalCall>,
 {
 	fn create_inherent(call: RuntimeCall) -> UncheckedExtrinsic {
-		UncheckedExtrinsic::new_bare(call)
+		generic::UncheckedExtrinsic::new_bare(call).into()
 	}
 }
 
@@ -2587,6 +2589,16 @@ mod runtime {
 	pub type VerifySignature = pallet_verify_signature::Pallet<Runtime>;
 }
 
+impl TryFrom<RuntimeCall> for pallet_revive::Call<Runtime> {
+	type Error = ();
+
+	fn try_from(value: RuntimeCall) -> Result<Self, Self::Error> {
+		match value {
+			RuntimeCall::Revive(call) => Ok(call),
+			_ => Err(()),
+		}
+	}
+}
 /// The address format for describing accounts.
 pub type Address = sp_runtime::MultiAddress<AccountId, AccountIndex>;
 /// Block header type as expected by this runtime.
@@ -2617,9 +2629,32 @@ pub type TxExtension = (
 	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct EthExtraImpl;
+
+impl EthExtra for EthExtraImpl {
+	type Config = Runtime;
+	type Extension = TxExtension;
+
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+		(
+			frame_system::CheckNonZeroSender::<Runtime>::new(),
+			frame_system::CheckSpecVersion::<Runtime>::new(),
+			frame_system::CheckTxVersion::<Runtime>::new(),
+			frame_system::CheckGenesis::<Runtime>::new(),
+			frame_system::CheckEra::from(crate::generic::Era::Immortal),
+			frame_system::CheckNonce::<Runtime>::from(nonce),
+			frame_system::CheckWeight::<Runtime>::new(),
+			pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<Runtime>::from(tip, None)
+				.into(),
+			frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(false),
+		)
+	}
+}
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, TxExtension>;
+	pallet_revive::evm::runtime::UncheckedExtrinsic<Address, Signature, EthExtraImpl>;
 /// Unchecked signature payload type as expected by this runtime.
 pub type UncheckedSignaturePayload =
 	generic::UncheckedSignaturePayload<Address, Signature, TxExtension>;
@@ -3124,6 +3159,38 @@ impl_runtime_apis! {
 
 	impl pallet_revive::ReviveApi<Block, AccountId, Balance, BlockNumber, EventRecord> for Runtime
 	{
+		fn eth_transact(
+			from: H160,
+			dest: Option<H160>,
+			value: Balance,
+			input: Vec<u8>,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+		) -> pallet_revive::EthContractResult<Balance>
+		{
+			use pallet_revive::AddressMapper;
+			let blockweights: BlockWeights = <Runtime as frame_system::Config>::BlockWeights::get();
+			let origin = <Runtime as pallet_revive::Config>::AddressMapper::to_account_id(&from);
+
+			let encoded_size = |pallet_call| {
+				let call = RuntimeCall::Revive(pallet_call);
+				let uxt: UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic::new_bare(call).into();
+				uxt.encoded_size() as u32
+			};
+
+			Revive::bare_eth_transact(
+				origin,
+				dest,
+				value,
+				input,
+				gas_limit.unwrap_or(blockweights.max_block),
+				storage_deposit_limit.unwrap_or(u128::MAX),
+				encoded_size,
+				pallet_revive::DebugInfo::UnsafeDebug,
+				pallet_revive::CollectEvents::UnsafeCollect,
+			)
+		}
+
 		fn call(
 			origin: AccountId,
 			dest: H160,
@@ -3131,7 +3198,7 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_revive::ContractExecResult<Balance, EventRecord> {
+		) -> pallet_revive::ContractResult<pallet_revive::ExecReturnValue, Balance, EventRecord> {
 			Revive::bare_call(
 				RuntimeOrigin::signed(origin),
 				dest,
@@ -3152,7 +3219,7 @@ impl_runtime_apis! {
 			code: pallet_revive::Code,
 			data: Vec<u8>,
 			salt: Option<[u8; 32]>,
-		) -> pallet_revive::ContractInstantiateResult<Balance, EventRecord>
+		) -> pallet_revive::ContractResult<pallet_revive::InstantiateReturnValue, Balance, EventRecord>
 		{
 			Revive::bare_instantiate(
 				RuntimeOrigin::signed(origin),
diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index a5cec856717f..16112386ad7c 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -28,6 +28,7 @@ node-primitives = { workspace = true, default-features = true }
 kitchensink-runtime = { workspace = true }
 pallet-asset-conversion = { workspace = true, default-features = true }
 pallet-assets = { workspace = true, default-features = true }
+pallet-revive = { workspace = true, default-features = true }
 pallet-asset-conversion-tx-payment = { workspace = true, default-features = true }
 pallet-asset-tx-payment = { workspace = true, default-features = true }
 pallet-skip-feeless-payment = { workspace = true, default-features = true }
diff --git a/substrate/bin/node/testing/src/bench.rs b/substrate/bin/node/testing/src/bench.rs
index cce1627a2ad2..3812524f0b1f 100644
--- a/substrate/bin/node/testing/src/bench.rs
+++ b/substrate/bin/node/testing/src/bench.rs
@@ -53,7 +53,7 @@ use sp_core::{
 use sp_crypto_hashing::blake2_256;
 use sp_inherents::InherentData;
 use sp_runtime::{
-	generic::{ExtrinsicFormat, Preamble, EXTRINSIC_FORMAT_VERSION},
+	generic::{self, ExtrinsicFormat, Preamble, EXTRINSIC_FORMAT_VERSION},
 	traits::{Block as BlockT, IdentifyAccount, Verify},
 	OpaqueExtrinsic,
 };
@@ -586,7 +586,7 @@ impl BenchKeyring {
 						key.sign(b)
 					}
 				});
-				UncheckedExtrinsic {
+				generic::UncheckedExtrinsic {
 					preamble: Preamble::Signed(
 						sp_runtime::MultiAddress::Id(signed),
 						signature,
@@ -595,15 +595,18 @@ impl BenchKeyring {
 					),
 					function: payload.0,
 				}
+				.into()
 			},
-			ExtrinsicFormat::Bare => UncheckedExtrinsic {
+			ExtrinsicFormat::Bare => generic::UncheckedExtrinsic {
 				preamble: Preamble::Bare(EXTRINSIC_FORMAT_VERSION),
 				function: xt.function,
-			},
-			ExtrinsicFormat::General(tx_ext) => UncheckedExtrinsic {
+			}
+			.into(),
+			ExtrinsicFormat::General(tx_ext) => generic::UncheckedExtrinsic {
 				preamble: sp_runtime::generic::Preamble::General(0, tx_ext),
 				function: xt.function,
-			},
+			}
+			.into(),
 		}
 	}
 
diff --git a/substrate/bin/node/testing/src/keyring.rs b/substrate/bin/node/testing/src/keyring.rs
index 2334cb3c4dfa..20497e85eab9 100644
--- a/substrate/bin/node/testing/src/keyring.rs
+++ b/substrate/bin/node/testing/src/keyring.rs
@@ -24,7 +24,7 @@ use node_primitives::{AccountId, Balance, Nonce};
 use sp_core::{crypto::get_public_from_string_or_panic, ecdsa, ed25519, sr25519};
 use sp_crypto_hashing::blake2_256;
 use sp_keyring::Sr25519Keyring;
-use sp_runtime::generic::{Era, ExtrinsicFormat, EXTRINSIC_FORMAT_VERSION};
+use sp_runtime::generic::{self, Era, ExtrinsicFormat, EXTRINSIC_FORMAT_VERSION};
 
 /// Alice's account id.
 pub fn alice() -> AccountId {
@@ -119,7 +119,7 @@ pub fn sign(
 						}
 					})
 					.into();
-			UncheckedExtrinsic {
+			generic::UncheckedExtrinsic {
 				preamble: sp_runtime::generic::Preamble::Signed(
 					sp_runtime::MultiAddress::Id(signed),
 					signature,
@@ -128,14 +128,17 @@ pub fn sign(
 				),
 				function: payload.0,
 			}
+			.into()
 		},
-		ExtrinsicFormat::Bare => UncheckedExtrinsic {
+		ExtrinsicFormat::Bare => generic::UncheckedExtrinsic {
 			preamble: sp_runtime::generic::Preamble::Bare(EXTRINSIC_FORMAT_VERSION),
 			function: xt.function,
-		},
-		ExtrinsicFormat::General(tx_ext) => UncheckedExtrinsic {
+		}
+		.into(),
+		ExtrinsicFormat::General(tx_ext) => generic::UncheckedExtrinsic {
 			preamble: sp_runtime::generic::Preamble::General(0, tx_ext),
 			function: xt.function,
-		},
+		}
+		.into(),
 	}
 }
diff --git a/substrate/frame/revive/Cargo.toml b/substrate/frame/revive/Cargo.toml
index e896d9e8fa26..8dbad5ffd8b6 100644
--- a/substrate/frame/revive/Cargo.toml
+++ b/substrate/frame/revive/Cargo.toml
@@ -19,18 +19,22 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 environmental = { workspace = true }
 paste = { workspace = true }
-polkavm = { version = "0.12.0", default-features = false }
-polkavm-common = { version = "0.12.0", default-features = false }
+polkavm = { version = "0.13.0", default-features = false }
+polkavm-common = { version = "0.13.0", default-features = false }
 bitflags = { workspace = true }
-codec = { features = [
-	"derive",
-	"max-encoded-len",
-], workspace = true }
+codec = { features = ["derive", "max-encoded-len"], workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 log = { workspace = true }
-serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
+serde = { features = [
+	"alloc",
+	"derive",
+], workspace = true, default-features = false }
 impl-trait-for-tuples = { workspace = true }
 rlp = { workspace = true }
+derive_more = { workspace = true }
+hex = { workspace = true }
+jsonrpsee = { workspace = true, features = ["full"], optional = true }
+ethereum-types = { workspace = true, features = ["codec", "rlp", "serialize"] }
 
 # Polkadot SDK Dependencies
 frame-benchmarking = { optional = true, workspace = true }
@@ -40,20 +44,28 @@ pallet-balances = { optional = true, workspace = true }
 pallet-revive-fixtures = { workspace = true, default-features = false }
 pallet-revive-uapi = { workspace = true, default-features = true }
 pallet-revive-proc-macro = { workspace = true, default-features = true }
+pallet-transaction-payment = { workspace = true }
 sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
+sp-weights = { workspace = true }
 xcm = { workspace = true }
 xcm-builder = { workspace = true }
+subxt-signer = { workspace = true, optional = true, features = [
+	"unstable-eth",
+] }
 
 [dev-dependencies]
 array-bytes = { workspace = true, default-features = true }
 assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
-wat = { workspace = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
+secp256k1 = { workspace = true, features = ["recovery"] }
+serde_json = { workspace = true }
+hex-literal = { workspace = true }
 
 # Polkadot SDK Dependencies
 pallet-balances = { workspace = true, default-features = true }
@@ -75,26 +87,35 @@ riscv = ["pallet-revive-fixtures/riscv"]
 std = [
 	"codec/std",
 	"environmental/std",
+	"ethereum-types/std",
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"hex/std",
+	"jsonrpsee",
 	"log/std",
 	"pallet-balances?/std",
 	"pallet-proxy/std",
 	"pallet-revive-fixtures/std",
 	"pallet-timestamp/std",
+	"pallet-transaction-payment/std",
 	"pallet-utility/std",
 	"polkavm-common/std",
 	"polkavm/std",
 	"rlp/std",
 	"scale-info/std",
-	"serde",
+	"secp256k1/std",
+	"serde/std",
+	"serde_json/std",
 	"sp-api/std",
+	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-keystore/std",
 	"sp-runtime/std",
 	"sp-std/std",
+	"sp-weights/std",
+	"subxt-signer",
 	"xcm-builder/std",
 	"xcm/std",
 ]
@@ -107,6 +128,7 @@ runtime-benchmarks = [
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-transaction-payment/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
@@ -119,6 +141,7 @@ try-runtime = [
 	"pallet-message-queue/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-timestamp/try-runtime",
+	"pallet-transaction-payment/try-runtime",
 	"pallet-utility/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/substrate/frame/revive/fixtures/Cargo.toml b/substrate/frame/revive/fixtures/Cargo.toml
index 75b23fdd44d1..1d89db002b72 100644
--- a/substrate/frame/revive/fixtures/Cargo.toml
+++ b/substrate/frame/revive/fixtures/Cargo.toml
@@ -21,7 +21,7 @@ log = { workspace = true }
 parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
-polkavm-linker = { version = "0.12.0" }
+polkavm-linker = { version = "0.13.0" }
 anyhow = { workspace = true, default-features = true }
 
 [features]
@@ -31,11 +31,4 @@ default = ["std"]
 # we will remove this once there is an upstream toolchain
 riscv = []
 # only when std is enabled all fixtures are available
-std = [
-	"anyhow",
-	"frame-system",
-	"log/std",
-	"sp-core",
-	"sp-io",
-	"sp-runtime",
-]
+std = ["anyhow", "frame-system", "log/std", "sp-core", "sp-io", "sp-runtime"]
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index 3178baf6bbe4..cb4b76408141 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -65,7 +65,6 @@ mod build {
 	}
 
 	/// Collect all contract entries from the given source directory.
-	/// Contracts that have already been compiled are filtered out.
 	fn collect_entries(contracts_dir: &Path) -> Vec<Entry> {
 		fs::read_dir(contracts_dir)
 			.expect("src dir exists; qed")
@@ -184,7 +183,13 @@ mod build {
 		let fixtures_dir: PathBuf = env::var("CARGO_MANIFEST_DIR")?.into();
 		let contracts_dir = fixtures_dir.join("contracts");
 		let uapi_dir = fixtures_dir.parent().expect("uapi dir exits; qed").join("uapi");
-		let out_dir: PathBuf = env::var("OUT_DIR")?.into();
+		let ws_dir: PathBuf = env::var("CARGO_WORKSPACE_ROOT_DIR")?.into();
+		let out_dir: PathBuf = ws_dir.join("target").join("pallet-revive-fixtures");
+
+		// create out_dir if it does not exist
+		if !out_dir.exists() {
+			fs::create_dir_all(&out_dir)?;
+		}
 
 		// the fixtures have a dependency on the uapi crate
 		println!("cargo::rerun-if-changed={}", fixtures_dir.display());
diff --git a/substrate/frame/revive/fixtures/build/Cargo.toml b/substrate/frame/revive/fixtures/build/Cargo.toml
index 948d7438cf98..c4aaf131148e 100644
--- a/substrate/frame/revive/fixtures/build/Cargo.toml
+++ b/substrate/frame/revive/fixtures/build/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 [dependencies]
 uapi = { package = 'pallet-revive-uapi', path = "", default-features = false }
 common = { package = 'pallet-revive-fixtures-common', path = "" }
-polkavm-derive = { version = "0.12.0" }
+polkavm-derive = { version = "0.13.0" }
 
 [profile.release]
 opt-level = 3
diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index 5548dca66d07..eacd63b97e57 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -22,8 +22,11 @@ extern crate alloc;
 /// Load a given wasm module and returns a wasm binary contents along with it's hash.
 #[cfg(feature = "std")]
 pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
-	let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
-	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
+	let ws_dir: std::path::PathBuf = env!("CARGO_WORKSPACE_ROOT_DIR").into();
+	let fixture_path = ws_dir
+		.join("target")
+		.join("pallet-revive-fixtures")
+		.join(format!("{fixture_name}.polkavm"));
 	log::debug!("Loading fixture from {fixture_path:?}");
 	let binary = std::fs::read(fixture_path)?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
@@ -40,7 +43,12 @@ pub mod bench {
 	#[cfg(feature = "riscv")]
 	macro_rules! fixture {
 		($name: literal) => {
-			include_bytes!(concat!(env!("OUT_DIR"), "/", $name, ".polkavm"))
+			include_bytes!(concat!(
+				env!("CARGO_WORKSPACE_ROOT_DIR"),
+				"/target/pallet-revive-fixtures/",
+				$name,
+				".polkavm"
+			))
 		};
 	}
 	#[cfg(not(feature = "riscv"))]
@@ -63,12 +71,3 @@ pub mod bench {
 		dummy
 	}
 }
-
-#[cfg(test)]
-mod test {
-	#[test]
-	fn out_dir_should_have_compiled_mocks() {
-		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
-		assert!(out_dir.join("dummy.polkavm").exists());
-	}
-}
diff --git a/substrate/frame/revive/mock-network/Cargo.toml b/substrate/frame/revive/mock-network/Cargo.toml
index 85656a57b49c..12de634b0b4a 100644
--- a/substrate/frame/revive/mock-network/Cargo.toml
+++ b/substrate/frame/revive/mock-network/Cargo.toml
@@ -87,3 +87,17 @@ runtime-benchmarks = [
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 ]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-assets/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-message-queue/try-runtime",
+	"pallet-proxy/try-runtime",
+	"pallet-revive/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"pallet-utility/try-runtime",
+	"pallet-xcm/try-runtime",
+	"polkadot-runtime-parachains/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/substrate/frame/revive/src/address.rs b/substrate/frame/revive/src/address.rs
index c51940ba771e..4633fce1f327 100644
--- a/substrate/frame/revive/src/address.rs
+++ b/substrate/frame/revive/src/address.rs
@@ -34,7 +34,7 @@ use sp_runtime::AccountId32;
 /// case for all existing runtimes as of right now. Reasing is that this will allow
 /// us to reverse an address -> account_id mapping by just stripping the prefix.
 pub trait AddressMapper<T>: private::Sealed {
-	/// Convert an account id to an ethereum adress.
+	/// Convert an account id to an ethereum address.
 	///
 	/// This mapping is **not** required to be reversible.
 	fn to_address(account_id: &T) -> H160;
diff --git a/substrate/frame/revive/src/evm.rs b/substrate/frame/revive/src/evm.rs
new file mode 100644
index 000000000000..c3495fc0559d
--- /dev/null
+++ b/substrate/frame/revive/src/evm.rs
@@ -0,0 +1,22 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//!Types, and traits to integrate pallet-revive with EVM.
+#![warn(missing_docs)]
+
+mod api;
+pub use api::*;
+pub mod runtime;
diff --git a/substrate/frame/revive/src/evm/api.rs b/substrate/frame/revive/src/evm/api.rs
new file mode 100644
index 000000000000..fe18c8735bed
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api.rs
@@ -0,0 +1,38 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! JSON-RPC methods and types, for Ethereum.
+
+mod byte;
+pub use byte::*;
+
+mod rlp_codec;
+pub use rlp;
+
+mod type_id;
+pub use type_id::*;
+
+mod rpc_types;
+mod rpc_types_gen;
+pub use rpc_types_gen::*;
+
+#[cfg(feature = "std")]
+mod account;
+
+#[cfg(feature = "std")]
+pub use account::*;
+
+mod signature;
diff --git a/substrate/frame/revive/src/evm/api/account.rs b/substrate/frame/revive/src/evm/api/account.rs
new file mode 100644
index 000000000000..c2217defc31f
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/account.rs
@@ -0,0 +1,51 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Utilities for working with Ethereum accounts.
+use crate::{
+	evm::{TransactionLegacySigned, TransactionLegacyUnsigned},
+	H160,
+};
+use rlp::Encodable;
+
+/// A simple account that can sign transactions
+pub struct Account(subxt_signer::eth::Keypair);
+
+impl Default for Account {
+	fn default() -> Self {
+		Self(subxt_signer::eth::dev::alith())
+	}
+}
+
+impl From<subxt_signer::eth::Keypair> for Account {
+	fn from(kp: subxt_signer::eth::Keypair) -> Self {
+		Self(kp)
+	}
+}
+
+impl Account {
+	/// Get the [`H160`] address of the account.
+	pub fn address(&self) -> H160 {
+		H160::from_slice(&self.0.account_id().as_ref())
+	}
+
+	/// Sign a transaction.
+	pub fn sign_transaction(&self, tx: TransactionLegacyUnsigned) -> TransactionLegacySigned {
+		let rlp_encoded = tx.rlp_bytes();
+		let signature = self.0.sign(&rlp_encoded);
+		TransactionLegacySigned::from(tx, signature.as_ref())
+	}
+}
diff --git a/substrate/frame/revive/src/evm/api/byte.rs b/substrate/frame/revive/src/evm/api/byte.rs
new file mode 100644
index 000000000000..df4ed1740ecd
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/byte.rs
@@ -0,0 +1,154 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Define Byte wrapper types for encoding and decoding hex strings
+use alloc::{vec, vec::Vec};
+use codec::{Decode, Encode};
+use core::{
+	fmt::{Debug, Display, Formatter, Result as FmtResult},
+	str::FromStr,
+};
+use hex_serde::HexCodec;
+use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+
+mod hex_serde {
+	#[cfg(not(feature = "std"))]
+	use alloc::{format, string::String, vec::Vec};
+	use serde::{Deserialize, Deserializer, Serializer};
+
+	pub trait HexCodec: Sized {
+		type Error;
+		fn to_hex(&self) -> String;
+		fn from_hex(s: String) -> Result<Self, Self::Error>;
+	}
+
+	impl HexCodec for u8 {
+		type Error = core::num::ParseIntError;
+		fn to_hex(&self) -> String {
+			format!("0x{:x}", self)
+		}
+		fn from_hex(s: String) -> Result<Self, Self::Error> {
+			u8::from_str_radix(s.trim_start_matches("0x"), 16)
+		}
+	}
+
+	impl<const T: usize> HexCodec for [u8; T] {
+		type Error = hex::FromHexError;
+		fn to_hex(&self) -> String {
+			format!("0x{}", hex::encode(self))
+		}
+		fn from_hex(s: String) -> Result<Self, Self::Error> {
+			let data = hex::decode(s.trim_start_matches("0x"))?;
+			data.try_into().map_err(|_| hex::FromHexError::InvalidStringLength)
+		}
+	}
+
+	impl HexCodec for Vec<u8> {
+		type Error = hex::FromHexError;
+		fn to_hex(&self) -> String {
+			format!("0x{}", hex::encode(self))
+		}
+		fn from_hex(s: String) -> Result<Self, Self::Error> {
+			hex::decode(s.trim_start_matches("0x"))
+		}
+	}
+
+	pub fn serialize<S, T>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+		T: HexCodec,
+	{
+		let s = value.to_hex();
+		serializer.serialize_str(&s)
+	}
+
+	pub fn deserialize<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+	where
+		D: Deserializer<'de>,
+		T: HexCodec,
+		<T as HexCodec>::Error: core::fmt::Debug,
+	{
+		let s = String::deserialize(deserializer)?;
+		let value = T::from_hex(s).map_err(|e| serde::de::Error::custom(format!("{:?}", e)))?;
+		Ok(value)
+	}
+}
+
+impl FromStr for Bytes {
+	type Err = hex::FromHexError;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		let data = hex::decode(s.trim_start_matches("0x"))?;
+		Ok(Bytes(data))
+	}
+}
+
+macro_rules! impl_hex {
+    ($type:ident, $inner:ty, $default:expr) => {
+        #[derive(Encode, Decode, Eq, PartialEq, TypeInfo, Clone, Serialize, Deserialize)]
+        #[doc = concat!("`", stringify!($inner), "`", " wrapper type for encoding and decoding hex strings")]
+        pub struct $type(#[serde(with = "hex_serde")] pub $inner);
+
+        impl Default for $type {
+            fn default() -> Self {
+                $type($default)
+            }
+        }
+
+        impl From<$inner> for $type {
+            fn from(inner: $inner) -> Self {
+                $type(inner)
+            }
+        }
+
+        impl Debug for $type {
+            fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
+                write!(f, concat!(stringify!($type), "({})"), self.0.to_hex())
+            }
+        }
+
+        impl Display for $type {
+            fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
+                write!(f, "{}", self.0.to_hex())
+            }
+        }
+    };
+}
+
+impl_hex!(Byte, u8, 0u8);
+impl_hex!(Bytes, Vec<u8>, vec![]);
+impl_hex!(Bytes8, [u8; 8], [0u8; 8]);
+impl_hex!(Bytes256, [u8; 256], [0u8; 256]);
+
+#[test]
+fn serialize_works() {
+	let a = Byte(42);
+	let s = serde_json::to_string(&a).unwrap();
+	assert_eq!(s, "\"0x2a\"");
+	let b = serde_json::from_str::<Byte>(&s).unwrap();
+	assert_eq!(a, b);
+
+	let a = Bytes(b"bello world".to_vec());
+	let s = serde_json::to_string(&a).unwrap();
+	assert_eq!(s, "\"0x62656c6c6f20776f726c64\"");
+	let b = serde_json::from_str::<Bytes>(&s).unwrap();
+	assert_eq!(a, b);
+
+	let a = Bytes256([42u8; 256]);
+	let s = serde_json::to_string(&a).unwrap();
+	let b = serde_json::from_str::<Bytes256>(&s).unwrap();
+	assert_eq!(a, b);
+}
diff --git a/substrate/frame/revive/src/evm/api/rlp_codec.rs b/substrate/frame/revive/src/evm/api/rlp_codec.rs
new file mode 100644
index 000000000000..e5f24c28a482
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/rlp_codec.rs
@@ -0,0 +1,219 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! RLP encoding and decoding for Ethereum transactions.
+//! See <https://eth.wiki/fundamentals/rlp> for more information about RLP encoding.
+
+use super::*;
+use alloc::vec::Vec;
+use rlp::{Decodable, Encodable};
+
+impl TransactionLegacyUnsigned {
+	/// Get the rlp encoded bytes of a signed transaction with a dummy 65 bytes signature.
+	pub fn dummy_signed_payload(&self) -> Vec<u8> {
+		let mut s = rlp::RlpStream::new();
+		s.append(self);
+		const DUMMY_SIGNATURE: [u8; 65] = [0u8; 65];
+		s.append_raw(&DUMMY_SIGNATURE.as_ref(), 1);
+		s.out().to_vec()
+	}
+}
+
+/// See <https://eips.ethereum.org/EIPS/eip-155>
+impl Encodable for TransactionLegacyUnsigned {
+	fn rlp_append(&self, s: &mut rlp::RlpStream) {
+		if let Some(chain_id) = self.chain_id {
+			s.begin_list(9);
+			s.append(&self.nonce);
+			s.append(&self.gas_price);
+			s.append(&self.gas);
+			match self.to {
+				Some(ref to) => s.append(to),
+				None => s.append_empty_data(),
+			};
+			s.append(&self.value);
+			s.append(&self.input.0);
+			s.append(&chain_id);
+			s.append(&0_u8);
+			s.append(&0_u8);
+		} else {
+			s.begin_list(6);
+			s.append(&self.nonce);
+			s.append(&self.gas_price);
+			s.append(&self.gas);
+			match self.to {
+				Some(ref to) => s.append(to),
+				None => s.append_empty_data(),
+			};
+			s.append(&self.value);
+			s.append(&self.input.0);
+		}
+	}
+}
+
+/// See <https://eips.ethereum.org/EIPS/eip-155>
+impl Decodable for TransactionLegacyUnsigned {
+	fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
+		Ok(TransactionLegacyUnsigned {
+			nonce: rlp.val_at(0)?,
+			gas_price: rlp.val_at(1)?,
+			gas: rlp.val_at(2)?,
+			to: {
+				let to = rlp.at(3)?;
+				if to.is_empty() {
+					None
+				} else {
+					Some(to.as_val()?)
+				}
+			},
+			value: rlp.val_at(4)?,
+			input: Bytes(rlp.val_at(5)?),
+			chain_id: {
+				if let Ok(chain_id) = rlp.val_at(6) {
+					Some(chain_id)
+				} else {
+					None
+				}
+			},
+			..Default::default()
+		})
+	}
+}
+
+impl Encodable for TransactionLegacySigned {
+	fn rlp_append(&self, s: &mut rlp::RlpStream) {
+		s.begin_list(9);
+		s.append(&self.transaction_legacy_unsigned.nonce);
+		s.append(&self.transaction_legacy_unsigned.gas_price);
+		s.append(&self.transaction_legacy_unsigned.gas);
+		match self.transaction_legacy_unsigned.to {
+			Some(ref to) => s.append(to),
+			None => s.append_empty_data(),
+		};
+		s.append(&self.transaction_legacy_unsigned.value);
+		s.append(&self.transaction_legacy_unsigned.input.0);
+
+		s.append(&self.v);
+		s.append(&self.r);
+		s.append(&self.s);
+	}
+}
+
+/// See <https://eips.ethereum.org/EIPS/eip-155>
+impl Decodable for TransactionLegacySigned {
+	fn decode(rlp: &rlp::Rlp) -> Result<Self, rlp::DecoderError> {
+		let v: U256 = rlp.val_at(6)?;
+
+		let extract_chain_id = |v: U256| {
+			if v.ge(&35u32.into()) {
+				Some((v - 35) / 2)
+			} else {
+				None
+			}
+		};
+
+		Ok(TransactionLegacySigned {
+			transaction_legacy_unsigned: {
+				TransactionLegacyUnsigned {
+					nonce: rlp.val_at(0)?,
+					gas_price: rlp.val_at(1)?,
+					gas: rlp.val_at(2)?,
+					to: {
+						let to = rlp.at(3)?;
+						if to.is_empty() {
+							None
+						} else {
+							Some(to.as_val()?)
+						}
+					},
+					value: rlp.val_at(4)?,
+					input: Bytes(rlp.val_at(5)?),
+					chain_id: extract_chain_id(v).map(|v| v.into()),
+					r#type: Type0 {},
+				}
+			},
+			v,
+			r: rlp.val_at(7)?,
+			s: rlp.val_at(8)?,
+		})
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+
+	#[test]
+	fn encode_decode_legacy_transaction_works() {
+		let tx = TransactionLegacyUnsigned {
+			chain_id: Some(596.into()),
+			gas: U256::from(21000),
+			nonce: U256::from(1),
+			gas_price: U256::from("0x640000006a"),
+			to: Some(Account::from(subxt_signer::eth::dev::baltathar()).address()),
+			value: U256::from(123123),
+			input: Bytes(vec![]),
+			r#type: Type0,
+		};
+
+		let rlp_bytes = rlp::encode(&tx);
+		let decoded = rlp::decode::<TransactionLegacyUnsigned>(&rlp_bytes).unwrap();
+		assert_eq!(&tx, &decoded);
+
+		let tx = Account::default().sign_transaction(tx);
+		let rlp_bytes = rlp::encode(&tx);
+		let decoded = rlp::decode::<TransactionLegacySigned>(&rlp_bytes).unwrap();
+		assert_eq!(&tx, &decoded);
+	}
+
+	#[test]
+	fn dummy_signed_payload_works() {
+		let tx = TransactionLegacyUnsigned {
+			chain_id: Some(596.into()),
+			gas: U256::from(21000),
+			nonce: U256::from(1),
+			gas_price: U256::from("0x640000006a"),
+			to: Some(Account::from(subxt_signer::eth::dev::baltathar()).address()),
+			value: U256::from(123123),
+			input: Bytes(vec![]),
+			r#type: Type0,
+		};
+
+		let signed_tx = Account::default().sign_transaction(tx.clone());
+		let rlp_bytes = rlp::encode(&signed_tx);
+		assert_eq!(tx.dummy_signed_payload().len(), rlp_bytes.len());
+	}
+
+	#[test]
+	fn recover_address_works() {
+		let account = Account::default();
+
+		let unsigned_tx = TransactionLegacyUnsigned {
+			value: 200_000_000_000_000_000_000u128.into(),
+			gas_price: 100_000_000_200u64.into(),
+			gas: 100_107u32.into(),
+			nonce: 3.into(),
+			to: Some(Account::from(subxt_signer::eth::dev::baltathar()).address()),
+			chain_id: Some(596.into()),
+			..Default::default()
+		};
+
+		let tx = account.sign_transaction(unsigned_tx.clone());
+		let recovered_address = tx.recover_eth_address().unwrap();
+
+		assert_eq!(account.address(), recovered_address);
+	}
+}
diff --git a/substrate/frame/revive/src/evm/api/rpc_types.rs b/substrate/frame/revive/src/evm/api/rpc_types.rs
new file mode 100644
index 000000000000..b15a0a53cd07
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/rpc_types.rs
@@ -0,0 +1,32 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Utility impl for the RPC types.
+use super::{ReceiptInfo, TransactionInfo, TransactionSigned};
+
+impl TransactionInfo {
+	/// Create a new [`TransactionInfo`] from a receipt and a signed transaction.
+	pub fn new(receipt: ReceiptInfo, transaction_signed: TransactionSigned) -> Self {
+		Self {
+			block_hash: receipt.block_hash,
+			block_number: receipt.block_number,
+			from: receipt.from,
+			hash: receipt.transaction_hash,
+			transaction_index: receipt.transaction_index,
+			transaction_signed,
+		}
+	}
+}
diff --git a/substrate/frame/revive/src/evm/api/rpc_types_gen.rs b/substrate/frame/revive/src/evm/api/rpc_types_gen.rs
new file mode 100644
index 000000000000..e4663a82232c
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/rpc_types_gen.rs
@@ -0,0 +1,682 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Generated JSON-RPC types.
+#![allow(missing_docs)]
+
+use super::{byte::*, Type0, Type1, Type2};
+use alloc::vec::Vec;
+use codec::{Decode, Encode};
+use derive_more::{From, TryInto};
+pub use ethereum_types::*;
+use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+
+/// Block object
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Block {
+	/// Base fee per gas
+	#[serde(rename = "baseFeePerGas", skip_serializing_if = "Option::is_none")]
+	pub base_fee_per_gas: Option<U256>,
+	/// Blob gas used
+	#[serde(rename = "blobGasUsed", skip_serializing_if = "Option::is_none")]
+	pub blob_gas_used: Option<U256>,
+	/// Difficulty
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub difficulty: Option<U256>,
+	/// Excess blob gas
+	#[serde(rename = "excessBlobGas", skip_serializing_if = "Option::is_none")]
+	pub excess_blob_gas: Option<U256>,
+	/// Extra data
+	#[serde(rename = "extraData")]
+	pub extra_data: Bytes,
+	/// Gas limit
+	#[serde(rename = "gasLimit")]
+	pub gas_limit: U256,
+	/// Gas used
+	#[serde(rename = "gasUsed")]
+	pub gas_used: U256,
+	/// Hash
+	pub hash: H256,
+	/// Bloom filter
+	#[serde(rename = "logsBloom")]
+	pub logs_bloom: Bytes256,
+	/// Coinbase
+	pub miner: Address,
+	/// Mix hash
+	#[serde(rename = "mixHash")]
+	pub mix_hash: H256,
+	/// Nonce
+	pub nonce: Bytes8,
+	/// Number
+	pub number: U256,
+	/// Parent Beacon Block Root
+	#[serde(rename = "parentBeaconBlockRoot", skip_serializing_if = "Option::is_none")]
+	pub parent_beacon_block_root: Option<H256>,
+	/// Parent block hash
+	#[serde(rename = "parentHash")]
+	pub parent_hash: H256,
+	/// Receipts root
+	#[serde(rename = "receiptsRoot")]
+	pub receipts_root: H256,
+	/// Ommers hash
+	#[serde(rename = "sha3Uncles")]
+	pub sha_3_uncles: H256,
+	/// Block size
+	pub size: U256,
+	/// State root
+	#[serde(rename = "stateRoot")]
+	pub state_root: H256,
+	/// Timestamp
+	pub timestamp: U256,
+	/// Total difficulty
+	#[serde(rename = "totalDifficulty", skip_serializing_if = "Option::is_none")]
+	pub total_difficulty: Option<U256>,
+	pub transactions: H256OrTransactionInfo,
+	/// Transactions root
+	#[serde(rename = "transactionsRoot")]
+	pub transactions_root: H256,
+	/// Uncles
+	pub uncles: Vec<H256>,
+	/// Withdrawals
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub withdrawals: Option<Vec<Withdrawal>>,
+	/// Withdrawals root
+	#[serde(rename = "withdrawalsRoot", skip_serializing_if = "Option::is_none")]
+	pub withdrawals_root: Option<H256>,
+}
+
+/// Block number or tag
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum BlockNumberOrTag {
+	/// Block number
+	U256(U256),
+	/// Block tag
+	BlockTag(BlockTag),
+}
+impl Default for BlockNumberOrTag {
+	fn default() -> Self {
+		BlockNumberOrTag::U256(Default::default())
+	}
+}
+
+/// Block number, tag, or block hash
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum BlockNumberOrTagOrHash {
+	/// Block number
+	U256(U256),
+	/// Block tag
+	BlockTag(BlockTag),
+	/// Block hash
+	H256(H256),
+}
+impl Default for BlockNumberOrTagOrHash {
+	fn default() -> Self {
+		BlockNumberOrTagOrHash::U256(Default::default())
+	}
+}
+
+/// Transaction object generic to all types
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct GenericTransaction {
+	/// accessList
+	/// EIP-2930 access list
+	#[serde(rename = "accessList", skip_serializing_if = "Option::is_none")]
+	pub access_list: Option<AccessList>,
+	/// blobVersionedHashes
+	/// List of versioned blob hashes associated with the transaction's EIP-4844 data blobs.
+	#[serde(rename = "blobVersionedHashes", skip_serializing_if = "Option::is_none")]
+	pub blob_versioned_hashes: Option<Vec<H256>>,
+	/// blobs
+	/// Raw blob data.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub blobs: Option<Vec<Bytes>>,
+	/// chainId
+	/// Chain ID that this transaction is valid on.
+	#[serde(rename = "chainId", skip_serializing_if = "Option::is_none")]
+	pub chain_id: Option<U256>,
+	/// from address
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub from: Option<Address>,
+	/// gas limit
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub gas: Option<U256>,
+	/// gas price
+	/// The gas price willing to be paid by the sender in wei
+	#[serde(rename = "gasPrice", skip_serializing_if = "Option::is_none")]
+	pub gas_price: Option<U256>,
+	/// input data
+	#[serde(alias = "data", skip_serializing_if = "Option::is_none")]
+	pub input: Option<Bytes>,
+	/// max fee per blob gas
+	/// The maximum total fee per gas the sender is willing to pay for blob gas in wei
+	#[serde(rename = "maxFeePerBlobGas", skip_serializing_if = "Option::is_none")]
+	pub max_fee_per_blob_gas: Option<U256>,
+	/// max fee per gas
+	/// The maximum total fee per gas the sender is willing to pay (includes the network / base fee
+	/// and miner / priority fee) in wei
+	#[serde(rename = "maxFeePerGas", skip_serializing_if = "Option::is_none")]
+	pub max_fee_per_gas: Option<U256>,
+	/// max priority fee per gas
+	/// Maximum fee per gas the sender is willing to pay to miners in wei
+	#[serde(rename = "maxPriorityFeePerGas", skip_serializing_if = "Option::is_none")]
+	pub max_priority_fee_per_gas: Option<U256>,
+	/// nonce
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub nonce: Option<U256>,
+	/// to address
+	pub to: Option<Address>,
+	/// type
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub r#type: Option<Byte>,
+	/// value
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub value: Option<U256>,
+}
+
+/// Receipt information
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct ReceiptInfo {
+	/// blob gas price
+	/// The actual value per gas deducted from the sender's account for blob gas. Only specified
+	/// for blob transactions as defined by EIP-4844.
+	#[serde(rename = "blobGasPrice", skip_serializing_if = "Option::is_none")]
+	pub blob_gas_price: Option<U256>,
+	/// blob gas used
+	/// The amount of blob gas used for this specific transaction. Only specified for blob
+	/// transactions as defined by EIP-4844.
+	#[serde(rename = "blobGasUsed", skip_serializing_if = "Option::is_none")]
+	pub blob_gas_used: Option<U256>,
+	/// block hash
+	#[serde(rename = "blockHash")]
+	pub block_hash: H256,
+	/// block number
+	#[serde(rename = "blockNumber")]
+	pub block_number: U256,
+	/// contract address
+	/// The contract address created, if the transaction was a contract creation, otherwise null.
+	#[serde(rename = "contractAddress")]
+	pub contract_address: Option<Address>,
+	/// cumulative gas used
+	/// The sum of gas used by this transaction and all preceding transactions in the same block.
+	#[serde(rename = "cumulativeGasUsed")]
+	pub cumulative_gas_used: U256,
+	/// effective gas price
+	/// The actual value per gas deducted from the sender's account. Before EIP-1559, this is equal
+	/// to the transaction's gas price. After, it is equal to baseFeePerGas + min(maxFeePerGas -
+	/// baseFeePerGas, maxPriorityFeePerGas).
+	#[serde(rename = "effectiveGasPrice")]
+	pub effective_gas_price: U256,
+	/// from
+	pub from: Address,
+	/// gas used
+	/// The amount of gas used for this specific transaction alone.
+	#[serde(rename = "gasUsed")]
+	pub gas_used: U256,
+	/// logs
+	pub logs: Vec<Log>,
+	/// logs bloom
+	#[serde(rename = "logsBloom")]
+	pub logs_bloom: Bytes256,
+	/// state root
+	/// The post-transaction state root. Only specified for transactions included before the
+	/// Byzantium upgrade.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub root: Option<H256>,
+	/// status
+	/// Either 1 (success) or 0 (failure). Only specified for transactions included after the
+	/// Byzantium upgrade.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub status: Option<U256>,
+	/// to
+	/// Address of the receiver or null in a contract creation transaction.
+	pub to: Option<Address>,
+	/// transaction hash
+	#[serde(rename = "transactionHash")]
+	pub transaction_hash: H256,
+	/// transaction index
+	#[serde(rename = "transactionIndex")]
+	pub transaction_index: U256,
+	/// type
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub r#type: Option<Byte>,
+}
+
+/// Syncing status
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum SyncingStatus {
+	/// Syncing progress
+	SyncingProgress(SyncingProgress),
+	/// Not syncing
+	/// Should always return false if not syncing.
+	Bool(bool),
+}
+impl Default for SyncingStatus {
+	fn default() -> Self {
+		SyncingStatus::SyncingProgress(Default::default())
+	}
+}
+
+/// Transaction information
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct TransactionInfo {
+	/// block hash
+	#[serde(rename = "blockHash")]
+	pub block_hash: H256,
+	/// block number
+	#[serde(rename = "blockNumber")]
+	pub block_number: U256,
+	/// from address
+	pub from: Address,
+	/// transaction hash
+	pub hash: H256,
+	/// transaction index
+	#[serde(rename = "transactionIndex")]
+	pub transaction_index: U256,
+	#[serde(flatten)]
+	pub transaction_signed: TransactionSigned,
+}
+
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum TransactionUnsigned {
+	Transaction4844Unsigned(Transaction4844Unsigned),
+	Transaction1559Unsigned(Transaction1559Unsigned),
+	Transaction2930Unsigned(Transaction2930Unsigned),
+	TransactionLegacyUnsigned(TransactionLegacyUnsigned),
+}
+impl Default for TransactionUnsigned {
+	fn default() -> Self {
+		TransactionUnsigned::Transaction4844Unsigned(Default::default())
+	}
+}
+
+/// Access list
+pub type AccessList = Vec<AccessListEntry>;
+
+/// Block tag
+/// `earliest`: The lowest numbered block the client has available; `finalized`: The most recent
+/// crypto-economically secure block, cannot be re-orged outside of manual intervention driven by
+/// community coordination; `safe`: The most recent block that is safe from re-orgs under honest
+/// majority and certain synchronicity assumptions; `latest`: The most recent block in the canonical
+/// chain observed by the client, this block may be re-orged out of the canonical chain even under
+/// healthy/normal conditions; `pending`: A sample next block built by the client on top of `latest`
+/// and containing the set of transactions usually taken from local mempool. Before the merge
+/// transition is finalized, any call querying for `finalized` or `safe` block MUST be responded to
+/// with `-39001: Unknown block` error
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub enum BlockTag {
+	#[serde(rename = "earliest")]
+	#[default]
+	Earliest,
+	#[serde(rename = "finalized")]
+	Finalized,
+	#[serde(rename = "safe")]
+	Safe,
+	#[serde(rename = "latest")]
+	Latest,
+	#[serde(rename = "pending")]
+	Pending,
+}
+
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum H256OrTransactionInfo {
+	/// Transaction hashes
+	H256s(Vec<H256>),
+	/// Full transactions
+	TransactionInfos(Vec<TransactionInfo>),
+}
+impl Default for H256OrTransactionInfo {
+	fn default() -> Self {
+		H256OrTransactionInfo::H256s(Default::default())
+	}
+}
+
+/// log
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Log {
+	/// address
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub address: Option<Address>,
+	/// block hash
+	#[serde(rename = "blockHash", skip_serializing_if = "Option::is_none")]
+	pub block_hash: Option<H256>,
+	/// block number
+	#[serde(rename = "blockNumber", skip_serializing_if = "Option::is_none")]
+	pub block_number: Option<U256>,
+	/// data
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub data: Option<Bytes>,
+	/// log index
+	#[serde(rename = "logIndex", skip_serializing_if = "Option::is_none")]
+	pub log_index: Option<U256>,
+	/// removed
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub removed: Option<bool>,
+	/// topics
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub topics: Option<Vec<H256>>,
+	/// transaction hash
+	#[serde(rename = "transactionHash")]
+	pub transaction_hash: H256,
+	/// transaction index
+	#[serde(rename = "transactionIndex", skip_serializing_if = "Option::is_none")]
+	pub transaction_index: Option<U256>,
+}
+
+/// Syncing progress
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct SyncingProgress {
+	/// Current block
+	#[serde(rename = "currentBlock", skip_serializing_if = "Option::is_none")]
+	pub current_block: Option<U256>,
+	/// Highest block
+	#[serde(rename = "highestBlock", skip_serializing_if = "Option::is_none")]
+	pub highest_block: Option<U256>,
+	/// Starting block
+	#[serde(rename = "startingBlock", skip_serializing_if = "Option::is_none")]
+	pub starting_block: Option<U256>,
+}
+
+/// EIP-1559 transaction.
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction1559Unsigned {
+	/// accessList
+	/// EIP-2930 access list
+	#[serde(rename = "accessList")]
+	pub access_list: AccessList,
+	/// chainId
+	/// Chain ID that this transaction is valid on.
+	#[serde(rename = "chainId")]
+	pub chain_id: U256,
+	/// gas limit
+	pub gas: U256,
+	/// gas price
+	/// The effective gas price paid by the sender in wei. For transactions not yet included in a
+	/// block, this value should be set equal to the max fee per gas. This field is DEPRECATED,
+	/// please transition to using effectiveGasPrice in the receipt object going forward.
+	#[serde(rename = "gasPrice")]
+	pub gas_price: U256,
+	/// input data
+	pub input: Bytes,
+	/// max fee per gas
+	/// The maximum total fee per gas the sender is willing to pay (includes the network / base fee
+	/// and miner / priority fee) in wei
+	#[serde(rename = "maxFeePerGas")]
+	pub max_fee_per_gas: U256,
+	/// max priority fee per gas
+	/// Maximum fee per gas the sender is willing to pay to miners in wei
+	#[serde(rename = "maxPriorityFeePerGas")]
+	pub max_priority_fee_per_gas: U256,
+	/// nonce
+	pub nonce: U256,
+	/// to address
+	pub to: Option<Address>,
+	/// type
+	pub r#type: Type2,
+	/// value
+	pub value: U256,
+}
+
+/// EIP-2930 transaction.
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction2930Unsigned {
+	/// accessList
+	/// EIP-2930 access list
+	#[serde(rename = "accessList")]
+	pub access_list: AccessList,
+	/// chainId
+	/// Chain ID that this transaction is valid on.
+	#[serde(rename = "chainId")]
+	pub chain_id: U256,
+	/// gas limit
+	pub gas: U256,
+	/// gas price
+	/// The gas price willing to be paid by the sender in wei
+	#[serde(rename = "gasPrice")]
+	pub gas_price: U256,
+	/// input data
+	pub input: Bytes,
+	/// nonce
+	pub nonce: U256,
+	/// to address
+	pub to: Option<Address>,
+	/// type
+	pub r#type: Type1,
+	/// value
+	pub value: U256,
+}
+
+/// EIP-4844 transaction.
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction4844Unsigned {
+	/// accessList
+	/// EIP-2930 access list
+	#[serde(rename = "accessList")]
+	pub access_list: AccessList,
+	/// blobVersionedHashes
+	/// List of versioned blob hashes associated with the transaction's EIP-4844 data blobs.
+	#[serde(rename = "blobVersionedHashes")]
+	pub blob_versioned_hashes: Vec<H256>,
+	/// chainId
+	/// Chain ID that this transaction is valid on.
+	#[serde(rename = "chainId")]
+	pub chain_id: U256,
+	/// gas limit
+	pub gas: U256,
+	/// input data
+	pub input: Bytes,
+	/// max fee per blob gas
+	/// The maximum total fee per gas the sender is willing to pay for blob gas in wei
+	#[serde(rename = "maxFeePerBlobGas")]
+	pub max_fee_per_blob_gas: U256,
+	/// max fee per gas
+	/// The maximum total fee per gas the sender is willing to pay (includes the network / base fee
+	/// and miner / priority fee) in wei
+	#[serde(rename = "maxFeePerGas")]
+	pub max_fee_per_gas: U256,
+	/// max priority fee per gas
+	/// Maximum fee per gas the sender is willing to pay to miners in wei
+	#[serde(rename = "maxPriorityFeePerGas")]
+	pub max_priority_fee_per_gas: U256,
+	/// nonce
+	pub nonce: U256,
+	/// to address
+	pub to: Address,
+	/// type
+	pub r#type: Byte,
+	/// value
+	pub value: U256,
+}
+
+/// Legacy transaction.
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct TransactionLegacyUnsigned {
+	/// chainId
+	/// Chain ID that this transaction is valid on.
+	#[serde(rename = "chainId", skip_serializing_if = "Option::is_none")]
+	pub chain_id: Option<U256>,
+	/// gas limit
+	pub gas: U256,
+	/// gas price
+	/// The gas price willing to be paid by the sender in wei
+	#[serde(rename = "gasPrice")]
+	pub gas_price: U256,
+	/// input data
+	pub input: Bytes,
+	/// nonce
+	pub nonce: U256,
+	/// to address
+	pub to: Option<Address>,
+	/// type
+	pub r#type: Type0,
+	/// value
+	pub value: U256,
+}
+
+#[derive(
+	Debug, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, From, TryInto, Eq, PartialEq,
+)]
+#[serde(untagged)]
+pub enum TransactionSigned {
+	Transaction4844Signed(Transaction4844Signed),
+	Transaction1559Signed(Transaction1559Signed),
+	Transaction2930Signed(Transaction2930Signed),
+	TransactionLegacySigned(TransactionLegacySigned),
+}
+impl Default for TransactionSigned {
+	fn default() -> Self {
+		TransactionSigned::Transaction4844Signed(Default::default())
+	}
+}
+
+/// Validator withdrawal
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Withdrawal {
+	/// recipient address for withdrawal value
+	pub address: Address,
+	/// value contained in withdrawal
+	pub amount: U256,
+	/// index of withdrawal
+	pub index: U256,
+	/// index of validator that generated withdrawal
+	#[serde(rename = "validatorIndex")]
+	pub validator_index: U256,
+}
+
+/// Access list entry
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct AccessListEntry {
+	pub address: Address,
+	#[serde(rename = "storageKeys")]
+	pub storage_keys: Vec<H256>,
+}
+
+/// Signed 1559 Transaction
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction1559Signed {
+	#[serde(flatten)]
+	pub transaction_1559_unsigned: Transaction1559Unsigned,
+	/// r
+	pub r: U256,
+	/// s
+	pub s: U256,
+	/// v
+	/// For backwards compatibility, `v` is optionally provided as an alternative to `yParity`.
+	/// This field is DEPRECATED and all use of it should migrate to `yParity`.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub v: Option<U256>,
+	/// yParity
+	/// The parity (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
+	#[serde(rename = "yParity", skip_serializing_if = "Option::is_none")]
+	pub y_parity: Option<U256>,
+}
+
+/// Signed 2930 Transaction
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction2930Signed {
+	#[serde(flatten)]
+	pub transaction_2930_unsigned: Transaction2930Unsigned,
+	/// r
+	pub r: U256,
+	/// s
+	pub s: U256,
+	/// v
+	/// For backwards compatibility, `v` is optionally provided as an alternative to `yParity`.
+	/// This field is DEPRECATED and all use of it should migrate to `yParity`.
+	#[serde(skip_serializing_if = "Option::is_none")]
+	pub v: Option<U256>,
+	/// yParity
+	/// The parity (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
+	#[serde(rename = "yParity")]
+	pub y_parity: U256,
+}
+
+/// Signed 4844 Transaction
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct Transaction4844Signed {
+	#[serde(flatten)]
+	pub transaction_4844_unsigned: Transaction4844Unsigned,
+	/// r
+	pub r: U256,
+	/// s
+	pub s: U256,
+	/// yParity
+	/// The parity (0 for even, 1 for odd) of the y-value of the secp256k1 signature.
+	#[serde(rename = "yParity", skip_serializing_if = "Option::is_none")]
+	pub y_parity: Option<U256>,
+}
+
+/// Signed Legacy Transaction
+#[derive(
+	Debug, Default, Clone, Encode, Decode, TypeInfo, Serialize, Deserialize, Eq, PartialEq,
+)]
+pub struct TransactionLegacySigned {
+	#[serde(flatten)]
+	pub transaction_legacy_unsigned: TransactionLegacyUnsigned,
+	/// r
+	pub r: U256,
+	/// s
+	pub s: U256,
+	/// v
+	pub v: U256,
+}
diff --git a/substrate/frame/revive/src/evm/api/signature.rs b/substrate/frame/revive/src/evm/api/signature.rs
new file mode 100644
index 000000000000..957d50c8e324
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/signature.rs
@@ -0,0 +1,80 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Ethereum signature utilities
+use super::{TransactionLegacySigned, TransactionLegacyUnsigned};
+use rlp::Encodable;
+use sp_core::{H160, U256};
+use sp_io::{crypto::secp256k1_ecdsa_recover, hashing::keccak_256};
+
+impl TransactionLegacyUnsigned {
+	/// Recover the Ethereum address, from an RLP encoded transaction and a 65 bytes signature.
+	pub fn recover_eth_address(rlp_encoded: &[u8], signature: &[u8; 65]) -> Result<H160, ()> {
+		let hash = keccak_256(rlp_encoded);
+		let mut addr = H160::default();
+		let pk = secp256k1_ecdsa_recover(&signature, &hash).map_err(|_| ())?;
+		addr.assign_from_slice(&keccak_256(&pk[..])[12..]);
+
+		Ok(addr)
+	}
+}
+
+impl TransactionLegacySigned {
+	/// Create a signed transaction from an [`TransactionLegacyUnsigned`] and a signature.
+	pub fn from(
+		transaction_legacy_unsigned: TransactionLegacyUnsigned,
+		signature: &[u8; 65],
+	) -> TransactionLegacySigned {
+		let r = U256::from_big_endian(&signature[..32]);
+		let s = U256::from_big_endian(&signature[32..64]);
+		let recovery_id = signature[64] as u32;
+		let v = transaction_legacy_unsigned
+			.chain_id
+			.map(|chain_id| chain_id * 2 + 35 + recovery_id)
+			.unwrap_or_else(|| U256::from(27) + recovery_id);
+
+		TransactionLegacySigned { transaction_legacy_unsigned, r, s, v }
+	}
+
+	/// Get the raw 65 bytes signature from the signed transaction.
+	pub fn raw_signature(&self) -> Result<[u8; 65], ()> {
+		let mut s = [0u8; 65];
+		self.r.write_as_big_endian(s[0..32].as_mut());
+		self.s.write_as_big_endian(s[32..64].as_mut());
+		s[64] = self.extract_recovery_id().ok_or(())?;
+		Ok(s)
+	}
+
+	/// Get the recovery ID from the signed transaction.
+	/// See https://eips.ethereum.org/EIPS/eip-155
+	fn extract_recovery_id(&self) -> Option<u8> {
+		if let Some(chain_id) = self.transaction_legacy_unsigned.chain_id {
+			// self.v - chain_id * 2 - 35
+			let v: u64 = self.v.try_into().ok()?;
+			let chain_id: u64 = chain_id.try_into().ok()?;
+			let r = v.checked_sub(chain_id.checked_mul(2)?)?.checked_sub(35)?;
+			r.try_into().ok()
+		} else {
+			self.v.try_into().ok()
+		}
+	}
+
+	/// Recover the Ethereum address from the signed transaction.
+	pub fn recover_eth_address(&self) -> Result<H160, ()> {
+		let rlp_encoded = self.transaction_legacy_unsigned.rlp_bytes();
+		TransactionLegacyUnsigned::recover_eth_address(&rlp_encoded, &self.raw_signature()?)
+	}
+}
diff --git a/substrate/frame/revive/src/evm/api/type_id.rs b/substrate/frame/revive/src/evm/api/type_id.rs
new file mode 100644
index 000000000000..7d75d53500b6
--- /dev/null
+++ b/substrate/frame/revive/src/evm/api/type_id.rs
@@ -0,0 +1,95 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Ethereum Typed Transaction types
+use super::Byte;
+use codec::{Decode, Encode};
+use scale_info::TypeInfo;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+/// A macro to generate Transaction type identifiers
+/// See <https://ethereum.org/en/developers/docs/transactions/#typed-transaction-envelope>
+macro_rules! transaction_type {
+	($name:ident, $value:literal) => {
+		#[doc = concat!("Transaction type identifier: ", $value)]
+		#[derive(Clone, Default, Debug, Eq, PartialEq)]
+		pub struct $name;
+
+		impl $name {
+			/// Convert to Byte
+			pub fn as_byte(&self) -> Byte {
+				Byte::from($value)
+			}
+
+			/// Try to convert from Byte
+			pub fn try_from_byte(byte: Byte) -> Result<Self, Byte> {
+				if byte.0 == $value {
+					Ok(Self {})
+				} else {
+					Err(byte)
+				}
+			}
+		}
+
+		impl Encode for $name {
+			fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
+				f(&[$value])
+			}
+		}
+		impl Decode for $name {
+			fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
+				if $value == input.read_byte()? {
+					Ok(Self {})
+				} else {
+					Err(codec::Error::from(concat!("expected ", $value)))
+				}
+			}
+		}
+
+		impl TypeInfo for $name {
+			type Identity = u8;
+			fn type_info() -> scale_info::Type {
+				<u8 as TypeInfo>::type_info()
+			}
+		}
+
+		impl Serialize for $name {
+			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+			where
+				S: Serializer,
+			{
+				serializer.serialize_str(concat!("0x", $value))
+			}
+		}
+		impl<'de> Deserialize<'de> for $name {
+			fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+			where
+				D: Deserializer<'de>,
+			{
+				let s: &str = Deserialize::deserialize(deserializer)?;
+				if s == concat!("0x", $value) {
+					Ok($name {})
+				} else {
+					Err(serde::de::Error::custom(concat!("expected ", $value)))
+				}
+			}
+		}
+	};
+}
+
+transaction_type!(Type0, 0);
+transaction_type!(Type1, 1);
+transaction_type!(Type2, 2);
diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
new file mode 100644
index 000000000000..58110bcf186f
--- /dev/null
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -0,0 +1,685 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//! Runtime types for integrating `pallet-revive` with the EVM.
+use crate::{
+	evm::api::{TransactionLegacySigned, TransactionLegacyUnsigned},
+	AccountIdOf, AddressMapper, BalanceOf, MomentOf, Weight, LOG_TARGET,
+};
+use codec::{Decode, Encode};
+use frame_support::{
+	dispatch::{DispatchInfo, GetDispatchInfo},
+	traits::{ExtrinsicCall, InherentBuilder, SignedTransactionBuilder},
+};
+use pallet_transaction_payment::OnChargeTransaction;
+use scale_info::TypeInfo;
+use sp_arithmetic::Percent;
+use sp_core::{Get, U256};
+use sp_runtime::{
+	generic::{self, CheckedExtrinsic, ExtrinsicFormat},
+	traits::{
+		self, Checkable, Dispatchable, ExtrinsicLike, ExtrinsicMetadata, IdentifyAccount, Member,
+		TransactionExtension,
+	},
+	transaction_validity::{InvalidTransaction, TransactionValidityError},
+	OpaqueExtrinsic, RuntimeDebug, Saturating,
+};
+
+use alloc::vec::Vec;
+
+type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
+
+/// The EVM gas price.
+/// This constant is used by the proxy to advertise it via the eth_gas_price RPC.
+///
+/// We use a fixed value for the gas price.
+/// This let us calculate the gas estimate for a transaction with the formula:
+/// `estimate_gas = substrate_fee / gas_price`.
+pub const GAS_PRICE: u32 = 1_000u32;
+
+/// Wraps [`generic::UncheckedExtrinsic`] to support checking unsigned
+/// [`crate::Call::eth_transact`] extrinsic.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+#[scale_info(skip_type_params(E))]
+pub struct UncheckedExtrinsic<Address, Signature, E: EthExtra>(
+	pub generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>,
+);
+
+impl<Address, Signature, E: EthExtra>
+	From<generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>>
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	fn from(
+		utx: generic::UncheckedExtrinsic<Address, CallOf<E::Config>, Signature, E::Extension>,
+	) -> Self {
+		Self(utx)
+	}
+}
+
+impl<Address: TypeInfo, Signature: TypeInfo, E: EthExtra> ExtrinsicLike
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	fn is_bare(&self) -> bool {
+		ExtrinsicLike::is_bare(&self.0)
+	}
+}
+
+impl<Address, Signature, E: EthExtra> ExtrinsicMetadata
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	const VERSION: u8 =
+		generic::UncheckedExtrinsic::<Address, CallOf<E::Config>, Signature, E::Extension>::VERSION;
+	type TransactionExtensions = E::Extension;
+}
+
+impl<Address: TypeInfo, Signature: TypeInfo, E: EthExtra> ExtrinsicCall
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	type Call = CallOf<E::Config>;
+
+	fn call(&self) -> &Self::Call {
+		self.0.call()
+	}
+}
+
+use sp_runtime::traits::MaybeDisplay;
+type OnChargeTransactionBalanceOf<T> = <<T as pallet_transaction_payment::Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
+
+impl<LookupSource, Signature, E, Lookup> Checkable<Lookup>
+	for UncheckedExtrinsic<LookupSource, Signature, E>
+where
+	E: EthExtra,
+	Self: Encode,
+	<E::Config as frame_system::Config>::Nonce: TryFrom<U256>,
+	<E::Config as frame_system::Config>::RuntimeCall: Dispatchable<Info = DispatchInfo>,
+	OnChargeTransactionBalanceOf<E::Config>: Into<BalanceOf<E::Config>>,
+	BalanceOf<E::Config>: Into<U256> + TryFrom<U256>,
+	MomentOf<E::Config>: Into<U256>,
+	CallOf<E::Config>: From<crate::Call<E::Config>> + TryInto<crate::Call<E::Config>>,
+
+	// required by Checkable for `generic::UncheckedExtrinsic`
+	LookupSource: Member + MaybeDisplay,
+	CallOf<E::Config>: Encode + Member + Dispatchable,
+	Signature: Member + traits::Verify,
+	<Signature as traits::Verify>::Signer: IdentifyAccount<AccountId = AccountIdOf<E::Config>>,
+	E::Extension: Encode + TransactionExtension<CallOf<E::Config>>,
+	Lookup: traits::Lookup<Source = LookupSource, Target = AccountIdOf<E::Config>>,
+{
+	type Checked = CheckedExtrinsic<AccountIdOf<E::Config>, CallOf<E::Config>, E::Extension>;
+
+	fn check(self, lookup: &Lookup) -> Result<Self::Checked, TransactionValidityError> {
+		if !self.0.is_signed() {
+			if let Ok(call) = self.0.function.clone().try_into() {
+				if let crate::Call::eth_transact { payload, gas_limit, storage_deposit_limit } =
+					call
+				{
+					let checked = E::try_into_checked_extrinsic(
+						payload,
+						gas_limit,
+						storage_deposit_limit,
+						self.encoded_size(),
+					)?;
+					return Ok(checked)
+				};
+			}
+		}
+		self.0.check(lookup)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn unchecked_into_checked_i_know_what_i_am_doing(
+		self,
+		lookup: &Lookup,
+	) -> Result<Self::Checked, TransactionValidityError> {
+		self.0.unchecked_into_checked_i_know_what_i_am_doing(lookup)
+	}
+}
+
+impl<Address, Signature, E: EthExtra> GetDispatchInfo for UncheckedExtrinsic<Address, Signature, E>
+where
+	CallOf<E::Config>: GetDispatchInfo + Dispatchable,
+{
+	fn get_dispatch_info(&self) -> DispatchInfo {
+		self.0.get_dispatch_info()
+	}
+}
+
+impl<Address: Encode, Signature: Encode, E: EthExtra> serde::Serialize
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	fn serialize<S>(&self, seq: S) -> Result<S::Ok, S::Error>
+	where
+		S: ::serde::Serializer,
+	{
+		self.0.serialize(seq)
+	}
+}
+
+impl<'a, Address: Decode, Signature: Decode, E: EthExtra> serde::Deserialize<'a>
+	for UncheckedExtrinsic<Address, Signature, E>
+{
+	fn deserialize<D>(de: D) -> Result<Self, D::Error>
+	where
+		D: serde::Deserializer<'a>,
+	{
+		let r = sp_core::bytes::deserialize(de)?;
+		Decode::decode(&mut &r[..])
+			.map_err(|e| serde::de::Error::custom(sp_runtime::format!("Decode error: {}", e)))
+	}
+}
+
+impl<Address, Signature, E: EthExtra> SignedTransactionBuilder
+	for UncheckedExtrinsic<Address, Signature, E>
+where
+	Address: TypeInfo,
+	CallOf<E::Config>: TypeInfo,
+	Signature: TypeInfo,
+	E::Extension: TypeInfo,
+{
+	type Address = Address;
+	type Signature = Signature;
+	type Extension = E::Extension;
+
+	fn new_signed_transaction(
+		call: Self::Call,
+		signed: Address,
+		signature: Signature,
+		tx_ext: E::Extension,
+	) -> Self {
+		generic::UncheckedExtrinsic::new_signed(call, signed, signature, tx_ext).into()
+	}
+}
+
+impl<Address, Signature, E: EthExtra> InherentBuilder for UncheckedExtrinsic<Address, Signature, E>
+where
+	Address: TypeInfo,
+	CallOf<E::Config>: TypeInfo,
+	Signature: TypeInfo,
+	E::Extension: TypeInfo,
+{
+	fn new_inherent(call: Self::Call) -> Self {
+		generic::UncheckedExtrinsic::new_bare(call).into()
+	}
+}
+
+impl<Address, Signature, E: EthExtra> From<UncheckedExtrinsic<Address, Signature, E>>
+	for OpaqueExtrinsic
+where
+	Address: Encode,
+	Signature: Encode,
+	CallOf<E::Config>: Encode,
+	E::Extension: Encode,
+{
+	fn from(extrinsic: UncheckedExtrinsic<Address, Signature, E>) -> Self {
+		Self::from_bytes(extrinsic.encode().as_slice()).expect(
+			"both OpaqueExtrinsic and UncheckedExtrinsic have encoding that is compatible with \
+				raw Vec<u8> encoding; qed",
+		)
+	}
+}
+
+/// EthExtra convert an unsigned [`crate::Call::eth_transact`] into a [`CheckedExtrinsic`].
+pub trait EthExtra {
+	/// The Runtime configuration.
+	type Config: crate::Config + pallet_transaction_payment::Config;
+
+	/// The Runtime's transaction extension.
+	/// It should include at least:
+	/// - [`frame_system::CheckNonce`] to ensure that the nonce from the Ethereum transaction is
+	///   correct.
+	type Extension: TransactionExtension<CallOf<Self::Config>>;
+
+	/// Get the transaction extension to apply to an unsigned [`crate::Call::eth_transact`]
+	/// extrinsic.
+	///
+	/// # Parameters
+	/// - `nonce`: The nonce extracted from the Ethereum transaction.
+	/// - `tip`: The transaction tip calculated from the Ethereum transaction.
+	fn get_eth_extension(
+		nonce: <Self::Config as frame_system::Config>::Nonce,
+		tip: BalanceOf<Self::Config>,
+	) -> Self::Extension;
+
+	/// Convert the unsigned [`crate::Call::eth_transact`] into a [`CheckedExtrinsic`].
+	/// and ensure that the fees from the Ethereum transaction correspond to the fees computed from
+	/// the encoded_len, the injected gas_limit and storage_deposit_limit.
+	///
+	/// # Parameters
+	/// - `payload`: The RLP-encoded Ethereum transaction.
+	/// - `gas_limit`: The gas limit for the extrinsic
+	/// - `storage_deposit_limit`: The storage deposit limit for the extrinsic,
+	/// - `encoded_len`: The encoded length of the extrinsic.
+	fn try_into_checked_extrinsic(
+		payload: Vec<u8>,
+		gas_limit: Weight,
+		storage_deposit_limit: BalanceOf<Self::Config>,
+		encoded_len: usize,
+	) -> Result<
+		CheckedExtrinsic<AccountIdOf<Self::Config>, CallOf<Self::Config>, Self::Extension>,
+		InvalidTransaction,
+	>
+	where
+		<Self::Config as frame_system::Config>::Nonce: TryFrom<U256>,
+		BalanceOf<Self::Config>: Into<U256> + TryFrom<U256>,
+		MomentOf<Self::Config>: Into<U256>,
+		<Self::Config as frame_system::Config>::RuntimeCall: Dispatchable<Info = DispatchInfo>,
+		OnChargeTransactionBalanceOf<Self::Config>: Into<BalanceOf<Self::Config>>,
+		CallOf<Self::Config>: From<crate::Call<Self::Config>>,
+	{
+		let tx = rlp::decode::<TransactionLegacySigned>(&payload).map_err(|err| {
+			log::debug!(target: LOG_TARGET, "Failed to decode transaction: {err:?}");
+			InvalidTransaction::Call
+		})?;
+
+		let signer = tx.recover_eth_address().map_err(|err| {
+			log::debug!(target: LOG_TARGET, "Failed to recover signer: {err:?}");
+			InvalidTransaction::BadProof
+		})?;
+
+		let signer =
+			<Self::Config as crate::Config>::AddressMapper::to_account_id_contract(&signer);
+		let TransactionLegacyUnsigned { nonce, chain_id, to, value, input, gas, gas_price, .. } =
+			tx.transaction_legacy_unsigned;
+
+		if chain_id.unwrap_or_default() != <Self::Config as crate::Config>::ChainId::get().into() {
+			log::debug!(target: LOG_TARGET, "Invalid chain_id {chain_id:?}");
+			return Err(InvalidTransaction::Call);
+		}
+
+		let call = if let Some(dest) = to {
+			crate::Call::call::<Self::Config> {
+				dest,
+				value: value.try_into().map_err(|_| InvalidTransaction::Call)?,
+				gas_limit,
+				storage_deposit_limit,
+				data: input.0,
+			}
+		} else {
+			let blob = match polkavm::ProgramBlob::blob_length(&input.0) {
+				Some(blob_len) => blob_len
+					.try_into()
+					.ok()
+					.and_then(|blob_len| (input.0.split_at_checked(blob_len))),
+				_ => None,
+			};
+
+			let Some((code, data)) = blob else {
+				log::debug!(target: LOG_TARGET, "Failed to extract polkavm code & data");
+				return Err(InvalidTransaction::Call);
+			};
+
+			crate::Call::instantiate_with_code::<Self::Config> {
+				value: value.try_into().map_err(|_| InvalidTransaction::Call)?,
+				gas_limit,
+				storage_deposit_limit,
+				code: code.to_vec(),
+				data: data.to_vec(),
+				salt: None,
+			}
+		};
+
+		let nonce = nonce.try_into().map_err(|_| InvalidTransaction::Call)?;
+
+		// Fees calculated with the fixed `GAS_PRICE` that should be used to estimate the gas.
+		let eth_fee_no_tip = U256::from(GAS_PRICE)
+			.saturating_mul(gas)
+			.try_into()
+			.map_err(|_| InvalidTransaction::Call)?;
+
+		// Fees with the actual gas_price from the transaction.
+		let eth_fee: BalanceOf<Self::Config> = U256::from(gas_price)
+			.saturating_mul(gas)
+			.try_into()
+			.map_err(|_| InvalidTransaction::Call)?;
+
+		let info = call.get_dispatch_info();
+		let function: CallOf<Self::Config> = call.into();
+
+		// Fees calculated from the extrinsic, without the tip.
+		let actual_fee: BalanceOf<Self::Config> =
+			pallet_transaction_payment::Pallet::<Self::Config>::compute_fee(
+				encoded_len as u32,
+				&info,
+				Default::default(),
+			)
+			.into();
+
+		log::debug!(target: LOG_TARGET, "Checking Ethereum transaction fees:
+			dispatch_info: {info:?}
+			encoded_len: {encoded_len:?}
+			fees: {actual_fee:?}
+		");
+
+		if eth_fee < actual_fee {
+			log::debug!(target: LOG_TARGET, "fees {eth_fee:?} too low for the extrinsic {actual_fee:?}");
+			return Err(InvalidTransaction::Payment.into())
+		}
+
+		let min = actual_fee.min(eth_fee_no_tip);
+		let max = actual_fee.max(eth_fee_no_tip);
+		let diff = Percent::from_rational(max - min, min);
+		if diff > Percent::from_percent(10) {
+			log::debug!(target: LOG_TARGET, "Difference between the extrinsic fees {actual_fee:?} and the Ethereum gas fees {eth_fee_no_tip:?} should be no more than 10% got {diff:?}");
+			return Err(InvalidTransaction::Call.into())
+		} else {
+			log::debug!(target: LOG_TARGET, "Difference between the extrinsic fees {actual_fee:?} and the Ethereum gas fees {eth_fee_no_tip:?}:  {diff:?}");
+		}
+
+		let tip = eth_fee.saturating_sub(eth_fee_no_tip);
+		log::debug!(target: LOG_TARGET, "Created checked Ethereum transaction with nonce {nonce:?} and tip: {tip:?}");
+		Ok(CheckedExtrinsic {
+			format: ExtrinsicFormat::Signed(signer.into(), Self::get_eth_extension(nonce, tip)),
+			function,
+		})
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+	use crate::{
+		evm::*,
+		test_utils::*,
+		tests::{ExtBuilder, RuntimeCall, RuntimeOrigin, Test},
+	};
+	use frame_support::{error::LookupError, traits::fungible::Mutate};
+	use pallet_revive_fixtures::compile_module;
+	use rlp::Encodable;
+	use sp_runtime::{
+		traits::{Checkable, DispatchTransaction},
+		MultiAddress, MultiSignature,
+	};
+	type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
+
+	/// A simple account that can sign transactions
+	pub struct Account(subxt_signer::eth::Keypair);
+
+	impl Default for Account {
+		fn default() -> Self {
+			Self(subxt_signer::eth::dev::alith())
+		}
+	}
+
+	impl From<subxt_signer::eth::Keypair> for Account {
+		fn from(kp: subxt_signer::eth::Keypair) -> Self {
+			Self(kp)
+		}
+	}
+
+	impl Account {
+		/// Get the [`AccountId`] of the account.
+		pub fn account_id(&self) -> AccountIdOf<Test> {
+			let address = self.address();
+			<Test as crate::Config>::AddressMapper::to_account_id_contract(&address)
+		}
+
+		/// Get the [`H160`] address of the account.
+		pub fn address(&self) -> H160 {
+			H160::from_slice(&self.0.account_id().as_ref())
+		}
+
+		/// Sign a transaction.
+		pub fn sign_transaction(&self, tx: TransactionLegacyUnsigned) -> TransactionLegacySigned {
+			let rlp_encoded = tx.rlp_bytes();
+			let signature = self.0.sign(&rlp_encoded);
+			TransactionLegacySigned::from(tx, signature.as_ref())
+		}
+	}
+
+	#[derive(Clone, PartialEq, Eq, Debug)]
+	pub struct Extra;
+	type SignedExtra = (frame_system::CheckNonce<Test>, ChargeTransactionPayment<Test>);
+
+	use pallet_transaction_payment::ChargeTransactionPayment;
+	impl EthExtra for Extra {
+		type Config = Test;
+		type Extension = SignedExtra;
+
+		fn get_eth_extension(nonce: u32, tip: BalanceOf<Test>) -> Self::Extension {
+			(frame_system::CheckNonce::from(nonce), ChargeTransactionPayment::from(tip))
+		}
+	}
+
+	type Ex = UncheckedExtrinsic<MultiAddress<AccountId32, u32>, MultiSignature, Extra>;
+	struct TestContext;
+
+	impl traits::Lookup for TestContext {
+		type Source = MultiAddress<AccountId32, u32>;
+		type Target = AccountIdOf<Test>;
+		fn lookup(&self, s: Self::Source) -> Result<Self::Target, LookupError> {
+			match s {
+				MultiAddress::Id(id) => Ok(id),
+				_ => Err(LookupError),
+			}
+		}
+	}
+
+	/// A builder for creating an unchecked extrinsic, and test that the check function works.
+	#[derive(Clone)]
+	struct UncheckedExtrinsicBuilder {
+		tx: TransactionLegacyUnsigned,
+		gas_limit: Weight,
+		storage_deposit_limit: BalanceOf<Test>,
+	}
+
+	impl UncheckedExtrinsicBuilder {
+		/// Create a new builder with default values.
+		fn new() -> Self {
+			Self {
+				tx: TransactionLegacyUnsigned {
+					chain_id: Some(<Test as crate::Config>::ChainId::get().into()),
+					gas_price: U256::from(GAS_PRICE),
+					..Default::default()
+				},
+				gas_limit: Weight::zero(),
+				storage_deposit_limit: 0,
+			}
+		}
+
+		/// Create a new builder with a call to the given address.
+		fn call_with(dest: H160) -> Self {
+			let mut builder = Self::new();
+			builder.tx.to = Some(dest);
+			builder.tx.gas = U256::from(516_708u128);
+			builder
+		}
+
+		/// Create a new builder with an instantiate call.
+		fn instantiate_with(code: Vec<u8>, data: Vec<u8>) -> Self {
+			let mut builder = Self::new();
+			builder.tx.input = Bytes(code.into_iter().chain(data.into_iter()).collect());
+			builder.tx.gas = U256::from(1_035_070u128);
+			builder
+		}
+
+		/// Update the transaction with the given function.
+		fn update(mut self, f: impl FnOnce(&mut TransactionLegacyUnsigned) -> ()) -> Self {
+			f(&mut self.tx);
+			self
+		}
+
+		/// Call `check` on the unchecked extrinsic, and `pre_dispatch` on the signed extension.
+		fn check(&self) -> Result<(RuntimeCall, SignedExtra), TransactionValidityError> {
+			let UncheckedExtrinsicBuilder { tx, gas_limit, storage_deposit_limit } = self.clone();
+
+			// Fund the account.
+			let account = Account::default();
+			let _ = <Test as crate::Config>::Currency::set_balance(
+				&account.account_id(),
+				100_000_000_000_000,
+			);
+
+			let payload = account.sign_transaction(tx).rlp_bytes().to_vec();
+			let call = RuntimeCall::Contracts(crate::Call::eth_transact {
+				payload,
+				gas_limit,
+				storage_deposit_limit,
+			});
+
+			let encoded_len = call.encoded_size();
+			let uxt: Ex = generic::UncheckedExtrinsic::new_bare(call).into();
+			let result: CheckedExtrinsic<_, _, _> = uxt.check(&TestContext {})?;
+			let (account_id, extra): (AccountId32, SignedExtra) = match result.format {
+				ExtrinsicFormat::Signed(signer, extra) => (signer, extra),
+				_ => unreachable!(),
+			};
+
+			extra.clone().validate_and_prepare(
+				RuntimeOrigin::signed(account_id),
+				&result.function,
+				&result.function.get_dispatch_info(),
+				encoded_len,
+			)?;
+
+			Ok((result.function, extra))
+		}
+	}
+
+	#[test]
+	fn check_eth_transact_call_works() {
+		ExtBuilder::default().build().execute_with(|| {
+			let builder = UncheckedExtrinsicBuilder::call_with(H160::from([1u8; 20]));
+			assert_eq!(
+				builder.check().unwrap().0,
+				crate::Call::call::<Test> {
+					dest: builder.tx.to.unwrap(),
+					value: builder.tx.value.as_u64(),
+					gas_limit: builder.gas_limit,
+					storage_deposit_limit: builder.storage_deposit_limit,
+					data: builder.tx.input.0
+				}
+				.into()
+			);
+		});
+	}
+
+	#[test]
+	fn check_eth_transact_instantiate_works() {
+		ExtBuilder::default().build().execute_with(|| {
+			let (code, _) = compile_module("dummy").unwrap();
+			let data = vec![];
+			let builder = UncheckedExtrinsicBuilder::instantiate_with(code.clone(), data.clone());
+
+			assert_eq!(
+				builder.check().unwrap().0,
+				crate::Call::instantiate_with_code::<Test> {
+					value: builder.tx.value.as_u64(),
+					gas_limit: builder.gas_limit,
+					storage_deposit_limit: builder.storage_deposit_limit,
+					code,
+					data,
+					salt: None
+				}
+				.into()
+			);
+		});
+	}
+
+	#[test]
+	fn check_eth_transact_nonce_works() {
+		ExtBuilder::default().build().execute_with(|| {
+			let builder = UncheckedExtrinsicBuilder::call_with(H160::from([1u8; 20]))
+				.update(|tx| tx.nonce = 1u32.into());
+
+			assert_eq!(
+				builder.check(),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Future))
+			);
+
+			<crate::System<Test>>::inc_account_nonce(Account::default().account_id());
+
+			let builder = UncheckedExtrinsicBuilder::call_with(H160::from([1u8; 20]));
+			assert_eq!(
+				builder.check(),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Stale))
+			);
+		});
+	}
+
+	#[test]
+	fn check_eth_transact_chain_id_works() {
+		ExtBuilder::default().build().execute_with(|| {
+			let builder = UncheckedExtrinsicBuilder::call_with(H160::from([1u8; 20]))
+				.update(|tx| tx.chain_id = Some(42.into()));
+
+			assert_eq!(
+				builder.check(),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+			);
+		});
+	}
+
+	#[test]
+	fn check_instantiate_data() {
+		ExtBuilder::default().build().execute_with(|| {
+			let code = b"invalid code".to_vec();
+			let data = vec![1];
+			let builder = UncheckedExtrinsicBuilder::instantiate_with(code.clone(), data.clone());
+
+			// Fail because the tx input fail to get the blob length
+			assert_eq!(
+				builder.clone().update(|tx| tx.input = Bytes(vec![1, 2, 3])).check(),
+				Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+			);
+		});
+	}
+
+	#[test]
+	fn check_transaction_fees() {
+		ExtBuilder::default().build().execute_with(|| {
+			let scenarios: [(_, Box<dyn FnOnce(&mut TransactionLegacyUnsigned)>, _); 5] = [
+				("Eth fees too low", Box::new(|tx| tx.gas_price /= 2), InvalidTransaction::Payment),
+				("Gas fees too high", Box::new(|tx| tx.gas *= 2), InvalidTransaction::Call),
+				("Gas fees too low", Box::new(|tx| tx.gas *= 2), InvalidTransaction::Call),
+				(
+					"Diff > 10%",
+					Box::new(|tx| tx.gas = tx.gas * 111 / 100),
+					InvalidTransaction::Call,
+				),
+				(
+					"Diff < 10%",
+					Box::new(|tx| {
+						tx.gas_price *= 2;
+						tx.gas = tx.gas * 89 / 100
+					}),
+					InvalidTransaction::Call,
+				),
+			];
+
+			for (msg, update_tx, err) in scenarios {
+				let builder =
+					UncheckedExtrinsicBuilder::call_with(H160::from([1u8; 20])).update(update_tx);
+
+				assert_eq!(builder.check(), Err(TransactionValidityError::Invalid(err)), "{}", msg);
+			}
+		});
+	}
+
+	#[test]
+	fn check_transaction_tip() {
+		ExtBuilder::default().build().execute_with(|| {
+			let (code, _) = compile_module("dummy").unwrap();
+			let data = vec![];
+			let builder = UncheckedExtrinsicBuilder::instantiate_with(code.clone(), data.clone())
+				.update(|tx| tx.gas_price = tx.gas_price * 103 / 100);
+
+			let tx = &builder.tx;
+			let expected_tip = tx.gas_price * tx.gas - U256::from(GAS_PRICE) * tx.gas;
+			let (_, extra) = builder.check().unwrap();
+			assert_eq!(U256::from(extra.1.tip()), expected_tip);
+		});
+	}
+}
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 07dbd096339b..759fba9f1c6a 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -841,6 +841,7 @@ where
 			storage_meter,
 			BalanceOf::<T>::zero(),
 			false,
+			true,
 		)?
 		else {
 			return Ok(None);
@@ -874,6 +875,7 @@ where
 		storage_meter: &mut storage::meter::GenericMeter<T, S>,
 		deposit_limit: BalanceOf<T>,
 		read_only: bool,
+		origin_is_caller: bool,
 	) -> Result<Option<(Frame<T>, E)>, ExecError> {
 		let (account_id, contract_info, executable, delegate_caller, entry_point) = match frame_args
 		{
@@ -905,7 +907,17 @@ where
 				let address = if let Some(salt) = salt {
 					address::create2(&deployer, executable.code(), input_data, salt)
 				} else {
-					address::create1(&deployer, account_nonce.saturated_into())
+					use sp_runtime::Saturating;
+					address::create1(
+						&deployer,
+						// the Nonce from the origin has been incremented pre-dispatch, so we need
+						// to subtract 1 to get the nonce at the time of the call.
+						if origin_is_caller {
+							account_nonce.saturating_sub(1u32.into()).saturated_into()
+						} else {
+							account_nonce.saturated_into()
+						},
+					)
 				};
 				let contract = ContractInfo::new(
 					&address,
@@ -976,6 +988,7 @@ where
 			nested_storage,
 			deposit_limit,
 			read_only,
+			false,
 		)? {
 			self.frames.try_push(frame).map_err(|_| Error::<T>::MaxCallDepthReached)?;
 			Ok(Some(executable))
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 9986da472c96..9b0bbb2d6bcb 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -26,25 +26,23 @@ mod benchmarking;
 mod benchmarking_dummy;
 mod exec;
 mod gas;
-mod primitives;
-use crate::exec::MomentOf;
-use frame_support::traits::IsType;
-pub use primitives::*;
-use sp_core::U256;
-
 mod limits;
+mod primitives;
 mod storage;
 mod transient_storage;
 mod wasm;
 
+#[cfg(test)]
+mod tests;
+
 pub mod chain_extension;
 pub mod debug;
+pub mod evm;
 pub mod test_utils;
 pub mod weights;
 
-#[cfg(test)]
-mod tests;
 use crate::{
+	evm::{runtime::GAS_PRICE, TransactionLegacyUnsigned},
 	exec::{AccountIdOf, ExecError, Executable, Ext, Key, Origin, Stack as ExecStack},
 	gas::GasMeter,
 	storage::{meter::Meter as StorageMeter, ContractInfo, DeletionQueueManager},
@@ -58,9 +56,10 @@ use frame_support::{
 		PostDispatchInfo, RawOrigin,
 	},
 	ensure,
+	pallet_prelude::DispatchClass,
 	traits::{
 		fungible::{Inspect, Mutate, MutateHold},
-		ConstU32, ConstU64, Contains, EnsureOrigin, Get, Time,
+		ConstU32, ConstU64, Contains, EnsureOrigin, Get, IsType, OriginTrait, Time,
 	},
 	weights::{Weight, WeightMeter},
 	BoundedVec, RuntimeDebugNoBound,
@@ -70,18 +69,21 @@ use frame_system::{
 	pallet_prelude::{BlockNumberFor, OriginFor},
 	EventRecord, Pallet as System,
 };
+use pallet_transaction_payment::OnChargeTransaction;
 use scale_info::TypeInfo;
-use sp_core::{H160, H256};
+use sp_core::{H160, H256, U256};
 use sp_runtime::{
 	traits::{BadOrigin, Convert, Dispatchable, Saturating},
 	DispatchError,
 };
 
 pub use crate::{
-	address::{AddressMapper, DefaultAddressMapper},
+	address::{create1, create2, AddressMapper, DefaultAddressMapper},
 	debug::Tracing,
+	exec::MomentOf,
 	pallet::*,
 };
+pub use primitives::*;
 pub use weights::WeightInfo;
 
 #[cfg(doc)]
@@ -90,6 +92,7 @@ pub use crate::wasm::SyscallDoc;
 type TrieId = BoundedVec<u8, ConstU32<128>>;
 type BalanceOf<T> =
 	<<T as Config>::Currency as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
+type OnChargeTransactionBalanceOf<T> = <<T as pallet_transaction_payment::Config>::OnChargeTransaction as OnChargeTransaction<T>>::Balance;
 type CodeVec = BoundedVec<u8, ConstU32<{ limits::code::BLOB_BYTES }>>;
 type EventRecordOf<T> =
 	EventRecord<<T as frame_system::Config>::RuntimeEvent, <T as frame_system::Config>::Hash>;
@@ -134,7 +137,7 @@ pub mod pallet {
 	use sp_runtime::Perbill;
 
 	/// The in-code storage version.
-	pub(crate) const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
+	pub(crate) const STORAGE_VERSION: StorageVersion = StorageVersion::new(0);
 
 	#[pallet::pallet]
 	#[pallet::storage_version(STORAGE_VERSION)]
@@ -160,6 +163,7 @@ pub mod pallet {
 		type RuntimeCall: Dispatchable<RuntimeOrigin = Self::RuntimeOrigin, PostInfo = PostDispatchInfo>
 			+ GetDispatchInfo
 			+ codec::Decode
+			+ core::fmt::Debug
 			+ IsType<<Self as frame_system::Config>::RuntimeCall>;
 
 		/// Overarching hold reason.
@@ -738,6 +742,33 @@ pub mod pallet {
 		BalanceOf<T>: Into<U256> + TryFrom<U256>,
 		MomentOf<T>: Into<U256>,
 	{
+		/// A raw EVM transaction, typically dispatched by an Ethereum JSON-RPC server.
+		///
+		/// # Parameters
+		///
+		/// * `payload`: The RLP-encoded [`crate::evm::TransactionLegacySigned`].
+		/// * `gas_limit`: The gas limit enforced during contract execution.
+		/// * `storage_deposit_limit`: The maximum balance that can be charged to the caller for
+		///   storage usage.
+		///
+		/// # Note
+		///
+		/// This call cannot be dispatched directly; attempting to do so will result in a failed
+		/// transaction. It serves as a wrapper for an Ethereum transaction. When submitted, the
+		/// runtime converts it into a [`sp_runtime::generic::CheckedExtrinsic`] by recovering the
+		/// signer and validating the transaction.
+		#[allow(unused_variables)]
+		#[pallet::call_index(0)]
+		#[pallet::weight(Weight::MAX)]
+		pub fn eth_transact(
+			origin: OriginFor<T>,
+			payload: Vec<u8>,
+			gas_limit: Weight,
+			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
+		) -> DispatchResultWithPostInfo {
+			Err(frame_system::Error::CallFiltered::<T>.into())
+		}
+
 		/// Makes a call to an account, optionally transferring some balance.
 		///
 		/// # Parameters
@@ -754,7 +785,7 @@ pub mod pallet {
 		/// * If the account is a regular account, any value will be transferred.
 		/// * If no account exists and the call value is not less than `existential_deposit`,
 		/// a regular account will be created and any value will be transferred.
-		#[pallet::call_index(0)]
+		#[pallet::call_index(1)]
 		#[pallet::weight(T::WeightInfo::call().saturating_add(*gas_limit))]
 		pub fn call(
 			origin: OriginFor<T>,
@@ -764,6 +795,7 @@ pub mod pallet {
 			#[pallet::compact] storage_deposit_limit: BalanceOf<T>,
 			data: Vec<u8>,
 		) -> DispatchResultWithPostInfo {
+			log::info!(target: LOG_TARGET, "Call: {:?} {:?} {:?}", dest, value, data);
 			let mut output = Self::bare_call(
 				origin,
 				dest,
@@ -787,7 +819,7 @@ pub mod pallet {
 		/// This function is identical to [`Self::instantiate_with_code`] but without the
 		/// code deployment step. Instead, the `code_hash` of an on-chain deployed wasm binary
 		/// must be supplied.
-		#[pallet::call_index(1)]
+		#[pallet::call_index(2)]
 		#[pallet::weight(
 			T::WeightInfo::instantiate(data.len() as u32).saturating_add(*gas_limit)
 		)]
@@ -851,7 +883,7 @@ pub mod pallet {
 		/// - The smart-contract account is created at the computed address.
 		/// - The `value` is transferred to the new account.
 		/// - The `deploy` function is executed in the context of the newly-created account.
-		#[pallet::call_index(2)]
+		#[pallet::call_index(3)]
 		#[pallet::weight(
 			T::WeightInfo::instantiate_with_code(code.len() as u32, data.len() as u32)
 			.saturating_add(*gas_limit)
@@ -902,7 +934,7 @@ pub mod pallet {
 		/// To avoid this situation a constructor could employ access control so that it can
 		/// only be instantiated by permissioned entities. The same is true when uploading
 		/// through [`Self::instantiate_with_code`].
-		#[pallet::call_index(3)]
+		#[pallet::call_index(4)]
 		#[pallet::weight(T::WeightInfo::upload_code(code.len() as u32))]
 		pub fn upload_code(
 			origin: OriginFor<T>,
@@ -916,7 +948,7 @@ pub mod pallet {
 		///
 		/// A code can only be removed by its original uploader (its owner) and only if it is
 		/// not used by any contract.
-		#[pallet::call_index(4)]
+		#[pallet::call_index(5)]
 		#[pallet::weight(T::WeightInfo::remove_code())]
 		pub fn remove_code(
 			origin: OriginFor<T>,
@@ -938,7 +970,7 @@ pub mod pallet {
 		/// This does **not** change the address of the contract in question. This means
 		/// that the contract address is no longer derived from its code hash after calling
 		/// this dispatchable.
-		#[pallet::call_index(5)]
+		#[pallet::call_index(6)]
 		#[pallet::weight(T::WeightInfo::set_code())]
 		pub fn set_code(
 			origin: OriginFor<T>,
@@ -1002,7 +1034,7 @@ where
 		data: Vec<u8>,
 		debug: DebugInfo,
 		collect_events: CollectEvents,
-	) -> ContractExecResult<BalanceOf<T>, EventRecordOf<T>> {
+	) -> ContractResult<ExecReturnValue, BalanceOf<T>, EventRecordOf<T>> {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let mut storage_deposit = Default::default();
 		let mut debug_message = if matches!(debug, DebugInfo::UnsafeDebug) {
@@ -1031,7 +1063,7 @@ where
 		} else {
 			None
 		};
-		ContractExecResult {
+		ContractResult {
 			result: result.map_err(|r| r.error),
 			gas_consumed: gas_meter.gas_consumed(),
 			gas_required: gas_meter.gas_required(),
@@ -1057,7 +1089,7 @@ where
 		salt: Option<[u8; 32]>,
 		debug: DebugInfo,
 		collect_events: CollectEvents,
-	) -> ContractInstantiateResult<BalanceOf<T>, EventRecordOf<T>> {
+	) -> ContractResult<InstantiateReturnValue, BalanceOf<T>, EventRecordOf<T>> {
 		let mut gas_meter = GasMeter::new(gas_limit);
 		let mut storage_deposit = Default::default();
 		let mut debug_message =
@@ -1099,7 +1131,7 @@ where
 		} else {
 			None
 		};
-		ContractInstantiateResult {
+		ContractResult {
 			result: output
 				.map(|(addr, result)| InstantiateReturnValue { result, addr })
 				.map_err(|e| e.error),
@@ -1111,6 +1143,184 @@ where
 		}
 	}
 
+	/// A version of [`Self::eth_transact`] used to dry-run Ethereum calls.
+	///
+	/// # Parameters
+	///
+	/// - `origin`: The origin of the call.
+	/// - `dest`: The destination address of the call.
+	/// - `value`: The value to transfer.
+	/// - `input`: The input data.
+	/// - `gas_limit`: The gas limit enforced during contract execution.
+	/// - `storage_deposit_limit`: The maximum balance that can be charged to the caller for storage
+	///   usage.
+	/// - `utx_encoded_size`: A function that takes a call and returns the encoded size of the
+	///   unchecked extrinsic.
+	/// - `debug`: Debugging configuration.
+	/// - `collect_events`: Event collection configuration.
+	pub fn bare_eth_transact(
+		origin: T::AccountId,
+		dest: Option<H160>,
+		value: BalanceOf<T>,
+		input: Vec<u8>,
+		gas_limit: Weight,
+		storage_deposit_limit: BalanceOf<T>,
+		utx_encoded_size: impl Fn(Call<T>) -> u32,
+		debug: DebugInfo,
+		collect_events: CollectEvents,
+	) -> EthContractResult<BalanceOf<T>>
+	where
+		T: pallet_transaction_payment::Config,
+		<T as frame_system::Config>::RuntimeCall:
+			Dispatchable<Info = frame_support::dispatch::DispatchInfo>,
+		<T as Config>::RuntimeCall: From<crate::Call<T>>,
+		<T as Config>::RuntimeCall: Encode,
+		OnChargeTransactionBalanceOf<T>: Into<BalanceOf<T>>,
+		T::Nonce: Into<U256>,
+	{
+		// Get the nonce to encode in the tx.
+		let nonce: T::Nonce = <System<T>>::account_nonce(&origin);
+
+		// Use a big enough gas price to ensure that the encoded size is large enough.
+		let max_gas_fee: BalanceOf<T> =
+			(pallet_transaction_payment::Pallet::<T>::weight_to_fee(Weight::MAX) /
+				GAS_PRICE.into())
+			.into();
+
+		// A contract call.
+		if let Some(dest) = dest {
+			// Dry run the call.
+			let result = crate::Pallet::<T>::bare_call(
+				T::RuntimeOrigin::signed(origin),
+				dest,
+				value,
+				gas_limit,
+				storage_deposit_limit,
+				input.clone(),
+				debug,
+				collect_events,
+			);
+
+			// Get the encoded size of the transaction.
+			let tx = TransactionLegacyUnsigned {
+				value: value.into(),
+				input: input.into(),
+				nonce: nonce.into(),
+				chain_id: Some(T::ChainId::get().into()),
+				gas_price: GAS_PRICE.into(),
+				gas: max_gas_fee.into(),
+				to: Some(dest),
+				..Default::default()
+			};
+			let eth_dispatch_call = crate::Call::<T>::eth_transact {
+				payload: tx.dummy_signed_payload(),
+				gas_limit: result.gas_required,
+				storage_deposit_limit: result.storage_deposit.charge_or_zero(),
+			};
+			let encoded_len = utx_encoded_size(eth_dispatch_call);
+
+			// Get the dispatch info of the call.
+			let dispatch_call: <T as Config>::RuntimeCall = crate::Call::<T>::call {
+				dest,
+				value,
+				gas_limit: result.gas_required,
+				storage_deposit_limit: result.storage_deposit.charge_or_zero(),
+				data: tx.input.0,
+			}
+			.into();
+			let dispatch_info = dispatch_call.get_dispatch_info();
+
+			// Compute the fee.
+			let fee = pallet_transaction_payment::Pallet::<T>::compute_fee(
+				encoded_len,
+				&dispatch_info,
+				0u32.into(),
+			)
+			.into();
+
+			log::debug!(target: LOG_TARGET, "Call dry run Result: dispatch_info: {dispatch_info:?} len: {encoded_len:?} fee: {fee:?}");
+			EthContractResult {
+				gas_required: result.gas_required,
+				storage_deposit: result.storage_deposit.charge_or_zero(),
+				result: result.result.map(|v| v.data),
+				fee,
+			}
+			// A contract deployment
+		} else {
+			// Extract code and data from the input.
+			let (code, data) = match polkavm::ProgramBlob::blob_length(&input) {
+				Some(blob_len) => blob_len
+					.try_into()
+					.ok()
+					.and_then(|blob_len| (input.split_at_checked(blob_len)))
+					.unwrap_or_else(|| (&input[..], &[][..])),
+				_ => {
+					log::debug!(target: LOG_TARGET, "Failed to extract polkavm blob length");
+					(&input[..], &[][..])
+				},
+			};
+
+			// Dry run the call.
+			let result = crate::Pallet::<T>::bare_instantiate(
+				T::RuntimeOrigin::signed(origin),
+				value,
+				gas_limit,
+				storage_deposit_limit,
+				Code::Upload(code.to_vec()),
+				data.to_vec(),
+				None,
+				debug,
+				collect_events,
+			);
+
+			// Get the encoded size of the transaction.
+			let tx = TransactionLegacyUnsigned {
+				gas: max_gas_fee.into(),
+				nonce: nonce.into(),
+				value: value.into(),
+				input: input.clone().into(),
+				gas_price: GAS_PRICE.into(),
+				chain_id: Some(T::ChainId::get().into()),
+				..Default::default()
+			};
+			let eth_dispatch_call = crate::Call::<T>::eth_transact {
+				payload: tx.dummy_signed_payload(),
+				gas_limit: result.gas_required,
+				storage_deposit_limit: result.storage_deposit.charge_or_zero(),
+			};
+			let encoded_len = utx_encoded_size(eth_dispatch_call);
+
+			// Get the dispatch info of the call.
+			let dispatch_call: <T as Config>::RuntimeCall =
+				crate::Call::<T>::instantiate_with_code {
+					value,
+					gas_limit: result.gas_required,
+					storage_deposit_limit: result.storage_deposit.charge_or_zero(),
+					code: code.to_vec(),
+					data: data.to_vec(),
+					salt: None,
+				}
+				.into();
+			let dispatch_info = dispatch_call.get_dispatch_info();
+
+			// Compute the fee.
+			let fee = pallet_transaction_payment::Pallet::<T>::compute_fee(
+				encoded_len,
+				&dispatch_info,
+				0u32.into(),
+			)
+			.into();
+
+			log::debug!(target: LOG_TARGET, "Call dry run Result: dispatch_info: {dispatch_info:?} len: {encoded_len:?} fee: {fee:?}");
+			EthContractResult {
+				gas_required: result.gas_required,
+				storage_deposit: result.storage_deposit.charge_or_zero(),
+				result: result.result.map(|v| v.result.data),
+				fee,
+			}
+		}
+	}
+
 	/// A generalized version of [`Self::upload_code`].
 	///
 	/// It is identical to [`Self::upload_code`] and only differs in the information it returns.
@@ -1199,7 +1409,7 @@ sp_api::decl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> ContractExecResult<Balance, EventRecord>;
+		) -> ContractResult<ExecReturnValue, Balance, EventRecord>;
 
 		/// Instantiate a new contract.
 		///
@@ -1212,7 +1422,20 @@ sp_api::decl_runtime_apis! {
 			code: Code,
 			data: Vec<u8>,
 			salt: Option<[u8; 32]>,
-		) -> ContractInstantiateResult<Balance, EventRecord>;
+		) -> ContractResult<InstantiateReturnValue, Balance, EventRecord>;
+
+
+		/// Perform an Ethereum call.
+		///
+		/// See [`crate::Pallet::bare_eth_transact`]
+		fn eth_transact(
+			origin: H160,
+			dest: Option<H160>,
+			value: Balance,
+			input: Vec<u8>,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+		) -> EthContractResult<Balance>;
 
 		/// Upload new code without instantiating a contract from it.
 		///
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 67bc144c3dd2..af0100d59cbe 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -76,19 +76,24 @@ pub struct ContractResult<R, Balance, EventRecord> {
 	/// RPC calls.
 	pub debug_message: Vec<u8>,
 	/// The execution result of the wasm code.
-	pub result: R,
+	pub result: Result<R, DispatchError>,
 	/// The events that were emitted during execution. It is an option as event collection is
 	/// optional.
 	pub events: Option<Vec<EventRecord>>,
 }
 
-/// Result type of a `bare_call` call as well as `ContractsApi::call`.
-pub type ContractExecResult<Balance, EventRecord> =
-	ContractResult<Result<ExecReturnValue, DispatchError>, Balance, EventRecord>;
-
-/// Result type of a `bare_instantiate` call as well as `ContractsApi::instantiate`.
-pub type ContractInstantiateResult<Balance, EventRecord> =
-	ContractResult<Result<InstantiateReturnValue, DispatchError>, Balance, EventRecord>;
+/// The result of the execution of a `eth_transact` call.
+#[derive(Clone, Eq, PartialEq, Encode, Decode, RuntimeDebug, TypeInfo)]
+pub struct EthContractResult<Balance> {
+	/// The fee charged for the execution.
+	pub fee: Balance,
+	/// The amount of gas that was necessary to execute the transaction.
+	pub gas_required: Weight,
+	/// Storage deposit charged.
+	pub storage_deposit: Balance,
+	/// The execution result.
+	pub result: Result<Vec<u8>, DispatchError>,
+}
 
 /// Result type of a `bare_code_upload` call.
 pub type CodeUploadResult<Balance> = Result<CodeUploadReturnValue<Balance>, DispatchError>;
diff --git a/substrate/frame/revive/src/test_utils/builder.rs b/substrate/frame/revive/src/test_utils/builder.rs
index d361590df95a..e64f58894432 100644
--- a/substrate/frame/revive/src/test_utils/builder.rs
+++ b/substrate/frame/revive/src/test_utils/builder.rs
@@ -17,9 +17,8 @@
 
 use super::{deposit_limit, GAS_LIMIT};
 use crate::{
-	address::AddressMapper, AccountIdOf, BalanceOf, Code, CollectEvents, Config,
-	ContractExecResult, ContractInstantiateResult, DebugInfo, EventRecordOf, ExecReturnValue,
-	InstantiateReturnValue, OriginFor, Pallet, Weight,
+	address::AddressMapper, AccountIdOf, BalanceOf, Code, CollectEvents, Config, ContractResult,
+	DebugInfo, EventRecordOf, ExecReturnValue, InstantiateReturnValue, OriginFor, Pallet, Weight,
 };
 use frame_support::pallet_prelude::DispatchResultWithPostInfo;
 use paste::paste;
@@ -140,7 +139,7 @@ builder!(
 		salt: Option<[u8; 32]>,
 		debug: DebugInfo,
 		collect_events: CollectEvents,
-	) -> ContractInstantiateResult<BalanceOf<T>, EventRecordOf<T>>;
+	) -> ContractResult<InstantiateReturnValue, BalanceOf<T>, EventRecordOf<T>>;
 
 	/// Build the instantiate call and unwrap the result.
 	pub fn build_and_unwrap_result(self) -> InstantiateReturnValue {
@@ -203,7 +202,7 @@ builder!(
 		data: Vec<u8>,
 		debug: DebugInfo,
 		collect_events: CollectEvents,
-	) -> ContractExecResult<BalanceOf<T>, EventRecordOf<T>>;
+	) -> ContractResult<ExecReturnValue, BalanceOf<T>, EventRecordOf<T>>;
 
 	/// Build the call and unwrap the result.
 	pub fn build_and_unwrap_result(self) -> ExecReturnValue {
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index e637c5f991c6..94af7dbd04d8 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -58,16 +58,17 @@ use frame_support::{
 		tokens::Preservation,
 		ConstU32, ConstU64, Contains, OnIdle, OnInitialize, StorageVersion,
 	},
-	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight, WeightMeter},
+	weights::{constants::WEIGHT_REF_TIME_PER_SECOND, FixedFee, IdentityFee, Weight, WeightMeter},
 };
 use frame_system::{EventRecord, Phase};
 use pallet_revive_fixtures::{bench::dummy_unique, compile_module};
 use pallet_revive_uapi::ReturnErrorCode as RuntimeReturnCode;
+use pallet_transaction_payment::{ConstFeeMultiplier, Multiplier};
 use sp_io::hashing::blake2_256;
 use sp_keystore::{testing::MemoryKeystore, KeystoreExt};
 use sp_runtime::{
 	testing::H256,
-	traits::{BlakeTwo256, Convert, IdentityLookup},
+	traits::{BlakeTwo256, Convert, IdentityLookup, One},
 	AccountId32, BuildStorage, DispatchError, Perbill, TokenError,
 };
 
@@ -82,6 +83,7 @@ frame_support::construct_runtime!(
 		Utility: pallet_utility,
 		Contracts: pallet_revive,
 		Proxy: pallet_proxy,
+		TransactionPayment: pallet_transaction_payment,
 		Dummy: pallet_dummy
 	}
 );
@@ -415,6 +417,18 @@ impl pallet_proxy::Config for Test {
 	type AnnouncementDepositFactor = ConstU64<1>;
 }
 
+parameter_types! {
+	pub FeeMultiplier: Multiplier = Multiplier::one();
+}
+
+#[derive_impl(pallet_transaction_payment::config_preludes::TestDefaultConfig)]
+impl pallet_transaction_payment::Config for Test {
+	type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter<Balances, ()>;
+	type WeightToFee = IdentityFee<<Self as pallet_balances::Config>::Balance>;
+	type LengthToFee = FixedFee<100, <Self as pallet_balances::Config>::Balance>;
+	type FeeMultiplierUpdate = ConstFeeMultiplier<FeeMultiplier>;
+}
+
 impl pallet_dummy::Config for Test {}
 
 parameter_types! {
@@ -509,6 +523,17 @@ impl Config for Test {
 	type ChainId = ChainId;
 }
 
+impl TryFrom<RuntimeCall> for crate::Call<Test> {
+	type Error = ();
+
+	fn try_from(value: RuntimeCall) -> Result<Self, Self::Error> {
+		match value {
+			RuntimeCall::Contracts(call) => Ok(call),
+			_ => Err(()),
+		}
+	}
+}
+
 pub struct ExtBuilder {
 	existential_deposit: u64,
 	storage_version: Option<StorageVersion>,
@@ -727,15 +752,16 @@ mod run_tests {
 			));
 
 			assert_eq!(System::account_nonce(&ALICE), 0);
+			System::inc_account_nonce(&ALICE);
 
-			for nonce in 0..3 {
+			for nonce in 1..3 {
 				let Contract { addr, .. } = builder::bare_instantiate(Code::Existing(code_hash))
 					.salt(None)
 					.build_and_unwrap_contract();
 				assert!(ContractInfoOf::<Test>::contains_key(&addr));
 				assert_eq!(
 					addr,
-					create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce)
+					create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
 				);
 			}
 			assert_eq!(System::account_nonce(&ALICE), 3);
@@ -747,7 +773,7 @@ mod run_tests {
 				assert!(ContractInfoOf::<Test>::contains_key(&addr));
 				assert_eq!(
 					addr,
-					create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce)
+					create1(&<Test as Config>::AddressMapper::to_address(&ALICE), nonce - 1)
 				);
 			}
 			assert_eq!(System::account_nonce(&ALICE), 6);
diff --git a/substrate/frame/revive/src/wasm/mod.rs b/substrate/frame/revive/src/wasm/mod.rs
index e2256d7dcea7..2b8022903849 100644
--- a/substrate/frame/revive/src/wasm/mod.rs
+++ b/substrate/frame/revive/src/wasm/mod.rs
@@ -200,7 +200,10 @@ where
 						&self.code_info.owner,
 						deposit,
 					)
-					.map_err(|_| <Error<T>>::StorageDepositNotEnoughFunds)?;
+					.map_err(|err| {
+						log::debug!(target: LOG_TARGET, "failed to store code for owner: {:?}: {err:?}", self.code_info.owner);
+						<Error<T>>::StorageDepositNotEnoughFunds
+					})?;
 
 					self.code_info.refcount = 0;
 					<PristineCode<T>>::insert(code_hash, &self.code);
diff --git a/substrate/frame/revive/src/wasm/runtime.rs b/substrate/frame/revive/src/wasm/runtime.rs
index 78c8b1929655..00be26aeaf8b 100644
--- a/substrate/frame/revive/src/wasm/runtime.rs
+++ b/substrate/frame/revive/src/wasm/runtime.rs
@@ -44,11 +44,6 @@ type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
 /// The maximum nesting depth a contract can use when encoding types.
 const MAX_DECODE_NESTING: u32 = 256;
 
-/// Encode a `U256` into a 32 byte buffer.
-fn as_bytes(u: U256) -> [u8; 32] {
-	u.to_little_endian()
-}
-
 #[derive(Clone, Copy)]
 pub enum ApiVersion {
 	/// Expose all APIs even unversioned ones. Only used for testing and benchmarking.
@@ -1545,7 +1540,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.balance()),
+			&self.ext.balance().to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -1566,7 +1561,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.balance_of(&address)),
+			&self.ext.balance_of(&address).to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -1579,7 +1574,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(U256::from(<E::T as Config>::ChainId::get())),
+			&U256::from(<E::T as Config>::ChainId::get()).to_little_endian(),
 			false,
 			|_| Some(RuntimeCosts::CopyToContract(32)),
 		)?)
@@ -1593,7 +1588,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.value_transferred()),
+			&self.ext.value_transferred().to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -1607,7 +1602,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.now()),
+			&self.ext.now().to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -1621,7 +1616,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.minimum_balance()),
+			&self.ext.minimum_balance().to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -1675,7 +1670,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(self.ext.block_number()),
+			&self.ext.block_number().to_little_endian(),
 			false,
 			already_charged,
 		)?)
@@ -2033,7 +2028,7 @@ pub mod env {
 		Ok(self.write_fixed_sandbox_output(
 			memory,
 			out_ptr,
-			&as_bytes(U256::from(self.ext.last_frame_output().data.len())),
+			&U256::from(self.ext.last_frame_output().data.len()).to_little_endian(),
 			false,
 			|len| Some(RuntimeCosts::CopyToContract(len)),
 		)?)
diff --git a/substrate/frame/revive/uapi/Cargo.toml b/substrate/frame/revive/uapi/Cargo.toml
index 8705781db002..9eaa1b68ca8e 100644
--- a/substrate/frame/revive/uapi/Cargo.toml
+++ b/substrate/frame/revive/uapi/Cargo.toml
@@ -21,7 +21,7 @@ codec = { features = [
 ], optional = true, workspace = true }
 
 [target.'cfg(target_arch = "riscv32")'.dependencies]
-polkavm-derive = { version = "0.12.0" }
+polkavm-derive = { version = "0.13.0" }
 
 [package.metadata.docs.rs]
 default-target = ["wasm32-unknown-unknown"]
diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml
index 7147a11fb9cd..370673622b95 100644
--- a/umbrella/Cargo.toml
+++ b/umbrella/Cargo.toml
@@ -442,6 +442,7 @@ try-runtime = [
 	"pallet-recovery?/try-runtime",
 	"pallet-referenda?/try-runtime",
 	"pallet-remark?/try-runtime",
+	"pallet-revive-mock-network?/try-runtime",
 	"pallet-revive?/try-runtime",
 	"pallet-root-offences?/try-runtime",
 	"pallet-root-testing?/try-runtime",
@@ -497,7 +498,6 @@ serde = [
 	"pallet-parameters?/serde",
 	"pallet-referenda?/serde",
 	"pallet-remark?/serde",
-	"pallet-revive?/serde",
 	"pallet-state-trie-migration?/serde",
 	"pallet-tips?/serde",
 	"pallet-transaction-payment?/serde",

From aeebf2f383390f2f86527d70212162d5dbea8b93 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Tue, 22 Oct 2024 18:02:01 +0200
Subject: [PATCH 15/20] [pallet-revive] fix fixture build path (#6174)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Cyrill Leutwiler <cyrill@parity.io>
---
 prdoc/pr_6174.prdoc                        |  9 ++++++++
 substrate/frame/revive/fixtures/build.rs   | 25 ++++++++++++++--------
 substrate/frame/revive/fixtures/src/lib.rs | 23 ++++++++++----------
 substrate/frame/revive/src/evm/runtime.rs  |  1 +
 4 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 prdoc/pr_6174.prdoc

diff --git a/prdoc/pr_6174.prdoc b/prdoc/pr_6174.prdoc
new file mode 100644
index 000000000000..8aa1c25012b1
--- /dev/null
+++ b/prdoc/pr_6174.prdoc
@@ -0,0 +1,9 @@
+title: '[pallet-revive] fix fixture build path'
+doc:
+- audience: Runtime Dev
+  description: "Fix fixture build path"
+crates:
+- name: pallet-revive-fixtures
+  bump: patch
+- name: pallet-revive
+  bump: patch
diff --git a/substrate/frame/revive/fixtures/build.rs b/substrate/frame/revive/fixtures/build.rs
index cb4b76408141..ee7db4203cc9 100644
--- a/substrate/frame/revive/fixtures/build.rs
+++ b/substrate/frame/revive/fixtures/build.rs
@@ -182,18 +182,14 @@ mod build {
 	pub fn run() -> Result<()> {
 		let fixtures_dir: PathBuf = env::var("CARGO_MANIFEST_DIR")?.into();
 		let contracts_dir = fixtures_dir.join("contracts");
-		let uapi_dir = fixtures_dir.parent().expect("uapi dir exits; qed").join("uapi");
-		let ws_dir: PathBuf = env::var("CARGO_WORKSPACE_ROOT_DIR")?.into();
-		let out_dir: PathBuf = ws_dir.join("target").join("pallet-revive-fixtures");
-
-		// create out_dir if it does not exist
-		if !out_dir.exists() {
-			fs::create_dir_all(&out_dir)?;
-		}
+		let out_dir: PathBuf = env::var("OUT_DIR")?.into();
 
 		// the fixtures have a dependency on the uapi crate
 		println!("cargo::rerun-if-changed={}", fixtures_dir.display());
-		println!("cargo::rerun-if-changed={}", uapi_dir.display());
+		let uapi_dir = fixtures_dir.parent().expect("parent dir exits; qed").join("uapi");
+		if uapi_dir.exists() {
+			println!("cargo::rerun-if-changed={}", uapi_dir.display());
+		}
 
 		let entries = collect_entries(&contracts_dir);
 		if entries.is_empty() {
@@ -207,6 +203,17 @@ mod build {
 		invoke_build(tmp_dir_path)?;
 
 		write_output(tmp_dir_path, &out_dir, entries)?;
+
+		#[cfg(unix)]
+		if let Ok(symlink_dir) = env::var("CARGO_WORKSPACE_ROOT_DIR") {
+			let symlink_dir: PathBuf = symlink_dir.into();
+			let symlink_dir: PathBuf = symlink_dir.join("target").join("pallet-revive-fixtures");
+			if symlink_dir.is_symlink() {
+				fs::remove_file(&symlink_dir)?
+			}
+			std::os::unix::fs::symlink(&out_dir, &symlink_dir)?;
+		}
+
 		Ok(())
 	}
 }
diff --git a/substrate/frame/revive/fixtures/src/lib.rs b/substrate/frame/revive/fixtures/src/lib.rs
index eacd63b97e57..5548dca66d07 100644
--- a/substrate/frame/revive/fixtures/src/lib.rs
+++ b/substrate/frame/revive/fixtures/src/lib.rs
@@ -22,11 +22,8 @@ extern crate alloc;
 /// Load a given wasm module and returns a wasm binary contents along with it's hash.
 #[cfg(feature = "std")]
 pub fn compile_module(fixture_name: &str) -> anyhow::Result<(Vec<u8>, sp_core::H256)> {
-	let ws_dir: std::path::PathBuf = env!("CARGO_WORKSPACE_ROOT_DIR").into();
-	let fixture_path = ws_dir
-		.join("target")
-		.join("pallet-revive-fixtures")
-		.join(format!("{fixture_name}.polkavm"));
+	let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
+	let fixture_path = out_dir.join(format!("{fixture_name}.polkavm"));
 	log::debug!("Loading fixture from {fixture_path:?}");
 	let binary = std::fs::read(fixture_path)?;
 	let code_hash = sp_io::hashing::keccak_256(&binary);
@@ -43,12 +40,7 @@ pub mod bench {
 	#[cfg(feature = "riscv")]
 	macro_rules! fixture {
 		($name: literal) => {
-			include_bytes!(concat!(
-				env!("CARGO_WORKSPACE_ROOT_DIR"),
-				"/target/pallet-revive-fixtures/",
-				$name,
-				".polkavm"
-			))
+			include_bytes!(concat!(env!("OUT_DIR"), "/", $name, ".polkavm"))
 		};
 	}
 	#[cfg(not(feature = "riscv"))]
@@ -71,3 +63,12 @@ pub mod bench {
 		dummy
 	}
 }
+
+#[cfg(test)]
+mod test {
+	#[test]
+	fn out_dir_should_have_compiled_mocks() {
+		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
+		assert!(out_dir.join("dummy.polkavm").exists());
+	}
+}
diff --git a/substrate/frame/revive/src/evm/runtime.rs b/substrate/frame/revive/src/evm/runtime.rs
index 58110bcf186f..e4340b27a187 100644
--- a/substrate/frame/revive/src/evm/runtime.rs
+++ b/substrate/frame/revive/src/evm/runtime.rs
@@ -387,6 +387,7 @@ pub trait EthExtra {
 	}
 }
 
+#[cfg(feature = "riscv")]
 #[cfg(test)]
 mod test {
 	use super::*;

From 77836cfb10d92fe797aac19695d2bf5c5448592c Mon Sep 17 00:00:00 2001
From: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:35:15 +0200
Subject: [PATCH 16/20] `fatxpool`: `LocalTransactionPool` implemented (#6104)

[`LocalTransactionPool`
trait](https://github.com/paritytech/polkadot-sdk/blob/d5b96e9e7f24adc1799f8e426c5cb69b4f2dbf8a/substrate/client/transaction-pool/api/src/lib.rs#L408-L426)
is now implemented for `ForkAwareTransactionPool`.

Closes #5493
---
 prdoc/pr_6104.prdoc                           | 10 ++++
 .../client/transaction-pool/benches/basics.rs |  9 ++++
 .../client/transaction-pool/src/common/api.rs | 37 +++++--------
 .../transaction-pool/src/common/tests.rs      |  9 ++++
 .../fork_aware_txpool/fork_aware_txpool.rs    | 20 +++----
 .../src/fork_aware_txpool/tx_mem_pool.rs      | 18 +++----
 .../src/fork_aware_txpool/view.rs             | 53 +++++++++++++++++--
 .../src/fork_aware_txpool/view_store.rs       | 40 +++++++++++---
 .../client/transaction-pool/src/graph/pool.rs | 13 ++++-
 .../runtime/transaction-pool/src/lib.rs       |  9 ++++
 10 files changed, 162 insertions(+), 56 deletions(-)
 create mode 100644 prdoc/pr_6104.prdoc

diff --git a/prdoc/pr_6104.prdoc b/prdoc/pr_6104.prdoc
new file mode 100644
index 000000000000..2b62a68c9f0e
--- /dev/null
+++ b/prdoc/pr_6104.prdoc
@@ -0,0 +1,10 @@
+title: "LocalTransactionPool implemented for fork aware transaction pool"
+
+doc:
+  - audience: Node Dev
+    description: |
+      LocalTransactionPool trait is implemented for fork aware transaction pool.
+
+crates:
+  - name: sc-transaction-pool
+    bump: minor
diff --git a/substrate/client/transaction-pool/benches/basics.rs b/substrate/client/transaction-pool/benches/basics.rs
index 2db34bc3f32f..0d8c1cbba9b4 100644
--- a/substrate/client/transaction-pool/benches/basics.rs
+++ b/substrate/client/transaction-pool/benches/basics.rs
@@ -91,6 +91,15 @@ impl ChainApi for TestApi {
 		})))
 	}
 
+	fn validate_transaction_blocking(
+		&self,
+		_at: <Self::Block as BlockT>::Hash,
+		_source: TransactionSource,
+		_uxt: Arc<<Self::Block as BlockT>::Extrinsic>,
+	) -> sc_transaction_pool_api::error::Result<TransactionValidity> {
+		unimplemented!();
+	}
+
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
diff --git a/substrate/client/transaction-pool/src/common/api.rs b/substrate/client/transaction-pool/src/common/api.rs
index a5185ba606ef..e16c0f2efa51 100644
--- a/substrate/client/transaction-pool/src/common/api.rs
+++ b/substrate/client/transaction-pool/src/common/api.rs
@@ -162,6 +162,18 @@ where
 		.boxed()
 	}
 
+	/// Validates a transaction by calling into the runtime.
+	///
+	/// Same as `validate_transaction` but blocks the current thread when performing validation.
+	fn validate_transaction_blocking(
+		&self,
+		at: Block::Hash,
+		source: TransactionSource,
+		uxt: graph::ExtrinsicFor<Self>,
+	) -> error::Result<TransactionValidity> {
+		validate_transaction_blocking(&*self.client, at, source, uxt)
+	}
+
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,
@@ -272,28 +284,3 @@ where
 
 	result
 }
-
-impl<Client, Block> FullChainApi<Client, Block>
-where
-	Block: BlockT,
-	Client: ProvideRuntimeApi<Block>
-		+ BlockBackend<Block>
-		+ BlockIdTo<Block>
-		+ HeaderBackend<Block>
-		+ HeaderMetadata<Block, Error = sp_blockchain::Error>,
-	Client: Send + Sync + 'static,
-	Client::Api: TaggedTransactionQueue<Block>,
-{
-	/// Validates a transaction by calling into the runtime, same as
-	/// `validate_transaction` but blocks the current thread when performing
-	/// validation. Only implemented for `FullChainApi` since we can call into
-	/// the runtime locally.
-	pub fn validate_transaction_blocking(
-		&self,
-		at: Block::Hash,
-		source: TransactionSource,
-		uxt: graph::ExtrinsicFor<Self>,
-	) -> error::Result<TransactionValidity> {
-		validate_transaction_blocking(&*self.client, at, source, uxt)
-	}
-}
diff --git a/substrate/client/transaction-pool/src/common/tests.rs b/substrate/client/transaction-pool/src/common/tests.rs
index 1cbabf8b5fde..b00cf5fbfede 100644
--- a/substrate/client/transaction-pool/src/common/tests.rs
+++ b/substrate/client/transaction-pool/src/common/tests.rs
@@ -156,6 +156,15 @@ impl ChainApi for TestApi {
 		futures::future::ready(Ok(res))
 	}
 
+	fn validate_transaction_blocking(
+		&self,
+		_at: <Self::Block as BlockT>::Hash,
+		_source: TransactionSource,
+		_uxt: Arc<<Self::Block as BlockT>::Extrinsic>,
+	) -> error::Result<TransactionValidity> {
+		unimplemented!();
+	}
+
 	/// Returns a block number given the block id.
 	fn block_id_to_number(
 		&self,
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
index 11e30bef7ea2..7e72b44adf38 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
@@ -599,7 +599,7 @@ where
 		log::debug!(target: LOG_TARGET, "fatp::submit_at count:{} views:{}", xts.len(), self.active_views_count());
 		log_xt_trace!(target: LOG_TARGET, xts.iter().map(|xt| self.tx_hash(xt)), "[{:?}] fatp::submit_at");
 		let xts = xts.into_iter().map(Arc::from).collect::<Vec<_>>();
-		let mempool_result = self.mempool.extend_unwatched(source, xts.clone());
+		let mempool_result = self.mempool.extend_unwatched(source, &xts);
 
 		if view_store.is_empty() {
 			return future::ready(Ok(mempool_result)).boxed()
@@ -838,16 +838,16 @@ where
 	fn submit_local(
 		&self,
 		_at: Block::Hash,
-		_xt: sc_transaction_pool_api::LocalTransactionFor<Self>,
+		xt: sc_transaction_pool_api::LocalTransactionFor<Self>,
 	) -> Result<Self::Hash, Self::Error> {
-		//todo [#5493]
-		//looks like view_store / view needs non async submit_local method ?.
-		let e = Err(sc_transaction_pool_api::error::Error::Unactionable.into());
-		log::warn!(
-			target: LOG_TARGET,
-			"LocalTransactionPool::submit_local is not implemented for ForkAwareTxPool, returning error: {e:?}",
-		);
-		e
+		log::debug!(target: LOG_TARGET, "fatp::submit_local views:{}", self.active_views_count());
+		let xt = Arc::from(xt);
+		let result = self
+			.mempool
+			.extend_unwatched(TransactionSource::Local, &[xt.clone()])
+			.remove(0)?;
+
+		self.view_store.submit_local(xt).or_else(|_| Ok(result))
 	}
 }
 
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/tx_mem_pool.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/tx_mem_pool.rs
index 86ea27dcf451..989c7e8ef356 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/tx_mem_pool.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/tx_mem_pool.rs
@@ -237,11 +237,11 @@ where
 	pub(super) fn extend_unwatched(
 		&self,
 		source: TransactionSource,
-		xts: Vec<ExtrinsicFor<ChainApi>>,
+		xts: &[ExtrinsicFor<ChainApi>],
 	) -> Vec<Result<ExtrinsicHash<ChainApi>, ChainApi::Error>> {
 		let mut transactions = self.transactions.write();
 		let result = xts
-			.into_iter()
+			.iter()
 			.map(|xt| {
 				let hash = self.api.hash_and_length(&xt).0;
 				self.try_insert(
@@ -437,7 +437,7 @@ mod tx_mem_pool_tests {
 
 		let xts = (0..max + 1).map(|x| Arc::from(uxt(x as _))).collect::<Vec<_>>();
 
-		let results = mempool.extend_unwatched(TransactionSource::External, xts);
+		let results = mempool.extend_unwatched(TransactionSource::External, &xts);
 		assert!(results.iter().take(max).all(Result::is_ok));
 		assert!(matches!(
 			results.into_iter().last().unwrap().unwrap_err(),
@@ -455,7 +455,7 @@ mod tx_mem_pool_tests {
 		let mut xts = (0..max - 1).map(|x| Arc::from(uxt(x as _))).collect::<Vec<_>>();
 		xts.push(xts.iter().last().unwrap().clone());
 
-		let results = mempool.extend_unwatched(TransactionSource::External, xts);
+		let results = mempool.extend_unwatched(TransactionSource::External, &xts);
 		assert!(results.iter().take(max - 1).all(Result::is_ok));
 		assert!(matches!(
 			results.into_iter().last().unwrap().unwrap_err(),
@@ -471,7 +471,7 @@ mod tx_mem_pool_tests {
 
 		let xts = (0..max).map(|x| Arc::from(uxt(x as _))).collect::<Vec<_>>();
 
-		let results = mempool.extend_unwatched(TransactionSource::External, xts);
+		let results = mempool.extend_unwatched(TransactionSource::External, &xts);
 		assert!(results.iter().all(Result::is_ok));
 
 		let xt = Arc::from(uxt(98));
@@ -481,7 +481,7 @@ mod tx_mem_pool_tests {
 			sc_transaction_pool_api::error::Error::ImmediatelyDropped
 		));
 		let xt = Arc::from(uxt(99));
-		let mut result = mempool.extend_unwatched(TransactionSource::External, vec![xt]);
+		let mut result = mempool.extend_unwatched(TransactionSource::External, &[xt]);
 		assert!(matches!(
 			result.pop().unwrap().unwrap_err(),
 			sc_transaction_pool_api::error::Error::ImmediatelyDropped
@@ -498,7 +498,7 @@ mod tx_mem_pool_tests {
 		let xt0 = xts.iter().last().unwrap().clone();
 		let xt1 = xts.iter().next().unwrap().clone();
 
-		let results = mempool.extend_unwatched(TransactionSource::External, xts);
+		let results = mempool.extend_unwatched(TransactionSource::External, &xts);
 		assert!(results.iter().all(Result::is_ok));
 
 		let result = mempool.push_watched(TransactionSource::External, xt0);
@@ -506,7 +506,7 @@ mod tx_mem_pool_tests {
 			result.unwrap_err(),
 			sc_transaction_pool_api::error::Error::AlreadyImported(_)
 		));
-		let mut result = mempool.extend_unwatched(TransactionSource::External, vec![xt1]);
+		let mut result = mempool.extend_unwatched(TransactionSource::External, &[xt1]);
 		assert!(matches!(
 			result.pop().unwrap().unwrap_err(),
 			sc_transaction_pool_api::error::Error::AlreadyImported(_)
@@ -521,7 +521,7 @@ mod tx_mem_pool_tests {
 
 		let xts0 = (0..10).map(|x| Arc::from(uxt(x as _))).collect::<Vec<_>>();
 
-		let results = mempool.extend_unwatched(TransactionSource::External, xts0);
+		let results = mempool.extend_unwatched(TransactionSource::External, &xts0);
 		assert!(results.iter().all(Result::is_ok));
 
 		let xts1 = (0..5).map(|x| Arc::from(uxt(2 * x))).collect::<Vec<_>>();
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
index fd5bfa8312c0..99095d88cb0a 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/view.rs
@@ -33,10 +33,11 @@ use crate::{
 	LOG_TARGET,
 };
 use parking_lot::Mutex;
-use sc_transaction_pool_api::{PoolStatus, TransactionSource};
+use sc_transaction_pool_api::{error::Error as TxPoolError, PoolStatus, TransactionSource};
 use sp_blockchain::HashAndNumber;
 use sp_runtime::{
-	traits::Block as BlockT, transaction_validity::TransactionValidityError, SaturatedConversion,
+	generic::BlockId, traits::Block as BlockT, transaction_validity::TransactionValidityError,
+	SaturatedConversion,
 };
 use std::{collections::HashMap, sync::Arc, time::Instant};
 
@@ -178,6 +179,50 @@ where
 		self.pool.submit_and_watch(&self.at, source, xt).await
 	}
 
+	/// Synchronously imports single unvalidated extrinsics into the view.
+	pub(super) fn submit_local(
+		&self,
+		xt: ExtrinsicFor<ChainApi>,
+	) -> Result<ExtrinsicHash<ChainApi>, ChainApi::Error> {
+		let (hash, length) = self.pool.validated_pool().api().hash_and_length(&xt);
+		log::trace!(target: LOG_TARGET, "[{:?}] view::submit_local at:{}", hash, self.at.hash);
+
+		let validity = self
+			.pool
+			.validated_pool()
+			.api()
+			.validate_transaction_blocking(
+				self.at.hash,
+				TransactionSource::Local,
+				Arc::from(xt.clone()),
+			)?
+			.map_err(|e| {
+				match e {
+					TransactionValidityError::Invalid(i) => TxPoolError::InvalidTransaction(i),
+					TransactionValidityError::Unknown(u) => TxPoolError::UnknownTransaction(u),
+				}
+				.into()
+			})?;
+
+		let block_number = self
+			.pool
+			.validated_pool()
+			.api()
+			.block_id_to_number(&BlockId::hash(self.at.hash))?
+			.ok_or_else(|| TxPoolError::InvalidBlockId(format!("{:?}", self.at.hash)))?;
+
+		let validated = ValidatedTransaction::valid_at(
+			block_number.saturated_into::<u64>(),
+			hash,
+			TransactionSource::Local,
+			Arc::from(xt),
+			length,
+			validity,
+		);
+
+		self.pool.validated_pool().submit(vec![validated]).remove(0)
+	}
+
 	/// Status of the pool associated with the view.
 	pub(super) fn status(&self) -> PoolStatus {
 		self.pool.validated_pool().status()
@@ -243,9 +288,7 @@ where
 						let validation_result = (api.validate_transaction(self.at.hash, tx.source, tx.data.clone()).await, tx.hash, tx);
 						validation_results.push(validation_result);
 					} else {
-						{
-							self.revalidation_worker_channels.lock().as_mut().map(|ch| ch.remove_sender());
-						}
+						self.revalidation_worker_channels.lock().as_mut().map(|ch| ch.remove_sender());
 						should_break = true;
 					}
 				} => {}
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/view_store.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/view_store.rs
index 953d6d860338..413fca223242 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/view_store.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/view_store.rs
@@ -29,6 +29,7 @@ use crate::{
 	ReadyIteratorFor, LOG_TARGET,
 };
 use futures::prelude::*;
+use itertools::Itertools;
 use parking_lot::RwLock;
 use sc_transaction_pool_api::{error::Error as PoolError, PoolStatus, TransactionSource};
 use sp_blockchain::TreeRoute;
@@ -110,6 +111,37 @@ where
 		HashMap::<_, _>::from_iter(results.into_iter())
 	}
 
+	/// Synchronously imports single unverified extrinsics into every active view.
+	pub(super) fn submit_local(
+		&self,
+		xt: ExtrinsicFor<ChainApi>,
+	) -> Result<ExtrinsicHash<ChainApi>, ChainApi::Error> {
+		let active_views = self
+			.active_views
+			.read()
+			.iter()
+			.map(|(_, view)| view.clone())
+			.collect::<Vec<_>>();
+
+		let tx_hash = self.api.hash_and_length(&xt).0;
+
+		let result = active_views
+			.iter()
+			.map(|view| {
+				self.dropped_stream_controller
+					.add_initial_views(std::iter::once(tx_hash), view.at.hash);
+				view.submit_local(xt.clone())
+			})
+			.find_or_first(Result::is_ok);
+
+		if let Some(Err(err)) = result {
+			log::trace!(target: LOG_TARGET, "[{:?}] submit_local: err: {}", tx_hash, err);
+			return Err(err)
+		};
+
+		Ok(tx_hash)
+	}
+
 	/// Import a single extrinsic and starts to watch its progress in the pool.
 	///
 	/// The extrinsic is imported to every view, and the individual streams providing the progress
@@ -155,12 +187,8 @@ where
 		let maybe_error = futures::future::join_all(submit_and_watch_futures)
 			.await
 			.into_iter()
-			.reduce(|mut r, v| {
-				if r.is_err() && v.is_ok() {
-					r = v;
-				}
-				r
-			});
+			.find_or_first(Result::is_ok);
+
 		if let Some(Err(err)) = maybe_error {
 			log::trace!(target: LOG_TARGET, "[{:?}] submit_and_watch: err: {}", tx_hash, err);
 			return Err((err, Some(external_watcher)));
diff --git a/substrate/client/transaction-pool/src/graph/pool.rs b/substrate/client/transaction-pool/src/graph/pool.rs
index 6d08a0f0b93c..2dd8de352c6b 100644
--- a/substrate/client/transaction-pool/src/graph/pool.rs
+++ b/substrate/client/transaction-pool/src/graph/pool.rs
@@ -73,7 +73,7 @@ pub trait ChainApi: Send + Sync {
 		+ Send
 		+ 'static;
 
-	/// Verify extrinsic at given block.
+	/// Asynchronously verify extrinsic at given block.
 	fn validate_transaction(
 		&self,
 		at: <Self::Block as BlockT>::Hash,
@@ -81,6 +81,17 @@ pub trait ChainApi: Send + Sync {
 		uxt: ExtrinsicFor<Self>,
 	) -> Self::ValidationFuture;
 
+	/// Synchronously verify given extrinsic at given block.
+	///
+	/// Validates a transaction by calling into the runtime. Same as `validate_transaction` but
+	/// blocks the current thread when performing validation.
+	fn validate_transaction_blocking(
+		&self,
+		at: <Self::Block as BlockT>::Hash,
+		source: TransactionSource,
+		uxt: ExtrinsicFor<Self>,
+	) -> Result<TransactionValidity, Self::Error>;
+
 	/// Returns a block number given the block id.
 	fn block_id_to_number(
 		&self,
diff --git a/substrate/test-utils/runtime/transaction-pool/src/lib.rs b/substrate/test-utils/runtime/transaction-pool/src/lib.rs
index 2d19dbfb6d49..6a4f38f63e82 100644
--- a/substrate/test-utils/runtime/transaction-pool/src/lib.rs
+++ b/substrate/test-utils/runtime/transaction-pool/src/lib.rs
@@ -450,6 +450,15 @@ impl ChainApi for TestApi {
 		ready(Ok(Ok(validity)))
 	}
 
+	fn validate_transaction_blocking(
+		&self,
+		_at: <Self::Block as BlockT>::Hash,
+		_source: TransactionSource,
+		_uxt: Arc<<Self::Block as BlockT>::Extrinsic>,
+	) -> Result<TransactionValidity, Error> {
+		unimplemented!();
+	}
+
 	fn block_id_to_number(
 		&self,
 		at: &BlockId<Self::Block>,

From 6418131a5de10a80f0d9957500d36d6592194cab Mon Sep 17 00:00:00 2001
From: tmpolaczyk <44604217+tmpolaczyk@users.noreply.github.com>
Date: Tue, 22 Oct 2024 22:23:29 +0200
Subject: [PATCH 17/20] Use bool::then instead of then_some with function calls
 (#6156)

I noticed that hardware benchmarks are being run even though we pass the
--no-hardware-benchmarks cli flag. After some debugging, the cause is an
incorrect usage of the `then_some` method.

From [std
docs](https://doc.rust-lang.org/std/primitive.bool.html#method.then_some):

> Arguments passed to then_some are eagerly evaluated; if you are
passing the result of a function call, it is recommended to use
[then](https://doc.rust-lang.org/std/primitive.bool.html#method.then),
which is lazily evaluated.

```rust
let mut a = 0;
let mut function_with_side_effects = || { a += 1; };

true.then_some(function_with_side_effects());
false.then_some(function_with_side_effects());

// `a` is incremented twice because the value passed to `then_some` is
// evaluated eagerly.
assert_eq!(a, 2);
```

This PR fixes all the similar usages of the `then_some` method across
the codebase.

polkadot address: 138eUqXvUYT3o4GdbnWQfGRzM8yDWh5Q2eFrFULL7RAXzdWD

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 cumulus/polkadot-omni-node/lib/src/command.rs | 16 +++++++------
 polkadot/cli/src/command.rs                   | 10 ++++----
 .../src/collator_side/validators_buffer.rs    |  2 +-
 prdoc/pr_6156.prdoc                           | 23 +++++++++++++++++++
 substrate/bin/node/cli/src/service.rs         | 10 ++++----
 substrate/client/network/src/discovery.rs     |  2 +-
 .../client/network/sync/src/strategy/state.rs |  2 +-
 .../client/network/sync/src/strategy/warp.rs  |  2 +-
 .../frame/contracts/proc-macro/src/lib.rs     |  2 +-
 .../src/pallet/expand/pallet_struct.rs        |  2 +-
 substrate/frame/support/src/migrations.rs     |  4 ++--
 templates/parachain/node/src/command.rs       | 16 +++++++------
 12 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 prdoc/pr_6156.prdoc

diff --git a/cumulus/polkadot-omni-node/lib/src/command.rs b/cumulus/polkadot-omni-node/lib/src/command.rs
index 350dcfee1cdb..fe935a03cc95 100644
--- a/cumulus/polkadot-omni-node/lib/src/command.rs
+++ b/cumulus/polkadot-omni-node/lib/src/command.rs
@@ -266,13 +266,15 @@ pub fn run<CliConfig: crate::cli::CliConfig>(cmd_config: RunConfig) -> Result<()
 				}
 
 				let hwbench = (!cli.no_hardware_benchmarks)
-					.then_some(config.database.path().map(|database_path| {
-						let _ = std::fs::create_dir_all(database_path);
-						sc_sysinfo::gather_hwbench(
-							Some(database_path),
-							&SUBSTRATE_REFERENCE_HARDWARE,
-						)
-					}))
+					.then(|| {
+						config.database.path().map(|database_path| {
+							let _ = std::fs::create_dir_all(database_path);
+							sc_sysinfo::gather_hwbench(
+								Some(database_path),
+								&SUBSTRATE_REFERENCE_HARDWARE,
+							)
+						})
+					})
 					.flatten();
 
 				let parachain_account =
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index d124c8fb7eb7..7c904e6658e7 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -203,10 +203,12 @@ where
 
 	runner.run_node_until_exit(move |config| async move {
 		let hwbench = (!cli.run.no_hardware_benchmarks)
-			.then_some(config.database.path().map(|database_path| {
-				let _ = std::fs::create_dir_all(&database_path);
-				sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
-			}))
+			.then(|| {
+				config.database.path().map(|database_path| {
+					let _ = std::fs::create_dir_all(&database_path);
+					sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
+				})
+			})
 			.flatten();
 
 		let database_source = config.database.clone();
diff --git a/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs b/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
index fbb3ff4328a5..35202fc96299 100644
--- a/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
+++ b/polkadot/node/network/collator-protocol/src/collator_side/validators_buffer.rs
@@ -110,7 +110,7 @@ impl ValidatorGroupsBuffer {
 			.validators
 			.iter()
 			.enumerate()
-			.filter_map(|(idx, authority_id)| bits[idx].then_some(authority_id.clone()))
+			.filter_map(|(idx, authority_id)| bits[idx].then(|| authority_id.clone()))
 			.collect();
 
 		if let Some(last_group) = self.group_infos.iter().last() {
diff --git a/prdoc/pr_6156.prdoc b/prdoc/pr_6156.prdoc
new file mode 100644
index 000000000000..d20324a83a2f
--- /dev/null
+++ b/prdoc/pr_6156.prdoc
@@ -0,0 +1,23 @@
+title: "Use bool::then instead of then_some with function calls"
+doc:
+- audience: Node Dev
+  description: |-
+    Fix misusage of `bool::then_some`.
+
+crates:
+- name: polkadot-omni-node-lib
+  bump: patch
+- name: polkadot-cli
+  bump: patch
+- name: polkadot-collator-protocol
+  bump: patch
+- name: sc-network
+  bump: patch
+- name: sc-network-sync
+  bump: patch
+- name: pallet-contracts-proc-macro
+  bump: patch
+- name: frame-support-procedural
+  bump: patch
+- name: frame-support
+  bump: patch
diff --git a/substrate/bin/node/cli/src/service.rs b/substrate/bin/node/cli/src/service.rs
index d71f1304caf5..7b166f94bcc8 100644
--- a/substrate/bin/node/cli/src/service.rs
+++ b/substrate/bin/node/cli/src/service.rs
@@ -420,10 +420,12 @@ pub fn new_full_base<N: NetworkBackend<Block, <Block as BlockT>::Hash>>(
 	let enable_offchain_worker = config.offchain_worker.enabled;
 
 	let hwbench = (!disable_hardware_benchmarks)
-		.then_some(config.database.path().map(|database_path| {
-			let _ = std::fs::create_dir_all(&database_path);
-			sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
-		}))
+		.then(|| {
+			config.database.path().map(|database_path| {
+				let _ = std::fs::create_dir_all(&database_path);
+				sc_sysinfo::gather_hwbench(Some(database_path), &SUBSTRATE_REFERENCE_HARDWARE)
+			})
+		})
 		.flatten();
 
 	let sc_service::PartialComponents {
diff --git a/substrate/client/network/src/discovery.rs b/substrate/client/network/src/discovery.rs
index 86c66c22701c..49e0797c126c 100644
--- a/substrate/client/network/src/discovery.rs
+++ b/substrate/client/network/src/discovery.rs
@@ -648,7 +648,7 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		let mut list: LinkedHashSet<_> = self
 			.permanent_addresses
 			.iter()
-			.filter_map(|(p, a)| (*p == peer_id).then_some(a.clone()))
+			.filter_map(|(p, a)| (*p == peer_id).then(|| a.clone()))
 			.collect();
 
 		if let Some(ephemeral_addresses) = self.ephemeral_addresses.get(&peer_id) {
diff --git a/substrate/client/network/sync/src/strategy/state.rs b/substrate/client/network/sync/src/strategy/state.rs
index a04ab8be4fea..d69ab3e2d535 100644
--- a/substrate/client/network/sync/src/strategy/state.rs
+++ b/substrate/client/network/sync/src/strategy/state.rs
@@ -173,7 +173,7 @@ impl<B: BlockT> StateStrategy<B> {
 		peer_id: PeerId,
 		announce: &BlockAnnounce<B::Header>,
 	) -> Option<(B::Hash, NumberFor<B>)> {
-		is_best.then_some({
+		is_best.then(|| {
 			let best_number = *announce.header.number();
 			let best_hash = announce.header.hash();
 			if let Some(ref mut peer) = self.peers.get_mut(&peer_id) {
diff --git a/substrate/client/network/sync/src/strategy/warp.rs b/substrate/client/network/sync/src/strategy/warp.rs
index cce6a93caf43..0c71dd3c6aee 100644
--- a/substrate/client/network/sync/src/strategy/warp.rs
+++ b/substrate/client/network/sync/src/strategy/warp.rs
@@ -301,7 +301,7 @@ where
 		peer_id: PeerId,
 		announce: &BlockAnnounce<B::Header>,
 	) -> Option<(B::Hash, NumberFor<B>)> {
-		is_best.then_some({
+		is_best.then(|| {
 			let best_number = *announce.header.number();
 			let best_hash = announce.header.hash();
 			if let Some(ref mut peer) = self.peers.get_mut(&peer_id) {
diff --git a/substrate/frame/contracts/proc-macro/src/lib.rs b/substrate/frame/contracts/proc-macro/src/lib.rs
index 84ea7de00a2f..4aba1d24dbd5 100644
--- a/substrate/frame/contracts/proc-macro/src/lib.rs
+++ b/substrate/frame/contracts/proc-macro/src/lib.rs
@@ -522,7 +522,7 @@ fn expand_docs(def: &EnvDef) -> TokenStream2 {
 ///    `expand_impls()`).
 fn expand_env(def: &EnvDef, docs: bool) -> TokenStream2 {
 	let impls = expand_impls(def);
-	let docs = docs.then_some(expand_docs(def)).unwrap_or(TokenStream2::new());
+	let docs = docs.then(|| expand_docs(def)).unwrap_or(TokenStream2::new());
 	let stable_api_count = def.host_funcs.iter().filter(|f| f.is_stable).count();
 
 	quote! {
diff --git a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index c6166ff45b19..79bf33a828e2 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -171,7 +171,7 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 	let whitelisted_storage_idents: Vec<syn::Ident> = def
 		.storages
 		.iter()
-		.filter_map(|s| s.whitelisted.then_some(s.ident.clone()))
+		.filter_map(|s| s.whitelisted.then(|| s.ident.clone()))
 		.collect();
 
 	let whitelisted_storage_keys_impl = quote::quote![
diff --git a/substrate/frame/support/src/migrations.rs b/substrate/frame/support/src/migrations.rs
index 905d6143e4f1..3fdf8d6edc95 100644
--- a/substrate/frame/support/src/migrations.rs
+++ b/substrate/frame/support/src/migrations.rs
@@ -825,14 +825,14 @@ impl<T: SteppedMigration> SteppedMigrations for T {
 
 	fn nth_id(n: u32) -> Option<Vec<u8>> {
 		n.is_zero()
-			.then_some(T::id().encode())
+			.then(|| T::id().encode())
 			.defensive_proof("nth_id should only be called with n==0")
 	}
 
 	fn nth_max_steps(n: u32) -> Option<Option<u32>> {
 		// It should be generally fine to call with n>0, but the code should not attempt to.
 		n.is_zero()
-			.then_some(T::max_steps())
+			.then(|| T::max_steps())
 			.defensive_proof("nth_max_steps should only be called with n==0")
 	}
 
diff --git a/templates/parachain/node/src/command.rs b/templates/parachain/node/src/command.rs
index 938bda837e0d..5d9308aed154 100644
--- a/templates/parachain/node/src/command.rs
+++ b/templates/parachain/node/src/command.rs
@@ -220,13 +220,15 @@ pub fn run() -> Result<()> {
 
 			runner.run_node_until_exit(|config| async move {
 				let hwbench = (!cli.no_hardware_benchmarks)
-					.then_some(config.database.path().map(|database_path| {
-						let _ = std::fs::create_dir_all(database_path);
-						sc_sysinfo::gather_hwbench(
-							Some(database_path),
-							&SUBSTRATE_REFERENCE_HARDWARE,
-						)
-					}))
+					.then(|| {
+						config.database.path().map(|database_path| {
+							let _ = std::fs::create_dir_all(database_path);
+							sc_sysinfo::gather_hwbench(
+								Some(database_path),
+								&SUBSTRATE_REFERENCE_HARDWARE,
+							)
+						})
+					})
 					.flatten();
 
 				let para_id = chain_spec::Extensions::try_get(&*config.chain_spec)

From b4732add46910370443d092a3f479986060f6df5 Mon Sep 17 00:00:00 2001
From: Francisco Aguirre <franciscoaguirreperez@gmail.com>
Date: Tue, 22 Oct 2024 18:38:38 -0300
Subject: [PATCH 18/20] Assets in pool with native can be used in
 `query_weight_to_asset_fee` (#6080)

A follow-up to https://github.com/paritytech/polkadot-sdk/pull/5599.
Assets in a pool with the native one are returned from
`query_acceptable_payment_assets`. Now those assets can be used in
`query_weight_to_asset_fee` to get the correct amount that needs to be
paid.

---------

Co-authored-by: command-bot <>
---
 .../emulated/common/src/macros.rs             | 68 +++++++++++++++++++
 .../tests/assets/asset-hub-rococo/src/lib.rs  |  2 +-
 .../assets/asset-hub-rococo/src/tests/swap.rs |  5 ++
 .../tests/assets/asset-hub-westend/src/lib.rs |  2 +-
 .../asset-hub-westend/src/tests/swap.rs       |  5 ++
 .../assets/asset-hub-rococo/src/lib.rs        | 44 +++++++-----
 .../assets/asset-hub-westend/src/lib.rs       | 47 ++++++++-----
 .../runtimes/assets/common/src/lib.rs         | 33 +++++++++
 prdoc/pr_6080.prdoc                           | 22 ++++++
 9 files changed, 191 insertions(+), 37 deletions(-)
 create mode 100644 prdoc/pr_6080.prdoc

diff --git a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
index 68926b04bfe6..3ff5ed388a39 100644
--- a/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
+++ b/cumulus/parachains/integration-tests/emulated/common/src/macros.rs
@@ -451,3 +451,71 @@ macro_rules! test_dry_run_transfer_across_pk_bridge {
 		}
 	};
 }
+
+#[macro_export]
+macro_rules! test_xcm_fee_querying_apis_work_for_asset_hub {
+	( $asset_hub:ty ) => {
+		$crate::macros::paste::paste! {
+			use emulated_integration_tests_common::USDT_ID;
+			use xcm_runtime_apis::fees::{Error as XcmPaymentApiError, runtime_decl_for_xcm_payment_api::XcmPaymentApiV1};
+
+			$asset_hub::execute_with(|| {
+				// Setup a pool between USDT and WND.
+				type RuntimeOrigin = <$asset_hub as Chain>::RuntimeOrigin;
+				type Assets = <$asset_hub as [<$asset_hub Pallet>]>::Assets;
+				type AssetConversion = <$asset_hub as [<$asset_hub Pallet>]>::AssetConversion;
+				let wnd = Location::new(1, []);
+				let usdt = Location::new(0, [PalletInstance(ASSETS_PALLET_ID), GeneralIndex(USDT_ID.into())]);
+				let sender = [<$asset_hub Sender>]::get();
+				assert_ok!(AssetConversion::create_pool(
+					RuntimeOrigin::signed(sender.clone()),
+					Box::new(wnd.clone()),
+					Box::new(usdt.clone()),
+				));
+
+				type Runtime = <$asset_hub as Chain>::Runtime;
+				let acceptable_payment_assets = Runtime::query_acceptable_payment_assets(4).unwrap();
+				assert_eq!(acceptable_payment_assets, vec![
+					VersionedAssetId::from(AssetId(wnd.clone())),
+					VersionedAssetId::from(AssetId(usdt.clone())),
+				]);
+
+				let program = Xcm::<()>::builder()
+					.withdraw_asset((Parent, 100u128))
+					.buy_execution((Parent, 10u128), Unlimited)
+					.deposit_asset(All, [0u8; 32])
+					.build();
+				let weight = Runtime::query_xcm_weight(VersionedXcm::from(program)).unwrap();
+				let fee_in_wnd = Runtime::query_weight_to_asset_fee(weight, VersionedAssetId::from(AssetId(wnd.clone()))).unwrap();
+				// Assets not in a pool don't work.
+				assert!(Runtime::query_weight_to_asset_fee(weight, VersionedAssetId::from(AssetId(Location::new(0, [PalletInstance(ASSETS_PALLET_ID), GeneralIndex(1)])))).is_err());
+				let fee_in_usdt_fail = Runtime::query_weight_to_asset_fee(weight, VersionedAssetId::from(AssetId(usdt.clone())));
+				// Weight to asset fee fails because there's not enough asset in the pool.
+				// We just created it, there's none.
+				assert_eq!(fee_in_usdt_fail, Err(XcmPaymentApiError::AssetNotFound));
+				// We add some.
+				assert_ok!(Assets::mint(
+					RuntimeOrigin::signed(sender.clone()),
+					USDT_ID.into(),
+					sender.clone().into(),
+					5_000_000_000_000
+				));
+				// We make 1 WND = 4 USDT.
+				assert_ok!(AssetConversion::add_liquidity(
+					RuntimeOrigin::signed(sender.clone()),
+					Box::new(wnd),
+					Box::new(usdt.clone()),
+					1_000_000_000_000,
+					4_000_000_000_000,
+					0,
+					0,
+					sender.into()
+				));
+				// Now it works.
+				let fee_in_usdt = Runtime::query_weight_to_asset_fee(weight, VersionedAssetId::from(AssetId(usdt)));
+				assert_ok!(fee_in_usdt);
+				assert!(fee_in_usdt.unwrap() > fee_in_wnd);
+			});
+		}
+	};
+}
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
index 12f440fdefee..1184b5fd7c4a 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/lib.rs
@@ -37,7 +37,7 @@ mod imports {
 	pub use emulated_integration_tests_common::{
 		accounts::DUMMY_EMPTY,
 		test_parachain_is_trusted_teleporter, test_parachain_is_trusted_teleporter_for_relay,
-		test_relay_is_trusted_teleporter,
+		test_relay_is_trusted_teleporter, test_xcm_fee_querying_apis_work_for_asset_hub,
 		xcm_emulator::{
 			assert_expected_events, bx, Chain, Parachain as Para, RelayChain as Relay, Test,
 			TestArgs, TestContext, TestExt,
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
index ac0c90ba198d..d9b32eaa357e 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
@@ -386,3 +386,8 @@ fn pay_xcm_fee_with_some_asset_swapped_for_native() {
 		);
 	});
 }
+
+#[test]
+fn xcm_fee_querying_apis_work() {
+	test_xcm_fee_querying_apis_work_for_asset_hub!(AssetHubRococo);
+}
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
index 906768b19b79..179a44e14aa1 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/lib.rs
@@ -34,7 +34,7 @@ mod imports {
 	pub use emulated_integration_tests_common::{
 		accounts::DUMMY_EMPTY,
 		test_parachain_is_trusted_teleporter, test_parachain_is_trusted_teleporter_for_relay,
-		test_relay_is_trusted_teleporter,
+		test_relay_is_trusted_teleporter, test_xcm_fee_querying_apis_work_for_asset_hub,
 		xcm_emulator::{
 			assert_expected_events, bx, Chain, Parachain as Para, RelayChain as Relay, Test,
 			TestArgs, TestContext, TestExt,
diff --git a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
index 1a2821452155..4535fd431990 100644
--- a/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
+++ b/cumulus/parachains/integration-tests/emulated/tests/assets/asset-hub-westend/src/tests/swap.rs
@@ -389,3 +389,8 @@ fn pay_xcm_fee_with_some_asset_swapped_for_native() {
 		);
 	});
 }
+
+#[test]
+fn xcm_fee_querying_apis_work() {
+	test_xcm_fee_querying_apis_work_for_asset_hub!(AssetHubWestend);
+}
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index ae5d2102ff66..f768f803aeaf 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -1412,31 +1412,41 @@ impl_runtime_apis! {
 			// We accept the native token to pay fees.
 			let mut acceptable_assets = vec![AssetId(native_token.clone())];
 			// We also accept all assets in a pool with the native token.
-			acceptable_assets.extend(
-				pallet_asset_conversion::Pools::<Runtime>::iter_keys().filter_map(
-					|(asset_1, asset_2)| {
-						if asset_1 == native_token {
-							Some(asset_2.clone().into())
-						} else if asset_2 == native_token {
-							Some(asset_1.clone().into())
-						} else {
-							None
-						}
-					},
-				),
-			);
+			let assets_in_pool_with_native = assets_common::get_assets_in_pool_with::<
+				Runtime,
+				xcm::v4::Location
+			>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();
+			acceptable_assets.extend(assets_in_pool_with_native);
 			PolkadotXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
 		}
 
 		fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result<u128, XcmPaymentApiError> {
+			let native_asset = xcm_config::TokenLocation::get();
+			let fee_in_native = WeightToFee::weight_to_fee(&weight);
 			match asset.try_as::<AssetId>() {
-				Ok(asset_id) if asset_id.0 == xcm_config::TokenLocation::get() => {
+				Ok(asset_id) if asset_id.0 == native_asset => {
 					// for native token
-					Ok(WeightToFee::weight_to_fee(&weight))
+					Ok(fee_in_native)
 				},
 				Ok(asset_id) => {
-					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
-					Err(XcmPaymentApiError::AssetNotFound)
+					let assets_in_pool_with_this_asset: Vec<_> = assets_common::get_assets_in_pool_with::<
+						Runtime,
+						xcm::v4::Location
+					>(&asset_id.0).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?;
+					if assets_in_pool_with_this_asset
+						.into_iter()
+						.map(|asset_id| asset_id.0)
+						.any(|location| location == native_asset) {
+						pallet_asset_conversion::Pallet::<Runtime>::quote_price_tokens_for_exact_tokens(
+							asset_id.clone().0,
+							native_asset,
+							fee_in_native,
+							true, // We include the fee.
+						).ok_or(XcmPaymentApiError::AssetNotFound)
+					} else {
+						log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
+						Err(XcmPaymentApiError::AssetNotFound)
+					}
 				},
 				Err(_) => {
 					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - failed to convert asset: {asset:?}!");
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 0da80098b28f..63234bfb6e59 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -1450,31 +1450,42 @@ impl_runtime_apis! {
 			// We accept the native token to pay fees.
 			let mut acceptable_assets = vec![AssetId(native_token.clone())];
 			// We also accept all assets in a pool with the native token.
-			acceptable_assets.extend(
-				pallet_asset_conversion::Pools::<Runtime>::iter_keys().filter_map(
-					|(asset_1, asset_2)| {
-						if asset_1 == native_token {
-							Some(asset_2.clone().into())
-						} else if asset_2 == native_token {
-							Some(asset_1.clone().into())
-						} else {
-							None
-						}
-					},
-				),
-			);
+			let assets_in_pool_with_native = assets_common::get_assets_in_pool_with::<
+				Runtime,
+				xcm::v4::Location
+			>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();
+			acceptable_assets.extend(assets_in_pool_with_native);
 			PolkadotXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
 		}
 
 		fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result<u128, XcmPaymentApiError> {
+			let native_asset = xcm_config::WestendLocation::get();
+			let fee_in_native = WeightToFee::weight_to_fee(&weight);
 			match asset.try_as::<AssetId>() {
-				Ok(asset_id) if asset_id.0 == xcm_config::WestendLocation::get() => {
-					// for native token
-					Ok(WeightToFee::weight_to_fee(&weight))
+				Ok(asset_id) if asset_id.0 == native_asset => {
+					// for native asset
+					Ok(fee_in_native)
 				},
 				Ok(asset_id) => {
-					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
-					Err(XcmPaymentApiError::AssetNotFound)
+					// We recognize assets in a pool with the native one.
+					let assets_in_pool_with_this_asset: Vec<_> = assets_common::get_assets_in_pool_with::<
+						Runtime,
+						xcm::v4::Location
+					>(&asset_id.0).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?;
+					if assets_in_pool_with_this_asset
+						.into_iter()
+						.map(|asset_id| asset_id.0)
+						.any(|location| location == native_asset) {
+						pallet_asset_conversion::Pallet::<Runtime>::quote_price_tokens_for_exact_tokens(
+							asset_id.clone().0,
+							native_asset,
+							fee_in_native,
+							true, // We include the fee.
+						).ok_or(XcmPaymentApiError::AssetNotFound)
+					} else {
+						log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - unhandled asset_id: {asset_id:?}!");
+						Err(XcmPaymentApiError::AssetNotFound)
+					}
 				},
 				Err(_) => {
 					log::trace!(target: "xcm::xcm_runtime_apis", "query_weight_to_asset_fee - failed to convert asset: {asset:?}!");
diff --git a/cumulus/parachains/runtimes/assets/common/src/lib.rs b/cumulus/parachains/runtimes/assets/common/src/lib.rs
index deda5fa4ab9c..26046e5974b5 100644
--- a/cumulus/parachains/runtimes/assets/common/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/common/src/lib.rs
@@ -26,6 +26,9 @@ pub mod runtime_api;
 extern crate alloc;
 
 use crate::matching::{LocalLocationPattern, ParentLocation};
+use alloc::vec::Vec;
+use codec::{Decode, EncodeLike};
+use core::cmp::PartialEq;
 use frame_support::traits::{Equals, EverythingBut};
 use parachains_common::{AssetIdForTrustBackedAssets, CollectionId, ItemId};
 use sp_runtime::traits::TryConvertInto;
@@ -134,6 +137,36 @@ pub type PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance> =
 		TryConvertInto,
 	>;
 
+/// Returns an iterator of all assets in a pool with `asset`.
+///
+/// Should only be used in runtime APIs since it iterates over the whole
+/// `pallet_asset_conversion::Pools` map.
+///
+/// It takes in any version of an XCM Location but always returns the latest one.
+/// This is to allow some margin of migrating the pools when updating the XCM version.
+///
+/// An error of type `()` is returned if the version conversion fails for XCM locations.
+/// This error should be mapped by the caller to a more descriptive one.
+pub fn get_assets_in_pool_with<
+	Runtime: pallet_asset_conversion::Config<PoolId = (L, L)>,
+	L: TryInto<Location> + Clone + Decode + EncodeLike + PartialEq,
+>(
+	asset: &L,
+) -> Result<Vec<AssetId>, ()> {
+	pallet_asset_conversion::Pools::<Runtime>::iter_keys()
+		.filter_map(|(asset_1, asset_2)| {
+			if asset_1 == *asset {
+				Some(asset_2)
+			} else if asset_2 == *asset {
+				Some(asset_1)
+			} else {
+				None
+			}
+		})
+		.map(|location| location.try_into().map_err(|_| ()).map(AssetId))
+		.collect::<Result<Vec<_>, _>>()
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/prdoc/pr_6080.prdoc b/prdoc/pr_6080.prdoc
new file mode 100644
index 000000000000..52ecd58dddde
--- /dev/null
+++ b/prdoc/pr_6080.prdoc
@@ -0,0 +1,22 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Assets in pool with native can be used in query_weight_to_asset_fee in Asset Hubs
+
+doc:
+  - audience: Runtime User
+    description: |
+      `query_weight_to_asset_fee` now works with assets in a pool with the native asset in both
+      Westend and Rococo asset hubs.
+      This means all the information you get from `query_acceptable_payment_assets` can be used
+      directly in `query_weight_to_asset_fee` to get the correct fees that need to be paid.
+
+crates:
+  - name: assets-common
+    bump: minor
+  - name: asset-hub-westend-runtime
+    bump: minor
+  - name: asset-hub-rococo-runtime
+    bump: minor
+  - name: emulated-integration-tests-common
+    bump: minor

From ed231828fbe662cdb78b24d54a98fc13a9a64fdd Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 23 Oct 2024 13:22:48 +0200
Subject: [PATCH 19/20] [pallet-revive] Add pallet to AH westend (#5502)

Add pallet-revive to Westend runtime, and configure the runtime to
accept Ethereum signed transaction
---
 Cargo.lock                                    |   9 +-
 .../assets/asset-hub-westend/Cargo.toml       |   4 +
 .../assets/asset-hub-westend/src/lib.rs       | 183 +++++++++++++++++-
 prdoc/pr_5502.prdoc                           |   7 +
 4 files changed, 196 insertions(+), 7 deletions(-)
 create mode 100644 prdoc/pr_5502.prdoc

diff --git a/Cargo.lock b/Cargo.lock
index a42f5baa4765..ce19fb039cb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1022,6 +1022,7 @@ dependencies = [
  "pallet-nfts",
  "pallet-nfts-runtime-api",
  "pallet-proxy",
+ "pallet-revive",
  "pallet-session",
  "pallet-state-trie-migration",
  "pallet-timestamp",
@@ -16835,8 +16836,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.10.5",
+ "heck 0.5.0",
+ "itertools 0.12.1",
  "log",
  "multimap",
  "once_cell",
@@ -16869,7 +16870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
@@ -16882,7 +16883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
  "anyhow",
- "itertools 0.10.5",
+ "itertools 0.12.1",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
index 5fa48381b674..d5eaa43ab834 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml
@@ -44,6 +44,7 @@ pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-uniques = { workspace = true }
+pallet-revive = { workspace = true }
 pallet-utility = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
@@ -129,6 +130,7 @@ runtime-benchmarks = [
 	"pallet-nft-fractionalization/runtime-benchmarks",
 	"pallet-nfts/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
+	"pallet-revive/runtime-benchmarks",
 	"pallet-state-trie-migration/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-transaction-payment/runtime-benchmarks",
@@ -169,6 +171,7 @@ try-runtime = [
 	"pallet-nft-fractionalization/try-runtime",
 	"pallet-nfts/try-runtime",
 	"pallet-proxy/try-runtime",
+	"pallet-revive/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-state-trie-migration/try-runtime",
 	"pallet-timestamp/try-runtime",
@@ -221,6 +224,7 @@ std = [
 	"pallet-nfts-runtime-api/std",
 	"pallet-nfts/std",
 	"pallet-proxy/std",
+	"pallet-revive/std",
 	"pallet-session/std",
 	"pallet-state-trie-migration/std",
 	"pallet-timestamp/std",
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index 63234bfb6e59..9a60de77a584 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -47,7 +47,7 @@ use frame_support::{
 		fungible, fungibles,
 		tokens::{imbalance::ResolveAssetTo, nonfungibles_v2::Inspect},
 		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, InstanceFilter,
-		TransformOrigin,
+		Nothing, TransformOrigin,
 	},
 	weights::{ConstantMultiplier, Weight, WeightToFee as _},
 	BoundedVec, PalletId,
@@ -58,13 +58,14 @@ use frame_system::{
 };
 use pallet_asset_conversion_tx_payment::SwapAssetAdapter;
 use pallet_nfts::{DestroyWitness, PalletFeatures};
+use pallet_revive::evm::runtime::EthExtra;
 use parachains_common::{
 	impls::DealWithFees, message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance,
 	BlockNumber, CollectionId, Hash, Header, ItemId, Nonce, Signature, AVERAGE_ON_INITIALIZE_RATIO,
 	NORMAL_DISPATCH_RATIO,
 };
 use sp_api::impl_runtime_apis;
-use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
+use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H160};
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, Saturating, Verify},
@@ -934,6 +935,52 @@ impl pallet_xcm_bridge_hub_router::Config<ToRococoXcmRouterInstance> for Runtime
 	type FeeAsset = xcm_config::bridging::XcmBridgeHubRouterFeeAssetId;
 }
 
+parameter_types! {
+	pub const DepositPerItem: Balance = deposit(1, 0);
+	pub const DepositPerByte: Balance = deposit(0, 1);
+	pub CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
+}
+
+type EventRecord = frame_system::EventRecord<
+	<Runtime as frame_system::Config>::RuntimeEvent,
+	<Runtime as frame_system::Config>::Hash,
+>;
+
+impl pallet_revive::Config for Runtime {
+	type Time = Timestamp;
+	type Currency = Balances;
+	type RuntimeEvent = RuntimeEvent;
+	type RuntimeCall = RuntimeCall;
+	type CallFilter = Nothing;
+	type DepositPerItem = DepositPerItem;
+	type DepositPerByte = DepositPerByte;
+	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
+	type WeightInfo = pallet_revive::weights::SubstrateWeight<Self>;
+	type ChainExtension = ();
+	type AddressMapper = pallet_revive::DefaultAddressMapper;
+	type RuntimeMemory = ConstU32<{ 128 * 1024 * 1024 }>;
+	type PVFMemory = ConstU32<{ 512 * 1024 * 1024 }>;
+	type UnsafeUnstableInterface = ConstBool<false>;
+	type UploadOrigin = EnsureSigned<Self::AccountId>;
+	type InstantiateOrigin = EnsureSigned<Self::AccountId>;
+	type RuntimeHoldReason = RuntimeHoldReason;
+	type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
+	type Debug = ();
+	type Xcm = pallet_xcm::Pallet<Self>;
+	type ChainId = ConstU64<420_420_421>;
+}
+
+impl TryFrom<RuntimeCall> for pallet_revive::Call<Runtime> {
+	type Error = ();
+
+	fn try_from(value: RuntimeCall) -> Result<Self, Self::Error> {
+		match value {
+			RuntimeCall::Revive(call) => Ok(call),
+			_ => Err(()),
+		}
+	}
+}
+
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
 	pub enum Runtime
@@ -982,6 +1029,7 @@ construct_runtime!(
 		AssetsFreezer: pallet_assets_freezer::<Instance1> = 57,
 		ForeignAssetsFreezer: pallet_assets_freezer::<Instance2> = 58,
 		PoolAssetsFreezer: pallet_assets_freezer::<Instance3> = 59,
+		Revive: pallet_revive = 60,
 
 		StateTrieMigration: pallet_state_trie_migration = 70,
 
@@ -1012,9 +1060,34 @@ pub type TxExtension = (
 	cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim<Runtime>,
 	frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
+
+/// Default extensions applied to Ethereum transactions.
+#[derive(Clone, PartialEq, Eq, Debug)]
+pub struct EthExtraImpl;
+
+impl EthExtra for EthExtraImpl {
+	type Config = Runtime;
+	type Extension = TxExtension;
+
+	fn get_eth_extension(nonce: u32, tip: Balance) -> Self::Extension {
+		(
+			frame_system::CheckNonZeroSender::<Runtime>::new(),
+			frame_system::CheckSpecVersion::<Runtime>::new(),
+			frame_system::CheckTxVersion::<Runtime>::new(),
+			frame_system::CheckGenesis::<Runtime>::new(),
+			frame_system::CheckMortality::from(generic::Era::Immortal),
+			frame_system::CheckNonce::<Runtime>::from(nonce),
+			frame_system::CheckWeight::<Runtime>::new(),
+			pallet_asset_conversion_tx_payment::ChargeAssetTxPayment::<Runtime>::from(tip, None),
+			cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim::<Runtime>::new(),
+			frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(false),
+		)
+	}
+}
+
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
-	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, TxExtension>;
+	pallet_revive::evm::runtime::UncheckedExtrinsic<Address, Signature, EthExtraImpl>;
 
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = (
@@ -1249,6 +1322,7 @@ mod benches {
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		[pallet_xcm_bridge_hub_router, ToRococo]
 		[pallet_asset_conversion_ops, AssetConversionMigration]
+		[pallet_revive, Revive]
 		// XCM
 		[pallet_xcm, PalletXcmExtrinsicsBenchmark::<Runtime>]
 		// NOTE: Make sure you point to the individual modules below.
@@ -1994,6 +2068,109 @@ impl_runtime_apis! {
 			PolkadotXcm::is_trusted_teleporter(asset, location)
 		}
 	}
+
+	impl pallet_revive::ReviveApi<Block, AccountId, Balance, BlockNumber, EventRecord> for Runtime
+	{
+		fn eth_transact(
+			from: H160,
+			dest: Option<H160>,
+			value: Balance,
+			input: Vec<u8>,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+		) -> pallet_revive::EthContractResult<Balance>
+		{
+			use pallet_revive::AddressMapper;
+			let blockweights = <Runtime as frame_system::Config>::BlockWeights::get();
+			let origin = <Runtime as pallet_revive::Config>::AddressMapper::to_account_id(&from);
+
+			let encoded_size = |pallet_call| {
+				let call = RuntimeCall::Revive(pallet_call);
+				let uxt: UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic::new_bare(call).into();
+				uxt.encoded_size() as u32
+			};
+
+			Revive::bare_eth_transact(
+				origin,
+				dest,
+				value,
+				input,
+				gas_limit.unwrap_or(blockweights.max_block),
+				storage_deposit_limit.unwrap_or(u128::MAX),
+				encoded_size,
+				pallet_revive::DebugInfo::UnsafeDebug,
+				pallet_revive::CollectEvents::UnsafeCollect,
+			)
+		}
+
+		fn call(
+			origin: AccountId,
+			dest: H160,
+			value: Balance,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+			input_data: Vec<u8>,
+		) -> pallet_revive::ContractResult<pallet_revive::ExecReturnValue, Balance, EventRecord> {
+			let blockweights= <Runtime as frame_system::Config>::BlockWeights::get();
+			Revive::bare_call(
+				RuntimeOrigin::signed(origin),
+				dest,
+				value,
+				gas_limit.unwrap_or(blockweights.max_block),
+				storage_deposit_limit.unwrap_or(u128::MAX),
+				input_data,
+				pallet_revive::DebugInfo::UnsafeDebug,
+				pallet_revive::CollectEvents::UnsafeCollect,
+			)
+		}
+
+		fn instantiate(
+			origin: AccountId,
+			value: Balance,
+			gas_limit: Option<Weight>,
+			storage_deposit_limit: Option<Balance>,
+			code: pallet_revive::Code,
+			data: Vec<u8>,
+			salt: Option<[u8; 32]>,
+		) -> pallet_revive::ContractResult<pallet_revive::InstantiateReturnValue, Balance, EventRecord>
+		{
+			let blockweights= <Runtime as frame_system::Config>::BlockWeights::get();
+			Revive::bare_instantiate(
+				RuntimeOrigin::signed(origin),
+				value,
+				gas_limit.unwrap_or(blockweights.max_block),
+				storage_deposit_limit.unwrap_or(u128::MAX),
+				code,
+				data,
+				salt,
+				pallet_revive::DebugInfo::UnsafeDebug,
+				pallet_revive::CollectEvents::UnsafeCollect,
+			)
+		}
+
+		fn upload_code(
+			origin: AccountId,
+			code: Vec<u8>,
+			storage_deposit_limit: Option<Balance>,
+		) -> pallet_revive::CodeUploadResult<Balance>
+		{
+			Revive::bare_upload_code(
+				RuntimeOrigin::signed(origin),
+				code,
+				storage_deposit_limit.unwrap_or(u128::MAX),
+			)
+		}
+
+		fn get_storage(
+			address: H160,
+			key: [u8; 32],
+		) -> pallet_revive::GetStorageResult {
+			Revive::get_storage(
+				address,
+				key
+			)
+		}
+	}
 }
 
 cumulus_pallet_parachain_system::register_validate_block! {
diff --git a/prdoc/pr_5502.prdoc b/prdoc/pr_5502.prdoc
new file mode 100644
index 000000000000..ea9972f01870
--- /dev/null
+++ b/prdoc/pr_5502.prdoc
@@ -0,0 +1,7 @@
+title: '[pallet-revive] Add pallet to AH westend'
+doc:
+  - audience: Runtime Dev
+    description: 'Add pallet-revive to Westend runtime, and configure the runtime to accept Ethereum signed transaction'
+crates:
+- name: asset-hub-westend-runtime
+  bump: major

From fc486e55d5f8c97c652c977f8a2295f6cb9c7231 Mon Sep 17 00:00:00 2001
From: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:58:58 +0100
Subject: [PATCH 20/20] Polkadot OmniNode Docs (#6094)

provides low-level documentation on how the omni-node is meant to work.
This is meant to act as reusable material for other teams (e.g.
Papermoon and W3F) to use and integrate into the high level Polkadot
documentation.

Broadly speaking, for omni-node to have great rust-docs, we need to
focus on the following crates, all of which got a bit of love in this
PR:

1. `sp-genesis-builder`
2. `polkadot-omni-node`
3. `polkadot-omni-node-lib`
4. `frame-omni-bencher`

On top of this, we have now:

* `polkadot_sdk_docs::guides` contains two new steps demonstrating the
most basic version of composing your pallet, putting it into a runtime,
and putting that runtime into omni-node
* `polkadot_sdk_docs::reference_docs::omni_node` to explain in more
detail how omni-node differs from the old-school node.
* `polkadot_sdk_docs::reference_docs::frame_weight_benchmarking` to
finally have a minimal reference about weights and benchmarking.
* It provides tests for some of the steps in
https://github.com/paritytech/polkadot-sdk/issues/5568


closes https://github.com/paritytech/polkadot-sdk/issues/5568
closes https://github.com/paritytech/polkadot-sdk/issues/4781

Next steps

- [x] Ensure the README of the parachain template is up-to-date.
@iulianbarbu
- [ ] Readme for `polkadot-omni-node` and similar is updated. For now,
use `cargo-readme` and copy over the rust-docs.

To build the branch locally and run this:
https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/meta_contributing/index.html#how-to-develop-locally

---------

Co-authored-by: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com>
Co-authored-by: Sebastian Kunert <skunert49@gmail.com>
Co-authored-by: Michal Kucharczyk <1728078+michalkucharczyk@users.noreply.github.com>
---
 .gitignore                                    |   1 +
 Cargo.lock                                    |  48 +-
 Cargo.toml                                    |   4 +
 cumulus/polkadot-omni-node/lib/src/cli.rs     |   6 +
 cumulus/polkadot-omni-node/lib/src/lib.rs     |  13 +-
 .../lib/src/nodes/manual_seal.rs              |   6 +-
 cumulus/polkadot-omni-node/src/main.rs        |   7 +-
 docs/mermaid/IA.mmd                           |   1 -
 docs/sdk/Cargo.toml                           |  24 +-
 docs/sdk/assets/theme.css                     |  35 ++
 .../packages/guides/first-pallet/Cargo.toml   |  26 +
 .../packages/guides/first-pallet/src/lib.rs   | 480 ++++++++++++++++++
 .../packages/guides/first-runtime/Cargo.toml  |  60 +++
 .../packages/guides/first-runtime/build.rs    |  27 +
 .../packages/guides/first-runtime/src/lib.rs  | 301 +++++++++++
 .../src/guides/enable_elastic_scaling_mvp.rs  |   9 +-
 docs/sdk/src/guides/mod.rs                    |  39 +-
 docs/sdk/src/guides/your_first_node.rs        | 313 ++++++++++++
 docs/sdk/src/guides/your_first_pallet/mod.rs  |  46 +-
 .../guides/your_first_pallet/with_event.rs    | 101 ----
 docs/sdk/src/guides/your_first_runtime.rs     | 169 +++++-
 docs/sdk/src/lib.rs                           |   3 +-
 docs/sdk/src/meta_contributing.rs             |  10 +-
 docs/sdk/src/polkadot_sdk/mod.rs              |  23 +
 docs/sdk/src/polkadot_sdk/substrate.rs        |  16 -
 .../src/reference_docs/chain_spec_genesis.rs  |   3 +
 .../frame_benchmarking_weight.rs              | 221 +++++++-
 docs/sdk/src/reference_docs/mod.rs            |   4 +-
 docs/sdk/src/reference_docs/omni_node.rs      | 185 +++++++
 docs/sdk/src/reference_docs/umbrella_crate.rs |   1 +
 prdoc/pr_6094.prdoc                           |  21 +
 substrate/bin/node/cli/src/cli.rs             |   1 +
 substrate/frame/Cargo.toml                    |   6 +
 substrate/frame/aura/src/lib.rs               |   4 +-
 substrate/frame/src/lib.rs                    |  10 +
 .../primitives/genesis-builder/src/lib.rs     |  72 ++-
 templates/minimal/runtime/src/lib.rs          |   2 +-
 .../runtime/src/genesis_config_presets.rs     |   2 +
 38 files changed, 2071 insertions(+), 229 deletions(-)
 create mode 100644 docs/sdk/packages/guides/first-pallet/Cargo.toml
 create mode 100644 docs/sdk/packages/guides/first-pallet/src/lib.rs
 create mode 100644 docs/sdk/packages/guides/first-runtime/Cargo.toml
 create mode 100644 docs/sdk/packages/guides/first-runtime/build.rs
 create mode 100644 docs/sdk/packages/guides/first-runtime/src/lib.rs
 delete mode 100644 docs/sdk/src/guides/your_first_pallet/with_event.rs
 create mode 100644 docs/sdk/src/reference_docs/omni_node.rs
 create mode 100644 prdoc/pr_6094.prdoc

diff --git a/.gitignore b/.gitignore
index 28c28cc8ab0e..afa9ed33f4a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ runtime/wasm/target/
 substrate.code-workspace
 target/
 *.scale
+justfile
diff --git a/Cargo.lock b/Cargo.lock
index ce19fb039cb9..602891892a2b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -15633,6 +15633,7 @@ dependencies = [
 name = "polkadot-sdk-docs"
 version = "0.0.1"
 dependencies = [
+ "assert_cmd",
  "chain-spec-guide-runtime",
  "cumulus-client-service",
  "cumulus-pallet-aura-ext",
@@ -15640,6 +15641,7 @@ dependencies = [
  "cumulus-primitives-proof-size-hostfunction",
  "cumulus-primitives-storage-weight-reclaim",
  "docify",
+ "frame-benchmarking",
  "frame-executive",
  "frame-metadata-hash-extension",
  "frame-support",
@@ -15663,6 +15665,7 @@ dependencies = [
  "pallet-example-offchain-worker",
  "pallet-example-single-block-migrations",
  "pallet-examples",
+ "pallet-grandpa",
  "pallet-multisig",
  "pallet-nfts",
  "pallet-preimage",
@@ -15677,8 +15680,12 @@ dependencies = [
  "pallet-xcm",
  "parachain-template-runtime",
  "parity-scale-codec",
+ "polkadot-omni-node-lib",
  "polkadot-sdk",
+ "polkadot-sdk-docs-first-pallet",
+ "polkadot-sdk-docs-first-runtime",
  "polkadot-sdk-frame",
+ "rand",
  "sc-chain-spec",
  "sc-cli",
  "sc-client-db",
@@ -15694,6 +15701,7 @@ dependencies = [
  "sc-rpc-api",
  "sc-service",
  "scale-info",
+ "serde_json",
  "simple-mermaid 0.1.1",
  "solochain-template-runtime",
  "sp-api 26.0.0",
@@ -15708,6 +15716,7 @@ dependencies = [
  "sp-std 14.0.0",
  "sp-tracing 16.0.0",
  "sp-version 29.0.0",
+ "sp-weights 27.0.0",
  "staging-chain-spec-builder",
  "staging-node-cli",
  "staging-parachain-info",
@@ -15720,6 +15729,35 @@ dependencies = [
  "xcm-simulator",
 ]
 
+[[package]]
+name = "polkadot-sdk-docs-first-pallet"
+version = "0.0.0"
+dependencies = [
+ "docify",
+ "parity-scale-codec",
+ "polkadot-sdk-frame",
+ "scale-info",
+]
+
+[[package]]
+name = "polkadot-sdk-docs-first-runtime"
+version = "0.0.0"
+dependencies = [
+ "docify",
+ "pallet-balances",
+ "pallet-sudo",
+ "pallet-timestamp",
+ "pallet-transaction-payment",
+ "pallet-transaction-payment-rpc-runtime-api",
+ "parity-scale-codec",
+ "polkadot-sdk-docs-first-pallet",
+ "polkadot-sdk-frame",
+ "scale-info",
+ "serde_json",
+ "sp-keyring",
+ "substrate-wasm-builder",
+]
+
 [[package]]
 name = "polkadot-sdk-frame"
 version = "0.1.0"
@@ -15742,8 +15780,10 @@ dependencies = [
  "sp-consensus-aura",
  "sp-consensus-grandpa",
  "sp-core 28.0.0",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io 30.0.0",
+ "sp-keyring",
  "sp-offchain",
  "sp-runtime 31.0.1",
  "sp-session",
@@ -16836,8 +16876,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
- "heck 0.5.0",
- "itertools 0.12.1",
+ "heck 0.4.1",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -16870,7 +16910,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
@@ -16883,7 +16923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.82",
diff --git a/Cargo.toml b/Cargo.toml
index 049de32b54cf..6ba91de3c09b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -149,6 +149,8 @@ members = [
 	"cumulus/test/service",
 	"cumulus/xcm/xcm-emulator",
 	"docs/sdk",
+	"docs/sdk/packages/guides/first-pallet",
+	"docs/sdk/packages/guides/first-runtime",
 	"docs/sdk/src/reference_docs/chain_spec_runtime",
 	"polkadot",
 	"polkadot/cli",
@@ -806,6 +808,8 @@ hyper = { version = "1.3.1", default-features = false }
 hyper-rustls = { version = "0.24.2" }
 hyper-util = { version = "0.1.5", default-features = false }
 # TODO: remove hyper v0.14 https://github.com/paritytech/polkadot-sdk/issues/4896
+first-pallet = { package = "polkadot-sdk-docs-first-pallet", path = "docs/sdk/packages/guides/first-pallet", default-features = false }
+first-runtime = { package = "polkadot-sdk-docs-first-runtime", path = "docs/sdk/packages/guides/first-runtime", default-features = false }
 hyperv14 = { package = "hyper", version = "0.14.29", default-features = false }
 impl-serde = { version = "0.5.0", default-features = false }
 impl-trait-for-tuples = { version = "0.2.2" }
diff --git a/cumulus/polkadot-omni-node/lib/src/cli.rs b/cumulus/polkadot-omni-node/lib/src/cli.rs
index 6ca328912bba..dc59c185d909 100644
--- a/cumulus/polkadot-omni-node/lib/src/cli.rs
+++ b/cumulus/polkadot-omni-node/lib/src/cli.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+//! CLI options of the omni-node. See [`Command`].
+
 use crate::{
 	chain_spec::DiskChainSpecLoader,
 	common::{
@@ -103,6 +105,7 @@ pub enum Subcommand {
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
 }
 
+/// CLI Options shipped with `polkadot-omni-node`.
 #[derive(clap::Parser)]
 #[command(
 	propagate_version = true,
@@ -113,9 +116,11 @@ pub struct Cli<Config: CliConfig> {
 	#[arg(skip)]
 	pub(crate) chain_spec_loader: Option<Box<dyn LoadSpec>>,
 
+	/// Possible subcommands. See [`Subcommand`].
 	#[command(subcommand)]
 	pub subcommand: Option<Subcommand>,
 
+	/// The shared parameters with all cumulus-based parachain nodes.
 	#[command(flatten)]
 	pub run: cumulus_client_cli::RunCmd,
 
@@ -200,6 +205,7 @@ impl<Config: CliConfig> SubstrateCli for Cli<Config> {
 	}
 }
 
+/// The relay chain CLI flags. These are passed in after a `--` at the end.
 #[derive(Debug)]
 pub struct RelayChainCli<Config: CliConfig> {
 	/// The actual relay chain cli object.
diff --git a/cumulus/polkadot-omni-node/lib/src/lib.rs b/cumulus/polkadot-omni-node/lib/src/lib.rs
index a293ab225c6f..3f01f4211144 100644
--- a/cumulus/polkadot-omni-node/lib/src/lib.rs
+++ b/cumulus/polkadot-omni-node/lib/src/lib.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
+//! # Polkadot Omni Node Library
+//!
 //! Helper library that can be used to run a parachain node.
 //!
 //! ## Overview
@@ -37,11 +39,18 @@
 //!
 //! ## Examples
 //!
-//! For an example, see the `polkadot-parachain-bin` crate.
+//! For an example, see the [`polkadot-parachain-bin`](https://crates.io/crates/polkadot-parachain-bin) crate.
+//!
+//! ## Binary
+//!
+//! It can be used to start a parachain node from a provided chain spec file.
+//! It is only compatible with runtimes that use block number `u32` and `Aura` consensus.
+//!
+//! Example: `polkadot-omni-node --chain <chain_spec.json>`
 
 #![deny(missing_docs)]
 
-mod cli;
+pub mod cli;
 mod command;
 mod common;
 mod fake_runtime_api;
diff --git a/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs b/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
index d00d7adf27e1..e8043bd7b2aa 100644
--- a/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
+++ b/cumulus/polkadot-omni-node/lib/src/nodes/manual_seal.rs
@@ -28,7 +28,6 @@ use sc_network::NetworkBackend;
 use sc_service::{build_polkadot_syncing_strategy, Configuration, PartialComponents, TaskManager};
 use sc_telemetry::TelemetryHandle;
 use sp_runtime::traits::Header;
-use sp_timestamp::Timestamp;
 use std::{marker::PhantomData, sync::Arc};
 
 pub struct ManualSealNode<NodeSpec>(PhantomData<NodeSpec>);
@@ -182,7 +181,10 @@ impl<NodeSpec: NodeSpecT> ManualSealNode<NodeSpec> {
 						additional_key_values: None,
 					};
 					Ok((
-						sp_timestamp::InherentDataProvider::new(Timestamp::new(0)),
+						// This is intentional, as the runtime that we expect to run against this
+						// will never receive the aura-related inherents/digests, and providing
+						// real timestamps would cause aura <> timestamp checking to fail.
+						sp_timestamp::InherentDataProvider::new(sp_timestamp::Timestamp::new(0)),
 						mocked_parachain,
 					))
 				}
diff --git a/cumulus/polkadot-omni-node/src/main.rs b/cumulus/polkadot-omni-node/src/main.rs
index a86ec6f6fde6..5bca81e2e78b 100644
--- a/cumulus/polkadot-omni-node/src/main.rs
+++ b/cumulus/polkadot-omni-node/src/main.rs
@@ -14,12 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-//! Basic polkadot omni-node.
+//! White labeled polkadot omni-node.
 //!
-//! It can be used to start a parachain node from a provided chain spec file.
-//! It is only compatible with runtimes that use block number `u32` and `Aura` consensus.
-//!
-//! Example: `polkadot-omni-node --chain [chain_spec.json]`
+//! For documentation, see [`polkadot_omni_node_lib`].
 
 #![warn(missing_docs)]
 #![warn(unused_extern_crates)]
diff --git a/docs/mermaid/IA.mmd b/docs/mermaid/IA.mmd
index 0f14e200df9c..dcf9806dcb62 100644
--- a/docs/mermaid/IA.mmd
+++ b/docs/mermaid/IA.mmd
@@ -8,6 +8,5 @@ flowchart
 
     polkadot_sdk --> substrate
     polkadot_sdk --> frame
-    polkadot_sdk --> polkadot[polkadot node]
     polkadot_sdk --> xcm
 	polkadot_sdk --> templates
diff --git a/docs/sdk/Cargo.toml b/docs/sdk/Cargo.toml
index b86ce9868208..0c39367eeed3 100644
--- a/docs/sdk/Cargo.toml
+++ b/docs/sdk/Cargo.toml
@@ -29,6 +29,7 @@ pallet-example-offchain-worker = { workspace = true, default-features = true }
 # How we build docs in rust-docs
 simple-mermaid = "0.1.1"
 docify = { workspace = true }
+serde_json = { workspace = true }
 
 # Polkadot SDK deps, typically all should only be in scope such that we can link to their doc item.
 polkadot-sdk = { features = ["runtime-full"], workspace = true, default-features = true }
@@ -39,6 +40,7 @@ subkey = { workspace = true, default-features = true }
 frame-system = { workspace = true }
 frame-support = { workspace = true }
 frame-executive = { workspace = true }
+frame-benchmarking = { workspace = true }
 pallet-example-authorization-tx-extension = { workspace = true, default-features = true }
 pallet-example-single-block-migrations = { workspace = true, default-features = true }
 frame-metadata-hash-extension = { workspace = true, default-features = true }
@@ -70,6 +72,9 @@ cumulus-primitives-proof-size-hostfunction = { workspace = true, default-feature
 cumulus-client-service = { workspace = true, default-features = true }
 cumulus-primitives-storage-weight-reclaim = { workspace = true, default-features = true }
 
+# Omni Node
+polkadot-omni-node-lib = { workspace = true, default-features = true }
+
 # Pallets and FRAME internals
 pallet-aura = { workspace = true, default-features = true }
 pallet-timestamp = { workspace = true, default-features = true }
@@ -92,6 +97,7 @@ pallet-scheduler = { workspace = true, default-features = true }
 pallet-referenda = { workspace = true, default-features = true }
 pallet-broker = { workspace = true, default-features = true }
 pallet-babe = { workspace = true, default-features = true }
+pallet-grandpa = { workspace = true, default-features = true }
 
 # Primitives
 sp-io = { workspace = true, default-features = true }
@@ -106,6 +112,7 @@ sp-arithmetic = { workspace = true, default-features = true }
 sp-genesis-builder = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-version = { workspace = true, default-features = true }
+sp-weights = { workspace = true, default-features = true }
 
 
 # XCM
@@ -117,9 +124,18 @@ xcm-simulator = { workspace = true }
 pallet-xcm = { workspace = true }
 
 # runtime guides
-chain-spec-guide-runtime = { workspace = true }
+
+chain-spec-guide-runtime = { workspace = true, default-features = true }
 
 # Templates
-minimal-template-runtime = { workspace = true }
-solochain-template-runtime = { workspace = true }
-parachain-template-runtime = { workspace = true }
+minimal-template-runtime = { workspace = true, default-features = true }
+solochain-template-runtime = { workspace = true, default-features = true }
+parachain-template-runtime = { workspace = true, default-features = true }
+
+# local packages
+first-runtime = { workspace = true, default-features = true }
+first-pallet = { workspace = true, default-features = true }
+
+[dev-dependencies]
+assert_cmd = "2.0.14"
+rand = "0.8"
diff --git a/docs/sdk/assets/theme.css b/docs/sdk/assets/theme.css
index 1f47a8ef5b0c..f9aa4760275e 100644
--- a/docs/sdk/assets/theme.css
+++ b/docs/sdk/assets/theme.css
@@ -6,6 +6,27 @@
 	--polkadot-purple: #552BBF;
 }
 
+/* Light theme */
+html[data-theme="light"] {
+    --quote-background: #f9f9f9;
+    --quote-border: #ccc;
+    --quote-text: #333;
+}
+
+/* Dark theme */
+html[data-theme="dark"] {
+    --quote-background: #333;
+    --quote-border: #555;
+    --quote-text: #f9f9f9;
+}
+
+/* Ayu theme */
+html[data-theme="ayu"] {
+    --quote-background: #272822;
+    --quote-border: #383830;
+    --quote-text: #f8f8f2;
+}
+
 body.sdk-docs {
 	nav.sidebar>div.sidebar-crate>a>img {
 		width: 190px;
@@ -20,3 +41,17 @@ body.sdk-docs {
 html[data-theme="light"] .sidebar-crate > .logo-container > img {
   content: url("https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/docs/images/Polkadot_Logo_Horizontal_Pink_Black.png");
 }
+
+/* Custom styles for blockquotes */
+blockquote {
+    background-color: var(--quote-background);
+    border-left: 5px solid var(--quote-border);
+    color: var(--quote-text);
+    margin: 1em 0;
+    padding: 1em 1.5em;
+    /* font-style: italic; */
+}
+
+blockquote p {
+    margin: 0;
+}
diff --git a/docs/sdk/packages/guides/first-pallet/Cargo.toml b/docs/sdk/packages/guides/first-pallet/Cargo.toml
new file mode 100644
index 000000000000..dad5b8863494
--- /dev/null
+++ b/docs/sdk/packages/guides/first-pallet/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "polkadot-sdk-docs-first-pallet"
+description = "A simple pallet created for the polkadot-sdk-docs guides"
+version = "0.0.0"
+license = "MIT-0"
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+publish = false
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { workspace = true }
+scale-info = { workspace = true }
+frame = { workspace = true, features = ["experimental", "runtime"] }
+docify = { workspace = true }
+
+[features]
+default = ["std"]
+std = ["codec/std", "frame/std", "scale-info/std"]
diff --git a/docs/sdk/packages/guides/first-pallet/src/lib.rs b/docs/sdk/packages/guides/first-pallet/src/lib.rs
new file mode 100644
index 000000000000..168b7ca44aba
--- /dev/null
+++ b/docs/sdk/packages/guides/first-pallet/src/lib.rs
@@ -0,0 +1,480 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Pallets used in the `your_first_pallet` guide.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[docify::export]
+#[frame::pallet(dev_mode)]
+pub mod shell_pallet {
+	use frame::prelude::*;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+}
+
+#[frame::pallet(dev_mode)]
+pub mod pallet {
+	use frame::prelude::*;
+
+	#[docify::export]
+	pub type Balance = u128;
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[docify::export]
+	/// Single storage item, of type `Balance`.
+	#[pallet::storage]
+	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
+
+	#[docify::export]
+	/// A mapping from `T::AccountId` to `Balance`
+	#[pallet::storage]
+	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
+
+	#[docify::export(impl_pallet)]
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		/// An unsafe mint that can be called by anyone. Not a great idea.
+		pub fn mint_unsafe(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			// ensure that this is a signed account, but we don't really check `_anyone`.
+			let _anyone = ensure_signed(origin)?;
+
+			// update the balances map. Notice how all `<T: Config>` remains as `<T>`.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			// update total issuance.
+			TotalIssuance::<T>::mutate(|t| *t = Some(t.unwrap_or(0) + amount));
+
+			Ok(())
+		}
+
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			if sender_balance < amount {
+				return Err("InsufficientBalance".into())
+			}
+			let remainder = sender_balance - amount;
+
+			// update sender and dest balances.
+			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			Balances::<T>::insert(&sender, remainder);
+
+			Ok(())
+		}
+	}
+
+	#[allow(unused)]
+	impl<T: Config> Pallet<T> {
+		#[docify::export]
+		pub fn transfer_better(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			ensure!(sender_balance >= amount, "InsufficientBalance");
+			let remainder = sender_balance - amount;
+
+			// .. snip
+			Ok(())
+		}
+
+		#[docify::export]
+		/// Transfer `amount` from `origin` to `dest`.
+		pub fn transfer_better_checked(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
+			let remainder = sender_balance.checked_sub(amount).ok_or("InsufficientBalance")?;
+
+			// .. snip
+			Ok(())
+		}
+	}
+
+	#[cfg(any(test, doc))]
+	pub(crate) mod tests {
+		use crate::pallet::*;
+
+		#[docify::export(testing_prelude)]
+		use frame::testing_prelude::*;
+
+		pub(crate) const ALICE: u64 = 1;
+		pub(crate) const BOB: u64 = 2;
+		pub(crate) const CHARLIE: u64 = 3;
+
+		#[docify::export]
+		// This runtime is only used for testing, so it should be somewhere like `#[cfg(test)] mod
+		// tests { .. }`
+		mod runtime {
+			use super::*;
+			// we need to reference our `mod pallet` as an identifier to pass to
+			// `construct_runtime`.
+			// YOU HAVE TO CHANGE THIS LINE BASED ON YOUR TEMPLATE
+			use crate::pallet as pallet_currency;
+
+			construct_runtime!(
+				pub enum Runtime {
+					// ---^^^^^^ This is where `enum Runtime` is defined.
+					System: frame_system,
+					Currency: pallet_currency,
+				}
+			);
+
+			#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+			impl frame_system::Config for Runtime {
+				type Block = MockBlock<Runtime>;
+				// within pallet we just said `<T as frame_system::Config>::AccountId`, now we
+				// finally specified it.
+				type AccountId = u64;
+			}
+
+			// our simple pallet has nothing to be configured.
+			impl pallet_currency::Config for Runtime {}
+		}
+
+		pub(crate) use runtime::*;
+
+		#[allow(unused)]
+		#[docify::export]
+		fn new_test_state_basic() -> TestState {
+			let mut state = TestState::new_empty();
+			let accounts = vec![(ALICE, 100), (BOB, 100)];
+			state.execute_with(|| {
+				for (who, amount) in &accounts {
+					Balances::<Runtime>::insert(who, amount);
+					TotalIssuance::<Runtime>::mutate(|b| *b = Some(b.unwrap_or(0) + amount));
+				}
+			});
+
+			state
+		}
+
+		#[docify::export]
+		pub(crate) struct StateBuilder {
+			balances: Vec<(<Runtime as frame_system::Config>::AccountId, Balance)>,
+		}
+
+		#[docify::export(default_state_builder)]
+		impl Default for StateBuilder {
+			fn default() -> Self {
+				Self { balances: vec![(ALICE, 100), (BOB, 100)] }
+			}
+		}
+
+		#[docify::export(impl_state_builder_add)]
+		impl StateBuilder {
+			fn add_balance(
+				mut self,
+				who: <Runtime as frame_system::Config>::AccountId,
+				amount: Balance,
+			) -> Self {
+				self.balances.push((who, amount));
+				self
+			}
+		}
+
+		#[docify::export(impl_state_builder_build)]
+		impl StateBuilder {
+			pub(crate) fn build_and_execute(self, test: impl FnOnce() -> ()) {
+				let mut ext = TestState::new_empty();
+				ext.execute_with(|| {
+					for (who, amount) in &self.balances {
+						Balances::<Runtime>::insert(who, amount);
+						TotalIssuance::<Runtime>::mutate(|b| *b = Some(b.unwrap_or(0) + amount));
+					}
+				});
+
+				ext.execute_with(test);
+
+				// assertions that must always hold
+				ext.execute_with(|| {
+					assert_eq!(
+						Balances::<Runtime>::iter().map(|(_, x)| x).sum::<u128>(),
+						TotalIssuance::<Runtime>::get().unwrap_or_default()
+					);
+				})
+			}
+		}
+
+		#[docify::export]
+		#[test]
+		fn first_test() {
+			TestState::new_empty().execute_with(|| {
+				// We expect Alice's account to have no funds.
+				assert_eq!(Balances::<Runtime>::get(&ALICE), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), None);
+
+				// mint some funds into Alice's account.
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(
+					RuntimeOrigin::signed(ALICE),
+					ALICE,
+					100
+				));
+
+				// re-check the above
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(100));
+			})
+		}
+
+		#[docify::export]
+		#[test]
+		fn state_builder_works() {
+			StateBuilder::default().build_and_execute(|| {
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&CHARLIE), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn state_builder_add_balance() {
+			StateBuilder::default().add_balance(CHARLIE, 42).build_and_execute(|| {
+				assert_eq!(Balances::<Runtime>::get(&CHARLIE), Some(42));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(242));
+			})
+		}
+
+		#[test]
+		#[should_panic]
+		fn state_builder_duplicate_genesis_fails() {
+			StateBuilder::default()
+				.add_balance(CHARLIE, 42)
+				.add_balance(CHARLIE, 43)
+				.build_and_execute(|| {
+					assert_eq!(Balances::<Runtime>::get(&CHARLIE), None);
+					assert_eq!(TotalIssuance::<Runtime>::get(), Some(242));
+				})
+		}
+
+		#[docify::export]
+		#[test]
+		fn mint_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the initial state, when:
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(RuntimeOrigin::signed(ALICE), BOB, 100));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(200));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(300));
+
+				// given:
+				assert_ok!(Pallet::<Runtime>::mint_unsafe(
+					RuntimeOrigin::signed(ALICE),
+					CHARLIE,
+					100
+				));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&CHARLIE), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(400));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn transfer_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the initial state, when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(ALICE), BOB, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(50));
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(150));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+
+				// when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(BOB), ALICE, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(100));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+
+		#[docify::export]
+		#[test]
+		fn transfer_from_non_existent_fails() {
+			StateBuilder::default().build_and_execute(|| {
+				// given the initial state, when:
+				assert_err!(
+					Pallet::<Runtime>::transfer(RuntimeOrigin::signed(CHARLIE), ALICE, 10),
+					"NonExistentAccount"
+				);
+
+				// then nothing has changed.
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(100));
+				assert_eq!(Balances::<Runtime>::get(&CHARLIE), None);
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+			});
+		}
+	}
+}
+
+#[frame::pallet(dev_mode)]
+pub mod pallet_v2 {
+	use super::pallet::Balance;
+	use frame::prelude::*;
+
+	#[docify::export(config_v2)]
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		/// The overarching event type of the runtime.
+		type RuntimeEvent: From<Event<Self>>
+			+ IsType<<Self as frame_system::Config>::RuntimeEvent>
+			+ TryInto<Event<Self>>;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::storage]
+	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
+
+	#[pallet::storage]
+	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
+
+	#[docify::export]
+	#[pallet::error]
+	pub enum Error<T> {
+		/// Account does not exist.
+		NonExistentAccount,
+		/// Account does not have enough balance.
+		InsufficientBalance,
+	}
+
+	#[docify::export]
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config> {
+		/// A transfer succeeded.
+		Transferred { from: T::AccountId, to: T::AccountId, amount: Balance },
+	}
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[docify::export(transfer_v2)]
+		pub fn transfer(
+			origin: T::RuntimeOrigin,
+			dest: T::AccountId,
+			amount: Balance,
+		) -> DispatchResult {
+			let sender = ensure_signed(origin)?;
+
+			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
+			let sender_balance =
+				Balances::<T>::get(&sender).ok_or(Error::<T>::NonExistentAccount)?;
+			let remainder =
+				sender_balance.checked_sub(amount).ok_or(Error::<T>::InsufficientBalance)?;
+
+			Balances::<T>::mutate(&dest, |b| *b = Some(b.unwrap_or(0) + amount));
+			Balances::<T>::insert(&sender, remainder);
+
+			Self::deposit_event(Event::<T>::Transferred { from: sender, to: dest, amount });
+
+			Ok(())
+		}
+	}
+
+	#[cfg(any(test, doc))]
+	pub mod tests {
+		use super::{super::pallet::tests::StateBuilder, *};
+		use frame::testing_prelude::*;
+		const ALICE: u64 = 1;
+		const BOB: u64 = 2;
+
+		#[docify::export]
+		pub mod runtime_v2 {
+			use super::*;
+			use crate::pallet_v2 as pallet_currency;
+
+			construct_runtime!(
+				pub enum Runtime {
+					System: frame_system,
+					Currency: pallet_currency,
+				}
+			);
+
+			#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
+			impl frame_system::Config for Runtime {
+				type Block = MockBlock<Runtime>;
+				type AccountId = u64;
+			}
+
+			impl pallet_currency::Config for Runtime {
+				type RuntimeEvent = RuntimeEvent;
+			}
+		}
+
+		pub(crate) use runtime_v2::*;
+
+		#[docify::export(transfer_works_v2)]
+		#[test]
+		fn transfer_works() {
+			StateBuilder::default().build_and_execute(|| {
+				// skip the genesis block, as events are not deposited there and we need them for
+				// the final assertion.
+				System::set_block_number(ALICE);
+
+				// given the initial state, when:
+				assert_ok!(Pallet::<Runtime>::transfer(RuntimeOrigin::signed(ALICE), BOB, 50));
+
+				// then:
+				assert_eq!(Balances::<Runtime>::get(&ALICE), Some(50));
+				assert_eq!(Balances::<Runtime>::get(&BOB), Some(150));
+				assert_eq!(TotalIssuance::<Runtime>::get(), Some(200));
+
+				// now we can also check that an event has been deposited:
+				assert_eq!(
+					System::read_events_for_pallet::<Event<Runtime>>(),
+					vec![Event::Transferred { from: ALICE, to: BOB, amount: 50 }]
+				);
+			});
+		}
+	}
+}
diff --git a/docs/sdk/packages/guides/first-runtime/Cargo.toml b/docs/sdk/packages/guides/first-runtime/Cargo.toml
new file mode 100644
index 000000000000..303d5c5e7f5f
--- /dev/null
+++ b/docs/sdk/packages/guides/first-runtime/Cargo.toml
@@ -0,0 +1,60 @@
+[package]
+name = "polkadot-sdk-docs-first-runtime"
+description = "A simple runtime created for the polkadot-sdk-docs guides"
+version = "0.0.0"
+license = "MIT-0"
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+edition.workspace = true
+publish = false
+
+[lints]
+workspace = true
+
+[dependencies]
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde_json = { workspace = true }
+
+# this is a frame-based runtime, thus importing `frame` with runtime feature enabled.
+frame = { workspace = true, features = ["experimental", "runtime"] }
+
+# pallets that we want to use
+pallet-balances = { workspace = true }
+pallet-sudo = { workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-transaction-payment = { workspace = true }
+pallet-transaction-payment-rpc-runtime-api = { workspace = true }
+
+# other polkadot-sdk-deps
+sp-keyring = { workspace = true }
+
+# local pallet templates
+first-pallet = { workspace = true }
+
+docify = { workspace = true }
+
+[build-dependencies]
+substrate-wasm-builder = { workspace = true, optional = true }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"scale-info/std",
+	"serde_json/std",
+
+	"frame/std",
+
+	"pallet-balances/std",
+	"pallet-sudo/std",
+	"pallet-timestamp/std",
+	"pallet-transaction-payment-rpc-runtime-api/std",
+	"pallet-transaction-payment/std",
+
+	"first-pallet/std",
+	"sp-keyring/std",
+
+	"substrate-wasm-builder",
+]
diff --git a/docs/sdk/packages/guides/first-runtime/build.rs b/docs/sdk/packages/guides/first-runtime/build.rs
new file mode 100644
index 000000000000..b7676a70dfe8
--- /dev/null
+++ b/docs/sdk/packages/guides/first-runtime/build.rs
@@ -0,0 +1,27 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+fn main() {
+	#[cfg(feature = "std")]
+	{
+		substrate_wasm_builder::WasmBuilder::new()
+			.with_current_project()
+			.export_heap_base()
+			.import_memory()
+			.build();
+	}
+}
diff --git a/docs/sdk/packages/guides/first-runtime/src/lib.rs b/docs/sdk/packages/guides/first-runtime/src/lib.rs
new file mode 100644
index 000000000000..92d51962b6fe
--- /dev/null
+++ b/docs/sdk/packages/guides/first-runtime/src/lib.rs
@@ -0,0 +1,301 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Runtime used in `your_first_runtime`.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+extern crate alloc;
+use alloc::{vec, vec::Vec};
+use first_pallet::pallet_v2 as our_first_pallet;
+use frame::{
+	prelude::*,
+	runtime::{apis, prelude::*},
+};
+use pallet_transaction_payment_rpc_runtime_api::{FeeDetails, RuntimeDispatchInfo};
+
+#[docify::export]
+#[runtime_version]
+pub const VERSION: RuntimeVersion = RuntimeVersion {
+	spec_name: create_runtime_str!("first-runtime"),
+	impl_name: create_runtime_str!("first-runtime"),
+	authoring_version: 1,
+	spec_version: 0,
+	impl_version: 1,
+	apis: RUNTIME_API_VERSIONS,
+	transaction_version: 1,
+	system_version: 1,
+};
+
+#[docify::export(cr)]
+construct_runtime!(
+	pub struct Runtime {
+		// Mandatory for all runtimes
+		System: frame_system,
+
+		// A number of other pallets from FRAME.
+		Timestamp: pallet_timestamp,
+		Balances: pallet_balances,
+		Sudo: pallet_sudo,
+		TransactionPayment: pallet_transaction_payment,
+
+		// Our local pallet
+		FirstPallet: our_first_pallet,
+	}
+);
+
+#[docify::export_content]
+mod runtime_types {
+	use super::*;
+	pub(super) type SignedExtra = (
+		// `frame` already provides all the signed extensions from `frame-system`. We just add the
+		// one related to tx-payment here.
+		frame::runtime::types_common::SystemTransactionExtensionsOf<Runtime>,
+		pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
+	);
+
+	pub(super) type Block = frame::runtime::types_common::BlockOf<Runtime, SignedExtra>;
+	pub(super) type Header = HeaderFor<Runtime>;
+
+	pub(super) type RuntimeExecutive = Executive<
+		Runtime,
+		Block,
+		frame_system::ChainContext<Runtime>,
+		Runtime,
+		AllPalletsWithSystem,
+	>;
+}
+use runtime_types::*;
+
+#[docify::export_content]
+mod config_impls {
+	use super::*;
+
+	parameter_types! {
+		pub const Version: RuntimeVersion = VERSION;
+	}
+
+	#[derive_impl(frame_system::config_preludes::SolochainDefaultConfig)]
+	impl frame_system::Config for Runtime {
+		type Block = Block;
+		type Version = Version;
+		type AccountData =
+			pallet_balances::AccountData<<Runtime as pallet_balances::Config>::Balance>;
+	}
+
+	#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
+	impl pallet_balances::Config for Runtime {
+		type AccountStore = System;
+	}
+
+	#[derive_impl(pallet_sudo::config_preludes::TestDefaultConfig)]
+	impl pallet_sudo::Config for Runtime {}
+
+	#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig)]
+	impl pallet_timestamp::Config for Runtime {}
+
+	#[derive_impl(pallet_transaction_payment::config_preludes::TestDefaultConfig)]
+	impl pallet_transaction_payment::Config for Runtime {
+		type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter<Balances, ()>;
+		// We specify a fixed length to fee here, which essentially means all transactions charge
+		// exactly 1 unit of fee.
+		type LengthToFee = FixedFee<1, <Self as pallet_balances::Config>::Balance>;
+		type WeightToFee = NoFee<<Self as pallet_balances::Config>::Balance>;
+	}
+}
+
+#[docify::export(our_config_impl)]
+impl our_first_pallet::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+}
+
+/// Provides getters for genesis configuration presets.
+pub mod genesis_config_presets {
+	use super::*;
+	use crate::{
+		interface::{Balance, MinimumBalance},
+		BalancesConfig, RuntimeGenesisConfig, SudoConfig,
+	};
+	use serde_json::Value;
+
+	/// Returns a development genesis config preset.
+	#[docify::export]
+	pub fn development_config_genesis() -> Value {
+		let endowment = <MinimumBalance as Get<Balance>>::get().max(1) * 1000;
+		let config = RuntimeGenesisConfig {
+			balances: BalancesConfig {
+				balances: AccountKeyring::iter()
+					.map(|a| (a.to_account_id(), endowment))
+					.collect::<Vec<_>>(),
+			},
+			sudo: SudoConfig { key: Some(AccountKeyring::Alice.to_account_id()) },
+			..Default::default()
+		};
+
+		serde_json::to_value(config).expect("Could not build genesis config.")
+	}
+
+	/// Get the set of the available genesis config presets.
+	#[docify::export]
+	pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
+		let patch = match id.try_into() {
+			Ok(DEV_RUNTIME_PRESET) => development_config_genesis(),
+			_ => return None,
+		};
+		Some(
+			serde_json::to_string(&patch)
+				.expect("serialization to json is expected to work. qed.")
+				.into_bytes(),
+		)
+	}
+
+	/// List of supported presets.
+	#[docify::export]
+	pub fn preset_names() -> Vec<PresetId> {
+		vec![PresetId::from(DEV_RUNTIME_PRESET)]
+	}
+}
+
+impl_runtime_apis! {
+	impl apis::Core<Block> for Runtime {
+		fn version() -> RuntimeVersion {
+			VERSION
+		}
+
+		fn execute_block(block: Block) {
+			RuntimeExecutive::execute_block(block)
+		}
+
+		fn initialize_block(header: &Header) -> ExtrinsicInclusionMode {
+			RuntimeExecutive::initialize_block(header)
+		}
+	}
+
+	impl apis::Metadata<Block> for Runtime {
+		fn metadata() -> OpaqueMetadata {
+			OpaqueMetadata::new(Runtime::metadata().into())
+		}
+
+		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
+			Runtime::metadata_at_version(version)
+		}
+
+		fn metadata_versions() -> Vec<u32> {
+			Runtime::metadata_versions()
+		}
+	}
+
+	impl apis::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(extrinsic: ExtrinsicFor<Runtime>) -> ApplyExtrinsicResult {
+			RuntimeExecutive::apply_extrinsic(extrinsic)
+		}
+
+		fn finalize_block() -> HeaderFor<Runtime> {
+			RuntimeExecutive::finalize_block()
+		}
+
+		fn inherent_extrinsics(data: InherentData) -> Vec<ExtrinsicFor<Runtime>> {
+			data.create_extrinsics()
+		}
+
+		fn check_inherents(
+			block: Block,
+			data: InherentData,
+		) -> CheckInherentsResult {
+			data.check_extrinsics(&block)
+		}
+	}
+
+	impl apis::TaggedTransactionQueue<Block> for Runtime {
+		fn validate_transaction(
+			source: TransactionSource,
+			tx: ExtrinsicFor<Runtime>,
+			block_hash: <Runtime as frame_system::Config>::Hash,
+		) -> TransactionValidity {
+			RuntimeExecutive::validate_transaction(source, tx, block_hash)
+		}
+	}
+
+	impl apis::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(header: &HeaderFor<Runtime>) {
+			RuntimeExecutive::offchain_worker(header)
+		}
+	}
+
+	impl apis::SessionKeys<Block> for Runtime {
+		fn generate_session_keys(_seed: Option<Vec<u8>>) -> Vec<u8> {
+			Default::default()
+		}
+
+		fn decode_session_keys(
+			_encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, apis::KeyTypeId)>> {
+			Default::default()
+		}
+	}
+
+	impl apis::AccountNonceApi<Block, interface::AccountId, interface::Nonce> for Runtime {
+		fn account_nonce(account: interface::AccountId) -> interface::Nonce {
+			System::account_nonce(account)
+		}
+	}
+
+	impl apis::GenesisBuilder<Block> for Runtime {
+		fn build_state(config: Vec<u8>) -> GenesisBuilderResult {
+			build_state::<RuntimeGenesisConfig>(config)
+		}
+
+		fn get_preset(id: &Option<PresetId>) -> Option<Vec<u8>> {
+			get_preset::<RuntimeGenesisConfig>(id, self::genesis_config_presets::get_preset)
+		}
+
+		fn preset_names() -> Vec<PresetId> {
+			crate::genesis_config_presets::preset_names()
+		}
+	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
+		Block,
+		interface::Balance,
+	> for Runtime {
+		fn query_info(uxt: ExtrinsicFor<Runtime>, len: u32) -> RuntimeDispatchInfo<interface::Balance> {
+			TransactionPayment::query_info(uxt, len)
+		}
+		fn query_fee_details(uxt: ExtrinsicFor<Runtime>, len: u32) -> FeeDetails<interface::Balance> {
+			TransactionPayment::query_fee_details(uxt, len)
+		}
+		fn query_weight_to_fee(weight: Weight) -> interface::Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> interface::Balance {
+			TransactionPayment::length_to_fee(length)
+		}
+	}
+}
+
+/// Just a handy re-definition of some types based on what is already provided to the pallet
+/// configs.
+pub mod interface {
+	use super::Runtime;
+	use frame::prelude::frame_system;
+
+	pub type AccountId = <Runtime as frame_system::Config>::AccountId;
+	pub type Nonce = <Runtime as frame_system::Config>::Nonce;
+	pub type Hash = <Runtime as frame_system::Config>::Hash;
+	pub type Balance = <Runtime as pallet_balances::Config>::Balance;
+	pub type MinimumBalance = <Runtime as pallet_balances::Config>::ExistentialDeposit;
+}
diff --git a/docs/sdk/src/guides/enable_elastic_scaling_mvp.rs b/docs/sdk/src/guides/enable_elastic_scaling_mvp.rs
index 812e674d163b..2339088abed4 100644
--- a/docs/sdk/src/guides/enable_elastic_scaling_mvp.rs
+++ b/docs/sdk/src/guides/enable_elastic_scaling_mvp.rs
@@ -70,10 +70,11 @@
 //! - Ensure enough coretime is assigned to the parachain. For maximum throughput the upper bound is
 //!   3 cores.
 //!
-//! <div class="warning">Phase 1 is not needed if using the <code>polkadot-parachain</code> binary
-//! built from the latest polkadot-sdk release! Simply pass the
-//! <code>--experimental-use-slot-based</code> parameter to the command line and jump to Phase
-//! 2.</div>
+//! <div class="warning">Phase 1 is NOT needed if using the <code>polkadot-parachain</code> or
+//! <code>polkadot-omni-node</code> binary, or <code>polkadot-omni-node-lib</code> built from the
+//! latest polkadot-sdk release! Simply pass the <code>--experimental-use-slot-based</code>
+//! ([`polkadot_omni_node_lib::cli::Cli::experimental_use_slot_based`]) parameter to the command
+//! line and jump to Phase 2.</div>
 //!
 //! The following steps assume using the cumulus parachain template.
 //!
diff --git a/docs/sdk/src/guides/mod.rs b/docs/sdk/src/guides/mod.rs
index a7fd146ccdf3..747128a728d0 100644
--- a/docs/sdk/src/guides/mod.rs
+++ b/docs/sdk/src/guides/mod.rs
@@ -1,14 +1,22 @@
 //! # Polkadot SDK Docs Guides
 //!
-//! This crate contains a collection of guides that are foundational to the developers of Polkadot
-//! SDK. They are common user-journeys that are traversed in the Polkadot ecosystem.
+//! This crate contains a collection of guides that are foundational to the developers of
+//! Polkadot SDK. They are common user-journeys that are traversed in the Polkadot ecosystem.
 //!
-//! 1. [`crate::guides::your_first_pallet`] is your starting point with Polkadot SDK. It contains
-//!    the basics of
-//! building a simple crypto currency with FRAME.
-//! 2. [`crate::guides::your_first_runtime`] is the next step in your journey. It contains the
-//!    basics of building a runtime that contains this pallet, plus a few common pallets from FRAME.
+//! The main user-journey covered by these guides is:
 //!
+//! * [`your_first_pallet`], where you learn what a FRAME pallet is, and write your first
+//!   application logic.
+//! * [`your_first_runtime`], where you learn how to compile your pallets into a WASM runtime.
+//! * [`your_first_node`], where you learn how to run the said runtime in a node.
+//!
+//! > By this step, you have already launched a full Polkadot-SDK-based blockchain!
+//!
+//! Once done, feel free to step up into one of our templates: [`crate::polkadot_sdk::templates`].
+//!
+//! [`your_first_pallet`]: crate::guides::your_first_pallet
+//! [`your_first_runtime`]: crate::guides::your_first_runtime
+//! [`your_first_node`]: crate::guides::your_first_node
 //!
 //! Other guides are related to other miscellaneous topics and are listed as modules below.
 
@@ -19,19 +27,12 @@ pub mod your_first_pallet;
 /// compiling it to [WASM](crate::polkadot_sdk::substrate#wasm-build).
 pub mod your_first_runtime;
 
-// /// Running the given runtime with a node. No specific consensus mechanism is used at this stage.
-// TODO
-// pub mod your_first_node;
-
-// /// How to enhance a given runtime and node to be cumulus-enabled, run it as a parachain
-// /// and connect it to a relay-chain.
-// TODO
-// pub mod cumulus_enabled_parachain;
+/// Running the given runtime with a node. No specific consensus mechanism is used at this stage.
+pub mod your_first_node;
 
-// /// How to make a given runtime XCM-enabled, capable of sending messages (`Transact`) between
-// /// itself and the relay chain to which it is connected.
-// TODO
-// pub mod xcm_enabled_parachain;
+/// How to enhance a given runtime and node to be cumulus-enabled, run it as a parachain
+/// and connect it to a relay-chain.
+// pub mod your_first_parachain;
 
 /// How to enable storage weight reclaiming in a parachain node and runtime.
 pub mod enable_pov_reclaim;
diff --git a/docs/sdk/src/guides/your_first_node.rs b/docs/sdk/src/guides/your_first_node.rs
index d12349c99063..da37c11c206f 100644
--- a/docs/sdk/src/guides/your_first_node.rs
+++ b/docs/sdk/src/guides/your_first_node.rs
@@ -1 +1,314 @@
 //! # Your first Node
+//!
+//! In this guide, you will learn how to run a runtime, such as the one created in
+//! [`your_first_runtime`], in a node. Within the context of this guide, we will focus on running
+//! the runtime with an [`omni-node`]. Please first read this page to learn about the OmniNode, and
+//! other options when it comes to running a node.
+//!
+//! [`your_first_runtime`] is a runtime with no consensus related code, and therefore can only be
+//! executed with a node that also expects no consensus ([`sc_consensus_manual_seal`]).
+//! `polkadot-omni-node`'s [`--dev-block-time`] precisely does this.
+//!
+//! > All of the following steps are coded as unit tests of this module. Please see `Source` of the
+//! > page for more information.
+//!
+//! ## Running The Omni Node
+//!
+//! ### Installs
+//!
+//! The `polkadot-omni-node` can either be downloaded from the latest [Release](https://github.com/paritytech/polkadot-sdk/releases/) of `polkadot-sdk`,
+//! or installed using `cargo`:
+//!
+//! ```text
+//! cargo install polkadot-omni-node
+//! ```
+//!
+//! Next, we need to install the [`chain-spec-builder`]. This is the tool that allows us to build
+//! chain-specifications, through interacting with the genesis related APIs of the runtime, as
+//! described in [`crate::guides::your_first_runtime#genesis-configuration`].
+//!
+//! ```text
+//! cargo install staging-chain-spec-builder
+//! ```
+//!
+//! > The name of the crate is prefixed with `staging` as the crate name `chain-spec-builder` on
+//! > crates.io is already taken and is not controlled by `polkadot-sdk` developers.
+//!
+//! ### Building Runtime
+//!
+//! Next, we need to build the corresponding runtime that we wish to interact with.
+//!
+//! ```text
+//! cargo build --release -p path-to-runtime
+//! ```
+//! Equivalent code in tests:
+#![doc = docify::embed!("./src/guides/your_first_node.rs", build_runtime)]
+//!
+//! This creates the wasm file under `./target/{release}/wbuild/release` directory.
+//!
+//! ### Building Chain Spec
+//!
+//! Next, we can generate the corresponding chain-spec file. For this example, we will use the
+//! `development` (`sp_genesis_config::DEVELOPMENT`) preset.
+//!
+//! Note that we intend to run this chain-spec with `polkadot-omni-node`, which is tailored for
+//! running parachains. This requires the chain-spec to always contain the `para_id` and a
+//! `relay_chain` fields, which are provided below as CLI arguments.
+//!
+//! ```text
+//! chain-spec-builder \
+//! 	-c <path-to-output> \
+//! 	create \
+//! 	--para-id 42 \
+//! 	--relay-chain dontcare \
+//! 	--runtime polkadot_sdk_docs_first_runtime.wasm \
+//! 	named-preset development
+//! ```
+//!
+//! Equivalent code in tests:
+#![doc = docify::embed!("./src/guides/your_first_node.rs", csb)]
+//!
+//!
+//! ### Running `polkadot-omni-node`
+//!
+//! Finally, we can run the node with the generated chain-spec file. We can also specify the block
+//! time using the `--dev-block-time` flag.
+//!
+//! ```text
+//! polkadot-omni-node \
+//! 	--tmp \
+//! 	--dev-block-time 1000 \
+//! 	--chain <chain_spec_file>.json
+//! ```
+//!
+//! > Note that we always prefer to use `--tmp` for testing, as it will save the chain state to a
+//! > temporary folder, allowing the chain-to be easily restarted without `purge-chain`. See
+//! > [`sc_cli::commands::PurgeChainCmd`] and [`sc_cli::commands::RunCmd::tmp`] for more info.
+//!
+//! This will start the node and import the blocks. Note while using `--dev-block-time`, the node
+//! will use the testing-specific manual-seal consensus. This is an efficient way to test the
+//! application logic of your runtime, without needing to yet care about consensus, block
+//! production, relay-chain and so on.
+//!
+//! ### Next Steps
+//!
+//! * See the rest of the steps in [`crate::reference_docs::omni_node#user-journey`].
+//!
+//! [`runtime`]: crate::reference_docs::glossary#runtime
+//! [`node`]: crate::reference_docs::glossary#node
+//! [`build_config`]: first_runtime::Runtime#method.build_config
+//! [`omni-node`]: crate::reference_docs::omni_node
+//! [`--dev-block-time`]: (polkadot_omni_node_lib::cli::Cli::dev_block_time)
+
+#[cfg(test)]
+mod tests {
+	use assert_cmd::Command;
+	use rand::Rng;
+	use sc_chain_spec::{DEV_RUNTIME_PRESET, LOCAL_TESTNET_RUNTIME_PRESET};
+	use sp_genesis_builder::PresetId;
+	use std::path::PathBuf;
+
+	const PARA_RUNTIME: &'static str = "parachain-template-runtime";
+	const FIRST_RUNTIME: &'static str = "polkadot-sdk-docs-first-runtime";
+	const MINIMAL_RUNTIME: &'static str = "minimal-template-runtime";
+
+	const CHAIN_SPEC_BUILDER: &'static str = "chain-spec-builder";
+	const OMNI_NODE: &'static str = "polkadot-omni-node";
+
+	fn cargo() -> Command {
+		Command::new(std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_string()))
+	}
+
+	fn get_target_directory() -> Option<PathBuf> {
+		let output = cargo().arg("metadata").arg("--format-version=1").output().ok()?;
+
+		if !output.status.success() {
+			return None;
+		}
+
+		let metadata: serde_json::Value = serde_json::from_slice(&output.stdout).ok()?;
+		let target_directory = metadata["target_directory"].as_str()?;
+
+		Some(PathBuf::from(target_directory))
+	}
+
+	fn find_release_binary(name: &str) -> Option<PathBuf> {
+		let target_dir = get_target_directory()?;
+		let release_path = target_dir.join("release").join(name);
+
+		if release_path.exists() {
+			Some(release_path)
+		} else {
+			None
+		}
+	}
+
+	fn find_wasm(runtime_name: &str) -> Option<PathBuf> {
+		let target_dir = get_target_directory()?;
+		let wasm_path = target_dir
+			.join("release")
+			.join("wbuild")
+			.join(runtime_name)
+			.join(format!("{}.wasm", runtime_name.replace('-', "_")));
+
+		if wasm_path.exists() {
+			Some(wasm_path)
+		} else {
+			None
+		}
+	}
+
+	fn maybe_build_runtimes() {
+		if find_wasm(&PARA_RUNTIME).is_none() {
+			println!("Building parachain-template-runtime...");
+			Command::new("cargo")
+				.arg("build")
+				.arg("--release")
+				.arg("-p")
+				.arg(PARA_RUNTIME)
+				.assert()
+				.success();
+		}
+		if find_wasm(&FIRST_RUNTIME).is_none() {
+			println!("Building polkadot-sdk-docs-first-runtime...");
+			#[docify::export_content]
+			fn build_runtime() {
+				Command::new("cargo")
+					.arg("build")
+					.arg("--release")
+					.arg("-p")
+					.arg(FIRST_RUNTIME)
+					.assert()
+					.success();
+			}
+			build_runtime()
+		}
+
+		assert!(find_wasm(PARA_RUNTIME).is_some());
+		assert!(find_wasm(FIRST_RUNTIME).is_some());
+	}
+
+	fn maybe_build_chain_spec_builder() {
+		if find_release_binary(CHAIN_SPEC_BUILDER).is_none() {
+			println!("Building chain-spec-builder...");
+			Command::new("cargo")
+				.arg("build")
+				.arg("--release")
+				.arg("-p")
+				.arg("staging-chain-spec-builder")
+				.assert()
+				.success();
+		}
+		assert!(find_release_binary(CHAIN_SPEC_BUILDER).is_some());
+	}
+
+	fn maybe_build_omni_node() {
+		if find_release_binary(OMNI_NODE).is_none() {
+			println!("Building polkadot-omni-node...");
+			Command::new("cargo")
+				.arg("build")
+				.arg("--release")
+				.arg("-p")
+				.arg("polkadot-omni-node")
+				.assert()
+				.success();
+		}
+	}
+
+	fn test_runtime_preset(runtime: &'static str, block_time: u64, maybe_preset: Option<PresetId>) {
+		sp_tracing::try_init_simple();
+		maybe_build_runtimes();
+		maybe_build_chain_spec_builder();
+		maybe_build_omni_node();
+
+		let chain_spec_builder =
+			find_release_binary(&CHAIN_SPEC_BUILDER).expect("we built it above; qed");
+		let omni_node = find_release_binary(OMNI_NODE).expect("we built it above; qed");
+		let runtime_path = find_wasm(runtime).expect("we built it above; qed");
+
+		let random_seed: u32 = rand::thread_rng().gen();
+		let chain_spec_file = std::env::current_dir()
+			.unwrap()
+			.join(format!("{}_{}_{}.json", runtime, block_time, random_seed));
+
+		Command::new(chain_spec_builder)
+			.args(["-c", chain_spec_file.to_str().unwrap()])
+			.arg("create")
+			.args(["--para-id", "1000", "--relay-chain", "dontcare"])
+			.args(["-r", runtime_path.to_str().unwrap()])
+			.args(match maybe_preset {
+				Some(preset) => vec!["named-preset".to_string(), preset.to_string()],
+				None => vec!["default".to_string()],
+			})
+			.assert()
+			.success();
+
+		let output = Command::new(omni_node)
+			.arg("--tmp")
+			.args(["--chain", chain_spec_file.to_str().unwrap()])
+			.args(["--dev-block-time", block_time.to_string().as_str()])
+			.timeout(std::time::Duration::from_secs(10))
+			.output()
+			.unwrap();
+
+		std::fs::remove_file(chain_spec_file).unwrap();
+
+		// uncomment for debugging.
+		// println!("output: {:?}", output);
+
+		let expected_blocks = (10_000 / block_time).saturating_div(2);
+		assert!(expected_blocks > 0, "test configuration is bad, should give it more time");
+		assert!(String::from_utf8(output.stderr)
+			.unwrap()
+			.contains(format!("Imported #{}", expected_blocks).to_string().as_str()));
+	}
+
+	#[test]
+	fn works_with_different_block_times() {
+		test_runtime_preset(PARA_RUNTIME, 100, Some(DEV_RUNTIME_PRESET.into()));
+		test_runtime_preset(PARA_RUNTIME, 3000, Some(DEV_RUNTIME_PRESET.into()));
+
+		// we need this snippet just for docs
+		#[docify::export_content(csb)]
+		fn build_para_chain_spec_works() {
+			let chain_spec_builder = find_release_binary(&CHAIN_SPEC_BUILDER).unwrap();
+			let runtime_path = find_wasm(PARA_RUNTIME).unwrap();
+			let output = "/tmp/demo-chain-spec.json";
+			Command::new(chain_spec_builder)
+				.args(["-c", output])
+				.arg("create")
+				.args(["--para-id", "1000", "--relay-chain", "dontcare"])
+				.args(["-r", runtime_path.to_str().unwrap()])
+				.args(["named-preset", "development"])
+				.assert()
+				.success();
+			std::fs::remove_file(output).unwrap();
+		}
+		build_para_chain_spec_works();
+	}
+
+	#[test]
+	fn parachain_runtime_works() {
+		// TODO: None doesn't work. But maybe it should? it would be misleading as many users might
+		// use it.
+		[Some(DEV_RUNTIME_PRESET.into()), Some(LOCAL_TESTNET_RUNTIME_PRESET.into())]
+			.into_iter()
+			.for_each(|preset| {
+				test_runtime_preset(PARA_RUNTIME, 1000, preset);
+			});
+	}
+
+	#[test]
+	fn minimal_runtime_works() {
+		[None, Some(DEV_RUNTIME_PRESET.into())].into_iter().for_each(|preset| {
+			test_runtime_preset(MINIMAL_RUNTIME, 1000, preset);
+		});
+	}
+
+	#[test]
+	fn guide_first_runtime_works() {
+		[Some(DEV_RUNTIME_PRESET.into())].into_iter().for_each(|preset| {
+			test_runtime_preset(FIRST_RUNTIME, 1000, preset);
+		});
+	}
+}
diff --git a/docs/sdk/src/guides/your_first_pallet/mod.rs b/docs/sdk/src/guides/your_first_pallet/mod.rs
index fcfaab00e552..aef8981b4d4a 100644
--- a/docs/sdk/src/guides/your_first_pallet/mod.rs
+++ b/docs/sdk/src/guides/your_first_pallet/mod.rs
@@ -47,7 +47,7 @@
 //!
 //! [`pallet::config`] and [`pallet::pallet`] are both mandatory parts of any
 //! pallet. Refer to the documentation of each to get an overview of what they do.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", shell_pallet)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", shell_pallet)]
 //!
 //! All of the code that follows in this guide should live inside of the `mod pallet`.
 //!
@@ -61,17 +61,17 @@
 //! > For the rest of this guide, we will opt for a balance type of `u128`. For the sake of
 //! > simplicity, we are hardcoding this type. In a real pallet is best practice to define it as a
 //! > generic bounded type in the `Config` trait, and then specify it in the implementation.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Balance)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", Balance)]
 //!
 //! The definition of these two storage items, based on [`pallet::storage`] details, is as follows:
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", TotalIssuance)]
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Balances)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", TotalIssuance)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", Balances)]
 //!
 //! ### Dispatchables
 //!
 //! Next, we will define the dispatchable functions. As per [`pallet::call`], these will be defined
 //! as normal `fn`s attached to `struct Pallet`.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_pallet)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", impl_pallet)]
 //!
 //! The logic of these functions is self-explanatory. Instead, we will focus on the FRAME-related
 //! details:
@@ -108,14 +108,14 @@
 //! How we handle error in the above snippets is fairly rudimentary. Let's look at how this can be
 //! improved. First, we can use [`frame::prelude::ensure`] to express the error slightly better.
 //! This macro will call `.into()` under the hood.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_better)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", transfer_better)]
 //!
 //! Moreover, you will learn in the [Defensive Programming
 //! section](crate::reference_docs::defensive_programming) that it is always recommended to use
 //! safe arithmetic operations in your runtime. By using [`frame::traits::CheckedSub`], we can not
 //! only take a step in that direction, but also improve the error handing and make it slightly more
 //! ergonomic.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_better_checked)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", transfer_better_checked)]
 //!
 //! This is more or less all the logic that there is in this basic currency pallet!
 //!
@@ -145,7 +145,7 @@
 //! through [`frame::runtime::prelude::construct_runtime`]. All runtimes also have to include
 //! [`frame::prelude::frame_system`]. So we expect to see a runtime with two pallet, `frame_system`
 //! and the one we just wrote.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", runtime)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", runtime)]
 //!
 //! > [`frame::pallet_macros::derive_impl`] is a FRAME feature that enables developers to have
 //! > defaults for associated types.
@@ -182,7 +182,7 @@
 //! to learn is that all of your pallet testing code should be wrapped in
 //! [`frame::testing_prelude::TestState`]. This is a type that provides access to an in-memory state
 //! to be used in our tests.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", first_test)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", first_test)]
 //!
 //! In the first test, we simply assert that there is no total issuance, and no balance associated
 //! with Alice's account. Then, we mint some balance into Alice's, and re-check.
@@ -206,16 +206,16 @@
 //!
 //! Let's see how we can implement a better test setup using this pattern. First, we define a
 //! `struct StateBuilder`.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", StateBuilder)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", StateBuilder)]
 //!
 //! This struct is meant to contain the same list of accounts and balances that we want to have at
 //! the beginning of each block. We hardcoded this to `let accounts = vec![(ALICE, 100), (2, 100)];`
 //! so far. Then, if desired, we attach a default value for this struct.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", default_state_builder)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", default_state_builder)]
 //!
 //! Like any other builder pattern, we attach functions to the type to mutate its internal
 //! properties.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_state_builder_add)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", impl_state_builder_add)]
 //!
 //!  Finally --the useful part-- we write our own custom `build_and_execute` function on
 //! this type. This function will do multiple things:
@@ -227,23 +227,23 @@
 //!    after each test. For example, in this test, we do some additional checking about the
 //!    correctness of the `TotalIssuance`. We leave it up to you as an exercise to learn why the
 //!    assertion should always hold, and how it is checked.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", impl_state_builder_build)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", impl_state_builder_build)]
 //!
 //! We can write tests that specifically check the initial state, and making sure our `StateBuilder`
 //! is working exactly as intended.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", state_builder_works)]
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", state_builder_add_balance)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", state_builder_works)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", state_builder_add_balance)]
 //!
 //! ### More Tests
 //!
 //! Now that we have a more ergonomic test setup, let's see how a well written test for transfer and
 //! mint would look like.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_works)]
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", mint_works)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", transfer_works)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", mint_works)]
 //!
 //! It is always a good idea to build a mental model where you write *at least* one test for each
 //! "success path" of a dispatchable, and one test for each "failure path", such as:
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_from_non_existent_fails)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", transfer_from_non_existent_fails)]
 //!
 //! We leave it up to you to write a test that triggers the `InsufficientBalance` error.
 //!
@@ -272,8 +272,8 @@
 //! With the explanation out of the way, let's see how these components can be added. Both follow a
 //! fairly familiar syntax: normal Rust enums, with extra [`pallet::event`] and [`pallet::error`]
 //! attributes attached.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Event)]
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", Error)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", Event)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", Error)]
 //!
 //! One slightly custom part of this is the [`pallet::generate_deposit`] part. Without going into
 //! too much detail, in order for a pallet to emit events to the rest of the system, it needs to do
@@ -288,17 +288,17 @@
 //! 2. But, doing this conversion and storing is too much to expect each pallet to define. FRAME
 //! provides a default way of storing events, and this is what [`pallet::generate_deposit`] is
 //! doing.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", config_v2)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", config_v2)]
 //!
 //! > These `Runtime*` types are better explained in
 //! > [`crate::reference_docs::frame_runtime_types`].
 //!
 //! Then, we can rewrite the `transfer` dispatchable as such:
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", transfer_v2)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", transfer_v2)]
 //!
 //! Then, notice how now we would need to provide this `type RuntimeEvent` in our test runtime
 //! setup.
-#![doc = docify::embed!("./src/guides/your_first_pallet/mod.rs", runtime_v2)]
+#![doc = docify::embed!("./packages/guides/first-pallet/src/lib.rs", runtime_v2)]
 //!
 //! In this snippet, the actual `RuntimeEvent` type (right hand side of `type RuntimeEvent =
 //! RuntimeEvent`) is generated by
diff --git a/docs/sdk/src/guides/your_first_pallet/with_event.rs b/docs/sdk/src/guides/your_first_pallet/with_event.rs
deleted file mode 100644
index a5af29c9c319..000000000000
--- a/docs/sdk/src/guides/your_first_pallet/with_event.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-#[frame::pallet(dev_mode)]
-pub mod pallet {
-	use frame::prelude::*;
-
-	#[docify::export]
-	pub type Balance = u128;
-
-	#[pallet::config]
-	pub trait Config: frame_system::Config {}
-
-	#[pallet::pallet]
-	pub struct Pallet<T>(_);
-
-	#[docify::export]
-	/// Single storage item, of type `Balance`.
-	#[pallet::storage]
-	pub type TotalIssuance<T: Config> = StorageValue<_, Balance>;
-
-	#[docify::export]
-	/// A mapping from `T::AccountId` to `Balance`
-	#[pallet::storage]
-	pub type Balances<T: Config> = StorageMap<_, _, T::AccountId, Balance>;
-
-	#[docify::export(impl_pallet)]
-	#[pallet::call]
-	impl<T: Config> Pallet<T> {
-		/// An unsafe mint that can be called by anyone. Not a great idea.
-		pub fn mint_unsafe(
-			origin: T::RuntimeOrigin,
-			dest: T::AccountId,
-			amount: Balance,
-		) -> DispatchResult {
-			// ensure that this is a signed account, but we don't really check `_anyone`.
-			let _anyone = ensure_signed(origin)?;
-
-			// update the balances map. Notice how all `<T: Config>` remains as `<T>`.
-			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
-			// update total issuance.
-			TotalIssuance::<T>::mutate(|t| *t = Some(t.unwrap_or(0) + amount));
-
-			Ok(())
-		}
-
-		/// Transfer `amount` from `origin` to `dest`.
-		pub fn transfer(
-			origin: T::RuntimeOrigin,
-			dest: T::AccountId,
-			amount: Balance,
-		) -> DispatchResult {
-			let sender = ensure_signed(origin)?;
-
-			// ensure sender has enough balance, and if so, calculate what is left after `amount`.
-			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
-			if sender_balance < amount {
-				return Err("NotEnoughBalance".into())
-			}
-			let remainder = sender_balance - amount;
-
-			// update sender and dest balances.
-			Balances::<T>::mutate(dest, |b| *b = Some(b.unwrap_or(0) + amount));
-			Balances::<T>::insert(&sender, remainder);
-
-			Ok(())
-		}
-	}
-
-	#[allow(unused)]
-	impl<T: Config> Pallet<T> {
-		#[docify::export]
-		pub fn transfer_better(
-			origin: T::RuntimeOrigin,
-			dest: T::AccountId,
-			amount: Balance,
-		) -> DispatchResult {
-			let sender = ensure_signed(origin)?;
-
-			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
-			ensure!(sender_balance >= amount, "NotEnoughBalance");
-			let remainder = sender_balance - amount;
-
-			// .. snip
-			Ok(())
-		}
-
-		#[docify::export]
-		/// Transfer `amount` from `origin` to `dest`.
-		pub fn transfer_better_checked(
-			origin: T::RuntimeOrigin,
-			dest: T::AccountId,
-			amount: Balance,
-		) -> DispatchResult {
-			let sender = ensure_signed(origin)?;
-
-			let sender_balance = Balances::<T>::get(&sender).ok_or("NonExistentAccount")?;
-			let remainder = sender_balance.checked_sub(amount).ok_or("NotEnoughBalance")?;
-
-			// .. snip
-			Ok(())
-		}
-	}
-}
diff --git a/docs/sdk/src/guides/your_first_runtime.rs b/docs/sdk/src/guides/your_first_runtime.rs
index c58abc1120c1..79f01e66979a 100644
--- a/docs/sdk/src/guides/your_first_runtime.rs
+++ b/docs/sdk/src/guides/your_first_runtime.rs
@@ -1,3 +1,170 @@
 //! # Your first Runtime
 //!
-//! 🚧 <https://github.com/paritytech/polkadot-sdk/pull/3946>
+//! This guide will walk you through the steps to add your pallet to a runtime.
+//!
+//! The good news is, in [`crate::guides::your_first_pallet`], we have already created a _test_
+//! runtime that was used for testing, and a real runtime is not that much different!
+//!
+//! ## Setup
+//!
+//! A runtime shares a few similar setup requirements as with a pallet:
+//!
+//! * importing [`frame`], [`codec`], and [`scale_info`] crates.
+//! * following the [`std` feature-gating](crate::polkadot_sdk::substrate#wasm-build) pattern.
+//!
+//! But, more specifically, it also contains:
+//!
+//! * a `build.rs` that uses [`substrate_wasm_builder`]. This entails declaring
+//!   `[build-dependencies]` in the Cargo manifest file:
+//!
+//! ```ignore
+//! [build-dependencies]
+//! substrate-wasm-builder = { ... }
+//! ```
+//!
+//! >Note that a runtime must always be one-runtime-per-crate. You cannot define multiple runtimes
+//! per rust crate.
+//!
+//! You can find the full code of this guide in [`first_runtime`].
+//!
+//! ## Your First Runtime
+//!
+//! The first new property of a real runtime that it must define its
+//! [`frame::runtime::prelude::RuntimeVersion`]:
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", VERSION)]
+//!
+//! The version contains a number of very important fields, such as `spec_version` and `spec_name`
+//! that play an important role in identifying your runtime and its version, more importantly in
+//! runtime upgrades. More about runtime upgrades in
+//! [`crate::reference_docs::frame_runtime_upgrades_and_migrations`].
+//!
+//! Then, a real runtime also contains the `impl` of all individual pallets' `trait Config` for
+//! `struct Runtime`, and a [`frame::runtime::prelude::construct_runtime`] macro that amalgamates
+//! them all.
+//!
+//! In the case of our example:
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", our_config_impl)]
+//!
+//! In this example, we bring in a number of other pallets from [`frame`] into the runtime, each of
+//! their `Config` need to be implemented for `struct Runtime`:
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", config_impls)]
+//!
+//! Notice how we use [`frame::pallet_macros::derive_impl`] to provide "default" configuration items
+//! for each pallet. Feel free to dive into the definition of each default prelude (eg.
+//! [`frame::prelude::frame_system::pallet::config_preludes`]) to learn more which types are exactly
+//! used.
+//!
+//! Recall that in test runtime in [`crate::guides::your_first_pallet`], we provided `type AccountId
+//! = u64` to `frame_system`, while in this case we rely on whatever is provided by
+//! [`SolochainDefaultConfig`], which is indeed a "real" 32 byte account id.
+//!
+//! Then, a familiar instance of `construct_runtime` amalgamates all of the pallets:
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", cr)]
+//!
+//! Recall from [`crate::reference_docs::wasm_meta_protocol`] that every (real) runtime needs to
+//! implement a set of runtime APIs that will then let the node to communicate with it. The final
+//! steps of crafting a runtime are related to achieving exactly this.
+//!
+//! First, we define a number of types that eventually lead to the creation of an instance of
+//! [`frame::runtime::prelude::Executive`]. The executive is a handy FRAME utility that, through
+//! amalgamating all pallets and further types, implements some of the very very core pieces of the
+//! runtime logic, such as how blocks are executed and other runtime-api implementations.
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", runtime_types)]
+//!
+//! Finally, we use [`frame::runtime::prelude::impl_runtime_apis`] to implement all of the runtime
+//! APIs that the runtime wishes to expose. As you will see in the code, most of these runtime API
+//! implementations are merely forwarding calls to `RuntimeExecutive` which handles the actual
+//! logic. Given that the implementation block is somewhat large, we won't repeat it here. You can
+//! look for `impl_runtime_apis!` in [`first_runtime`].
+//!
+//! ```ignore
+//! impl_runtime_apis! {
+//! 	impl apis::Core<Block> for Runtime {
+//! 		fn version() -> RuntimeVersion {
+//! 			VERSION
+//! 		}
+//!
+//! 		fn execute_block(block: Block) {
+//! 			RuntimeExecutive::execute_block(block)
+//! 		}
+//!
+//! 		fn initialize_block(header: &Header) -> ExtrinsicInclusionMode {
+//! 			RuntimeExecutive::initialize_block(header)
+//! 		}
+//! 	}
+//!
+//! 	// many more trait impls...
+//! }
+//! ```
+//!
+//! And that more or less covers the details of how you would write a real runtime!
+//!
+//! Once you compile a crate that contains a runtime as above, simply running `cargo build` will
+//! generate the wasm blobs and place them under `./target/release/wbuild`, as explained
+//! [here](crate::polkadot_sdk::substrate#wasm-build).
+//!
+//! ## Genesis Configuration
+//!
+//! Every runtime specifies a number of runtime APIs that help the outer world (most notably, a
+//! `node`) know what is the genesis state of this runtime. These APIs are then used to generate
+//! what is known as a  **Chain Specification, or chain spec for short**. A chain spec is the
+//! primary way to run a new chain.
+//!
+//! These APIs are defined in [`sp_genesis_builder`], and are re-exposed as a part of
+//! [`frame::runtime::apis`]. Therefore, the implementation blocks can be found inside of
+//! `impl_runtime_apis!` similar to:
+//!
+//! ```ignore
+//! impl_runtime_apis! {
+//!  	impl apis::GenesisBuilder<Block> for Runtime {
+//! 			fn build_state(config: Vec<u8>) -> GenesisBuilderResult {
+//! 				build_state::<RuntimeGenesisConfig>(config)
+//! 			}
+//!
+//! 			fn get_preset(id: &Option<PresetId>) -> Option<Vec<u8>> {
+//! 				get_preset::<RuntimeGenesisConfig>(id, self::genesis_config_presets::get_preset)
+//! 			}
+//!
+//! 			fn preset_names() -> Vec<PresetId> {
+//! 				crate::genesis_config_presets::preset_names()
+//! 			}
+//! 		}
+//!
+//! }
+//! ```
+//!
+//! The implementation of these function can naturally vary from one runtime to the other, but the
+//! overall pattern is common. For the case of this runtime, we do the following:
+//!
+//! 1. Expose one non-default preset, namely [`sp_genesis_builder::DEV_RUNTIME_PRESET`]. This means
+//!    our runtime has two "presets" of genesis state in total: `DEV_RUNTIME_PRESET` and `None`.
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", preset_names)]
+//!
+//! For `build_state` and `get_preset`, we use the helper functions provide by frame:
+//!
+//! * [`frame::runtime::prelude::build_state`] and [`frame::runtime::prelude::get_preset`].
+//!
+//! Indeed, our runtime needs to specify what its `DEV_RUNTIME_PRESET` genesis state should be like:
+#![doc = docify::embed!("./packages/guides/first-runtime/src/lib.rs", development_config_genesis)]
+//!
+//! For more in-depth information about `GenesisConfig`, `ChainSpec`, the `GenesisBuilder` API and
+//! `chain-spec-builder`, see [`crate::reference_docs::chain_spec_genesis`].
+//!
+//! ## Next Step
+//!
+//! See [`crate::guides::your_first_node`].
+//!
+//! ## Further Reading
+//!
+//! 1. To learn more about signed extensions, see [`crate::reference_docs::signed_extensions`].
+//! 2. `AllPalletsWithSystem` is also generated by `construct_runtime`, as explained in
+//!    [`crate::reference_docs::frame_runtime_types`].
+//! 3. `Executive` supports more generics, most notably allowing the runtime to configure more
+//!    runtime migrations, as explained in
+//!    [`crate::reference_docs::frame_runtime_upgrades_and_migrations`].
+//! 4. Learn more about adding and implementing runtime apis in
+//!    [`crate::reference_docs::custom_runtime_api_rpc`].
+//! 5. To see a complete example of a runtime+pallet that is similar to this guide, please see
+//!    [`crate::polkadot_sdk::templates`].
+//!
+//! [`SolochainDefaultConfig`]: struct@frame_system::pallet::config_preludes::SolochainDefaultConfig
diff --git a/docs/sdk/src/lib.rs b/docs/sdk/src/lib.rs
index 86ca677d7cef..e2c5fc93479c 100644
--- a/docs/sdk/src/lib.rs
+++ b/docs/sdk/src/lib.rs
@@ -12,7 +12,8 @@
 //! - Start by learning about the the [`polkadot_sdk`], its structure and context.
 //! - Then, head over to the [`guides`]. This modules contains in-depth guides about the most
 //!   important user-journeys of the Polkadot SDK.
-//! - Whilst reading the guides, you might find back-links to [`reference_docs`].
+//! 	- Whilst reading the guides, you might find back-links to [`reference_docs`].
+//! - [`external_resources`] for a list of 3rd party guides and tutorials.
 //! - Finally, <https://paritytech.github.io> is the parent website of this crate that contains the
 //!   list of further tools related to the Polkadot SDK.
 //!
diff --git a/docs/sdk/src/meta_contributing.rs b/docs/sdk/src/meta_contributing.rs
index e1297151b231..d68d9bca18b1 100644
--- a/docs/sdk/src/meta_contributing.rs
+++ b/docs/sdk/src/meta_contributing.rs
@@ -69,7 +69,8 @@
 //! > what topics are already covered in this crate, and how you can build on top of the information
 //! > that they already pose, rather than repeating yourself**.
 //!
-//! For more details see the [latest documenting guidelines](https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/DOCUMENTATION_GUIDELINES.md).
+//! For more details see the [latest documenting
+//! guidelines](https://github.com/paritytech/polkadot-sdk/blob/master/docs/contributor/DOCUMENTATION_GUIDELINES.md).
 //!
 //! #### Example: Explaining `#[pallet::call]`
 //!
@@ -132,6 +133,13 @@
 //! compromise, but in the long term, we should work towards finding a way to maintain different
 //! revisions of this crate.
 //!
+//! ## Versioning
+//!
+//! So long as not deployed in `crates.io`, please notice that all of the information in this crate,
+//! namely in [`crate::guides`] and such are compatible with the master branch of `polkadot-sdk`. A
+//! few solutions have been proposed to improve this, please see
+//! [here](https://github.com/paritytech/polkadot-sdk/issues/6191).
+//!
 //! ## How to Develop Locally
 //!
 //! To view the docs specific [`crate`] locally for development, including the correct HTML headers
diff --git a/docs/sdk/src/polkadot_sdk/mod.rs b/docs/sdk/src/polkadot_sdk/mod.rs
index c089b6729ce5..bf7346b871a1 100644
--- a/docs/sdk/src/polkadot_sdk/mod.rs
+++ b/docs/sdk/src/polkadot_sdk/mod.rs
@@ -75,6 +75,26 @@
 //! runtimes are located under the
 //! [`polkadot-fellows/runtimes`](https://github.com/polkadot-fellows/runtimes) repository.
 //!
+//! ### Binaries
+//!
+//! The main binaries that are part of the Polkadot SDK are:
+
+//! * [`polkadot`]: The Polkadot relay chain node binary, as noted above.
+//! * [`polkadot-omni-node`]: A white-labeled parachain collator node. See more in
+//!   [`crate::reference_docs::omni_node`].
+//! * [`polkadot-parachain-bin`]: The collator node used to run collators for all Polkadot system
+//!   parachains.
+//! * [`frame-omni-bencher`]: a benchmarking tool for FRAME-based runtimes. Nodes typically contain
+//!   a
+//!  `benchmark` subcommand that does the same.
+//! * [`chain_spec_builder`]: Utility to build chain-specs Nodes  typically contain a `build-spec`
+//!   subcommand that does the same.
+//! * [`subkey`]: Substrate's key management utility.
+//! * [`substrate-node`](node_cli) is an extensive substrate node that contains the superset of all
+//!   runtime and node side features. The corresponding runtime, called [`kitchensink_runtime`]
+//!   contains all of the modules that are provided with `FRAME`. This node and runtime is only used
+//!   for testing and demonstration.
+//!
 //! ### Summary
 //!
 //! The following diagram summarizes how some of the components of Polkadot SDK work together:
@@ -116,6 +136,9 @@
 //! [`cumulus`]: crate::polkadot_sdk::cumulus
 //! [`polkadot`]: crate::polkadot_sdk::polkadot
 //! [`xcm`]: crate::polkadot_sdk::xcm
+//! [`frame-omni-bencher`]: https://crates.io/crates/frame-omni-bencher
+//! [`polkadot-parachain-bin`]: https://crates.io/crates/polkadot-parachain-bin
+//! [`polkadot-omni-node`]: https://crates.io/crates/polkadot-omni-node
 
 /// Learn about Cumulus, the framework that transforms [`substrate`]-based chains into
 /// [`polkadot`]-enabled parachains.
diff --git a/docs/sdk/src/polkadot_sdk/substrate.rs b/docs/sdk/src/polkadot_sdk/substrate.rs
index 56b89f8c9c2a..ed654c2842c4 100644
--- a/docs/sdk/src/polkadot_sdk/substrate.rs
+++ b/docs/sdk/src/polkadot_sdk/substrate.rs
@@ -90,22 +90,6 @@
 //!
 //! In order to ensure that the WASM build is **deterministic**, the [Substrate Runtime Toolbox (srtool)](https://github.com/paritytech/srtool) can be used.
 //!
-//! ### Binaries
-//!
-//! Multiple binaries are shipped with substrate, the most important of which are located in the
-//! [`./bin`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/bin) folder.
-//!
-//! * [`node_cli`] is an extensive substrate node that contains the superset of all runtime and node
-//!   side features. The corresponding runtime, called [`kitchensink_runtime`] contains all of the
-//!   modules that are provided with `FRAME`. This node and runtime is only used for testing and
-//!   demonstration.
-//!     * [`chain_spec_builder`]: Utility to build more detailed chain-specs for the aforementioned
-//!       node. Other projects typically contain a `build-spec` subcommand that does the same.
-//! * [`node_template`](https://github.com/paritytech/polkadot-sdk/tree/master/substrate/bin/node):
-//!   a template node that contains a minimal set of features and can act as a starting point of a
-//!   project.
-//! * [`subkey`]: Substrate's key management utility.
-//!
 //! ### Anatomy of a Binary Crate
 //!
 //! From the above, [`node_cli`]/[`kitchensink_runtime`] and `node-template` are essentially
diff --git a/docs/sdk/src/reference_docs/chain_spec_genesis.rs b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
index a2e22d1ed1eb..3326f433f288 100644
--- a/docs/sdk/src/reference_docs/chain_spec_genesis.rs
+++ b/docs/sdk/src/reference_docs/chain_spec_genesis.rs
@@ -152,10 +152,13 @@
 //! presets and build the chain specification file. It is possible to use the tool with the
 //! [_demonstration runtime_][`chain_spec_guide_runtime`]. To build the required packages, just run
 //! the following command:
+//!
 //! ```ignore
 //! cargo build -p staging-chain-spec-builder -p chain-spec-guide-runtime --release
 //! ```
+//!
 //! The `chain-spec-builder` util can also be installed with `cargo install`:
+//!
 //! ```ignore
 //! cargo install staging-chain-spec-builder
 //! cargo build -p chain-spec-guide-runtime --release
diff --git a/docs/sdk/src/reference_docs/frame_benchmarking_weight.rs b/docs/sdk/src/reference_docs/frame_benchmarking_weight.rs
index cf9e58791492..68d7d31f67f3 100644
--- a/docs/sdk/src/reference_docs/frame_benchmarking_weight.rs
+++ b/docs/sdk/src/reference_docs/frame_benchmarking_weight.rs
@@ -1,23 +1,212 @@
 //! # FRAME Benchmarking and Weights.
 //!
-//! Notes:
+//! This reference doc explores the concept of weights within Polkadot-SDK runtimes, and more
+//! specifically how FRAME-based runtimes handle it.
 //!
-//! On Weight as a concept.
+//! ## Metering
 //!
-//! - Why we need it. Super important. People hate this. We need to argue why it is worth it.
-//! - Axis of weight: PoV + Time.
-//! - pre dispatch weight vs. metering and post dispatch correction.
-//! 	- mention that we will do this for PoV
-//! 	- you can manually refund using `DispatchResultWithPostInfo`.
-//! - Technically you can have weights with any benchmarking framework. You just need one number to
-//!   be computed pre-dispatch. But FRAME gives you a framework for this.
-//! - improve documentation of `#[weight = ..]` and `#[pallet::weight(..)]`. All syntax variation
-//!   should be covered.
+//! The existence of "weight" as a concept in Polkadot-SDK is a direct consequence of the usage of
+//! WASM as a virtual machine. Unlike a metered virtual machine like EVM, where every instruction
+//! can have a (fairly) deterministic "cost" (also known as "gas price") associated with it, WASM is
+//! a stack machine with more complex instruction set, and more unpredictable execution times. This
+//! means that unlike EVM, it is not possible to implement a "metering" system in WASM. A metering
+//! system is one in which instructions are executed one by one, and the cost/gas is stored in an
+//! accumulator. The execution may then halt once a gas limit is reached.
 //!
-//! On FRAME benchmarking machinery:
+//! In Polkadot-SDK, the WASM runtime is not assumed to be metered.
 //!
-//! - Component analysis, why everything must be linear.
-//! - How to write benchmarks, how you must think of worst case.
-//! - How to run benchmarks.
+//! ## Trusted Code
 //!
-//! - <https://www.shawntabrizi.com/assets/presentations/substrate-storage-deep-dive.pdf>
+//! Another important difference is that EVM is mostly used to express smart contracts, which are
+//! foreign and untrusted codes from the perspective of the blockchain executing them. In such
+//! cases, metering is crucial, in order to ensure a malicious code cannot consume more gas than
+//! expected.
+//!
+//! This assumption does not hold about the runtime of Polkadot-SDK-based blockchains. The runtime
+//! is trusted code, and it is assumed to be written by the same team/developers who are running the
+//! blockchain itself. Therefore, this assumption of "untrusted foreign code" does not hold.
+//!
+//! This is why the runtime can opt for a more performant, more flexible virtual machine like WASM,
+//! and get away without having metering.
+//!
+//! ## Benchmarking
+//!
+//! With the matter of untrusted code execution out of the way, the need for strict metering goes
+//! out of the way. Yet, it would still be very beneficial for block producers to be able to know an
+//! upper bound on how much resources a operation is going to consume before actually executing that
+//! operation. This is why FRAME has a toolkit for benchmarking pallets: So that this upper bound
+//! can be empirically determined.
+//!
+//! > Note: Benchmarking is a static analysis: It is all about knowing the upper bound of how much
+//! > resources an operation takes statically, without actually executing it. In the context of
+//! > FRAME extrinsics, this static-ness is expressed by the keyword "pre-dispatch".
+//!
+//! To understand why this upper bound is needed, consider the following: A block producer knows
+//! they have 20ms left to finish producing their block, and wishes to include more transactions in
+//! the block. Yet, in a metered environment, it would not know which transaction is likely to fit
+//! the 20ms. In a benchmarked environment, it can examine the transactions for their upper bound,
+//! and include the ones that are known to fit based on the worst case.
+//!
+//! The benchmarking code can be written as a part of FRAME pallet, using the macros provided in
+//! [`frame_benchmarking`]. See any of the existing pallets in `polkadot-sdk`, or the pallets in our
+//! [`crate::polkadot_sdk::templates`] for examples.
+//!
+//! ## Weight
+//!
+//! Finally, [`sp_weights::Weight`] is the output of the benchmarking process. It is a
+//! two-dimensional data structure that demonstrates the resources consumed by a given block of
+//! code (for example, a transaction). The two dimensions are:
+//!
+//! * reference time: The time consumed in pico-seconds, on a reference hardware.
+//! * proof size: The amount of storage proof necessary to re-execute the block of code. This is
+//!   mainly needed for parachain <> relay-chain verification.
+//!
+//! ## How To Write Benchmarks: Worst Case
+//!
+//! The most important detail about writing benchmarking code is that it must be written such that
+//! it captures the worst case execution of any block of code.
+//!
+//! Consider:
+#![doc = docify::embed!("./src/reference_docs/frame_benchmarking_weight.rs", simple_transfer)]
+//!
+//! If this block of code is to be benchmarked, then the benchmarking code must be written such that
+//! it captures the worst case.
+//!
+//! ## Gluing Pallet Benchmarking with Runtime
+//!
+//! FRAME pallets are mandated to provide their own benchmarking code. Runtimes contain the
+//! boilerplate needed to run these benchmarking (see [Running Benchmarks
+//! below](#running-benchmarks)). The outcome of running these benchmarks are meant to be fed back
+//! into the pallet via a conventional `trait WeightInfo` on `Config`:
+#![doc = docify::embed!("src/reference_docs/frame_benchmarking_weight.rs", WeightInfo)]
+//!
+//! Then, individual functions of this trait are the final values that we assigned to the
+//! [`frame::pallet_macros::weight`] attribute:
+#![doc = docify::embed!("./src/reference_docs/frame_benchmarking_weight.rs", simple_transfer_2)]
+//!
+//! ## Manual Refund
+//!
+//! Back to the assumption of writing benchmarks for worst case: Sometimes, the pre-dispatch weight
+//! significantly differ from the post-dispatch actual weight consumed. This can be expressed with
+//! the following FRAME syntax:
+#![doc = docify::embed!("./src/reference_docs/frame_benchmarking_weight.rs", simple_transfer_3)]
+//!
+//! ## Running Benchmarks
+//!
+//! Two ways exist to run the benchmarks of a runtime.
+//!
+//! 1. The old school way: Most Polkadot-SDK based nodes (such as the ones integrated in
+//!    [`templates`]) have an a `benchmark` subcommand integrated into themselves.
+//! 2. The more [`crate::reference_docs::omni_node`] compatible way of running the benchmarks would
+//!    be using [`frame-omni-bencher`] CLI, which only relies on a runtime.
+//!
+//! Note that by convention, the runtime and pallets always have their benchmarking code feature
+//! gated as behind `runtime-benchmarks`. So, the runtime should be compiled with `--features
+//! runtime-benchmarks`.
+//!
+//! ## Automatic Refund of `proof_size`.
+//!
+//! A new feature in FRAME allows the runtime to be configured for "automatic refund" of the proof
+//! size weight. This is very useful for maximizing the throughput of parachains. Please see:
+//! [`crate::guides::enable_pov_reclaim`].
+//!
+//! ## Summary
+//!
+//! Polkadot-SDK runtimes use a more performant VM, namely WASM, which does not have metering. In
+//! return they have to be benchmarked to provide an upper bound on the resources they consume. This
+//! upper bound is represented as [`sp_weights::Weight`].
+//!
+//! ## Future: PolkaVM
+//!
+//! With the transition of Polkadot relay chain to [JAM], a set of new features are being
+//! introduced, one of which being a new virtual machine named [PolkaVM] that is as flexible as
+//! WASM, but also capable of metering. This might alter the future of benchmarking in FRAME and
+//! Polkadot-SDK, rendering them not needed anymore once PolkaVM is fully integrated into
+//! Polkadot-sdk. For a basic explanation of JAM and PolkaVM, see [here](https://blog.kianenigma.com/posts/tech/demystifying-jam/#pvm).
+//!
+//!
+//! [`frame-omni-bencher`]: https://crates.io/crates/frame-omni-bencher
+//! [`templates`]: crate::polkadot_sdk::templates
+//! [PolkaVM]: https://github.com/koute/polkavm
+//! [JAM]: https://graypaper.com
+
+#[frame::pallet(dev_mode)]
+#[allow(unused_variables, unreachable_code, unused, clippy::diverging_sub_expression)]
+pub mod pallet {
+	use frame::prelude::*;
+
+	#[docify::export]
+	pub trait WeightInfo {
+		fn simple_transfer() -> Weight;
+	}
+
+	#[pallet::config]
+	pub trait Config: frame_system::Config {
+		type WeightInfo: WeightInfo;
+	}
+
+	#[pallet::pallet]
+	pub struct Pallet<T>(_);
+
+	#[pallet::call]
+	impl<T: Config> Pallet<T> {
+		#[docify::export]
+		#[pallet::weight(10_000)]
+		pub fn simple_transfer(
+			origin: OriginFor<T>,
+			destination: T::AccountId,
+			amount: u32,
+		) -> DispatchResult {
+			let destination_exists = todo!();
+			if destination_exists {
+				// simpler code path
+			} else {
+				// more complex code path
+			}
+			Ok(())
+		}
+
+		#[docify::export]
+		#[pallet::weight(T::WeightInfo::simple_transfer())]
+		pub fn simple_transfer_2(
+			origin: OriginFor<T>,
+			destination: T::AccountId,
+			amount: u32,
+		) -> DispatchResult {
+			let destination_exists = todo!();
+			if destination_exists {
+				// simpler code path
+			} else {
+				// more complex code path
+			}
+			Ok(())
+		}
+
+		#[docify::export]
+		// This is the worst-case, pre-dispatch weight.
+		#[pallet::weight(T::WeightInfo::simple_transfer())]
+		pub fn simple_transfer_3(
+			origin: OriginFor<T>,
+			destination: T::AccountId,
+			amount: u32,
+		) -> DispatchResultWithPostInfo {
+			// ^^ Notice the new return type
+			let destination_exists = todo!();
+			if destination_exists {
+				// simpler code path
+				// Note that need for .into(), to convert `()` to `PostDispatchInfo`
+				// See: https://paritytech.github.io/polkadot-sdk/master/frame_support/dispatch/struct.PostDispatchInfo.html#impl-From%3C()%3E-for-PostDispatchInfo
+				Ok(().into())
+			} else {
+				// more complex code path
+				let actual_weight =
+					todo!("this can likely come from another benchmark that is NOT the worst case");
+				let pays_fee = todo!("You can set this to `Pays::Yes` or `Pays::No` to change if this transaction should pay fees");
+				Ok(frame::deps::frame_support::dispatch::PostDispatchInfo {
+					actual_weight: Some(actual_weight),
+					pays_fee,
+				})
+			}
+		}
+	}
+}
diff --git a/docs/sdk/src/reference_docs/mod.rs b/docs/sdk/src/reference_docs/mod.rs
index 9cf5605a88ba..e47eece784c4 100644
--- a/docs/sdk/src/reference_docs/mod.rs
+++ b/docs/sdk/src/reference_docs/mod.rs
@@ -78,7 +78,6 @@ pub mod frame_system_accounts;
 pub mod development_environment_advice;
 
 /// Learn about benchmarking and weight.
-// TODO: @shawntabrizi @ggwpez https://github.com/paritytech/polkadot-sdk-docs/issues/50
 pub mod frame_benchmarking_weight;
 
 /// Learn about the token-related logic in FRAME and how to apply it to your use case.
@@ -109,3 +108,6 @@ pub mod umbrella_crate;
 
 /// Learn about how to create custom RPC endpoints and runtime APIs.
 pub mod custom_runtime_api_rpc;
+
+/// The [`polkadot-omni-node`](https://crates.io/crates/polkadot-omni-node) and its related binaries.
+pub mod omni_node;
diff --git a/docs/sdk/src/reference_docs/omni_node.rs b/docs/sdk/src/reference_docs/omni_node.rs
new file mode 100644
index 000000000000..44d63704a458
--- /dev/null
+++ b/docs/sdk/src/reference_docs/omni_node.rs
@@ -0,0 +1,185 @@
+//! # (Omni) Node
+//!
+//! This reference doc elaborates on what a Polkadot-SDK/Substrate node software is, and what
+//! various ways exist to run one.
+//!
+//! The node software, as denoted in [`crate::reference_docs::wasm_meta_protocol`], is everything in
+//! a blockchain other than the WASM runtime. It contains common components such as the database,
+//! networking, RPC server and consensus. Substrate-based nodes are native binaries that are
+//! compiled down from the Rust source code. The `node` folder in any of the [`templates`] are
+//! examples of this source.
+//!
+//! > Note: A typical node also contains a lot of other tools (exposed as subcommands) that are
+//! > useful for operating a blockchain, such as the ones noted in
+//! > [`polkadot_omni_node_lib::cli::Cli::subcommand`].
+//!
+//! ## Node <> Runtime Interdependence
+//!
+//! While in principle the node can be mostly independent of the runtime, for various reasons, such
+//! as the [native runtime](crate::reference_docs::wasm_meta_protocol#native-runtime), the node and
+//! runtime were historically tightly linked together. Another reason is that the node and the
+//! runtime need to be in agreement about which consensus algorithm they use, as described
+//! [below](#consensus-engine).
+//!
+//! Specifically, the node relied on the existence of a linked runtime, and *could only reliably run
+//! that runtime*. This is why if you look at any of the [`templates`], they are all composed of a
+//! node, and a runtime.
+//!
+//! Moreover, the code and API of each of these nodes was historically very advanced, and tailored
+//! towards those who wish to customize many of the node components at depth.
+//!
+//! > The notorious `service.rs` in any node template is a good example of this.
+//!
+//! A [trend](https://github.com/paritytech/polkadot-sdk/issues/62) has already been undergoing in
+//! order to de-couple the node and the runtime for a long time. The north star of this effort is
+//! twofold :
+//!
+//! 1. develop what can be described as an "omni-node": A node that can run most runtimes.
+//! 2. provide a cleaner abstraction for creating a custom node.
+//!
+//! While a single omni-node running *all possible runtimes* is not feasible, the
+//! [`polkadot-omni-node`] is an attempt at creating the former, and the [`polkadot_omni_node_lib`]
+//! is the latter.
+//!
+//! > Note: The OmniNodes are mainly focused on the development needs of **Polkadot
+//! > parachains ONLY**, not (Substrate) solo-chains. For the time being, solo-chains are not
+//! > supported by the OmniNodes. This might change in the future.
+//!
+//! ## Types of Nodes
+//!
+//! With the emergence of the OmniNodes, let's look at the various Node options available to a
+//! builder.
+//!
+//! ### [`polkadot-omni-node`]
+//!
+//! [`polkadot-omni-node`] is a white-labeled binary, released as a part of Polkadot SDK that is
+//! capable of meeting the needs of most Polkadot parachains.
+//!
+//! It can act as the collator of a parachain in production, with all the related auxillary
+//! functionalities that a normal collator node has: RPC server, archiving state, etc. Moreover, it
+//! can also run the wasm blob of the parachain locally for testing and development.
+//!
+//! ### [`polkadot_omni_node_lib`]
+//!
+//! [`polkadot_omni_node_lib`] is the library version of the above, which can be used to create a
+//! fresh parachain node, with a some limited configuration options using a lean API.
+//!
+//! ### Old School Nodes
+//!
+//! The existing node architecture, as seen in the [`templates`], is still available for those who
+//! want to have full control over the node software.
+//!
+//! ### Summary
+//!
+//! We can summarize the choices for the node software of any given user of Polkadot-SDK, wishing to
+//! deploy a parachain into 3 categories:
+//!
+//! 1. **Use the [`polkadot-omni-node`]**: This is the easiest way to get started, and is the most
+//!   likely to be the best choice for most users.
+//!     * can run almost any runtime with [`--dev-block-time`]
+//! 2. **Use the [`polkadot_omni_node_lib`]**: This is the best choice for those who want to have
+//!    slightly more control over the node software, such as embedding a custom chain-spec.
+//! 3. **Use the old school nodes**: This is the best choice for those who want to have full control
+//!    over the node software, such as changing the consensus engine, altering the transaction pool,
+//!    and so on.
+//!
+//! ## _OmniTools_: User Journey
+//!
+//! All in all, the user journey of a team/builder, in the OmniNode world is as follows:
+//!
+//! * The [`templates`], most notably the [`parachain-template`] is the canonical starting point.
+//!   That being said, the node code of the templates (which may be eventually
+//!   removed/feature-gated) is no longer of relevance. The only focus is in the runtime, and
+//!   obtaining a `.wasm` file. References:
+//!     * [`crate::guides::your_first_pallet`]
+//!     * [`crate::guides::your_first_runtime`]
+//! * If need be, the weights of the runtime need to be updated using `frame-omni-bencher`.
+//!   References:
+//!     * [`crate::reference_docs::frame_benchmarking_weight`]
+//! * Next, [`chain-spec-builder`] is used to generate a `chain_spec.json`, either for development,
+//!   or for production. References:
+//!     * [`crate::reference_docs::chain_spec_genesis`]
+//! * For local development, the following options are available:
+//!     * `polkadot-omni-node` (notably, with [`--dev-block-time`]). References:
+//!         * [`crate::guides::your_first_node`]
+//!     * External tools such as `chopsticks`, `zombienet`.
+//!         * See the `README.md` file of the `polkadot-sdk-parachain-template`.
+//! * For production `polkadot-omni-node` can be used out of the box.
+//! * For further customization [`polkadot_omni_node_lib`] can be used.
+//!
+//! ## Appendix
+//!
+//! This section describes how the interdependence between the node and the runtime is related to
+//! the consensus engine. This information is useful for those who want to understand the
+//! historical context of the node and the runtime.
+//!
+//! ### Consensus Engine
+//!
+//! In any given substrate-based chain, both the node and the runtime will have their own
+//! opinion/information about what consensus engine is going to be used.
+//!
+//! In practice, the majority of the implementation of any consensus engine is in the node side, but
+//! the runtime also typically needs to expose a custom runtime-api to enable the particular
+//! consensus engine to work, and that particular runtime-api is implemented by a pallet
+//! corresponding to that consensus engine.
+//!
+//! For example, taking a snippet from [`solochain_template_runtime`], the runtime has to provide
+//! this additional runtime-api (compared to [`minimal_template_runtime`]), if the node software is
+//! configured to use the Aura consensus engine:
+//!
+//! ```text
+//! impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+//!     fn slot_duration() -> sp_consensus_aura::SlotDuration {
+//!         ...
+//!     }
+//!     fn authorities() -> Vec<AuraId> {
+//!         ...
+//!     }
+//! }
+//! ```
+//!
+//! For simplicity, we can break down "consensus" into two main parts:
+//!
+//! * Block Authoring: Deciding who gets to produce the next block.
+//! * Finality: Deciding when a block is considered final.
+//!
+//! For block authoring, there are a number of options:
+//!
+//! * [`sc_consensus_manual_seal`]: Useful for testing, where any node can produce a block at any
+//!   time. This is often combined with a fixed interval at which a block is produced.
+//! * [`sc_consensus_aura`]/[`pallet_aura`]: A simple round-robin block authoring mechanism.
+//! * [`sc_consensus_babe`]/[`pallet_babe`]: A more advanced block authoring mechanism, capable of
+//!   anonymizing the next block author.
+//! * [`sc_consensus_pow`]: Proof of Work block authoring.
+//!
+//! For finality, there is one main option shipped with polkadot-sdk:
+//!
+//! * [`sc_consensus_grandpa`]/[`pallet_grandpa`]: A finality gadget that uses a voting mechanism to
+//!   decide when a block
+//!
+//! **The most important lesson here is that the node and the runtime must have matching consensus
+//! components.**
+//!
+//! ### Consequences for OmniNode
+//!
+//!
+//! The consequence of the above is that anyone using the OmniNode must also be aware of the
+//! consensus system used in the runtime, and be aware if it is matching that of the OmniNode or
+//! not. For the time being, [`polkadot-omni-node`] only supports:
+//!
+//! * Parachain-based Aura consensus, with 6s async-backing block-time, and before full elastic
+//!   scaling). [`polkadot_omni_node_lib::cli::Cli::experimental_use_slot_based`] for fixed factor
+//!   scaling (a step
+//! * Ability to run any runtime with [`--dev-block-time`] flag. This uses
+//!   [`sc_consensus_manual_seal`] under the hood, and has no restrictions on the runtime's
+//!   consensus.
+//!
+//! [This](https://github.com/paritytech/polkadot-sdk/issues/5565) future improvement to OmniNode
+//! aims to make such checks automatic.
+//!
+//!
+//! [`templates`]: crate::polkadot_sdk::templates
+//! [`parachain-template`]: https://github.com/paritytech/polkadot-sdk-parachain-template
+//! [`--dev-block-time`]: polkadot_omni_node_lib::cli::Cli::dev_block_time
+//! [`polkadot-omni-node`]: https://crates.io/crates/polkadot-omni-node
+//! [`chain-spec-builder`]: https://crates.io/crates/staging-chain-spec-builder
diff --git a/docs/sdk/src/reference_docs/umbrella_crate.rs b/docs/sdk/src/reference_docs/umbrella_crate.rs
index 1074cde37693..8d9bcdfc2089 100644
--- a/docs/sdk/src/reference_docs/umbrella_crate.rs
+++ b/docs/sdk/src/reference_docs/umbrella_crate.rs
@@ -5,6 +5,7 @@
 //! crate. This helps with selecting the right combination of crate versions, since otherwise 3rd
 //! party tools are needed to select a compatible set of versions.
 //!
+//!
 //! ## Features
 //!
 //! The umbrella crate supports no-std builds and can therefore be used in the runtime and node.
diff --git a/prdoc/pr_6094.prdoc b/prdoc/pr_6094.prdoc
new file mode 100644
index 000000000000..23391c889155
--- /dev/null
+++ b/prdoc/pr_6094.prdoc
@@ -0,0 +1,21 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Polkadot OmniNode Docs
+
+doc:
+  - audience: ...
+    description: |
+      Adds documentation in https://paritytech.github.io/polkadot-sdk/master/polkadot_sdk_docs/index.html and rust-docs for polkadot-omni-node project.
+
+crates:
+  - name: sp-genesis-builder
+    bump: patch
+  - name: pallet-aura
+    bump: patch
+  - name: polkadot-omni-node-lib
+    bump: patch
+  - name: polkadot-sdk-frame # since the crate is "experimental, we don't need to bump yet."
+    bump: major
+  - name: polkadot-omni-node
+    bump: patch
diff --git a/substrate/bin/node/cli/src/cli.rs b/substrate/bin/node/cli/src/cli.rs
index c0dcacb2e4b4..1d7001a5dccf 100644
--- a/substrate/bin/node/cli/src/cli.rs
+++ b/substrate/bin/node/cli/src/cli.rs
@@ -59,6 +59,7 @@ pub enum Subcommand {
 	Inspect(node_inspect::cli::InspectCmd),
 
 	/// Sub-commands concerned with benchmarking.
+	///
 	/// The pallet benchmarking moved to the `pallet` sub-command.
 	#[command(subcommand)]
 	Benchmark(frame_benchmarking_cli::BenchmarkCmd),
diff --git a/substrate/frame/Cargo.toml b/substrate/frame/Cargo.toml
index 595fb5a19b04..2d0daf82997d 100644
--- a/substrate/frame/Cargo.toml
+++ b/substrate/frame/Cargo.toml
@@ -44,8 +44,10 @@ sp-offchain = { optional = true, workspace = true }
 sp-session = { optional = true, workspace = true }
 sp-consensus-aura = { optional = true, workspace = true }
 sp-consensus-grandpa = { optional = true, workspace = true }
+sp-genesis-builder = { optional = true, workspace = true }
 sp-inherents = { optional = true, workspace = true }
 sp-storage = { optional = true, workspace = true }
+sp-keyring = { optional = true, workspace = true }
 
 frame-executive = { optional = true, workspace = true }
 frame-system-rpc-runtime-api = { optional = true, workspace = true }
@@ -73,7 +75,9 @@ runtime = [
 	"sp-block-builder",
 	"sp-consensus-aura",
 	"sp-consensus-grandpa",
+	"sp-genesis-builder",
 	"sp-inherents",
+	"sp-keyring",
 	"sp-offchain",
 	"sp-session",
 	"sp-storage",
@@ -97,8 +101,10 @@ std = [
 	"sp-consensus-aura?/std",
 	"sp-consensus-grandpa?/std",
 	"sp-core/std",
+	"sp-genesis-builder?/std",
 	"sp-inherents?/std",
 	"sp-io/std",
+	"sp-keyring?/std",
 	"sp-offchain?/std",
 	"sp-runtime/std",
 	"sp-session?/std",
diff --git a/substrate/frame/aura/src/lib.rs b/substrate/frame/aura/src/lib.rs
index f829578fb285..c74e864ea0d9 100644
--- a/substrate/frame/aura/src/lib.rs
+++ b/substrate/frame/aura/src/lib.rs
@@ -400,7 +400,9 @@ impl<T: Config> OnTimestampSet<T::Moment> for Pallet<T> {
 		assert_eq!(
 			CurrentSlot::<T>::get(),
 			timestamp_slot,
-			"Timestamp slot must match `CurrentSlot`"
+			"Timestamp slot must match `CurrentSlot`. This likely means that the configured block \
+			time in the node and/or rest of the runtime is not compatible with Aura's \
+			`SlotDuration`",
 		);
 	}
 }
diff --git a/substrate/frame/src/lib.rs b/substrate/frame/src/lib.rs
index fcd96b40c3c4..ade1095cc504 100644
--- a/substrate/frame/src/lib.rs
+++ b/substrate/frame/src/lib.rs
@@ -222,7 +222,12 @@ pub mod runtime {
 
 		// Types often used in the runtime APIs.
 		pub use sp_core::OpaqueMetadata;
+		pub use sp_genesis_builder::{
+			PresetId, Result as GenesisBuilderResult, DEV_RUNTIME_PRESET,
+			LOCAL_TESTNET_RUNTIME_PRESET,
+		};
 		pub use sp_inherents::{CheckInherentsResult, InherentData};
+		pub use sp_keyring::AccountKeyring;
 		pub use sp_runtime::{ApplyExtrinsicResult, ExtrinsicInclusionMode};
 	}
 
@@ -246,6 +251,7 @@ pub mod runtime {
 		pub use sp_block_builder::*;
 		pub use sp_consensus_aura::*;
 		pub use sp_consensus_grandpa::*;
+		pub use sp_genesis_builder::*;
 		pub use sp_offchain::*;
 		pub use sp_session::runtime_api::*;
 		pub use sp_transaction_pool::runtime_api::*;
@@ -396,8 +402,12 @@ pub mod deps {
 	#[cfg(feature = "runtime")]
 	pub use sp_consensus_grandpa;
 	#[cfg(feature = "runtime")]
+	pub use sp_genesis_builder;
+	#[cfg(feature = "runtime")]
 	pub use sp_inherents;
 	#[cfg(feature = "runtime")]
+	pub use sp_keyring;
+	#[cfg(feature = "runtime")]
 	pub use sp_offchain;
 	#[cfg(feature = "runtime")]
 	pub use sp_storage;
diff --git a/substrate/primitives/genesis-builder/src/lib.rs b/substrate/primitives/genesis-builder/src/lib.rs
index 07317bc4cb52..4763aa06341e 100644
--- a/substrate/primitives/genesis-builder/src/lib.rs
+++ b/substrate/primitives/genesis-builder/src/lib.rs
@@ -17,17 +17,33 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
-//! Substrate genesis config builder
+//! # Substrate genesis config builder.
 //!
-//! For FRAME based runtimes, this runtime interface provides means to interact with
-//! `RuntimeGenesisConfig`. Runtime provides a default `RuntimeGenesisConfig` structure in a form of
-//! the JSON blob.
+//! This crate contains [`GenesisBuilder`], a runtime-api to be implemented by runtimes, in order to
+//! express their genesis state.
 //!
-//! For non-FRAME runtimes this interface is intended to build genesis state of the runtime basing
-//! on some input arbitrary bytes array. This documentation uses term `RuntimeGenesisConfig`, which
-//! for non-FRAME runtimes may be understood as the runtime-side entity representing initial runtime
-//! configuration. The representation of the preset is an arbitrary `Vec<u8>` and does not
-//! necessarily have to represent a JSON blob.
+//! The overall flow of the methods in [`GenesisBuilder`] is as follows:
+//!
+//! 1. [`GenesisBuilder::preset_names`]: A runtime exposes a number of different
+//!    `RuntimeGenesisConfig` variations, each of which is called a `preset`, and is identified by a
+//!    [`PresetId`]. All runtimes are encouraged to expose at least [`DEV_RUNTIME_PRESET`] and
+//!    [`LOCAL_TESTNET_RUNTIME_PRESET`] presets for consistency.
+//! 2. [`GenesisBuilder::get_preset`]: Given a `PresetId`, this the runtime returns the JSON blob
+//!    representation of the `RuntimeGenesisConfig` for that preset. This JSON blob is often mixed
+//!    into the broader `chain_spec`. If `None` is given, [`GenesisBuilder::get_preset`] provides a
+//!    JSON represention of the default `RuntimeGenesisConfig` (by simply serializing the
+//!    `RuntimeGenesisConfig::default()` value into JSON format). This is used as a base for
+//!    applying patches / presets.
+
+//! 3. [`GenesisBuilder::build_state`]: Given a JSON blob, this method should deserialize it and
+//!    enact it (using `frame_support::traits::BuildGenesisConfig` for Frame-based runtime),
+//!    essentially writing it to the state.
+//!
+//! The first two flows are often done in between a runtime, and the `chain_spec_builder` binary.
+//! The latter is used when a new blockchain is launched to enact and store the genesis state. See
+//! the documentation of `chain_spec_builder` for more info.
+//!
+//! ## Patching
 //!
 //! The runtime may provide a number of partial predefined `RuntimeGenesisConfig` configurations in
 //! the form of patches which shall be applied on top of the default `RuntimeGenesisConfig`. The
@@ -35,19 +51,22 @@
 //! customized in the default runtime genesis config. These predefined configurations are referred
 //! to as presets.
 //!
-//! This allows the runtime to provide a number of predefined configs (e.g. for different
-//! testnets or development) without neccessity to leak the runtime types outside the itself (e.g.
-//! node or chain-spec related tools).
+//! This allows the runtime to provide a number of predefined configs (e.g. for different testnets
+//! or development) without necessarily to leak the runtime types outside itself (e.g. node or
+//! chain-spec related tools).
+//!
+//! ## FRAME vs. non-FRAME
+//!
+//! For FRAME based runtimes [`GenesisBuilder`] provides means to interact with
+//! `RuntimeGenesisConfig`.
+//!
+//! For non-FRAME runtimes this interface is intended to build genesis state of the runtime basing
+//! on some input arbitrary bytes array. This documentation uses term `RuntimeGenesisConfig`, which
+//! for non-FRAME runtimes may be understood as the "runtime-side entity representing initial
+//! runtime genesis configuration". The representation of the preset is an arbitrary `Vec<u8>` and
+//! does not necessarily have to represent a JSON blob.
 //!
-//! This Runtime API allows to interact with `RuntimeGenesisConfig`, in particular:
-//! - provide the list of available preset names,
-//! - provide a number of named presets of `RuntimeGenesisConfig`,
-//! - provide a JSON represention of the default `RuntimeGenesisConfig` (by simply serializing the
-//!   default `RuntimeGenesisConfig` struct into JSON format),
-//! - deserialize the full `RuntimeGenesisConfig` from given JSON blob and put the resulting
-//!   `RuntimeGenesisConfig` structure into the state storage creating the initial runtime's state.
-//!   Allows to build customized genesis. This operation internally calls `GenesisBuild::build`
-//!   function for all runtime pallets.
+//! ## Genesis Block State
 //!
 //! Providing externalities with an empty storage and putting `RuntimeGenesisConfig` into storage
 //! (by calling `build_state`) allows to construct the raw storage of `RuntimeGenesisConfig`
@@ -75,14 +94,15 @@ pub const DEV_RUNTIME_PRESET: &'static str = "development";
 pub const LOCAL_TESTNET_RUNTIME_PRESET: &'static str = "local_testnet";
 
 sp_api::decl_runtime_apis! {
-	/// API to interact with RuntimeGenesisConfig for the runtime
+	/// API to interact with `RuntimeGenesisConfig` for the runtime
 	pub trait GenesisBuilder {
 		/// Build `RuntimeGenesisConfig` from a JSON blob not using any defaults and store it in the
 		/// storage.
 		///
-		/// In the case of a FRAME-based runtime, this function deserializes the full `RuntimeGenesisConfig` from the given JSON blob and
-		/// puts it into the storage. If the provided JSON blob is incorrect or incomplete or the
-		/// deserialization fails, an error is returned.
+		/// In the case of a FRAME-based runtime, this function deserializes the full
+		/// `RuntimeGenesisConfig` from the given JSON blob and puts it into the storage. If the
+		/// provided JSON blob is incorrect or incomplete or the deserialization fails, an error
+		/// is returned.
 		///
 		/// Please note that provided JSON blob must contain all `RuntimeGenesisConfig` fields, no
 		/// defaults will be used.
@@ -91,7 +111,7 @@ sp_api::decl_runtime_apis! {
 		/// Returns a JSON blob representation of the built-in `RuntimeGenesisConfig` identified by
 		/// `id`.
 		///
-		/// If `id` is `None` the function returns JSON blob representation of the default
+		/// If `id` is `None` the function should return JSON blob representation of the default
 		/// `RuntimeGenesisConfig` struct of the runtime. Implementation must provide default
 		/// `RuntimeGenesisConfig`.
 		///
diff --git a/templates/minimal/runtime/src/lib.rs b/templates/minimal/runtime/src/lib.rs
index 464cad4e3da0..4f914a823bf6 100644
--- a/templates/minimal/runtime/src/lib.rs
+++ b/templates/minimal/runtime/src/lib.rs
@@ -324,7 +324,7 @@ impl_runtime_apis! {
 		}
 
 		fn preset_names() -> Vec<sp_genesis_builder::PresetId> {
-			self::genesis_config_presets::preset_names()
+			crate::genesis_config_presets::preset_names()
 		}
 	}
 }
diff --git a/templates/parachain/runtime/src/genesis_config_presets.rs b/templates/parachain/runtime/src/genesis_config_presets.rs
index 322c91f4f136..394bde0be770 100644
--- a/templates/parachain/runtime/src/genesis_config_presets.rs
+++ b/templates/parachain/runtime/src/genesis_config_presets.rs
@@ -76,6 +76,8 @@ fn local_testnet_genesis() -> Value {
 		],
 		Sr25519Keyring::well_known().map(|k| k.to_account_id()).collect(),
 		Sr25519Keyring::Alice.to_account_id(),
+		// TODO: this is super opaque, how should one know they should configure this? add to
+		// README!
 		1000.into(),
 	)
 }