diff --git a/crates/apollo_gateway/src/rpc_state_reader.rs b/crates/apollo_gateway/src/rpc_state_reader.rs index 0b6a15996ca..8ab3be53f42 100644 --- a/crates/apollo_gateway/src/rpc_state_reader.rs +++ b/crates/apollo_gateway/src/rpc_state_reader.rs @@ -1,4 +1,4 @@ -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use apollo_rpc::CompiledContractClass; use blockifier::execution::contract_class::{ CompiledClassV0, diff --git a/crates/apollo_gateway/src/rpc_state_reader_test.rs b/crates/apollo_gateway/src/rpc_state_reader_test.rs index eca2dc7dc11..ff1210e8173 100644 --- a/crates/apollo_gateway/src/rpc_state_reader_test.rs +++ b/crates/apollo_gateway/src/rpc_state_reader_test.rs @@ -1,4 +1,4 @@ -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use apollo_rpc::CompiledContractClass; use blockifier::execution::contract_class::RunnableCompiledClass; use blockifier::state::state_api::StateReader; diff --git a/crates/apollo_gateway_config/src/config.rs b/crates/apollo_gateway_config/src/config.rs index e977d0ab72c..93aa547c551 100644 --- a/crates/apollo_gateway_config/src/config.rs +++ b/crates/apollo_gateway_config/src/config.rs @@ -22,7 +22,6 @@ use validator::Validate; use crate::compiler_version::VersionId; -const JSON_RPC_VERSION: &str = "2.0"; const DEFAULT_BUCKET_NAME: &str = "proof-archive"; #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)] @@ -202,45 +201,6 @@ impl SerializeConfig for StatelessTransactionValidatorConfig { } } -#[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)] -pub struct RpcStateReaderConfig { - pub url: String, - pub json_rpc_version: String, -} - -impl RpcStateReaderConfig { - pub fn from_url(url: String) -> Self { - Self { url, ..Default::default() } - } -} - -impl Default for RpcStateReaderConfig { - fn default() -> Self { - Self { url: Default::default(), json_rpc_version: JSON_RPC_VERSION.to_string() } - } -} - -#[cfg(any(feature = "testing", test))] -impl RpcStateReaderConfig { - pub fn create_for_testing() -> Self { - Self::from_url("http://localhost:8080".to_string()) - } -} - -impl SerializeConfig for RpcStateReaderConfig { - fn dump(&self) -> BTreeMap { - BTreeMap::from_iter([ - ser_param("url", &self.url, "The url of the rpc server.", ParamPrivacyInput::Public), - ser_param( - "json_rpc_version", - &self.json_rpc_version, - "The json rpc version.", - ParamPrivacyInput::Public, - ), - ]) - } -} - #[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)] pub struct StatefulTransactionValidatorConfig { // If true, ensures the max L2 gas price exceeds (a configurable percentage of) the base gas diff --git a/crates/apollo_gateway_config/src/lib.rs b/crates/apollo_gateway_config/src/lib.rs index c5286923b11..d0eeefdfece 100644 --- a/crates/apollo_gateway_config/src/lib.rs +++ b/crates/apollo_gateway_config/src/lib.rs @@ -1,2 +1,3 @@ pub mod compiler_version; pub mod config; +pub mod rpc_state_reader_config; diff --git a/crates/apollo_gateway_config/src/rpc_state_reader_config.rs b/crates/apollo_gateway_config/src/rpc_state_reader_config.rs new file mode 100644 index 00000000000..656997998a3 --- /dev/null +++ b/crates/apollo_gateway_config/src/rpc_state_reader_config.rs @@ -0,0 +1,47 @@ +use std::collections::BTreeMap; + +use apollo_config::dumping::{ser_param, SerializeConfig}; +use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam}; +use serde::{Deserialize, Serialize}; +use validator::Validate; + +const JSON_RPC_VERSION: &str = "2.0"; + +#[derive(Clone, Debug, Serialize, Deserialize, Validate, PartialEq)] +pub struct RpcStateReaderConfig { + pub url: String, + pub json_rpc_version: String, +} + +impl RpcStateReaderConfig { + pub fn from_url(url: String) -> Self { + Self { url, ..Default::default() } + } +} + +impl Default for RpcStateReaderConfig { + fn default() -> Self { + Self { url: Default::default(), json_rpc_version: JSON_RPC_VERSION.to_string() } + } +} + +#[cfg(any(feature = "testing", test))] +impl RpcStateReaderConfig { + pub fn create_for_testing() -> Self { + Self::from_url("http://localhost:8080".to_string()) + } +} + +impl SerializeConfig for RpcStateReaderConfig { + fn dump(&self) -> BTreeMap { + BTreeMap::from_iter([ + ser_param("url", &self.url, "The url of the rpc server.", ParamPrivacyInput::Public), + ser_param( + "json_rpc_version", + &self.json_rpc_version, + "The json rpc version.", + ParamPrivacyInput::Public, + ), + ]) + } +} diff --git a/crates/blockifier_reexecution/src/lib.rs b/crates/blockifier_reexecution/src/lib.rs index f935d1e2407..933f360ee1c 100644 --- a/crates/blockifier_reexecution/src/lib.rs +++ b/crates/blockifier_reexecution/src/lib.rs @@ -5,7 +5,7 @@ pub mod serde_utils; pub mod state_reader; pub mod utils; -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use blockifier::blockifier::config::ContractClassManagerConfig; use blockifier::blockifier::transaction_executor::TransactionExecutionOutput; use blockifier::context::BlockContext; diff --git a/crates/blockifier_reexecution/src/main.rs b/crates/blockifier_reexecution/src/main.rs index 8c36fbe5345..80d7b4a84e0 100644 --- a/crates/blockifier_reexecution/src/main.rs +++ b/crates/blockifier_reexecution/src/main.rs @@ -1,7 +1,7 @@ use std::fs; use std::path::Path; -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use blockifier::blockifier::config::ContractClassManagerConfig; use blockifier::state::contract_class_manager::ContractClassManager; use blockifier_reexecution::cli::{ diff --git a/crates/blockifier_reexecution/src/state_reader/rpc_state_reader.rs b/crates/blockifier_reexecution/src/state_reader/rpc_state_reader.rs index c8c0688af4f..9205ca856ea 100644 --- a/crates/blockifier_reexecution/src/state_reader/rpc_state_reader.rs +++ b/crates/blockifier_reexecution/src/state_reader/rpc_state_reader.rs @@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex}; use apollo_gateway::errors::{serde_err_to_state_err, RPCStateReaderError}; use apollo_gateway::rpc_objects::{BlockHeader, BlockId, GetBlockWithTxHashesParams}; use apollo_gateway::rpc_state_reader::RpcStateReader as GatewayRpcStateReader; -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use assert_matches::assert_matches; use blockifier::abi::constants; use blockifier::blockifier::config::TransactionExecutorConfig; diff --git a/crates/blockifier_reexecution/src/state_reader/rpc_state_reader_test.rs b/crates/blockifier_reexecution/src/state_reader/rpc_state_reader_test.rs index 5b000a2aa64..8377a1263c9 100644 --- a/crates/blockifier_reexecution/src/state_reader/rpc_state_reader_test.rs +++ b/crates/blockifier_reexecution/src/state_reader/rpc_state_reader_test.rs @@ -14,7 +14,7 @@ use std::sync::{Arc, Mutex}; use apollo_gateway::rpc_objects::BlockId; use apollo_gateway::rpc_state_reader::RpcStateReader as GatewayRpcStateReader; -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use assert_matches::assert_matches; use blockifier::blockifier::config::ContractClassManagerConfig; use blockifier::state::contract_class_manager::ContractClassManager; diff --git a/crates/blockifier_reexecution/src/utils.rs b/crates/blockifier_reexecution/src/utils.rs index 139ebdd9d1c..bd368540351 100644 --- a/crates/blockifier_reexecution/src/utils.rs +++ b/crates/blockifier_reexecution/src/utils.rs @@ -2,7 +2,7 @@ use std::collections::BTreeMap; use std::env; use std::sync::{Arc, LazyLock}; -use apollo_gateway_config::config::RpcStateReaderConfig; +use apollo_gateway_config::rpc_state_reader_config::RpcStateReaderConfig; use apollo_rpc_execution::{ETH_FEE_CONTRACT_ADDRESS, STRK_FEE_CONTRACT_ADDRESS}; use blockifier::context::{ChainInfo, FeeTokenAddresses}; use blockifier::execution::contract_class::{CompiledClassV0, CompiledClassV1};