github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 17:18:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Signature functions moved to rpc_types_compat (#4143)

Browse Source
This commit is contained in:
Supernovahs.eth
2023-08-10 20:36:49 +05:30
committed by GitHub
parent 9817a9e724
commit b8b7ad60ad
4 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/rpc/rpc-types-compat/src/transaction/mod.rs
View File

@@ -1,12 +1,12 @@
//! Compatibility functions for rpc `Transaction` type.
mod signature;
use reth_primitives::{
AccessListItem, BlockNumber, Transaction as PrimitiveTransaction,
TransactionKind as PrimitiveTransactionKind, TransactionSignedEcRecovered, TxType, H256, U128,
U256, U64,
};
use reth_rpc_types::{Signature, Transaction};
use reth_rpc_types::Transaction;
use signature::from_primitive_signature;
/// Create a new rpc transaction result for a mined transaction, using the given block hash,
/// number, and tx index fields to populate the corresponding fields in the rpc result.
///
@@ -96,11 +96,8 @@ fn fill(
),
};
let signature = Signature::from_primitive_signature(
*signed_tx.signature(),
signed_tx.tx_type(),
signed_tx.chain_id(),
);
let signature =
from_primitive_signature(*signed_tx.signature(), signed_tx.tx_type(), signed_tx.chain_id());
Transaction {
hash: signed_tx.hash(),

51
crates/rpc/rpc-types-compat/src/transaction/signature.rs Normal file
View File

@@ -0,0 +1,51 @@
use reth_primitives::{Signature as PrimitiveSignature, TxType, U256};
use reth_rpc_types::{Parity, Signature};
/// Creates a new rpc signature from a legacy [primitive
/// signature](reth_primitives::Signature), using the give chain id to compute the signature's
/// recovery id.
///
/// If the chain id is `Some`, the recovery id is computed according to [EIP-155](https://eips.ethereum.org/EIPS/eip-155).
pub(crate) fn from_legacy_primitive_signature(
signature: PrimitiveSignature,
chain_id: Option<u64>,
) -> Signature {
Signature {
r: signature.r,
s: signature.s,
v: U256::from(signature.v(chain_id)),
y_parity: None,
}
}
/// Creates a new rpc signature from a non-legacy [primitive
/// signature](reth_primitives::Signature). This sets the `v` value to `0` or `1` depending on
/// the signature's `odd_y_parity`.
pub(crate) fn from_typed_primitive_signature(signature: PrimitiveSignature) -> Signature {
Signature {
r: signature.r,
s: signature.s,
v: U256::from(signature.odd_y_parity as u8),
y_parity: Some(Parity(signature.odd_y_parity)),
}
}
/// Creates a new rpc signature from a legacy [primitive
/// signature](reth_primitives::Signature).
///
/// The tx type is used to determine whether or not to use the `chain_id` to compute the
/// signature's recovery id.
///
/// If the transaction is a legacy transaction, it will use the `chain_id` to compute the
/// signature's recovery id. If the transaction is a typed transaction, it will set the `v`
/// value to `0` or `1` depending on the signature's `odd_y_parity`.
pub(crate) fn from_primitive_signature(
signature: PrimitiveSignature,
tx_type: TxType,
chain_id: Option<u64>,
) -> Signature {
match tx_type {
TxType::Legacy => from_legacy_primitive_signature(signature, chain_id),
_ => from_typed_primitive_signature(signature),
}
}

2
crates/rpc/rpc-types/src/eth/transaction/mod.rs
View File

@@ -3,7 +3,7 @@ pub use receipt::TransactionReceipt;
pub use request::TransactionRequest;
use reth_primitives::{AccessListItem, Address, Bytes, H256, U128, U256, U64};
use serde::{Deserialize, Serialize};
pub use signature::Signature;
pub use signature::{Parity, Signature};
pub use typed::*;
mod common;

53
crates/rpc/rpc-types/src/eth/transaction/signature.rs
View File

@@ -1,5 +1,5 @@
//! Signature related RPC values
use reth_primitives::{Signature as PrimitiveSignature, TxType, U256};
use reth_primitives::U256;
use serde::{Deserialize, Serialize};
/// Container type for all signature fields in RPC
@@ -23,57 +23,6 @@ pub struct Signature {
pub y_parity: Option<Parity>,
}
impl Signature {
/// Creates a new rpc signature from a legacy [primitive
/// signature](reth_primitives::Signature), using the give chain id to compute the signature's
/// recovery id.
///
/// If the chain id is `Some`, the recovery id is computed according to [EIP-155](https://eips.ethereum.org/EIPS/eip-155).
pub(crate) fn from_legacy_primitive_signature(
signature: PrimitiveSignature,
chain_id: Option<u64>,
) -> Self {
Self {
r: signature.r,
s: signature.s,
v: U256::from(signature.v(chain_id)),
y_parity: None,
}
}
/// Creates a new rpc signature from a non-legacy [primitive
/// signature](reth_primitives::Signature). This sets the `v` value to `0` or `1` depending on
/// the signature's `odd_y_parity`.
pub(crate) fn from_typed_primitive_signature(signature: PrimitiveSignature) -> Self {
Self {
r: signature.r,
s: signature.s,
v: U256::from(signature.odd_y_parity as u8),
y_parity: Some(Parity(signature.odd_y_parity)),
}
}
/// Creates a new rpc signature from a legacy [primitive
/// signature](reth_primitives::Signature).
///
/// The tx type is used to determine whether or not to use the `chain_id` to compute the
/// signature's recovery id.
///
/// If the transaction is a legacy transaction, it will use the `chain_id` to compute the
/// signature's recovery id. If the transaction is a typed transaction, it will set the `v`
/// value to `0` or `1` depending on the signature's `odd_y_parity`.
pub fn from_primitive_signature(
signature: PrimitiveSignature,
tx_type: TxType,
chain_id: Option<u64>,
) -> Self {
match tx_type {
TxType::Legacy => Signature::from_legacy_primitive_signature(signature, chain_id),
_ => Signature::from_typed_primitive_signature(signature),
}
}
}
/// Type that represents the signature parity byte, meant for use in RPC.
///
/// This will be serialized as "0x0" if false, and "0x1" if true.