diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1446245163..82b2239d22 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -244,11 +244,11 @@ jobs: run: cat .github/env >> $GITHUB_ENV - name: Install stable toolchain - run: | - rustup install $RUST_STABLE_VERSION - rustup default $RUST_STABLE_VERSION - rustup target add wasm32-unknown-unknown - rustup component add rust-src + uses: dtolnay/rust-toolchain@master + with: + targets: "wasm32-unknown-unknown" + components: "rust-src" + toolchain: "${{env.RUST_STABLE_VERSION}}" - name: Fetch cache uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 @@ -314,7 +314,6 @@ jobs: run: yarn install - name: Running ecosystem tests - working-directory: ./ecosystem-tests uses: nick-fields/retry@v3 with: timeout_minutes: 60 diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd8b0d813..3acb44b85a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Update the XCM `Weigher` from `FixedWeightBounds` to `WeightInfoBounds` with benchmarked weights for Polkadot Collectives ([polkadot-fellows/runtimes#547](https://github.com/polkadot-fellows/runtimes/pull/547)) - Increase max PoV size to 10Mib on Kusama ([polkadot-fellows/runtimes#553](https://github.com/polkadot-fellows/runtimes/pull/553)) - Update to Polkadot SDK `stable2409-4` ([polkadot-fellows/runtimes#558](https://github.com/polkadot-fellows/runtimes/pull/558)) +- Asset Hubs: disable vested transfers as preparation for the Asset Hub Migration ([polkadot-fellows/runtime#579](https://github.com/polkadot-fellows/runtimes/pull/579)) #### From [#490](https://github.com/polkadot-fellows/runtimes/pull/490) diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs index 8476548d2e..45fcfedaf7 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs @@ -62,8 +62,8 @@ use frame_support::{ ord_parameter_types, parameter_types, traits::{ fungible, fungibles, tokens::imbalance::ResolveAssetTo, AsEnsureOriginWithArg, ConstBool, - ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Equals, InstanceFilter, - TransformOrigin, WithdrawReasons, + ConstU128, ConstU32, ConstU64, ConstU8, Contains, EitherOfDiverse, Equals, EverythingBut, + InstanceFilter, TransformOrigin, WithdrawReasons, }, weights::{ConstantMultiplier, Weight, WeightToFee as _}, BoundedVec, PalletId, @@ -175,9 +175,16 @@ parameter_types! { pub const SS58Prefix: u8 = 2; } +pub struct VestedTransferCalls; +impl Contains for VestedTransferCalls { + fn contains(call: &RuntimeCall) -> bool { + matches!(call, RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })) + } +} + // Configure FRAME pallets to include in runtime. impl frame_system::Config for Runtime { - type BaseCallFilter = frame_support::traits::Everything; + type BaseCallFilter = EverythingBut; type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type AccountId = AccountId; diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs index dc045e463b..2663e610ff 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs @@ -100,8 +100,8 @@ use frame_support::{ parameter_types, traits::{ fungible, fungibles, tokens::imbalance::ResolveAssetTo, AsEnsureOriginWithArg, ConstBool, - ConstU32, ConstU64, ConstU8, EitherOfDiverse, Equals, InstanceFilter, NeverEnsureOrigin, - TransformOrigin, WithdrawReasons, + ConstU32, ConstU64, ConstU8, Contains, EitherOfDiverse, Equals, EverythingBut, + InstanceFilter, NeverEnsureOrigin, TransformOrigin, WithdrawReasons, }, weights::{ConstantMultiplier, Weight, WeightToFee as _}, PalletId, @@ -193,9 +193,16 @@ parameter_types! { pub const SS58Prefix: u8 = 0; } +pub struct VestedTransferCalls; +impl Contains for VestedTransferCalls { + fn contains(call: &RuntimeCall) -> bool { + matches!(call, RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })) + } +} + // Configure FRAME pallets to include in runtime. impl frame_system::Config for Runtime { - type BaseCallFilter = frame_support::traits::Everything; + type BaseCallFilter = EverythingBut; type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type AccountId = AccountId;