pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 17:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

pallet-utility: Disallow none origin (#12321)

Browse Source 
Co-authored-by: André Silva <andrerfosilva@gmail.com>
This commit is contained in:
Bastian Köcher
2022-09-22 09:41:16 +02:00
committed by GitHub
parent 857c3bf37b
commit 8a43b42ab1
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/utility/src/lib.rs
+3 -3
View File
@@ -203,7 +203,7 @@ pub mod pallet {
origin: OriginFor<T>, origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>, calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo { ) -> 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(); let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls); ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);
@@ -319,7 +319,7 @@ pub mod pallet {
origin: OriginFor<T>, origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>, calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo { ) -> 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(); let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls); ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);
@@ -426,7 +426,7 @@ pub mod pallet {
origin: OriginFor<T>, origin: OriginFor<T>,
calls: Vec<<T as Config>::RuntimeCall>, calls: Vec<<T as Config>::RuntimeCall>,
) -> DispatchResultWithPostInfo { ) -> 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(); let calls_len = calls.len();
ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls); ensure!(calls_len <= Self::batched_calls_limit() as usize, Error::<T>::TooManyCalls);
substrate/frame/utility/src/tests.rs
+12 -2
View File
@@ -25,6 +25,7 @@ use crate as utility;
use frame_support::{ use frame_support::{
assert_err_ignore_postinfo, assert_noop, assert_ok, assert_err_ignore_postinfo, assert_noop, assert_ok,
dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable, Pays}, dispatch::{DispatchError, DispatchErrorWithPostInfo, Dispatchable, Pays},
error::BadOrigin,
parameter_types, storage, parameter_types, storage,
traits::{ConstU32, ConstU64, Contains}, traits::{ConstU32, ConstU64, Contains},
weights::Weight, weights::Weight,
@@ -651,7 +652,7 @@ fn force_batch_works() {
call_transfer(2, 10), call_transfer(2, 10),
call_transfer(2, 5), call_transfer(2, 5),
] ]
),); ));
System::assert_last_event(utility::Event::BatchCompletedWithErrors.into()); System::assert_last_event(utility::Event::BatchCompletedWithErrors.into());
System::assert_has_event( System::assert_has_event(
utility::Event::ItemFailed { error: DispatchError::Other("") }.into(), utility::Event::ItemFailed { error: DispatchError::Other("") }.into(),
@@ -662,10 +663,19 @@ fn force_batch_works() {
assert_ok!(Utility::force_batch( assert_ok!(Utility::force_batch(
RuntimeOrigin::signed(2), RuntimeOrigin::signed(2),
vec![call_transfer(1, 5), call_transfer(1, 5),] vec![call_transfer(1, 5), call_transfer(1, 5),]
),); ));
System::assert_last_event(utility::Event::BatchCompleted.into()); System::assert_last_event(utility::Event::BatchCompleted.into());
assert_ok!(Utility::force_batch(RuntimeOrigin::signed(1), vec![call_transfer(2, 50),]),); assert_ok!(Utility::force_batch(RuntimeOrigin::signed(1), vec![call_transfer(2, 50),]),);
System::assert_last_event(utility::Event::BatchCompletedWithErrors.into()); 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);
})
}