cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

merge with upstream add context bytes to error log

Browse Source
This commit is contained in:
realbigsean 2022-12-22 14:06:28 -05:00
commit d504d51dd9
No known key found for this signature in database
GPG Key ID: B372B64D866BF8CC
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/http_api/src/publish_blocks.rs
View File

@ -32,7 +32,7 @@ pub async fn publish_block<T: BeaconChainTypes>(
let block_root = block_root.unwrap_or_else(|| block.canonical_root()); let block_root = block_root.unwrap_or_else(|| block.canonical_root());
// Send the block, regardless of whether or not it is valid. The API // Send the block, regardless of whether or not it is valid. The API
// specification is very clear that this isa the desired behaviour. // specification is very clear that this is the desired behaviour.
let wrapped_block = if matches!(block.as_ref(), &SignedBeaconBlock::Eip4844(_)) { let wrapped_block = if matches!(block.as_ref(), &SignedBeaconBlock::Eip4844(_)) {
if let Some(sidecar) = chain.blob_cache.pop(&block_root) { if let Some(sidecar) = chain.blob_cache.pop(&block_root) {
let block_and_blobs = SignedBeaconBlockAndBlobsSidecar { let block_and_blobs = SignedBeaconBlockAndBlobsSidecar {

3
beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs
View File

@ -716,9 +716,10 @@ fn context_bytes_to_fork_name(
.from_context_bytes(context_bytes) .from_context_bytes(context_bytes)
.cloned() .cloned()
.ok_or_else(|| { .ok_or_else(|| {
let encoded = hex::encode(context_bytes);
RPCError::ErrorResponse( RPCError::ErrorResponse(
RPCResponseErrorCode::InvalidRequest, RPCResponseErrorCode::InvalidRequest,
"Context bytes does not correspond to a valid fork".to_string(), format!("Context bytes {} do not correspond to a valid fork", encoded),
) )
}) })
} }

3
scripts/local_testnet/el_bootnode.sh
View File

@ -1,4 +1,5 @@
priv_key="02fd74636e96a8ffac8e7b01b0de8dea94d6bcf4989513b38cf59eb32163ff91" priv_key="02fd74636e96a8ffac8e7b01b0de8dea94d6bcf4989513b38cf59eb32163ff91"
source ./vars.env
/home/sean/CLionProjects/eip4844-interop/geth/go-ethereum/build/bin/bootnode --nodekeyhex $priv_key $BOOTNODE_BINARY --nodekeyhex $priv_key

3
scripts/local_testnet/vars.env
View File

@ -1,4 +1,5 @@
GETH_BINARY=/home/sean/CLionProjects/eip4844-interop/geth/go-ethereum/build/bin/geth GETH_BINARY=/geth
BOOTNODE_BINARY=bootnode
# Base directories for the validator keys and secrets # Base directories for the validator keys and secrets
DATADIR=~/.lighthouse/local-testnet DATADIR=~/.lighthouse/local-testnet