Skip to content

Commit

Permalink
Merge branch 'polkadot-fellows:main' into donal-coretime-chain-specs
Browse files Browse the repository at this point in the history
  • Loading branch information
seadanda authored Aug 6, 2024
2 parents e483e24 + b1b3776 commit 48c9ac7
Show file tree
Hide file tree
Showing 19 changed files with 342 additions and 1,459 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Runtime apis to help with delegate-stake based Nomination Pools ([SDK v1.13 #4537](https://github.com/paritytech/polkadot-sdk/pull/4537)).
- Kusama system chains: enable PoV-reclaim.

### Added

- Fast promotion tracks for the Fellowship ranks I-III ([polkadot-fellows/runtimes#356](https://github.com/polkadot-fellows/runtimes/pull/356)).

### Changed

- Polkadot chains: allow arbitrary XCM execution ([polkadot-fellows/runtimes#345](https://github.com/polkadot-fellows/runtimes/pull/345)).
- Bounties: Remove payout delay ([polkadot-fellows/runtimes#386](https://github.com/polkadot-fellows/runtimes/pull/386)).
- Polkadot System Chains: Reduce the base transaction fee by half ([polkadot-fellows/runtimes#398](https://github.com/polkadot-fellows/runtimes/pull/398)).

Expand Down Expand Up @@ -105,6 +110,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

- Remove deprecated calls from treasury pallet ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #3820](https://github.com/paritytech/polkadot-sdk/pull/3820)).
- Treasury pallet: - remove unused config parameters ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #4831](https://github.com/paritytech/polkadot-sdk/pull/4831)).
- Remove Identity from Polkadot Relay Chain ([runtimes#415](https://github.com/polkadot-fellows/runtimes/pull/415))

#### From [#322](https://github.com/polkadot-fellows/runtimes/pull/322):

Expand Down
5 changes: 2 additions & 3 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ polkadot-system-emulated-network = { path = "integration-tests/emulated/networks
primitive-types = { version = "0.12.2", default-features = false }
frame-metadata-hash-extension = { version = "0.4.0", default-features = false }
remote-externalities = { version = "0.43.0", package = "frame-remote-externalities" }
runtime-parachains = { version = "15.0.0", default-features = false, package = "polkadot-runtime-parachains" }
runtime-parachains = { version = "15.0.1", default-features = false, package = "polkadot-runtime-parachains" }
sc-chain-spec = { version = "35.0.0" }
sc-network = { version = "0.42.0" }
scale-info = { version = "2.10.0", default-features = false }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ decl_test_parachains! {
PolkadotXcm: people_polkadot_runtime::PolkadotXcm,
Balances: people_polkadot_runtime::Balances,
Identity: people_polkadot_runtime::Identity,
IdentityMigrator: people_polkadot_runtime::IdentityMigrator,
}
},
}
Expand Down
2 changes: 0 additions & 2 deletions integration-tests/emulated/chains/relays/polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ decl_test_relay_chains! {
Treasury: polkadot_runtime::Treasury,
AssetRate: polkadot_runtime::AssetRate,
Hrmp: polkadot_runtime::Hrmp,
Identity: polkadot_runtime::Identity,
IdentityMigrator: polkadot_runtime::IdentityMigrator,
}
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
// limitations under the License.

mod governance;
mod reap_identity;
mod teleport;
Loading

0 comments on commit 48c9ac7

Please sign in to comment.