This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Introduce CheckNonZeroSender #10413
Merged
Merged
Introduce CheckNonZeroSender #10413
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
70938c8
Introduce CheckNonZeroSender
gavofyork 28d97d5
Missing file
gavofyork 09eac59
Formatting
gavofyork 9447102
Fixes
gavofyork 51a725b
Formatting
gavofyork e5f1f2a
some fixes to compile
shawntabrizi 837abd7
Update frame/system/src/extensions/check_non_zero_sender.rs
shawntabrizi d8767dd
Fixes
gavofyork be8494d
Merge branch 'gav-disable-zero' of github.com:paritytech/substrate in…
gavofyork 383f282
Fixes
gavofyork 3cbfdf6
another fix
shawntabrizi a257ff3
Formatting
gavofyork c803ea6
Merge branch 'gav-disable-zero' of github.com:paritytech/substrate in…
gavofyork 2e83bca
Merge branch 'master' into gav-disable-zero
shawntabrizi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
// This file is part of Substrate. | ||
|
||
// Copyright (C) 2017-2021 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::Config; | ||
use codec::{Decode, Encode}; | ||
use frame_support::weights::DispatchInfo; | ||
use scale_info::TypeInfo; | ||
use sp_runtime::{ | ||
traits::{DispatchInfoOf, Dispatchable, SignedExtension}, | ||
transaction_validity::{ | ||
InvalidTransaction, TransactionValidity, TransactionValidityError, ValidTransaction, | ||
}, | ||
}; | ||
use sp_std::{marker::PhantomData, prelude::*}; | ||
|
||
/// Check to ensure that the sender is not the zero address. | ||
#[derive(Encode, Decode, Clone, Eq, PartialEq, TypeInfo)] | ||
#[scale_info(skip_type_params(T))] | ||
pub struct CheckNonZeroSender<T: Config + Send + Sync>(PhantomData<T>); | ||
|
||
impl<T: Config + Send + Sync> sp_std::fmt::Debug for CheckNonZeroSender<T> { | ||
#[cfg(feature = "std")] | ||
fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { | ||
write!(f, "CheckNonZeroSender") | ||
} | ||
|
||
#[cfg(not(feature = "std"))] | ||
fn fmt(&self, _: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { | ||
Ok(()) | ||
} | ||
} | ||
|
||
impl<T: Config + Send + Sync> CheckNonZeroSender<T> { | ||
/// Create new `SignedExtension` to check runtime version. | ||
pub fn new() -> Self { | ||
Self(sp_std::marker::PhantomData) | ||
} | ||
} | ||
|
||
impl<T: Config + Send + Sync> SignedExtension for CheckNonZeroSender<T> | ||
where | ||
T::Call: Dispatchable<Info = DispatchInfo>, | ||
{ | ||
type AccountId = T::AccountId; | ||
type Call = T::Call; | ||
type AdditionalSigned = (); | ||
type Pre = (); | ||
const IDENTIFIER: &'static str = "CheckNonZeroSender"; | ||
|
||
fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { | ||
Ok(()) | ||
} | ||
|
||
fn validate( | ||
&self, | ||
who: &Self::AccountId, | ||
_call: &Self::Call, | ||
_info: &DispatchInfoOf<Self::Call>, | ||
_len: usize, | ||
) -> TransactionValidity { | ||
if who.using_encoded(|d| d.into_iter().all(|x| *x == 0)) { | ||
return Err(TransactionValidityError::Invalid(InvalidTransaction::BadSigner)) | ||
} | ||
Ok(ValidTransaction::default()) | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use super::*; | ||
use crate::mock::{new_test_ext, Test, CALL}; | ||
use frame_support::{assert_noop, assert_ok}; | ||
|
||
#[test] | ||
fn zero_account_ban_works() { | ||
new_test_ext().execute_with(|| { | ||
let info = DispatchInfo::default(); | ||
let len = 0_usize; | ||
assert_noop!( | ||
CheckNonZeroSender::<Test>::new().validate(&0, CALL, &info, len), | ||
InvalidTransaction::BadSigner | ||
); | ||
assert_ok!(CheckNonZeroSender::<Test>::new().validate(&1, CALL, &info, len)); | ||
}) | ||
} | ||
} |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will require that clients update before.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:-(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean it is not a hard requirement, aka we don't break authoring. We will just get a failure on
validate_block
when trying to decode the return value.