@@ -53,8 +53,8 @@ struct BuilderConfig {
5353#[ instrument]
5454#[ tokio:: main]
5555async fn main ( ) -> color_eyre:: eyre:: Result < ( ) > {
56- let relay_config : BuilderConfig = BuilderConfig :: parse ( ) ;
57- let log_level: LevelFilter = relay_config . log_level . into ( ) ;
56+ let builder_config : BuilderConfig = BuilderConfig :: parse ( ) ;
57+ let log_level: LevelFilter = builder_config . log_level . into ( ) ;
5858
5959 // Initialize logging.
6060 color_eyre:: install ( ) ?;
@@ -65,19 +65,18 @@ async fn main() -> color_eyre::eyre::Result<()> {
6565
6666 tracing:: info!( "Starting mock relay" ) ;
6767
68- let beacon_url = SensitiveUrl :: parse ( relay_config . beacon_node . as_str ( ) )
68+ let beacon_url = SensitiveUrl :: parse ( builder_config . beacon_node . as_str ( ) )
6969 . map_err ( |e| eyre ! ( format!( "{e:?}" ) ) ) ?;
7070 let beacon_client =
7171 eth2:: BeaconNodeHttpClient :: new ( beacon_url, Timeouts :: set_all ( Duration :: from_secs ( 12 ) ) ) ;
72-
7372 let config = beacon_client
7473 . get_config_spec :: < types:: ConfigAndPreset > ( )
7574 . await
7675 . map_err ( |e| eyre ! ( format!( "{e:?}" ) ) ) ?;
7776 let spec = ChainSpec :: from_config :: < MainnetEthSpec > ( config. data . config ( ) )
7877 . ok_or ( eyre ! ( "unable to parse chain spec from config" ) ) ?;
7978
80- let url = SensitiveUrl :: parse ( relay_config . execution_endpoint . as_str ( ) )
79+ let url = SensitiveUrl :: parse ( builder_config . execution_endpoint . as_str ( ) )
8180 . map_err ( |e| eyre ! ( format!( "{e:?}" ) ) ) ?;
8281
8382 // Convert slog logs from the EL to tracing logs.
@@ -95,7 +94,8 @@ async fn main() -> color_eyre::eyre::Result<()> {
9594
9695 let config = Config {
9796 execution_endpoint : Some ( url) ,
98- secret_file : Some ( relay_config. jwt_secret ) ,
97+ secret_file : Some ( builder_config. jwt_secret ) ,
98+ suggested_fee_recipient : builder_config. default_fee_recipient ,
9999 ..Default :: default ( )
100100 } ;
101101
@@ -115,7 +115,13 @@ async fn main() -> color_eyre::eyre::Result<()> {
115115 let pubkey = rustic_builder. deref ( ) . public_key ( ) ;
116116 tracing:: info!( "Builder pubkey: {pubkey:?}" ) ;
117117
118- let listener = tokio:: net:: TcpListener :: bind ( "0.0.0.0:3000" ) . await . unwrap ( ) ;
118+ let listener = tokio:: net:: TcpListener :: bind ( format ! (
119+ "{}:{}" ,
120+ builder_config. address, builder_config. port
121+ ) )
122+ . await
123+ . unwrap ( ) ;
124+ tracing:: info!( "Listening on {listener:?}" ) ;
119125 let app = builder_server:: server:: new ( rustic_builder) ;
120126 axum:: serve ( listener, app) . await ?;
121127
0 commit comments