-
Notifications
You must be signed in to change notification settings - Fork 775
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into gpestana/epm-mb
- Loading branch information
Showing
68 changed files
with
4,894 additions
and
1,360 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,7 +81,7 @@ jobs: | |
| - name: install parity-publish | ||
| if: ${{ !contains(github.event.pull_request.labels.*.name, 'R0-silent') }} | ||
| # Set the target dir to cache the build. | ||
| run: CARGO_TARGET_DIR=./target/ cargo install [email protected].3 --locked -q | ||
| run: CARGO_TARGET_DIR=./target/ cargo install [email protected].4 --locked -q | ||
|
|
||
| - name: check semver | ||
| if: ${{ !contains(github.event.pull_request.labels.*.name, 'R0-silent') }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,12 +26,14 @@ jobs: | |
| - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7 | ||
|
|
||
| - name: Rust Cache | ||
| uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 | ||
| uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 | ||
| with: | ||
| cache-on-failure: true | ||
|
|
||
| - name: install parity-publish | ||
| run: cargo install [email protected] --locked -q | ||
| run: | | ||
| rustup override set 1.82.0 | ||
| cargo install [email protected] --locked -q | ||
| - name: parity-publish update plan | ||
| run: parity-publish --color always plan --skip-check --prdoc prdoc/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,12 +19,12 @@ jobs: | |
| - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7 | ||
|
|
||
| - name: Rust Cache | ||
| uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 | ||
| uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 | ||
| with: | ||
| cache-on-failure: true | ||
|
|
||
| - name: install parity-publish | ||
| run: cargo install [email protected].3 --locked -q | ||
| run: cargo install [email protected].4 --locked -q | ||
|
|
||
| - name: parity-publish check | ||
| run: parity-publish --color always check --allow-unpublished | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,12 +13,12 @@ jobs: | |
| - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7 | ||
|
|
||
| - name: Rust Cache | ||
| uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 | ||
| uses: Swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2.7.7 | ||
| with: | ||
| cache-on-failure: true | ||
|
|
||
| - name: install parity-publish | ||
| run: cargo install [email protected].3 --locked -q | ||
| run: cargo install [email protected].4 --locked -q | ||
|
|
||
| - name: parity-publish claim | ||
| env: | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
114 changes: 114 additions & 0 deletions
114
...achains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/reward_pool.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| // 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. | ||
|
|
||
| use crate::imports::*; | ||
| use codec::Encode; | ||
| use frame_support::{assert_ok, sp_runtime::traits::Dispatchable, traits::schedule::DispatchTime}; | ||
| use xcm_executor::traits::ConvertLocation; | ||
|
|
||
| #[test] | ||
| fn treasury_creates_asset_reward_pool() { | ||
| AssetHubRococo::execute_with(|| { | ||
| type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent; | ||
| type Balances = <AssetHubRococo as AssetHubRococoPallet>::Balances; | ||
|
|
||
| let treasurer = | ||
| Location::new(1, [Plurality { id: BodyId::Treasury, part: BodyPart::Voice }]); | ||
| let treasurer_account = | ||
| ahr_xcm_config::LocationToAccountId::convert_location(&treasurer).unwrap(); | ||
|
|
||
| assert_ok!(Balances::force_set_balance( | ||
| <AssetHubRococo as Chain>::RuntimeOrigin::root(), | ||
| treasurer_account.clone().into(), | ||
| ASSET_HUB_ROCOCO_ED * 100_000, | ||
| )); | ||
|
|
||
| let events = AssetHubRococo::events(); | ||
| match events.iter().last() { | ||
| Some(RuntimeEvent::Balances(pallet_balances::Event::BalanceSet { who, .. })) => | ||
| assert_eq!(*who, treasurer_account), | ||
| _ => panic!("Expected Balances::BalanceSet event"), | ||
| } | ||
| }); | ||
|
|
||
| Rococo::execute_with(|| { | ||
| type AssetHubRococoRuntimeCall = <AssetHubRococo as Chain>::RuntimeCall; | ||
| type AssetHubRococoRuntime = <AssetHubRococo as Chain>::Runtime; | ||
| type RococoRuntimeCall = <Rococo as Chain>::RuntimeCall; | ||
| type RococoRuntime = <Rococo as Chain>::Runtime; | ||
| type RococoRuntimeEvent = <Rococo as Chain>::RuntimeEvent; | ||
| type RococoRuntimeOrigin = <Rococo as Chain>::RuntimeOrigin; | ||
|
|
||
| Dmp::make_parachain_reachable(AssetHubRococo::para_id()); | ||
|
|
||
| let staked_asset_id = bx!(RelayLocation::get()); | ||
| let reward_asset_id = bx!(RelayLocation::get()); | ||
|
|
||
| let reward_rate_per_block = 1_000_000_000; | ||
| let lifetime = 1_000_000_000; | ||
| let admin = None; | ||
|
|
||
| let create_pool_call = | ||
| RococoRuntimeCall::XcmPallet(pallet_xcm::Call::<RococoRuntime>::send { | ||
| dest: bx!(VersionedLocation::V4( | ||
| xcm::v4::Junction::Parachain(AssetHubRococo::para_id().into()).into() | ||
| )), | ||
| message: bx!(VersionedXcm::V5(Xcm(vec![ | ||
| UnpaidExecution { weight_limit: Unlimited, check_origin: None }, | ||
| Transact { | ||
| origin_kind: OriginKind::SovereignAccount, | ||
| fallback_max_weight: None, | ||
| call: AssetHubRococoRuntimeCall::AssetRewards( | ||
| pallet_asset_rewards::Call::<AssetHubRococoRuntime>::create_pool { | ||
| staked_asset_id, | ||
| reward_asset_id, | ||
| reward_rate_per_block, | ||
| expiry: DispatchTime::After(lifetime), | ||
| admin | ||
| } | ||
| ) | ||
| .encode() | ||
| .into(), | ||
| } | ||
| ]))), | ||
| }); | ||
|
|
||
| let treasury_origin: RococoRuntimeOrigin = Treasurer.into(); | ||
| assert_ok!(create_pool_call.dispatch(treasury_origin)); | ||
|
|
||
| assert_expected_events!( | ||
| Rococo, | ||
| vec![ | ||
| RococoRuntimeEvent::XcmPallet(pallet_xcm::Event::Sent { .. }) => {}, | ||
| ] | ||
| ); | ||
| }); | ||
|
|
||
| AssetHubRococo::execute_with(|| { | ||
| type Runtime = <AssetHubRococo as Chain>::Runtime; | ||
| type RuntimeEvent = <AssetHubRococo as Chain>::RuntimeEvent; | ||
|
|
||
| assert_eq!(1, pallet_asset_rewards::Pools::<Runtime>::iter().count()); | ||
|
|
||
| let events = AssetHubRococo::events(); | ||
| match events.iter().last() { | ||
| Some(RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { | ||
| success: true, | ||
| .. | ||
| })) => (), | ||
| _ => panic!("Expected MessageQueue::Processed event"), | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.