Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

pallet-utility: Disallow none origin #12321

Merged
merged 2 commits into from
Sep 22, 2022
Merged

pallet-utility: Disallow none origin #12321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750abe9
pallet-utility: Disallow none origin
bkchr Sep 21, 2022
5590a2c
Merge branch 'master' into bkchr-utility-disallow-none-origin
andresilva Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frame/utility/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ pub mod pallet {
origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo {
let is_root = ensure_root(origin.clone()).is_ok();
let is_root = ensure_signed_or_root(origin.clone())?.is_none();
let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);

Expand Down Expand Up @@ -319,7 +319,7 @@ pub mod pallet {
origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo {
let is_root = ensure_root(origin.clone()).is_ok();
let is_root = ensure_signed_or_root(origin.clone())?.is_none();
let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);

Expand Down Expand Up @@ -426,7 +426,7 @@ pub mod pallet {
origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo {
let is_root = ensure_root(origin.clone()).is_ok();
let is_root = ensure_signed_or_root(origin.clone())?.is_none();
let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);

Expand Down
14 changes: 12 additions & 2 deletions frame/utility/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use crate as utility;
use frame_support::{
assert_err_ignore_postinfo, assert_noop, assert_ok,
dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable, Pays},
error::BadOrigin,
parameter_types, storage,
traits::{ConstU32, ConstU64, Contains},
weights::Weight,
Expand Down Expand Up @@ -651,7 +652,7 @@ fn force_batch_works() {
call_transfer(2, 10),
call_transfer(2, 5),
]
),);
));
System::assert_last_event(utility::Event::BatchCompletedWithErrors.into());
System::assert_has_event(
utility::Event::ItemFailed { error: DispatchError::Other("") }.into(),
Expand All @@ -662,10 +663,19 @@ fn force_batch_works() {
assert_ok!(Utility::force_batch(
RuntimeOrigin::signed(2),
vec![call_transfer(1, 5), call_transfer(1, 5),]
),);
));
System::assert_last_event(utility::Event::BatchCompleted.into());

assert_ok!(Utility::force_batch(RuntimeOrigin::signed(1), vec![call_transfer(2, 50),]),);
System::assert_last_event(utility::Event::BatchCompletedWithErrors.into());
});
}

#[test]
fn none_origin_does_not_work() {
new_test_ext().execute_with(|| {
assert_noop!(Utility::force_batch(RuntimeOrigin::none(), vec![]), BadOrigin);
assert_noop!(Utility::batch(RuntimeOrigin::none(), vec![]), BadOrigin);
assert_noop!(Utility::batch_all(RuntimeOrigin::none(), vec![]), BadOrigin);
})
}