Merge pull request #231 from Vid201/chore/misc

chore: misc
silius-rs · Oct 26, 2023 · 3f9e810 · 3f9e810
2 parents cbd6735 + e8d1536
commit 3f9e810
Show file tree

Hide file tree

Showing 21 changed files with 250 additions and 77 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ members = [
     "crates/primitives",
     "crates/rpc",
     "crates/uopool",
-    "examples",
+    "examples/*",
     "tests",
 ]
 default-members = ["bin/silius"]

diff --git a/crates/grpc/Cargo.toml b/crates/grpc/Cargo.toml
@@ -17,7 +17,6 @@ dashmap = "5.4.0"
 ethers = { workspace = true }
 expanded-pathbuf = { workspace = true }
 eyre = { workspace = true }
-futures-util = { workspace = true }
 parking_lot = { workspace = true }
 prost = "0.11"
 serde_json = { workspace = true }

diff --git a/crates/grpc/src/lib.rs b/crates/grpc/src/lib.rs
@@ -1,6 +1,5 @@
 #![allow(dead_code)]
 
-mod builder;
 mod bundler;
 mod proto;
 mod uopool;

diff --git a/crates/grpc/src/uopool.rs b/crates/grpc/src/uopool.rs
@@ -1,6 +1,5 @@
 use crate::proto::uopool::*;
 use crate::{
-    builder::UoPoolBuilder,
     proto::types::{GetChainIdResponse, GetSupportedEntryPointsResponse},
     utils::{parse_addr, parse_hash, parse_uo},
 };
@@ -20,7 +19,7 @@ use silius_uopool::{
 };
 use silius_uopool::{
     mempool_id, validate::validator::StandardUserOperationValidator, MempoolId, Reputation,
-    UoPool as UserOperationPool,
+    UoPool as UserOperationPool, UoPoolBuilder,
 };
 use std::fmt::{Debug, Display};
 use std::{net::SocketAddr, sync::Arc, time::Duration};

diff --git a/crates/uopool/Cargo.toml b/crates/uopool/Cargo.toml
@@ -16,6 +16,7 @@ educe = { version = "0.4", features = ["Debug", "Default"] }
 enumset = "1.1.2"
 ethers = { workspace = true }
 eyre = { workspace = true }
+futures-util = { workspace = true }
 page_size = "0.5.0"
 parking_lot = { workspace = true }
 prost = "0.11"

diff --git a/crates/grpc/src/builder.rs → crates/uopool/src/builder.rs b/crates/grpc/src/builder.rs → crates/uopool/src/builder.rs
@@ -1,3 +1,7 @@
+use crate::{
+    validate::validator::StandardUserOperationValidator, Mempool, MempoolBox, Reputation,
+    ReputationBox, UoPool, VecCh, VecUo,
+};
 use ethers::{
     providers::Middleware,
     types::{Address, H256, U256},
@@ -14,10 +18,6 @@ use silius_primitives::{
     reputation::ReputationEntry,
     Chain, UserOperation,
 };
-use silius_uopool::{
-    validate::validator::StandardUserOperationValidator, Mempool, MempoolBox, Reputation,
-    ReputationBox, UoPool, VecCh, VecUo,
-};
 use std::sync::Arc;
 use std::{
     fmt::{Debug, Display},

diff --git a/crates/uopool/src/lib.rs b/crates/uopool/src/lib.rs
@@ -1,6 +1,7 @@
 //! The UserOperation alternative mempool implementation according to the [ERC-4337 specifications](https://eips.ethereum.org/EIPS/eip-4337#Alternative%20Mempools).
 #![allow(dead_code)]
 
+mod builder;
 mod database;
 mod memory;
 mod mempool;
@@ -9,6 +10,7 @@ mod uopool;
 mod utils;
 pub mod validate;
 
+pub use builder::UoPoolBuilder;
 pub use database::{
     init_env, mempool::DatabaseMempool, reputation::DatabaseReputation, DBError, WriteMap,
 };

diff --git a/crates/uopool/src/validate/validator.rs b/crates/uopool/src/validate/validator.rs
@@ -152,6 +152,8 @@ where
             .with_sanity_check(Paymaster)
             .with_sanity_check(Entities)
             .with_sanity_check(UnstakedEntities)
+            .with_simulation_check(Signature)
+            .with_simulation_check(Timestamp)
     }
 
     /// Simulates validation of a [UserOperation](UserOperation) via the [simulate_validation](crate::entry_point::EntryPoint::simulate_validation) method of the [entry_point](crate::entry_point::EntryPoint).

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
diff --git a/examples/README.md b/examples/README.md
@@ -3,23 +3,41 @@
 ### Creating your first user operation
 
 ```bash
+cd user-operation
 cargo run --example user-operation
 ```
 
 ### Simple account - create 
 
 ```bash
-SEED_PHRASE="test test test test test test test test test test test junk" BUNDLER_URL="http://127.0.0.1:3000" cargo run --example simple-account-create
+cd simple-account
+SEED_PHRASE="test test test test test test test test test test test junk" BUNDLER_URL="http://127.0.0.1:3000" cargo run --example create
 ```
 
 ### Simple account - deposit funds to entrypoint
 
 ```bash
-SEED_PHRASE="test test test test test test test test test test test junk" PROVIDER_URL="http://127.0.0.1:3000" cargo run --example simple-account-deposit
+cd simple-account
+SEED_PHRASE="test test test test test test test test test test test junk" PROVIDER_URL="http://127.0.0.1:3000" cargo run --example deposit
 ```
 
 ### Simple account - transfer
 
 ```bash
-SEED_PHRASE="test test test test test test test test test test test junk" BUNDLER_URL="http://127.0.0.1:3000" cargo run --example simple-account-transfer
-```
+cd simple-account
+SEED_PHRASE="test test test test test test test test test test test junk" BUNDLER_URL="http://127.0.0.1:3000" cargo run --example transfer
+```
+
+### Storage - memory
+
+```bash
+cd storage
+PROVIDER_URL="http://127.0.0.1:8545" cargo run --example memory
+```
+
+### Storage - database
+
+```bash
+cd storage
+PROVIDER_URL="http://127.0.0.1:8545" cargo run --example database
+```
diff --git a/examples/simple-account/Cargo.toml b/examples/simple-account/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "examples-simple-account"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+description = """
+AA (ERC-4337) bundler examples - simple account
+"""
+
+[dependencies]
+alloy-primitives = "0.3"
+alloy-sol-types = "0.3"
+ethers = { workspace = true }
+eyre = { workspace = true }
+reqwest = { version = "0.11.4", features = ["json"] }
+serde = "1"
+serde_json = "1"
+silius-contracts = { path = "../../crates/contracts" }
+silius-primitives = { path = "../../crates/primitives" }
+silius-tests = { path = "../../tests" }
+tokio = { workspace = true }
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["silius-contracts", "silius-primitives", "silius-tests"]
+
+[[example]]
+name = "create"
+path = "examples/create.rs"
+
+[[example]]
+name = "deposit"
+path = "examples/deposit.rs"
+
+[[example]]
+name = "transfer"
+path = "examples/transfer.rs"
diff --git a/examples/simple_account/create.rs → examples/simple-account/examples/create.rs b/examples/simple_account/create.rs → examples/simple-account/examples/create.rs
@@ -4,8 +4,10 @@ use ethers::{
     signers::{coins_bip39::English, MnemonicBuilder, Signer},
     types::{transaction::eip2718::TypedTransaction, Address, Bytes, U256},
 };
+use examples_simple_account::{
+    simple_account::SimpleAccountExecute, EstimateResult, Request, Response,
+};
 use reqwest;
-use silius_examples::{simple_account::SimpleAccountExecute, EstimateResult, Request, Response};
 use silius_primitives::consts::entry_point::ADDRESS;
 use silius_primitives::UserOperation;
 use silius_primitives::Wallet as UoWallet;

diff --git a/examples/simple_account/deposit.rs → examples/simple-account/examples/deposit.rs b/examples/simple_account/deposit.rs → examples/simple-account/examples/deposit.rs
diff --git a/examples/simple_account/transfer.rs → examples/simple-account/examples/transfer.rs b/examples/simple_account/transfer.rs → examples/simple-account/examples/transfer.rs
@@ -5,9 +5,11 @@ use ethers::{
     types::{Address, Bytes, U256},
     utils::parse_ether,
 };
+use examples_simple_account::{
+    simple_account::SimpleAccountExecute, EstimateResult, Request, Response,
+};
 use reqwest;
 use silius_contracts::EntryPoint;
-use silius_examples::{simple_account::SimpleAccountExecute, EstimateResult, Request, Response};
 use silius_primitives::consts::entry_point::ADDRESS;
 use silius_primitives::UserOperation;
 use silius_primitives::Wallet as UoWallet;

diff --git a/examples/src/lib.rs → examples/simple-account/src/lib.rs b/examples/src/lib.rs → examples/simple-account/src/lib.rs
diff --git a/examples/storage/Cargo.toml b/examples/storage/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "examples-storage"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+rust-version = { workspace = true }
+description = """
+AA (ERC-4337) bundler examples - storage
+"""
+
+[dependencies]
+ethers = { workspace = true }
+eyre = { workspace = true }
+silius-primitives = { path = "../../crates/primitives" }
+silius-uopool = { path = "../../crates/uopool" }
+tempdir = "0.3.7"
+tokio = { workspace = true }
+
+[[example]]
+name = "memory"
+path = "examples/memory.rs"
+
+[[example]]
+name = "database"
+path = "examples/database.rs"
+