Skip to content

Commit

Permalink
Merge branch 'main' into acceptable-payment-assets-in-asset-hubs
Browse files Browse the repository at this point in the history
  • Loading branch information
franciscoaguirre authored Jan 13, 2025
2 parents 5f6bdfd + c1f8b7f commit ed18df7
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ jobs:
env:
RUSTFLAGS: "-C debug-assertions -D warnings"
SKIP_WASM_BUILD: 1
WS: ${{ matrix.runtime.uri }}
RUST_LOG: "remote-ext=info"

- name: Test benchmarks ${{ matrix.runtime.name }}
run: |
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix missing Encointer democracy pallet hook needed for enactment ([polkadot-fellows/runtimes/pull/508](https://github.com/polkadot-fellows/runtimes/pull/508))
- Improve benchmark configuration: fix storage whitelist in benchmarks ([polkadot-fellows/runtimes/pull/525](https://github.com/polkadot-fellows/runtimes/pull/525))

### Fixed

- Disallow `add_sub` and `set_subs` from `NonTransfer` proxy type in people chain runtimes ([polkadot-fellows/runtimes#518](https://github.com/polkadot-fellows/runtimes/pull/518))

### Added

- Location conversion tests for relays and parachains ([polkadot-fellows/runtimes#487](https://github.com/polkadot-fellows/runtimes/pull/487))
Expand Down
26 changes: 23 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This repository houses the code required to build the runtimes for Polkadot, Kus

## Structure

Each leaf folder contains one runtime crate:
Runtimes can be found in the `relay` and `system-parachains` top-level folders, each leaf folder of which contains one runtime crate:

<!-- Run "tree -I 'target' -d -L 3" and then delete some folders from Polkadot and Kusama. -->

Expand All @@ -21,8 +21,15 @@ Each leaf folder contains one runtime crate:
│ └── bridge-hub-polkadot
├── collectives
│ └── collectives-polkadot
└── gluttons
└── glutton-kusama
├── coretime
│ ├── coretime-kusama
│ └── coretime-polkadot
├── encointer
├── gluttons
│ └── glutton-kusama
└── people
├── people-kusama
└── people-polkadot
```

## Approval rights
Expand Down Expand Up @@ -61,6 +68,19 @@ The release process is building all runtimes and then puts them into a release i

The format of [`CHANGELOG.md`](CHANGELOG.md) is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

### Point releases

In order to release a patch or fix outside the normal release process, some additional steps are needed.

To submit a fix to release `x.y.z` and make a point release:

- Make your changes based on x.y.z
- Create a branch `x.y.b` from the most recent release, where `b = z + 1` (contact a maintainer)
- Make a PR against the branch `x.y.b`
- Trigger the release process manually (contact a maintainer)
- Check for other planned releases which originally targeted the same semver version and post on the issue letting them know that they should bump
- Once the release is out, amend the GitHub release and delete all unchanged runtime blobs. Highlight if this release only affects some runtimes (contact a maintainer)
- Backport your changes to the `CHANGELOG.md` to the main branch
## Release guidelines

Here is an overview of the recommended steps.
Expand Down
6 changes: 5 additions & 1 deletion system-parachains/people/people-kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,11 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
c,
RuntimeCall::Balances { .. } |
// `request_judgement` puts up a deposit to transfer to a registrar
RuntimeCall::Identity(pallet_identity::Call::request_judgement { .. })
RuntimeCall::Identity(pallet_identity::Call::request_judgement { .. }) |
// `set_subs` and `add_sub` will take and repatriate deposits from the proxied
// account, should not be allowed.
RuntimeCall::Identity(pallet_identity::Call::add_sub { .. }) |
RuntimeCall::Identity(pallet_identity::Call::set_subs { .. })
),
ProxyType::CancelProxy => matches!(
c,
Expand Down
6 changes: 5 additions & 1 deletion system-parachains/people/people-polkadot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,11 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
c,
RuntimeCall::Balances { .. } |
// `request_judgement` puts up a deposit to transfer to a registrar
RuntimeCall::Identity(pallet_identity::Call::request_judgement { .. })
RuntimeCall::Identity(pallet_identity::Call::request_judgement { .. }) |
// `set_subs` and `add_sub` will take and repatriate deposits from the proxied
// account, should not be allowed.
RuntimeCall::Identity(pallet_identity::Call::add_sub { .. }) |
RuntimeCall::Identity(pallet_identity::Call::set_subs { .. })
),
ProxyType::CancelProxy => matches!(
c,
Expand Down

0 comments on commit ed18df7

Please sign in to comment.