gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix signature parsing

Browse Source
This commit is contained in:
Paul Hauner
2019-11-13 19:42:17 +11:00
parent 7b5a868f4a
commit 7406ef8e8a
4 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
beacon_node/rest_api/src/helpers.rs
View File

@@ -10,11 +10,13 @@ use http::header;
use hyper::{Body, Request}; use hyper::{Body, Request};
use network::NetworkMessage; use network::NetworkMessage;
use parking_lot::RwLock; use parking_lot::RwLock;
use ssz::Encode; use ssz::{Decode, Encode};
use std::sync::Arc; use std::sync::Arc;
use store::{iter::AncestorIter, Store}; use store::{iter::AncestorIter, Store};
use tokio::sync::mpsc; use tokio::sync::mpsc;
use types::{Attestation, BeaconBlock, BeaconState, EthSpec, Hash256, RelativeEpoch, Slot}; use types::{
Attestation, BeaconBlock, BeaconState, EthSpec, Hash256, RelativeEpoch, Signature, Slot,
};
/// Parse a slot from a `0x` preixed string. /// Parse a slot from a `0x` preixed string.
/// ///
@@ -41,6 +43,23 @@ pub fn check_content_type_for_json(req: &Request<Body>) -> Result<(), ApiError>
} }
} }
/// Parse a signature from a `0x` preixed string.
pub fn parse_signature(string: &str) -> Result<Signature, ApiError> {
const PREFIX: &str = "0x";
if string.starts_with(PREFIX) {
let trimmed = string.trim_start_matches(PREFIX);
let bytes = hex::decode(trimmed)
.map_err(|e| ApiError::BadRequest(format!("Unable to parse signature hex: {:?}", e)))?;
Signature::from_ssz_bytes(&bytes)
.map_err(|e| ApiError::BadRequest(format!("Unable to parse signature bytes: {:?}", e)))
} else {
Err(ApiError::BadRequest(
"Signature must have a '0x' prefix".to_string(),
))
}
}
/// Parse a root from a `0x` preixed string. /// Parse a root from a `0x` preixed string.
/// ///
/// E.g., `"0x0000000000000000000000000000000000000000000000000000000000000000"` /// E.g., `"0x0000000000000000000000000000000000000000000000000000000000000000"`
@@ -54,7 +73,7 @@ pub fn parse_root(string: &str) -> Result<Hash256, ApiError> {
.map_err(|e| ApiError::BadRequest(format!("Unable to parse root: {:?}", e))) .map_err(|e| ApiError::BadRequest(format!("Unable to parse root: {:?}", e)))
} else { } else {
Err(ApiError::BadRequest( Err(ApiError::BadRequest(
"Root must have a '0x' prefix".to_string(), "Root must have a '0x' prefix".to_string(),
)) ))
} }
} }
@@ -71,7 +90,7 @@ pub fn parse_pubkey(string: &str) -> Result<PublicKey, ApiError> {
Ok(pubkey) Ok(pubkey)
} else { } else {
Err(ApiError::BadRequest( Err(ApiError::BadRequest(
"Public key must have a '0x' prefix".to_string(), "Public key must have a '0x' prefix".to_string(),
)) ))
} }
} }

12
beacon_node/rest_api/src/validator.rs
View File

@@ -1,11 +1,11 @@
use crate::helpers::{ use crate::helpers::{
check_content_type_for_json, get_beacon_chain_from_request, get_logger_from_request, check_content_type_for_json, get_beacon_chain_from_request, get_logger_from_request,
parse_pubkey, publish_attestation_to_network, publish_beacon_block_to_network, parse_pubkey, parse_signature, publish_attestation_to_network, publish_beacon_block_to_network,
}; };
use crate::response_builder::ResponseBuilder; use crate::response_builder::ResponseBuilder;
use crate::{ApiError, ApiResult, BoxFut, UrlQuery}; use crate::{ApiError, ApiResult, BoxFut, UrlQuery};
use beacon_chain::{AttestationProcessingOutcome, BeaconChainTypes, BlockProcessingOutcome}; use beacon_chain::{AttestationProcessingOutcome, BeaconChainTypes, BlockProcessingOutcome};
use bls::{AggregateSignature, PublicKey, Signature, BLS_PUBLIC_KEY_BYTE_SIZE}; use bls::{AggregateSignature, PublicKey, BLS_PUBLIC_KEY_BYTE_SIZE};
use futures::future::Future; use futures::future::Future;
use futures::stream::Stream; use futures::stream::Stream;
use hyper::{Body, Request}; use hyper::{Body, Request};
@@ -166,16 +166,12 @@ pub fn get_new_beacon_block<T: BeaconChainTypes + 'static>(req: Request<Body>) -
.map_err(|e| { .map_err(|e| {
ApiError::BadRequest(format!("Invalid slot parameter, must be a u64. {:?}", e)) ApiError::BadRequest(format!("Invalid slot parameter, must be a u64. {:?}", e))
})?; })?;
let randao_bytes = query let randao_reveal = query
.first_of(&["randao_reveal"]) .first_of(&["randao_reveal"])
.map(|(_key, value)| value) .and_then(|(_key, value)| parse_signature(&value))
.map(hex::decode)?
.map_err(|e| { .map_err(|e| {
ApiError::BadRequest(format!("Invalid hex string for randao_reveal: {:?}", e)) ApiError::BadRequest(format!("Invalid hex string for randao_reveal: {:?}", e))
})?; })?;
let randao_reveal = Signature::from_bytes(randao_bytes.as_slice()).map_err(|e| {
ApiError::BadRequest(format!("randao_reveal is not a valid signature: {:?}", e))
})?;
let (new_block, _state) = beacon_chain let (new_block, _state) = beacon_chain
.produce_block(randao_reveal, slot) .produce_block(randao_reveal, slot)

40
beacon_node/rest_api/tests/test.rs
View File

@@ -1,12 +1,15 @@
#![cfg(test)] #![cfg(test)]
use beacon_chain::{BeaconChain, BeaconChainTypes};
use node_test_rig::{ use node_test_rig::{
environment::{Environment, EnvironmentBuilder}, environment::{Environment, EnvironmentBuilder},
LocalBeaconNode, LocalBeaconNode,
}; };
use std::sync::Arc;
use tree_hash::TreeHash; use tree_hash::TreeHash;
use types::{ use types::{
test_utils::generate_deterministic_keypair, Domain, EthSpec, MinimalEthSpec, Signature, Slot, test_utils::generate_deterministic_keypair, ChainSpec, Domain, EthSpec, MinimalEthSpec,
Signature, Slot,
}; };
type E = MinimalEthSpec; type E = MinimalEthSpec;
@@ -21,11 +24,29 @@ fn build_env() -> Environment<E> {
.expect("environment should build") .expect("environment should build")
} }
/// Returns the randao reveal for the given slot (assuming the given `beacon_chain` uses
/// deterministic keypairs).
fn get_randao_reveal<T: BeaconChainTypes>(
beacon_chain: Arc<BeaconChain<T>>,
slot: Slot,
spec: &ChainSpec,
) -> Signature {
let fork = beacon_chain.head().beacon_state.fork.clone();
let proposer_index = beacon_chain
.block_proposer(slot)
.expect("should get proposer index");
let keypair = generate_deterministic_keypair(proposer_index);
let epoch = slot.epoch(E::slots_per_epoch());
let message = epoch.tree_hash_root();
let domain = spec.get_domain(epoch, Domain::Randao, &fork);
Signature::new(&message, domain, &keypair.sk)
}
#[test] #[test]
fn validator_block() { fn validator_block_get() {
let mut env = build_env(); let mut env = build_env();
let spec = E::default_spec(); let spec = &E::default_spec();
let node = LocalBeaconNode::production(env.core_context()); let node = LocalBeaconNode::production(env.core_context());
let remote_node = node.remote_node().expect("should produce remote node"); let remote_node = node.remote_node().expect("should produce remote node");
@@ -35,19 +56,8 @@ fn validator_block() {
.beacon_chain() .beacon_chain()
.expect("client should have beacon chain"); .expect("client should have beacon chain");
let fork = beacon_chain.head().beacon_state.fork.clone();
let slot = Slot::new(1); let slot = Slot::new(1);
let randao_reveal = { let randao_reveal = get_randao_reveal(beacon_chain.clone(), slot, spec);
let proposer_index = beacon_chain
.block_proposer(slot)
.expect("should get proposer index");
let keypair = generate_deterministic_keypair(proposer_index);
let epoch = slot.epoch(E::slots_per_epoch());
let message = epoch.tree_hash_root();
let domain = spec.get_domain(epoch, Domain::Randao, &fork);
Signature::new(&message, domain, &keypair.sk)
};
let block = env let block = env
.runtime() .runtime()

2
tests/node_test_rig/src/lib.rs
View File

@@ -63,5 +63,7 @@ fn testing_client_config() -> (ClientConfig, TempDir) {
genesis_time: 13_371_337, genesis_time: 13_371_337,
}; };
client_config.dummy_eth1_backend = true;
(client_config, tempdir) (client_config, tempdir)
} }