mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-10 04:01:51 +00:00
Resolve merge conflicts
This commit is contained in:
@@ -40,7 +40,7 @@ use warp::reply::{self, Reply};
|
||||
use warp::{Filter, Rejection};
|
||||
|
||||
pub const DEFAULT_FEE_RECIPIENT: Address = Address::repeat_byte(42);
|
||||
pub const DEFAULT_GAS_LIMIT: u64 = 45_000_000;
|
||||
pub const DEFAULT_GAS_LIMIT: u64 = 60_000_000;
|
||||
pub const DEFAULT_BUILDER_PRIVATE_KEY: &str =
|
||||
"607a11b45a7219cc61a3d9c5fd08c7eebd602a6a19a977f8d3771d5711a550f2";
|
||||
|
||||
@@ -72,7 +72,7 @@ impl Operation {
|
||||
}
|
||||
|
||||
pub fn mock_builder_extra_data<E: EthSpec>() -> types::VariableList<u8, E::MaxExtraDataBytes> {
|
||||
"mock_builder".as_bytes().to_vec().into()
|
||||
"mock_builder".as_bytes().to_vec().try_into().unwrap()
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
Reference in New Issue
Block a user