Skip to content

Commit bf60fb8

Browse files
committed
fix: use new sdk
1 parent 26fb35c commit bf60fb8

File tree

4 files changed

+7
-35
lines changed

4 files changed

+7
-35
lines changed

bin/builder.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use builder::{
88
};
99
use init4_bin_base::{deps::tracing, utils::from_env::FromEnv};
1010
use signet_sim::SimCache;
11+
use signet_types::constants::SignetSystemConstants;
1112
use std::sync::Arc;
1213
use tokio::select;
1314
use tracing::info_span;
@@ -20,7 +21,7 @@ async fn main() -> eyre::Result<()> {
2021
let init_span_guard = info_span!("builder initialization");
2122

2223
let config = BuilderConfig::from_env()?.clone();
23-
let constants = config.load_pecorino_constants();
24+
let constants = SignetSystemConstants::pecorino();
2425
let authenticator = Authenticator::new(&config)?;
2526

2627
let (host_provider, sequencer_signer) =

src/config.rs

+1-31
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
use crate::{
2-
constants,
3-
signer::{LocalOrAws, SignerError},
4-
};
1+
use crate::signer::{LocalOrAws, SignerError};
52
use alloy::{
63
network::{Ethereum, EthereumWallet},
74
primitives::Address,
@@ -16,7 +13,6 @@ use alloy::{
1613
use eyre::Result;
1714
use init4_bin_base::utils::{calc::SlotCalculator, from_env::FromEnv};
1815
use oauth2::url;
19-
use signet_types::config::{HostConfig, PredeployTokens, RollupConfig, SignetSystemConstants};
2016
use signet_zenith::Zenith;
2117
use std::borrow::Cow;
2218

@@ -210,30 +206,4 @@ impl BuilderConfig {
210206
pub const fn connect_zenith(&self, provider: HostProvider) -> ZenithInstance {
211207
Zenith::new(self.zenith_address, provider)
212208
}
213-
214-
/// Loads the Signet system constants for Pecorino.
215-
pub const fn load_pecorino_constants(&self) -> SignetSystemConstants {
216-
let host = HostConfig::new(
217-
self.host_chain_id,
218-
constants::PECORINO_DEPLOY_HEIGHT,
219-
self.zenith_address,
220-
constants::HOST_ORDERS,
221-
constants::HOST_PASSAGE,
222-
constants::HOST_TRANSACTOR,
223-
PredeployTokens::new(constants::HOST_USDC, constants::HOST_USDT, constants::HOST_WBTC),
224-
);
225-
let rollup = RollupConfig::new(
226-
self.ru_chain_id,
227-
constants::ROLLUP_ORDERS,
228-
constants::ROLLUP_PASSAGE,
229-
constants::BASE_FEE_RECIPIENT,
230-
PredeployTokens::new(
231-
constants::ROLLUP_USDC,
232-
constants::ROLLUP_USDT,
233-
constants::ROLLUP_WBTC,
234-
),
235-
);
236-
237-
SignetSystemConstants::new(host, rollup)
238-
}
239209
}

src/tasks/block.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use chrono::{DateTime, Utc};
1717
use eyre::Report;
1818
use init4_bin_base::utils::calc::SlotCalculator;
1919
use signet_sim::{BlockBuild, BuiltBlock, SimCache};
20-
use signet_types::config::SignetSystemConstants;
20+
use signet_types::constants::SignetSystemConstants;
2121
use std::{
2222
sync::{
2323
Arc,

tests/block_builder_test.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ mod tests {
1515
};
1616
use init4_bin_base::utils::calc::SlotCalculator;
1717
use signet_sim::{SimCache, SimItem};
18+
use signet_types::constants::SignetSystemConstants;
1819
use std::{
1920
sync::Arc,
2021
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
@@ -33,7 +34,7 @@ mod tests {
3334

3435
// Make a test config
3536
let config = setup_test_config().unwrap();
36-
let constants = config.load_pecorino_constants();
37+
let constants = SignetSystemConstants::pecorino();
3738

3839
// Create an anvil instance for testing
3940
let anvil_instance = Anvil::new().chain_id(PECORINO_CHAIN_ID).spawn();
@@ -90,7 +91,7 @@ mod tests {
9091

9192
// Make a test config
9293
let config = setup_test_config().unwrap();
93-
let constants = config.load_pecorino_constants();
94+
let constants = SignetSystemConstants::pecorino();
9495

9596
// Create an anvil instance for testing
9697
let anvil_instance = Anvil::new().chain_id(PECORINO_CHAIN_ID).spawn();

0 commit comments

Comments
 (0)