Rename Account Abstraction Core

Cargo.toml

@@ -7,15 +7,13 @@ homepage = "https://github.com/base/tips"
 repository = "https://github.com/base/tips"
 
 [workspace]
-members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core", "crates/account-abstraction-core-v2", "crates/system-tests"]
+members = ["crates/audit", "crates/ingress-rpc", "crates/core", "crates/account-abstraction-core"]
 resolver = "2"
 
 [workspace.dependencies]
 tips-audit = { path = "crates/audit" }
 tips-core = { path = "crates/core" }
 account-abstraction-core = { path = "crates/account-abstraction-core" }
-account-abstraction-core-v2 = { path = "crates/account-abstraction-core-v2" }
-tips-system-tests = { path = "crates/system-tests" }
 
 # Reth
 reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.3" }
@@ -29,11 +27,9 @@ alloy-primitives = { version = "1.4.1", default-features = false, features = [
 ] }
 alloy-consensus = { version = "1.0.41" }
 alloy-provider = { version = "1.0.41" }
+alloy-serde = "1.0.41"
 alloy-rpc-types = "1.1.2"
 alloy-sol-types = { version = "1.4.1", default-features = false }
-alloy-signer = { version = "1.0.41" }
-alloy-network = { version = "1.0.41" }
-alloy-serde = "1.0.41"
 
 # op-alloy
 op-alloy-network = { version = "0.22.0", default-features = false }

crates/account-abstraction-core/Cargo.toml

@@ -7,8 +7,6 @@ homepage.workspace = true
 repository.workspace = true
 edition.workspace = true
 
-[lib]
-path = "core/src/lib.rs"
 [dependencies]
 alloy-serde = { version = "1.0.41", default-features = false }
 serde.workspace = true
@@ -20,12 +18,12 @@ reth-rpc-eth-types.workspace = true
 tokio.workspace = true
 jsonrpsee.workspace = true
 async-trait = { workspace = true }
-alloy-sol-types.workspace= true
+alloy-sol-types.workspace = true
 anyhow.workspace = true
 rdkafka.workspace = true
 serde_json.workspace = true
 tips-core.workspace = true
-tracing.workspace=true
+tracing.workspace = true
 
 [dev-dependencies]
 alloy-primitives.workspace = true

crates/account-abstraction-core-v2/README.md → crates/account-abstraction-core/README.md

@@ -1,4 +1,4 @@
-# account-abstraction-core-v2
+# account-abstraction-core
 
 Clean architecture implementation for ERC-4337 account abstraction mempool and validation.
 
@@ -228,10 +228,10 @@ pub fn create_mempool_engine(
 3. **Reusability**: Services can be used in multiple binaries
    ```rust
    // ingress-rpc binary
-   use account_abstraction_core_v2::MempoolEngine;
+   use account_abstraction_core::MempoolEngine;
 
    // batch-processor binary
-   use account_abstraction_core_v2::MempoolEngine;
+   use account_abstraction_core::MempoolEngine;
 
    // Same code, different contexts!
    ```
@@ -252,7 +252,7 @@ pub fn create_mempool_engine(
 ### Basic Usage (with Factory)
 
 ```rust
-use account_abstraction_core_v2::create_mempool_engine;
+use account_abstraction_core::create_mempool_engine;
 
 let engine = create_mempool_engine(
     "kafka.properties",
@@ -269,7 +269,7 @@ tokio::spawn(async move {
 ### Custom Setup (without Factory)
 
 ```rust
-use account_abstraction_core_v2::{
+use account_abstraction_core::{
     MempoolEngine,
     infrastructure::kafka::consumer::KafkaEventSource,
 };
@@ -282,7 +282,7 @@ let engine = MempoolEngine::with_event_source(event_source, Some(custom_config))
 ### Testing
 
 ```rust
-use account_abstraction_core_v2::{
+use account_abstraction_core::{
     MempoolEngine, MempoolEvent,
     services::interfaces::event_source::EventSource,
 };