Skip to content

Serve real Gloas bids and envelopes from the auctioneer's existing submissions #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0w3n-d wants to merge 1 commit into from
Open

Serve real Gloas bids and envelopes from the auctioneer's existing submissions #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions crates/relay/src/api/proposer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use helix_common::{
use helix_database::handle::DbHandle;
use helix_operator::OperatorPubSub;
use hyper::StatusCode;
pub use submit_signed_beacon_block::{GloasBuilderIdentity, GloasPayloadStore, NoHeldPayloads};
pub use submit_signed_beacon_block::{GloasBuilderIdentity, HeldGloasPayload};

use crate::{
api::{Api, router::Terminating},
Expand All @@ -46,7 +46,6 @@ pub struct ProposerApi<A: Api> {
pub reg_handle: RegWorkerHandle,
pub operator_api: Option<Arc<OperatorPubSub>>,
pub gloas_builder_identity: Arc<GloasBuilderIdentity>,
pub gloas_payload_store: Arc<dyn GloasPayloadStore>,
}

impl<A: Api> ProposerApi<A> {
Expand All @@ -65,7 +64,6 @@ impl<A: Api> ProposerApi<A> {
reg_handle: RegWorkerHandle,
alert_manager: Arc<AlertManager>,
operator_api: Option<Arc<OperatorPubSub>>,
gloas_payload_store: Arc<dyn GloasPayloadStore>,
) -> Self {
let gloas_builder_identity = Arc::new(GloasBuilderIdentity {
builder_index: relay_config.gloas_builder_index,
Expand All @@ -87,7 +85,6 @@ impl<A: Api> ProposerApi<A> {
reg_handle,
operator_api,
gloas_builder_identity,
gloas_payload_store,
}
}
}
Expand Down
100 changes: 48 additions & 52 deletions crates/relay/src/api/proposer/submit_signed_beacon_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use helix_types::{
};
use hyper::StatusCode;
use ssz::Decode;
use tracing::info;
use tracing::{info, warn};
use tree_hash::TreeHash;

use super::{ProposerApi, get_payload::fork_name_from_header};
Expand All @@ -22,22 +22,6 @@ pub struct HeldGloasPayload {
pub execution_requests: ExecutionRequestsGloas,
}

/// Looks up and consumes the payload held for a bid's committed block hash. Must not return
/// the same payload twice.
pub trait GloasPayloadStore: Send + Sync {
fn take_held_payload(&self, block_hash: B256) -> Option<HeldGloasPayload>;
}

/// Placeholder `GloasPayloadStore`: nothing has held a payload yet.
// TODO(gloas): implement against the auctioneer; see gattaca-com/helix#489 step 3.
pub struct NoHeldPayloads;

impl GloasPayloadStore for NoHeldPayloads {
fn take_held_payload(&self, _block_hash: B256) -> Option<HeldGloasPayload> {
None
}
}

/// Helix's own on-chain Gloas builder identity: `builder_index` plus signing key.
// TODO(gloas): support external builder-signed bids/envelopes; see gattaca-com/helix#489 step 5.
pub struct GloasBuilderIdentity {
Expand All @@ -64,12 +48,31 @@ impl GloasBuilderIdentity {
let signature = self.keypair.sk.sign(message.signing_root(domain));
SignedExecutionPayloadEnvelope { message, signature }
}

/// Signs a `SignedExecutionPayloadBid` under the same domain as `sign_envelope`.
pub fn sign_bid(
&self,
message: helix_types::ExecutionPayloadBid,
chain_info: &ChainInfo,
) -> helix_types::SignedExecutionPayloadBid {
let epoch = message.slot.epoch(MainnetEthSpec::slots_per_epoch());
let fork = chain_info.spec.fork_at_epoch(epoch);
let domain = chain_info.spec.get_domain(
epoch,
Domain::BeaconBuilder,
&fork,
chain_info.genesis_validators_root,
);
let signature = self.keypair.sk.sign(message.signing_root(domain));
helix_types::SignedExecutionPayloadBid { message, signature }
}
}

/// Constructs and signs the `SignedExecutionPayloadEnvelope` fulfilling `block`'s committed bid.
/// `held` is the payload the auctioneer has stored for the bid's committed block hash, if any.
pub(super) fn construct_signed_envelope(
block: &SignedBeaconBlockGloas,
store: &dyn GloasPayloadStore,
held: Option<HeldGloasPayload>,
identity: &GloasBuilderIdentity,
chain_info: &ChainInfo,
) -> Result<SignedExecutionPayloadEnvelope, ProposerApiError> {
Expand All @@ -83,9 +86,7 @@ pub(super) fn construct_signed_envelope(
});
}

let held = store
.take_held_payload(bid_block_hash)
.ok_or(ProposerApiError::NoHeldPayloadForBlock(bid_block_hash))?;
let held = held.ok_or(ProposerApiError::NoHeldPayloadForBlock(bid_block_hash))?;

let held_block_hash: B256 = held.payload.block_hash.0;
if held_block_hash != bid_block_hash {
Expand Down Expand Up @@ -128,9 +129,25 @@ impl<A: Api> ProposerApi<A> {

info!(slot = block.message.slot.as_u64(), "accepted submitSignedBeaconBlock request");

let bid_block_hash: B256 =
block.message.body.signed_execution_payload_bid.message.block_hash.0;
let Ok(rx) = proposer_api
.auctioneer_handle
.take_held_gloas_payload(bid_block_hash, block.message.slot)
else {
return Err(ProposerApiError::InternalServerError);
};
let held = match rx.await {
Ok(held) => held,
Err(err) => {
warn!(%err, "failed to fetch held Gloas payload from auctioneer");
return Err(ProposerApiError::InternalServerError);
}
};

let signed_envelope = construct_signed_envelope(
&block,
proposer_api.gloas_payload_store.as_ref(),
held,
&proposer_api.gloas_builder_identity,
&proposer_api.chain_info,
)?;
Expand All @@ -146,31 +163,11 @@ impl<A: Api> ProposerApi<A> {

#[cfg(test)]
mod construct_signed_envelope_tests {
use std::sync::Mutex;

use helix_common::utils::install_default_crypto_provider;
use helix_types::{BeaconBlockGloas, BlsSignature, EmptyBlock, ExecutionBlockHash};

use super::*;

struct StubStore(Mutex<Option<HeldGloasPayload>>);

impl StubStore {
fn holding(payload: HeldGloasPayload) -> Self {
Self(Mutex::new(Some(payload)))
}

fn empty() -> Self {
Self(Mutex::new(None))
}
}

impl GloasPayloadStore for StubStore {
fn take_held_payload(&self, _block_hash: B256) -> Option<HeldGloasPayload> {
self.0.lock().unwrap().take()
}
}

fn held_payload(block_hash: B256) -> HeldGloasPayload {
let mut payload = ExecutionPayloadGloas::default();
payload.block_hash = ExecutionBlockHash(block_hash);
Expand Down Expand Up @@ -202,11 +199,11 @@ mod construct_signed_envelope_tests {
let block_hash = B256::repeat_byte(0x11);
let parent_root = B256::repeat_byte(0x22);
let block = test_block(block_hash, 7, parent_root);
let store = StubStore::holding(held_payload(block_hash));
let held = Some(held_payload(block_hash));
let identity = identity(7);

let signed_envelope =
construct_signed_envelope(&block, &store, &identity, &chain_info).unwrap();
construct_signed_envelope(&block, held, &identity, &chain_info).unwrap();

assert_eq!(signed_envelope.message.builder_index, 7);
assert_eq!(signed_envelope.message.beacon_block_root, block.message.tree_hash_root());
Expand All @@ -219,11 +216,11 @@ mod construct_signed_envelope_tests {
let chain_info = ChainInfo::default();
let block_hash = B256::repeat_byte(0x33);
let block = test_block(block_hash, 3, B256::ZERO);
let store = StubStore::holding(held_payload(block_hash));
let held = Some(held_payload(block_hash));
let identity = identity(3);

let signed_envelope =
construct_signed_envelope(&block, &store, &identity, &chain_info).unwrap();
construct_signed_envelope(&block, held, &identity, &chain_info).unwrap();

let epoch = signed_envelope.message.slot().epoch(MainnetEthSpec::slots_per_epoch());
let fork = chain_info.spec.fork_at_epoch(epoch);
Expand All @@ -240,10 +237,9 @@ mod construct_signed_envelope_tests {
let chain_info = ChainInfo::default();
let block_hash = B256::repeat_byte(0x44);
let block = test_block(block_hash, 1, B256::ZERO);
let store = StubStore::empty();
let identity = identity(1);

let result = construct_signed_envelope(&block, &store, &identity, &chain_info);
let result = construct_signed_envelope(&block, None, &identity, &chain_info);

assert!(
matches!(result, Err(ProposerApiError::NoHeldPayloadForBlock(hash)) if hash == block_hash)
Expand All @@ -256,10 +252,10 @@ mod construct_signed_envelope_tests {
let bid_block_hash = B256::repeat_byte(0x55);
let wrong_held_hash = B256::repeat_byte(0x66);
let block = test_block(bid_block_hash, 1, B256::ZERO);
let store = StubStore::holding(held_payload(wrong_held_hash));
let held = Some(held_payload(wrong_held_hash));
let identity = identity(1);

let result = construct_signed_envelope(&block, &store, &identity, &chain_info);
let result = construct_signed_envelope(&block, held, &identity, &chain_info);

assert!(matches!(
result,
Expand All @@ -273,10 +269,10 @@ mod construct_signed_envelope_tests {
let chain_info = ChainInfo::default();
let block_hash = B256::repeat_byte(0x77);
let block = test_block(block_hash, 9, B256::ZERO);
let store = StubStore::holding(held_payload(block_hash));
let held = Some(held_payload(block_hash));
let identity = identity(1);

let result = construct_signed_envelope(&block, &store, &identity, &chain_info);
let result = construct_signed_envelope(&block, held, &identity, &chain_info);

assert!(matches!(
result,
Expand Down
8 changes: 2 additions & 6 deletions crates/relay/src/api/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,8 @@ use tracing::{error, info};
use crate::{
AuctioneerHandle, DbHandle, PostgresDatabaseService, RegWorkerHandle,
api::{
Api, FutureBidSubmissionResult,
builder::api::BuilderApi,
extract::raw_web_socket::RawWebSocket,
proposer::{NoHeldPayloads, ProposerApi},
router::build_router,
Api, FutureBidSubmissionResult, builder::api::BuilderApi,
extract::raw_web_socket::RawWebSocket, proposer::ProposerApi, router::build_router,
},
gossip::{GossipedMessage, GrpcGossiperClientManager, process_gossip_messages},
network::api::RelayNetworkApi,
Expand Down Expand Up @@ -154,7 +151,6 @@ pub async fn run_api_service<A: Api>(
registrations_handle,
alert_manager,
operator_api,
Arc::new(NoHeldPayloads),
));

tokio::spawn(process_gossip_messages(
Expand Down
7 changes: 6 additions & 1 deletion crates/relay/src/auctioneer/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ use tracing::{debug, info, warn};

use crate::{
SubmissionDataWithSpan,
api::{FutureBidSubmissionResult, builder::error::BuilderApiError},
api::{
FutureBidSubmissionResult, builder::error::BuilderApiError, proposer::GloasBuilderIdentity,
},
auctioneer::{
AuctioneerHandle, BlockMergeResponse,
bid_adjustor::BidAdjustor,
Expand Down Expand Up @@ -77,6 +79,7 @@ pub struct Context<B: BidAdjustor> {
pub alert_manager: Arc<AlertManager>,
pub operator_api: Option<Arc<OperatorPubSub>>,
pub builder_preferences: BuilderPreferencesStore,
pub gloas_builder_identity: Arc<GloasBuilderIdentity>,
}

const EXPECTED_PAYLOADS_PER_SLOT: usize = 5000;
Expand All @@ -100,6 +103,7 @@ impl<B: BidAdjustor> Context<B> {
auctioneer_handle: AuctioneerHandle,
alert_manager: Arc<AlertManager>,
operator_api: Option<Arc<OperatorPubSub>>,
gloas_builder_identity: Arc<GloasBuilderIdentity>,
) -> Self {
let unknown_builder_info = BuilderInfo {
collateral: U256::ZERO,
Expand Down Expand Up @@ -146,6 +150,7 @@ impl<B: BidAdjustor> Context<B> {
alert_manager,
operator_api,
builder_preferences: BuilderPreferencesStore::default(),
gloas_builder_identity,
}
}

Expand Down
Loading
Loading