Skip to content

Commit 4c4e303

Browse files
avivg-starkwareavivg-starkware
committed
apollo_starknet_client: remove unused py gateway transactions
1 parent dc888d1 commit 4c4e303

20 files changed

+34
-1087
lines changed

‎crates/apollo_rpc/src/api.rs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::sync::Arc;
33
use apollo_class_manager_types::SharedClassManagerClient;
44
use apollo_rpc_execution::ExecutionConfig;
55
use apollo_starknet_client::reader::PendingData;
6-
use apollo_starknet_client::writer::StarknetWriter;
76
use apollo_storage::StorageReader;
87
use jsonrpsee::{Methods, RpcModule};
98
use papyrus_common::pending_classes::PendingClasses;
@@ -62,7 +61,6 @@ pub fn get_methods_from_supported_apis(
6261
shared_highest_block: Arc<RwLock<Option<BlockHashAndNumber>>>,
6362
pending_data: Arc<RwLock<PendingData>>,
6463
pending_classes: Arc<RwLock<PendingClasses>>,
65-
starknet_writer: Arc<dyn StarknetWriter>,
6664
class_manager_client: Option<SharedClassManagerClient>,
6765
) -> Methods {
6866
let mut methods: Methods = Methods::new();
@@ -76,7 +74,6 @@ pub fn get_methods_from_supported_apis(
7674
shared_highest_block,
7775
pending_data,
7876
pending_classes,
79-
starknet_writer,
8077
class_manager_client,
8178
};
8279
version_config::VERSION_CONFIG
@@ -116,7 +113,6 @@ pub trait JsonRpcServerTrait: Sized {
116113
shared_highest_block: Arc<RwLock<Option<BlockHashAndNumber>>>,
117114
pending_data: Arc<RwLock<PendingData>>,
118115
pending_classes: Arc<RwLock<PendingClasses>>,
119-
starknet_writer: Arc<dyn StarknetWriter>,
120116
class_manager_client: Option<SharedClassManagerClient>,
121117
) -> Self;
122118

@@ -134,8 +130,6 @@ struct JsonRpcServerImplGenerator {
134130
shared_highest_block: Arc<RwLock<Option<BlockHashAndNumber>>>,
135131
pending_data: Arc<RwLock<PendingData>>,
136132
pending_classes: Arc<RwLock<PendingClasses>>,
137-
// TODO(shahak): Change this struct to be with a generic type of StarknetWriter.
138-
starknet_writer: Arc<dyn StarknetWriter>,
139133
class_manager_client: Option<SharedClassManagerClient>,
140134
}
141135

@@ -149,7 +143,6 @@ type JsonRpcServerImplParams = (
149143
Arc<RwLock<Option<BlockHashAndNumber>>>,
150144
Arc<RwLock<PendingData>>,
151145
Arc<RwLock<PendingClasses>>,
152-
Arc<dyn StarknetWriter>,
153146
Option<SharedClassManagerClient>,
154147
);
155148

@@ -165,7 +158,6 @@ impl JsonRpcServerImplGenerator {
165158
self.shared_highest_block,
166159
self.pending_data,
167160
self.pending_classes,
168-
self.starknet_writer,
169161
self.class_manager_client,
170162
)
171163
}
@@ -184,7 +176,6 @@ impl JsonRpcServerImplGenerator {
184176
shared_highest_block,
185177
pending_data,
186178
pending_classes,
187-
starknet_writer,
188179
class_manager_client,
189180
) = self.get_params();
190181
Into::<Methods>::into(
@@ -198,7 +189,6 @@ impl JsonRpcServerImplGenerator {
198189
shared_highest_block,
199190
pending_data,
200191
pending_classes,
201-
starknet_writer,
202192
class_manager_client,
203193
)
204194
.into_rpc_module(),

‎crates/apollo_rpc/src/lib.rs‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ use apollo_config::validators::validate_ascii;
2424
use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
2525
use apollo_rpc_execution::ExecutionConfig;
2626
use apollo_starknet_client::reader::PendingData;
27-
use apollo_starknet_client::writer::StarknetGatewayClient;
28-
use apollo_starknet_client::RetryConfig;
2927
use apollo_storage::base_layer::BaseLayerStorageReader;
3028
use apollo_storage::body::events::EventIndex;
3129
use apollo_storage::db::TransactionKind;
@@ -79,8 +77,6 @@ pub struct RpcConfig {
7977
pub max_events_keys: usize,
8078
// TODO(lev,shahak): remove once we remove papyrus.
8179
pub collect_metrics: bool,
82-
pub starknet_url: String,
83-
pub apollo_gateway_retry_config: RetryConfig,
8480
pub execution_config: ExecutionConfig,
8581
}
8682

@@ -93,12 +89,6 @@ impl Default for RpcConfig {
9389
max_events_chunk_size: 1000,
9490
max_events_keys: 100,
9591
collect_metrics: false,
96-
starknet_url: String::from("https://alpha-mainnet.starknet.io/"),
97-
apollo_gateway_retry_config: RetryConfig {
98-
retry_base_millis: 50,
99-
retry_max_delay_millis: 1000,
100-
max_retries: 5,
101-
},
10292
execution_config: ExecutionConfig::default(),
10393
}
10494
}
@@ -142,28 +132,10 @@ impl SerializeConfig for RpcConfig {
142132
"If true, collect metrics for the rpc.",
143133
ParamPrivacyInput::Public,
144134
),
145-
ser_param(
146-
"starknet_url",
147-
&self.starknet_url,
148-
"URL for communicating with Starknet in write_api methods.",
149-
ParamPrivacyInput::Public,
150-
),
151135
]);
152136

153137
self_params_dump
154138
.append(&mut prepend_sub_config_name(self.execution_config.dump(), "execution_config"));
155-
let mut retry_config_dump = prepend_sub_config_name(
156-
self.apollo_gateway_retry_config.dump(),
157-
"apollo_gateway_retry_config",
158-
);
159-
for param in retry_config_dump.values_mut() {
160-
param.description = format!(
161-
"For communicating with Starknet gateway, {}{}",
162-
param.description[0..1].to_lowercase(),
163-
&param.description[1..]
164-
);
165-
}
166-
self_params_dump.append(&mut retry_config_dump);
167139
self_params_dump
168140
}
169141
}
@@ -234,11 +206,6 @@ pub async fn run_server(
234206
shared_highest_block,
235207
pending_data,
236208
pending_classes,
237-
Arc::new(StarknetGatewayClient::new(
238-
&config.starknet_url,
239-
node_version,
240-
config.apollo_gateway_retry_config,
241-
)?),
242209
class_manager_client,
243210
);
244211
let addr;

‎crates/apollo_rpc/src/test_utils.rs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ use std::sync::Arc;
33

44
use apollo_rpc_execution::ExecutionConfig;
55
use apollo_starknet_client::reader::PendingData;
6-
use apollo_starknet_client::writer::MockStarknetWriter;
76
use apollo_storage::test_utils::get_test_storage_by_scope;
87
use apollo_storage::{StorageScope, StorageWriter};
98
use jsonrpsee::core::RpcResult;
@@ -61,21 +60,19 @@ pub(crate) fn get_test_rpc_server_and_storage_writer<T: JsonRpcServerTrait>()
6160
}
6261

6362
pub(crate) fn get_test_rpc_server_and_storage_writer_from_params<T: JsonRpcServerTrait>(
64-
mock_client: Option<MockStarknetWriter>,
63+
_mock_client: Option<()>,
6564
shared_highest_block: Option<Arc<RwLock<Option<BlockHashAndNumber>>>>,
6665
pending_data: Option<Arc<RwLock<PendingData>>>,
6766
pending_classes: Option<Arc<RwLock<PendingClasses>>>,
6867
storage_scope: Option<StorageScope>,
6968
) -> (RpcModule<T>, StorageWriter) {
70-
let mock_client = mock_client.unwrap_or_default();
7169
let shared_highest_block = shared_highest_block.unwrap_or(get_test_highest_block());
7270
let pending_data = pending_data.unwrap_or(get_test_pending_data());
7371
let pending_classes = pending_classes.unwrap_or(get_test_pending_classes());
7472
let storage_scope = storage_scope.unwrap_or_default();
7573

7674
let ((storage_reader, storage_writer), _temp_dir) = get_test_storage_by_scope(storage_scope);
7775
let config = get_test_rpc_config();
78-
let mock_client_arc = Arc::new(mock_client);
7976
(
8077
T::new(
8178
config.chain_id,
@@ -87,7 +84,6 @@ pub(crate) fn get_test_rpc_server_and_storage_writer_from_params<T: JsonRpcServe
8784
shared_highest_block,
8885
pending_data,
8986
pending_classes,
90-
mock_client_arc,
9187
None,
9288
)
9389
.into_rpc_module(),

‎crates/apollo_rpc/src/v0_8/api/api_impl.rs‎

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ use apollo_starknet_client::reader::objects::transaction::{
2020
TransactionReceipt as ClientTransactionReceipt,
2121
};
2222
use apollo_starknet_client::reader::PendingData;
23-
use apollo_starknet_client::writer::{StarknetWriter, WriterClientError};
24-
use apollo_starknet_client::ClientError;
2523
use apollo_storage::body::events::{EventIndex, EventsReader};
2624
use apollo_storage::body::{BodyStorageReader, TransactionIndex};
2725
use apollo_storage::compiled_class::CasmStorageReader;
@@ -116,11 +114,6 @@ use super::super::transaction::{
116114
TypedDeployAccountTransaction,
117115
TypedInvokeTransaction,
118116
};
119-
use super::super::write_api_error::{
120-
starknet_error_to_declare_error,
121-
starknet_error_to_deploy_account_error,
122-
starknet_error_to_invoke_error,
123-
};
124117
use super::super::write_api_result::{
125118
AddDeclareOkResult,
126119
AddDeployAccountOkResult,
@@ -170,7 +163,6 @@ pub struct JsonRpcServerImpl {
170163
pub shared_highest_block: Arc<RwLock<Option<BlockHashAndNumber>>>,
171164
pub pending_data: Arc<RwLock<PendingData>>,
172165
pub pending_classes: Arc<RwLock<PendingClasses>>,
173-
pub writer_client: Arc<dyn StarknetWriter>,
174166
pub class_manager_client: Option<SharedClassManagerClient>,
175167
}
176168

@@ -947,54 +939,31 @@ impl JsonRpcServer for JsonRpcServerImpl {
947939
#[instrument(skip(self), level = "debug", err, ret)]
948940
async fn add_invoke_transaction(
949941
&self,
950-
invoke_transaction: TypedInvokeTransaction,
942+
_invoke_transaction: TypedInvokeTransaction,
951943
) -> RpcResult<AddInvokeOkResult> {
952-
let result = self.writer_client.add_invoke_transaction(&invoke_transaction.into()).await;
953-
match result {
954-
Ok(res) => Ok(res.into()),
955-
Err(WriterClientError::ClientError(ClientError::StarknetError(starknet_error))) => {
956-
Err(ErrorObjectOwned::from(starknet_error_to_invoke_error(starknet_error)))
957-
}
958-
Err(err) => Err(internal_server_error(err)),
959-
}
944+
Err(internal_server_error_with_msg(
945+
"add_invoke_transaction is not supported - gateway client has been removed",
946+
))
960947
}
961948

962949
#[instrument(skip(self), level = "debug", err, ret)]
963950
async fn add_deploy_account_transaction(
964951
&self,
965-
deploy_account_transaction: TypedDeployAccountTransaction,
952+
_deploy_account_transaction: TypedDeployAccountTransaction,
966953
) -> RpcResult<AddDeployAccountOkResult> {
967-
let result = self
968-
.writer_client
969-
.add_deploy_account_transaction(&deploy_account_transaction.into())
970-
.await;
971-
match result {
972-
Ok(res) => Ok(res.into()),
973-
Err(WriterClientError::ClientError(ClientError::StarknetError(starknet_error))) => {
974-
Err(ErrorObjectOwned::from(starknet_error_to_deploy_account_error(starknet_error)))
975-
}
976-
Err(err) => Err(internal_server_error(err)),
977-
}
954+
Err(internal_server_error_with_msg(
955+
"add_deploy_account_transaction is not supported - gateway client has been removed",
956+
))
978957
}
979958

980959
#[instrument(skip(self), level = "debug", err, ret)]
981960
async fn add_declare_transaction(
982961
&self,
983-
declare_transaction: BroadcastedDeclareTransaction,
962+
_declare_transaction: BroadcastedDeclareTransaction,
984963
) -> RpcResult<AddDeclareOkResult> {
985-
let result = self
986-
.writer_client
987-
.add_declare_transaction(
988-
&declare_transaction.try_into().map_err(internal_server_error)?,
989-
)
990-
.await;
991-
match result {
992-
Ok(res) => Ok(res.into()),
993-
Err(WriterClientError::ClientError(ClientError::StarknetError(starknet_error))) => {
994-
Err(ErrorObjectOwned::from(starknet_error_to_declare_error(starknet_error)))
995-
}
996-
Err(err) => Err(internal_server_error(err)),
997-
}
964+
Err(internal_server_error_with_msg(
965+
"add_declare_transaction is not supported - gateway client has been removed",
966+
))
998967
}
999968

1000969
#[instrument(skip(self, transactions), level = "debug", err, ret)]
@@ -1788,7 +1757,6 @@ impl JsonRpcServerTrait for JsonRpcServerImpl {
17881757
shared_highest_block: Arc<RwLock<Option<BlockHashAndNumber>>>,
17891758
pending_data: Arc<RwLock<PendingData>>,
17901759
pending_classes: Arc<RwLock<PendingClasses>>,
1791-
writer_client: Arc<dyn StarknetWriter>,
17921760
class_manager_client: Option<SharedClassManagerClient>,
17931761
) -> Self {
17941762
Self {
@@ -1801,7 +1769,6 @@ impl JsonRpcServerTrait for JsonRpcServerImpl {
18011769
shared_highest_block,
18021770
pending_data,
18031771
pending_classes,
1804-
writer_client,
18051772
class_manager_client,
18061773
}
18071774
}

‎crates/apollo_rpc/src/v0_8/api/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ impl TryFrom<BroadcastedDeclareTransaction> for ExecutableTransactionInput {
520520
}
521521

522522
fn user_deprecated_contract_class_to_sn_api(
523-
value: apollo_starknet_client::writer::objects::transaction::DeprecatedContractClass,
523+
value: super::broadcasted_transaction::DeprecatedContractClass,
524524
) -> Result<starknet_api::deprecated_contract_class::ContractClass, ErrorObjectOwned> {
525525
Ok(starknet_api::deprecated_contract_class::ContractClass {
526526
abi: value.abi,

‎crates/apollo_rpc/src/v0_8/api/test.rs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ use apollo_starknet_client::starknet_error::{
2525
StarknetError,
2626
StarknetErrorCode,
2727
};
28-
use apollo_starknet_client::writer::objects::response::{
29-
DeclareResponse,
30-
DeployAccountResponse,
31-
InvokeResponse,
32-
};
33-
use apollo_starknet_client::writer::objects::transaction::{
34-
DeclareTransaction as ClientDeclareTransaction,
35-
DeployAccountTransaction as ClientDeployAccountTransaction,
36-
InvokeTransaction as ClientInvokeTransaction,
37-
};
38-
use apollo_starknet_client::writer::{MockStarknetWriter, WriterClientError, WriterClientResult};
3928
use apollo_starknet_client::ClientError;
4029
use apollo_storage::base_layer::BaseLayerStorageWriter;
4130
use apollo_storage::body::events::EventIndex;

0 commit comments

Comments
 (0)