Skip to content

Commit 4a45faf

Browse files
authored
chore(workspace): remove reth dependency and use base-reth-rpc-types in place (#131)
1 parent 2d70ac0 commit 4a45faf

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

Cargo.lock

Lines changed: 10 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ tips-ingress-rpc-lib = { path = "crates/ingress-rpc" }
3838
tips-system-tests = { path = "crates/system-tests" }
3939
account-abstraction-core = { path = "crates/account-abstraction-core" }
4040

41-
# reth
42-
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
43-
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
44-
reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
41+
# base-reth
42+
base-reth-rpc-types = { git = "https://github.com/base/node-reth", branch = "main" }
4543

4644
# revm
4745
op-revm = { version = "12.0.0", default-features = false }

crates/account-abstraction-core/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ alloy-serde.workspace = true
1313
async-trait.workspace = true
1414
alloy-sol-types.workspace = true
1515
op-alloy-network.workspace = true
16-
reth-rpc-eth-types.workspace = true
1716
serde = { workspace = true, features = ["std", "derive"] }
1817
tokio = { workspace = true, features = ["full"] }
1918
tracing = { workspace = true, features = ["std"] }

crates/ingress-rpc/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ async-trait.workspace = true
1818
metrics-derive.workspace = true
1919
op-alloy-network.workspace = true
2020
alloy-signer-local.workspace = true
21-
reth-optimism-evm.workspace = true
22-
reth-rpc-eth-types.workspace = true
21+
base-reth-rpc-types.workspace = true
2322
account-abstraction-core.workspace = true
2423
alloy-primitives = { workspace = true, features = ["map-foldhash", "serde"] }
2524
tokio = { workspace = true, features = ["full"] }

crates/ingress-rpc/src/service.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ use alloy_consensus::transaction::Recovered;
77
use alloy_consensus::{Transaction, transaction::SignerRecoverable};
88
use alloy_primitives::{Address, B256, Bytes, FixedBytes};
99
use alloy_provider::{Provider, RootProvider, network::eip2718::Decodable2718};
10+
use base_reth_rpc_types::EthApiError;
1011
use jsonrpsee::{
1112
core::{RpcResult, async_trait},
1213
proc_macros::rpc,
1314
};
1415
use op_alloy_consensus::OpTxEnvelope;
1516
use op_alloy_network::Optimism;
16-
use reth_rpc_eth_types::EthApiError;
1717
use std::time::{SystemTime, UNIX_EPOCH};
1818
use tips_audit_lib::BundleEvent;
1919
use tips_core::types::ParsedBundle;

crates/ingress-rpc/src/validation.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ use alloy_consensus::private::alloy_eips::{BlockId, BlockNumberOrTag};
22
use alloy_primitives::{Address, B256, U256};
33
use alloy_provider::{Provider, RootProvider};
44
use async_trait::async_trait;
5+
use base_reth_rpc_types::{EthApiError, SignError, extract_l1_info_from_tx};
56
use jsonrpsee::core::RpcResult;
67
use op_alloy_network::Optimism;
78
use op_revm::l1block::L1BlockInfo;
8-
use reth_optimism_evm::extract_l1_info_from_tx;
9-
use reth_rpc_eth_types::{EthApiError, SignError};
109
use std::collections::HashSet;
1110
use std::time::{Duration, SystemTime, UNIX_EPOCH};
1211
use tips_core::Bundle;

0 commit comments

Comments
 (0)