-
Notifications
You must be signed in to change notification settings - Fork 619
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: signable message prefix for meta tx #8578
Merged
near-bulldozer
merged 7 commits into
near:master
from
jakmeier:meta-tx-signable-message
Feb 20, 2023
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
b3d6abb
feat: signable message prefix
jakmeier 93e4c61
add signable message tests
jakmeier c289db9
update old tests
jakmeier fc80352
clippy
jakmeier d44ab08
update python tests to new signature format
jakmeier 320aa20
Merge branch 'master' into meta-tx-signable-message
jakmeier e001125
address review comments
jakmeier 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,301 @@ | ||
use crate::hash::hash; | ||
use crate::types::AccountId; | ||
use borsh::{BorshDeserialize, BorshSerialize}; | ||
use near_crypto::{Signature, Signer}; | ||
|
||
// These numbers are picked to be compatible with the current protocol and how | ||
// transactions are defined in it. Introducing this is no protocol change. This | ||
// is just a forward-looking implementation detail of meta transactions. | ||
// | ||
// We plan to establish a standard with NEP-461 that makes this an official | ||
jakmeier marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// specification in the wider ecosystem. Note that NEP-461 should not change the | ||
// protocol in any way, unless we have to change meta transaction implementation | ||
// details to adhere to the future standard. | ||
// | ||
// TODO: consider making these public once there is an approved standard. | ||
const MIN_ON_CHAIN_DISCRIMINANT: u32 = 1 << 30; | ||
const MAX_ON_CHAIN_DISCRIMINANT: u32 = (1 << 31) - 1; | ||
const MIN_OFF_CHAIN_DISCRIMINANT: u32 = 1 << 31; | ||
const MAX_OFF_CHAIN_DISCRIMINANT: u32 = u32::MAX; | ||
|
||
// NEPs currently included in the scheme | ||
const NEP_366_META_TRANSACTIONS: u32 = 366; | ||
|
||
/// Used to distinguish message types that are sign by account keys, to avoid an | ||
/// abuse of signed messages as something else. | ||
/// | ||
/// This prefix must be be at the first four bytes of a message body that is | ||
/// signed under this signature scheme. | ||
/// | ||
/// The scheme is a draft introduced to avoid security issues with the | ||
/// implementation of meta transactions (NEP-366) but will eventually be | ||
/// standardized with NEP-461 that solves the problem more generally. | ||
#[derive( | ||
Debug, | ||
Clone, | ||
Copy, | ||
PartialEq, | ||
Eq, | ||
PartialOrd, | ||
Ord, | ||
Hash, | ||
BorshSerialize, | ||
BorshDeserialize, | ||
serde::Serialize, | ||
serde::Deserialize, | ||
)] | ||
pub struct MessageDiscriminant { | ||
/// The unique prefix, serialized in little-endian by borsh. | ||
discriminant: u32, | ||
} | ||
|
||
/// A wrapper around a message that should be signed using this scheme. | ||
/// | ||
/// Only used for constructing a signature, not used to transmit messages. The | ||
/// discriminant prefix is implicit and should be known by the receiver based on | ||
/// the context in which the message is received. | ||
#[derive(BorshSerialize, BorshDeserialize)] | ||
pub struct SignableMessage<'a, T> { | ||
pub discriminant: MessageDiscriminant, | ||
pub msg: &'a T, | ||
} | ||
|
||
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] | ||
#[non_exhaustive] | ||
pub enum SignableMessageType { | ||
/// A delegate action, intended for a relayer to included it in an action list of a transaction. | ||
DelegateAction, | ||
} | ||
|
||
#[derive(thiserror::Error, Debug)] | ||
#[non_exhaustive] | ||
pub enum ReadDiscriminantError { | ||
#[error("does not fit any known categories")] | ||
UnknownMessageType, | ||
#[error("NEP {0} does not have a known on-chain use")] | ||
UnknownOnChainNep(u32), | ||
#[error("NEP {0} does not have a known off-chain use")] | ||
UnknownOffChainNep(u32), | ||
#[error("discriminant is in the range for transactions")] | ||
TransactionFound, | ||
} | ||
|
||
#[derive(thiserror::Error, Debug)] | ||
#[non_exhaustive] | ||
pub enum CreateDiscriminantError { | ||
#[error("nep number {0} is too big")] | ||
NepTooLarge(u32), | ||
} | ||
|
||
impl<'a, T: BorshSerialize> SignableMessage<'a, T> { | ||
pub fn new(msg: &'a T, ty: SignableMessageType) -> Self { | ||
let discriminant = ty.into(); | ||
Self { discriminant, msg } | ||
} | ||
|
||
pub fn sign(&self, signer: &dyn Signer) -> Signature { | ||
let bytes = self.try_to_vec().expect("Failed to deserialize"); | ||
let hash = hash(&bytes); | ||
signer.sign(hash.as_bytes()) | ||
} | ||
} | ||
|
||
impl MessageDiscriminant { | ||
/// Create a discriminant for an on-chain actionable message that was introduced in the specified NEP. | ||
/// | ||
/// Allows creating discriminants currently unknown in this crate, which can | ||
/// be useful to prototype new standards. For example, when the client | ||
/// project still relies on an older version of this crate while nightly | ||
/// nearcore already supports a new NEP. | ||
pub fn new_on_chain(nep: u32) -> Result<Self, CreateDiscriminantError> { | ||
// unchecked arithmetic: these are constants | ||
if nep > MAX_ON_CHAIN_DISCRIMINANT - MIN_ON_CHAIN_DISCRIMINANT { | ||
Err(CreateDiscriminantError::NepTooLarge(nep)) | ||
} else { | ||
Ok(Self { | ||
// unchecked arithmetic: just checked range | ||
discriminant: MIN_ON_CHAIN_DISCRIMINANT + nep, | ||
}) | ||
} | ||
} | ||
|
||
/// Create a discriminant for an off-chain message that was introduced in the specified NEP. | ||
/// | ||
/// Allows creating discriminants currently unknown in this crate, which can | ||
/// be useful to prototype new standards. For example, when the client | ||
/// project still relies on an older version of this crate while nightly | ||
/// nearcore already supports a new NEP. | ||
pub fn new_off_chain(nep: u32) -> Result<Self, CreateDiscriminantError> { | ||
// unchecked arithmetic: these are constants | ||
if nep > MAX_OFF_CHAIN_DISCRIMINANT - MIN_OFF_CHAIN_DISCRIMINANT { | ||
Err(CreateDiscriminantError::NepTooLarge(nep)) | ||
} else { | ||
Ok(Self { | ||
// unchecked arithmetic: just checked range | ||
discriminant: MIN_OFF_CHAIN_DISCRIMINANT + nep, | ||
}) | ||
} | ||
} | ||
|
||
/// Returns the raw integer value of the discriminant as an integer value. | ||
pub fn raw_discriminant(&self) -> u32 { | ||
self.discriminant | ||
} | ||
|
||
/// Whether this discriminant marks a traditional `SignedTransaction`. | ||
pub fn is_transaction(&self) -> bool { | ||
// Backwards compatibility with transaction that were defined before this standard: | ||
// Transaction begins with `AccountId`, which is just a `String` in | ||
// borsh serialization, which starts with the length of the underlying | ||
// byte vector in little endian u32. | ||
// Currently allowed AccountIds are between 2 and 64 bytes. | ||
self.discriminant >= AccountId::MIN_LEN as u32 | ||
&& self.discriminant <= AccountId::MAX_LEN as u32 | ||
} | ||
|
||
/// If this discriminant marks a message intended for on-chain use, return | ||
/// the NEP in which the message type was introduced. | ||
pub fn on_chain_nep(&self) -> Option<u32> { | ||
if self.discriminant < MIN_ON_CHAIN_DISCRIMINANT | ||
|| self.discriminant > MAX_ON_CHAIN_DISCRIMINANT | ||
{ | ||
None | ||
} else { | ||
// unchecked arithmetic: just checked it is in range | ||
let nep = self.discriminant - MIN_ON_CHAIN_DISCRIMINANT; | ||
Some(nep) | ||
} | ||
} | ||
|
||
/// If this discriminant marks a message intended for off-chain use, return | ||
/// the NEP in which the message type was introduced. | ||
/// | ||
/// clippy: MAX_OFF_CHAIN_DISCRIMINANT currently is u32::MAX which makes the | ||
/// comparison pointless, however I think it helps code readability to have | ||
/// it spelled out anyway | ||
#[allow(clippy::absurd_extreme_comparisons)] | ||
pub fn off_chain_nep(&self) -> Option<u32> { | ||
if self.discriminant < MIN_OFF_CHAIN_DISCRIMINANT | ||
|| self.discriminant > MAX_OFF_CHAIN_DISCRIMINANT | ||
{ | ||
None | ||
} else { | ||
// unchecked arithmetic: just checked it is in range | ||
let nep = self.discriminant - MIN_OFF_CHAIN_DISCRIMINANT; | ||
Some(nep) | ||
} | ||
} | ||
} | ||
|
||
impl TryFrom<MessageDiscriminant> for SignableMessageType { | ||
type Error = ReadDiscriminantError; | ||
|
||
fn try_from(discriminant: MessageDiscriminant) -> Result<Self, Self::Error> { | ||
if discriminant.is_transaction() { | ||
Err(Self::Error::TransactionFound) | ||
} else if let Some(nep) = discriminant.on_chain_nep() { | ||
match nep { | ||
NEP_366_META_TRANSACTIONS => Ok(Self::DelegateAction), | ||
_ => Err(Self::Error::UnknownOnChainNep(nep)), | ||
} | ||
} else if let Some(nep) = discriminant.off_chain_nep() { | ||
Err(Self::Error::UnknownOffChainNep(nep)) | ||
} else { | ||
Err(Self::Error::UnknownMessageType) | ||
} | ||
} | ||
} | ||
|
||
impl From<SignableMessageType> for MessageDiscriminant { | ||
fn from(ty: SignableMessageType) -> Self { | ||
// unwrapping here is ok, we know the constant NEP numbers used are in range | ||
match ty { | ||
SignableMessageType::DelegateAction => { | ||
MessageDiscriminant::new_on_chain(NEP_366_META_TRANSACTIONS).unwrap() | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use near_crypto::PublicKey; | ||
|
||
use super::*; | ||
use crate::delegate_action::{DelegateAction, SignedDelegateAction}; | ||
use crate::test_utils::create_user_test_signer; | ||
|
||
// happy path for NEP-366 signature | ||
#[test] | ||
fn nep_366_ok() { | ||
let sender_id: AccountId = "alice.near".parse().unwrap(); | ||
let receiver_id: AccountId = "bob.near".parse().unwrap(); | ||
let signer = create_user_test_signer(&sender_id); | ||
|
||
let delegate_action = delegate_action(sender_id, receiver_id, signer.public_key()); | ||
let signable = SignableMessage::new(&delegate_action, SignableMessageType::DelegateAction); | ||
let signed = SignedDelegateAction { | ||
signature: signable.sign(&signer), | ||
delegate_action: delegate_action, | ||
}; | ||
|
||
assert!(signed.verify()); | ||
} | ||
|
||
// Try to use a wrong nep number in NEP-366 signature verification. | ||
#[test] | ||
fn nep_366_wrong_nep() { | ||
let sender_id: AccountId = "alice.near".parse().unwrap(); | ||
let receiver_id: AccountId = "bob.near".parse().unwrap(); | ||
let signer = create_user_test_signer(&sender_id); | ||
|
||
let delegate_action = delegate_action(sender_id, receiver_id, signer.public_key()); | ||
let wrong_nep = 777; | ||
let signable = SignableMessage { | ||
discriminant: MessageDiscriminant::new_on_chain(wrong_nep).unwrap(), | ||
msg: &delegate_action, | ||
}; | ||
let signed = SignedDelegateAction { | ||
signature: signable.sign(&signer), | ||
delegate_action: delegate_action, | ||
}; | ||
|
||
assert!(!signed.verify()); | ||
} | ||
|
||
// Try to use a wrong message type in NEP-366 signature verification. | ||
#[test] | ||
fn nep_366_wrong_msg_type() { | ||
let sender_id: AccountId = "alice.near".parse().unwrap(); | ||
let receiver_id: AccountId = "bob.near".parse().unwrap(); | ||
let signer = create_user_test_signer(&sender_id); | ||
|
||
let delegate_action = delegate_action(sender_id, receiver_id, signer.public_key()); | ||
let correct_nep = 366; | ||
// here we use it as an off-chain only signature | ||
let wrong_discriminant = MessageDiscriminant::new_off_chain(correct_nep).unwrap(); | ||
let signable = SignableMessage { discriminant: wrong_discriminant, msg: &delegate_action }; | ||
let signed = SignedDelegateAction { | ||
signature: signable.sign(&signer), | ||
delegate_action: delegate_action, | ||
}; | ||
|
||
assert!(!signed.verify()); | ||
} | ||
|
||
fn delegate_action( | ||
sender_id: AccountId, | ||
receiver_id: AccountId, | ||
public_key: PublicKey, | ||
) -> DelegateAction { | ||
let delegate_action = DelegateAction { | ||
sender_id, | ||
receiver_id, | ||
actions: vec![], | ||
nonce: 0, | ||
max_block_height: 1000, | ||
public_key, | ||
}; | ||
delegate_action | ||
} | ||
} |
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.
The naming of this function feels a bit confusing
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.
Good point. I renamed it to
get_nep461_hash
to make clear this is specially constructed hash according to the rules dictated by nep461. And I added a comment. I hope this makes it clearer.