impl fastrlp traits for Signature (#1444)

This commit is contained in:
Dan Cline 2022-07-04 14:13:30 -04:00 committed by GitHub
parent fe267049c8
commit c077a633c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 1 deletions

26
Cargo.lock generated
View File

@ -1279,6 +1279,7 @@ dependencies = [
"convert_case", "convert_case",
"elliptic-curve", "elliptic-curve",
"ethabi", "ethabi",
"fastrlp",
"generic-array 0.14.5", "generic-array 0.14.5",
"hex", "hex",
"hex-literal", "hex-literal",
@ -1512,6 +1513,31 @@ dependencies = [
"instant", "instant",
] ]
[[package]]
name = "fastrlp"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6c60b758dc5bf92743e1b863ac88b84a4750bd096b19c2f524359659dc1f1ac"
dependencies = [
"arrayvec 0.7.2",
"auto_impl",
"bytes",
"ethereum-types",
"fastrlp-derive",
]
[[package]]
name = "fastrlp-derive"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9499f20a2fa1a744422de24d1b4d1ec58f240147de1d0a3ceacadf2e240b4fc2"
dependencies = [
"bytes",
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "ff" name = "ff"
version = "0.11.0" version = "0.11.0"

View File

@ -10,6 +10,7 @@ repository = "https://github.com/gakonst/ethers-rs"
keywords = ["ethereum", "web3", "celo", "ethers"] keywords = ["ethereum", "web3", "celo", "ethers"]
[dependencies] [dependencies]
fastrlp = { version = "0.1.2", features = ["std", "derive", "ethereum-types"] }
rlp = { version = "0.5.0", default-features = false, features = ["std"] } rlp = { version = "0.5.0", default-features = false, features = ["std"] }
ethabi = { version = "17.1.0", default-features = false, features = ["full-serde", "rlp"] } ethabi = { version = "17.1.0", default-features = false, features = ["full-serde", "rlp"] }
arrayvec = { version = "0.7.2", default-features = false } arrayvec = { version = "0.7.2", default-features = false }

View File

@ -4,6 +4,7 @@ use crate::{
utils::hash_message, utils::hash_message,
}; };
use fastrlp::Decodable;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::{convert::TryFrom, fmt, str::FromStr}; use std::{convert::TryFrom, fmt, str::FromStr};
@ -53,7 +54,7 @@ pub enum RecoveryMessage {
Hash(H256), Hash(H256),
} }
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Copy)] #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Copy, Hash)]
/// An ECDSA signature /// An ECDSA signature
pub struct Signature { pub struct Signature {
/// R value /// R value
@ -141,6 +142,29 @@ impl Signature {
pub fn to_vec(&self) -> Vec<u8> { pub fn to_vec(&self) -> Vec<u8> {
self.into() self.into()
} }
/// Decodes a signature from RLP bytes, assuming no RLP header
pub(crate) fn decode_signature(buf: &mut &[u8]) -> Result<Self, fastrlp::DecodeError> {
let v = u64::decode(buf)?;
Ok(Self { r: U256::decode(buf)?, s: U256::decode(buf)?, v })
}
}
impl fastrlp::Decodable for Signature {
fn decode(buf: &mut &[u8]) -> Result<Self, fastrlp::DecodeError> {
Self::decode_signature(buf)
}
}
impl fastrlp::Encodable for Signature {
fn length(&self) -> usize {
self.r.length() + self.s.length() + self.v.length()
}
fn encode(&self, out: &mut dyn bytes::BufMut) {
self.v.encode(out);
self.r.encode(out);
self.s.encode(out);
}
} }
fn normalize_recovery_id(v: u64) -> u8 { fn normalize_recovery_id(v: u64) -> u8 {