gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle merge fork in web3signer (#2631)

Browse Source
This commit is contained in:
Paul Hauner
2021-09-27 10:49:14 +10:00
parent 10b263fed4
commit 18eee2dc82
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
validator_client/src/signing_method/web3signer.rs
View File

@@ -1,5 +1,6 @@
//! Contains the types required to make JSON requests to Web3Signer servers.
use super::Error;
use serde::{Deserialize, Serialize};
use types::*;
@@ -66,13 +67,14 @@ pub enum Web3SignerObject<'a, T: EthSpec> {
}
impl<'a, T: EthSpec> Web3SignerObject<'a, T> {
pub fn beacon_block(block: &'a BeaconBlock<T>) -> Self {
pub fn beacon_block(block: &'a BeaconBlock<T>) -> Result<Self, Error> {
let version = match block {
BeaconBlock::Base(_) => ForkName::Phase0,
BeaconBlock::Altair(_) => ForkName::Altair,
BeaconBlock::Merge(_) => return Err(Error::MergeForkNotSupported),
};
Web3SignerObject::BeaconBlock { version, block }
Ok(Web3SignerObject::BeaconBlock { version, block })
}
pub fn message_type(&self) -> MessageType {