Skip to content

refactor: update config to use derive #75

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

Merged
merged 2 commits into from
May 8, 2025
Merged

refactor: update config to use derive #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2280e57
refactor: update config to use derive
prestwich May 7, 2025
717926b
fix: not optional
prestwich May 8, 2025
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
15 changes: 6 additions & 9 deletions bin/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use builder::{
tx_poller,
},
};
use init4_bin_base::{deps::tracing, utils::calc::SlotCalculator};
use init4_bin_base::{deps::tracing, utils::from_env::FromEnv};
use signet_sim::SimCache;
use std::sync::Arc;
use tokio::select;
Expand All @@ -19,15 +19,13 @@ async fn main() -> eyre::Result<()> {
let _guard = init4_bin_base::init4();
let init_span_guard = info_span!("builder initialization");

let config = BuilderConfig::load_from_env()?.clone();
let config = BuilderConfig::from_env()?.clone();
let constants = config.load_pecorino_constants();
let authenticator = Authenticator::new(&config)?;

let (host_provider, ru_provider, sequencer_signer) = tokio::try_join!(
config.connect_host_provider(),
config.connect_ru_provider(),
config.connect_sequencer_signer(),
)?;
let (host_provider, sequencer_signer) =
tokio::try_join!(config.connect_host_provider(), config.connect_sequencer_signer(),)?;
let ru_provider = config.connect_ru_provider();

let zenith = config.connect_zenith(host_provider.clone());

Expand Down Expand Up @@ -55,8 +53,7 @@ async fn main() -> eyre::Result<()> {
let (submit_channel, submit_jh) = submit.spawn();

let sim_items = SimCache::new();
let slot_calculator =
SlotCalculator::new(config.start_timestamp, config.chain_offset, config.target_slot_time);
let slot_calculator = config.slot_calculator;

let sim = Arc::new(Simulator::new(&config, ru_provider.clone(), slot_calculator));

Expand Down
66 changes: 38 additions & 28 deletions bin/submit_transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,65 @@ use alloy::{
rpc::types::eth::TransactionRequest,
signers::aws::AwsSigner,
};
use aws_config::BehaviorVersion;
use builder::config::{HostProvider, load_address, load_string, load_u64, load_url};
use builder::config::HostProvider;
use init4_bin_base::{
deps::metrics::{counter, histogram},
init4,
utils::from_env::FromEnv,
};
use std::time::{Duration, Instant};
use tokio::time::timeout;

#[derive(Debug, Clone, FromEnv)]
struct Config {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe call this something like SubmitConfig to clearly distinguish it from the BuilderConfig

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they're in different targets so i dont think we need to distinguish

#[from_env(var = "RPC_URL", desc = "Ethereum RPC URL")]
rpc_url: String,
#[from_env(var = "CHAIN_ID", desc = "Ethereum chain ID")]
chain_id: u64,
#[from_env(var = "AWS_KMS_KEY_ID", desc = "AWS KMS key ID")]
kms_key_id: String,
#[from_env(var = "RECIPIENT_ADDRESS", desc = "Recipient address")]
recipient_address: Address,
#[from_env(var = "SLEEP_TIME", desc = "Time to sleep between transactions")]
sleep_time: u64,
}

impl Config {
async fn provider(&self) -> HostProvider {
let config = aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;
let client = aws_sdk_kms::Client::new(&config);
let signer =
AwsSigner::new(client, self.kms_key_id.clone(), Some(self.chain_id)).await.unwrap();

ProviderBuilder::new()
.wallet(EthereumWallet::from(signer))
.connect(&self.rpc_url)
.await
.unwrap()
}
}

#[tokio::main]
async fn main() {
init4();

tracing::trace!("connecting to provider");
let (provider, recipient_address, sleep_time) = connect_from_config().await;

let config = Config::from_env().unwrap();
let provider = config.provider().await;
let recipient_address = config.recipient_address;
let sleep_time = config.sleep_time;

loop {
tracing::debug!("attempting transaction");
send_transaction(provider.clone(), recipient_address).await;
send_transaction(&provider, recipient_address).await;

tracing::debug!(sleep_time, "sleeping");
tokio::time::sleep(tokio::time::Duration::from_secs(sleep_time)).await;
}
}

async fn send_transaction(provider: HostProvider, recipient_address: Address) {
async fn send_transaction(provider: &HostProvider, recipient_address: Address) {
// construct simple transaction to send ETH to a recipient
let tx = TransactionRequest::default()
.with_from(provider.default_signer_address())
Expand Down Expand Up @@ -66,26 +99,3 @@ async fn send_transaction(provider: HostProvider, recipient_address: Address) {
tracing::debug!(success = receipt.status(), mine_time, hash, "transaction mined");
histogram!("txn_submitter.tx_mine_time").record(mine_time as f64);
}

async fn connect_from_config() -> (HostProvider, Address, u64) {
// load signer config values from .env
let rpc_url = load_url("RPC_URL").unwrap();
let chain_id = load_u64("CHAIN_ID").unwrap();
let kms_key_id = load_string("AWS_KMS_KEY_ID").unwrap();
// load transaction sending config value from .env
let recipient_address: Address = load_address("RECIPIENT_ADDRESS").unwrap();
let sleep_time = load_u64("SLEEP_TIME").unwrap();

// connect signer & provider
let config = aws_config::load_defaults(BehaviorVersion::latest()).await;
let client = aws_sdk_kms::Client::new(&config);
let signer = AwsSigner::new(client, kms_key_id.to_string(), Some(chain_id)).await.unwrap();

let provider = ProviderBuilder::new()
.wallet(EthereumWallet::from(signer))
.connect(&rpc_url)
.await
.unwrap();

(provider, recipient_address, sleep_time)
}
Loading