d8623cfc4f
* Checkout serde_utils from rayonism * Make eth1::http functions pub * Add bones of execution_layer * Modify decoding * Expose Transaction, cargo fmt * Add executePayload * Add all minimal spec endpoints * Start adding json rpc wrapper * Finish custom JSON response handler * Switch to new rpc sending method * Add first test * Fix camelCase * Finish adding tests * Begin threading execution layer into BeaconChain * Fix clippy lints * Fix clippy lints * Thread execution layer into ClientBuilder * Add CLI flags * Add block processing methods to ExecutionLayer * Add block_on to execution_layer * Integrate execute_payload * Add extra_data field * Begin implementing payload handle * Send consensus valid/invalid messages * Fix minor type in task_executor * Call forkchoiceUpdated * Add search for TTD block * Thread TTD into execution layer * Allow producing block with execution payload * Add LRU cache for execution blocks * Remove duplicate 0x on ssz_types serialization * Add tests for block getter methods * Add basic block generator impl * Add is_valid_terminal_block to EL * Verify merge block in block_verification * Partially implement --terminal-block-hash-override * Add terminal_block_hash to ChainSpec * Remove Option from terminal_block_hash in EL * Revert merge changes to consensus/fork_choice * Remove commented-out code * Add bones for handling RPC methods on test server * Add first ExecutionLayer tests * Add testing for finding terminal block * Prevent infinite loops * Add insert_merge_block to block gen * Add block gen test for pos blocks * Start adding payloads to block gen * Fix clippy lints * Add execution payload to block gen * Add execute_payload to block_gen * Refactor block gen * Add all routes to mock server * Use Uint256 for base_fee_per_gas * Add working execution chain build * Remove unused var * Revert "Use Uint256 for base_fee_per_gas" This reverts commit 6c88f19ac45db834dd4dbf7a3c6e7242c1c0f735. * Fix base_fee_for_gas Uint256 * Update execute payload handle * Improve testing, fix bugs * Fix default fee-recipient * Fix fee-recipient address (again) * Add check for terminal block, add comments, tidy * Apply suggestions from code review Co-authored-by: realbigsean <seananderson33@GMAIL.com> * Fix is_none on handle Drop * Remove commented-out tests Co-authored-by: realbigsean <seananderson33@GMAIL.com>
78 lines
1.9 KiB
Rust
78 lines
1.9 KiB
Rust
//! Provides utilities for parsing 0x-prefixed hex strings.
|
|
|
|
use serde::de::{self, Visitor};
|
|
use std::fmt;
|
|
|
|
/// Encode `data` as a 0x-prefixed hex string.
|
|
pub fn encode<T: AsRef<[u8]>>(data: T) -> String {
|
|
let hex = hex::encode(data);
|
|
|
|
let mut s = "0x".to_string();
|
|
s.push_str(hex.as_str());
|
|
s
|
|
}
|
|
|
|
/// Decode `data` from a 0x-prefixed hex string.
|
|
pub fn decode(s: &str) -> Result<Vec<u8>, String> {
|
|
if let Some(stripped) = s.strip_prefix("0x") {
|
|
hex::decode(stripped).map_err(|e| format!("invalid hex: {:?}", e))
|
|
} else {
|
|
Err("hex must have 0x prefix".to_string())
|
|
}
|
|
}
|
|
|
|
pub struct PrefixedHexVisitor;
|
|
|
|
impl<'de> Visitor<'de> for PrefixedHexVisitor {
|
|
type Value = Vec<u8>;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
formatter.write_str("a hex string with 0x prefix")
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
|
|
where
|
|
E: de::Error,
|
|
{
|
|
decode(value).map_err(de::Error::custom)
|
|
}
|
|
}
|
|
|
|
pub struct HexVisitor;
|
|
|
|
impl<'de> Visitor<'de> for HexVisitor {
|
|
type Value = Vec<u8>;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
formatter.write_str("a hex string (irrelevant of prefix)")
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
|
|
where
|
|
E: de::Error,
|
|
{
|
|
hex::decode(value.trim_start_matches("0x"))
|
|
.map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn encoding() {
|
|
let bytes = vec![0, 255];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x00ff");
|
|
|
|
let bytes = vec![];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x");
|
|
|
|
let bytes = vec![1, 2, 3];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x010203");
|
|
}
|
|
}
|