Merge pull request #226 from Vid201/feat/new_spec_tests

feat: bundler conformance to latest specs, handle reputation
silius-rs · Oct 16, 2023 · cbd6735 · cbd6735
2 parents 502194d + c611d03
commit cbd6735
Show file tree

Hide file tree

Showing 41 changed files with 1,199 additions and 406 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: eth-infinitism/bundler-spec-tests
-          ref: 'e193753db1910fb6d0ee2661d96a8d8f79d6c7d8'
+          ref: 'bbd61f21e95ed1290678fcbfd9551b1502c81fe9'
           submodules: true
       - uses: actions/checkout@v3
         with:
@@ -94,7 +94,7 @@ jobs:
 
       - run: pip install jq yq
 
-      - run: pdm install && git submodule update --init --recursive && cd @account-abstraction && yarn && yarn compile &&  cd ../spec && yarn && yarn build
+      - run: pdm install && git submodule update --init --recursive && cd @account-abstraction && git fetch --all --tags && git checkout tags/v0.6.0 -b v0.6.0 && yarn && yarn compile &&  cd ../spec && yarn && yarn build
 
       - uses: actions/download-artifact@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ make lint
 make test
 ```
 
-Official [bundler spec tests](https://github.com/eth-infinitism/bundler-spec-tests) developed by the [eth-infinitism](https://github.com/eth-infinitism/) team are also included in the repo's CI pipeline (commit: [e193753db1910fb6d0ee2661d96a8d8f79d6c7d8](https://github.com/eth-infinitism/bundler-spec-tests/tree/e193753db1910fb6d0ee2661d96a8d8f79d6c7d8)). You can find more information on how to run tests [here](https://github.com/eth-infinitism/bundler-spec-tests). Make sure your contribution doesn't break the tests!
+Official [bundler spec tests](https://github.com/eth-infinitism/bundler-spec-tests) developed by the [eth-infinitism](https://github.com/eth-infinitism/) team are also included in the repo's CI pipeline (commit: [bbd61f21e95ed1290678fcbfd9551b1502c81fe9](https://github.com/eth-infinitism/bundler-spec-tests/tree/bbd61f21e95ed1290678fcbfd9551b1502c81fe9)). You can find more information on how to run tests [here](https://github.com/eth-infinitism/bundler-spec-tests). Make sure your contribution doesn't break the tests!
 
 ## Contact
 

diff --git a/bin/silius/src/bundler.rs b/bin/silius/src/bundler.rs
@@ -162,7 +162,6 @@ where
         chain_id,
         args.max_verification_gas,
         args.min_stake,
-        args.min_unstake_delay,
         args.min_priority_fee_per_gas,
         args.whitelist,
         args.uopool_mode,

diff --git a/bin/silius/src/cli/args.rs b/bin/silius/src/cli/args.rs
@@ -77,10 +77,6 @@ pub struct UoPoolArgs {
     #[clap(long, value_parser=parse_u256, default_value = "1")]
     pub min_stake: U256,
 
-    /// Minimum unstake delay for entities.
-    #[clap(long, value_parser=parse_u256, default_value = "0")]
-    pub min_unstake_delay: U256,
-
     /// Minimum priority fee per gas.
     #[clap(long, value_parser=parse_u256, default_value = "0")]
     pub min_priority_fee_per_gas: U256,

diff --git a/crates/grpc/src/builder.rs b/crates/grpc/src/builder.rs
@@ -1,4 +1,3 @@
-use crate::uopool::{GAS_INCREASE_PERC, MAX_UOS_PER_UNSTAKED_SENDER};
 use ethers::{
     providers::Middleware,
     types::{Address, H256, U256},
@@ -7,9 +6,12 @@ use eyre::format_err;
 use futures_util::StreamExt;
 use silius_contracts::EntryPoint;
 use silius_primitives::{
+    consts::reputation::{
+        BAN_SLACK, MIN_INCLUSION_RATE_DENOMINATOR, MIN_UNSTAKE_DELAY, THROTTLING_SLACK,
+    },
     get_address,
     provider::BlockStream,
-    reputation::{ReputationEntry, BAN_SLACK, MIN_INCLUSION_RATE_DENOMINATOR, THROTTLING_SLACK},
+    reputation::ReputationEntry,
     Chain, UserOperation,
 };
 use silius_uopool::{
@@ -35,7 +37,6 @@ where
     chain: Chain,
     max_verification_gas: U256,
     min_stake: U256,
-    min_unstake_delay: U256,
     min_priority_fee_per_gas: U256,
     whitelist: Vec<Address>,
     mempool: MempoolBox<VecUo, VecCh, P, E>,
@@ -57,7 +58,6 @@ where
         chain: Chain,
         max_verification_gas: U256,
         min_stake: U256,
-        min_unstake_delay: U256,
         min_priority_fee_per_gas: U256,
         whitelist: Vec<Address>,
         mempool: P,
@@ -73,7 +73,7 @@ where
             THROTTLING_SLACK,
             BAN_SLACK,
             min_stake,
-            min_unstake_delay,
+            MIN_UNSTAKE_DELAY.into(),
         );
         for addr in whitelist.iter() {
             reputation.add_whitelist(addr);
@@ -86,7 +86,6 @@ where
             chain,
             max_verification_gas,
             min_stake,
-            min_unstake_delay,
             min_priority_fee_per_gas,
             whitelist,
             mempool,
@@ -199,17 +198,13 @@ where
                 self.chain,
                 self.max_verification_gas,
                 self.min_priority_fee_per_gas,
-                MAX_UOS_PER_UNSTAKED_SENDER,
-                GAS_INCREASE_PERC.into(),
             )
         } else {
             StandardUserOperationValidator::new_canonical(
                 entry_point.clone(),
                 self.chain,
                 self.max_verification_gas,
                 self.min_priority_fee_per_gas,
-                MAX_UOS_PER_UNSTAKED_SENDER,
-                GAS_INCREASE_PERC.into(),
             )
         };
 

diff --git a/crates/grpc/src/bundler.rs b/crates/grpc/src/bundler.rs
@@ -89,8 +89,10 @@ where
         if !self.is_running() {
             info!("Starting auto bundling");
 
-            let mut r = self.running.lock();
-            *r = true;
+            {
+                let mut r = self.running.lock();
+                *r = true;
+            }
 
             for bundler in self.bundlers.iter() {
                 let bundler_own = bundler.clone();
@@ -100,10 +102,11 @@ where
                 tokio::spawn(async move {
                     let mut interval = tokio::time::interval(Duration::from_secs(int));
                     loop {
+                        interval.tick().await;
+
                         if !is_running(running_lock.clone()) {
                             break;
                         }
-                        interval.tick().await;
 
                         match Self::get_user_operations(
                             &uopool_grpc_client,

diff --git a/crates/grpc/src/proto.rs b/crates/grpc/src/proto.rs
@@ -315,6 +315,26 @@ pub mod types {
             Self::from(value.0)
         }
     }
+
+    impl From<silius_primitives::reputation::StakeInfo> for StakeInfo {
+        fn from(value: silius_primitives::reputation::StakeInfo) -> Self {
+            Self {
+                address: Some(value.address.into()),
+                stake: value.stake.as_u64(),
+                unstake_delay: value.unstake_delay.as_u64(),
+            }
+        }
+    }
+
+    impl From<StakeInfo> for silius_primitives::reputation::StakeInfo {
+        fn from(value: StakeInfo) -> Self {
+            Self {
+                address: value.address.unwrap_or_default().into(),
+                stake: value.stake.into(),
+                unstake_delay: value.unstake_delay.into(),
+            }
+        }
+    }
 }
 
 pub mod uopool {

diff --git a/crates/grpc/src/protos/types/types.proto b/crates/grpc/src/protos/types/types.proto
@@ -88,3 +88,9 @@ message Log{
     H256 transaction_hash = 8;
     PbU256 log_index = 9;
 }
+
+message StakeInfo {
+    H160 address = 1;
+    uint64 stake = 2;
+    uint64 unstake_delay = 3;
+}
diff --git a/crates/grpc/src/protos/uopool/uopool.proto b/crates/grpc/src/protos/uopool/uopool.proto
@@ -103,6 +103,16 @@ message GetUserOperationReceiptResponse{
     string reason = 10;
 }
 
+message GetStakeInfoRequest {
+    types.H160 addr = 1;
+    types.H160 ep = 2;
+}
+
+message GetStakeInfoResponse {
+    types.StakeInfo info = 1;
+    bool is_staked = 2;
+}
+
 service UoPool {
     rpc Add(AddRequest) returns (AddResponse);
     rpc Remove(RemoveRequest) returns (google.protobuf.Empty);
@@ -112,9 +122,12 @@ service UoPool {
     rpc GetSortedUserOperations(GetSortedRequest) returns (GetSortedResponse);
     rpc GetUserOperationByHash(UserOperationHashRequest) returns (GetUserOperationByHashResponse);
     rpc GetUserOperationReceipt(UserOperationHashRequest) returns (GetUserOperationReceiptResponse);
+    rpc GetStakeInfo(GetStakeInfoRequest) returns (GetStakeInfoResponse);
 
     // debug
     rpc GetAll(GetAllRequest) returns (GetAllResponse);
+    rpc ClearMempool(google.protobuf.Empty) returns (google.protobuf.Empty);
+    rpc ClearReputation(google.protobuf.Empty) returns (google.protobuf.Empty);
     rpc Clear(google.protobuf.Empty) returns (google.protobuf.Empty);
     rpc GetAllReputation(GetAllReputationRequest) returns (GetAllReputationResponse);
     rpc SetReputation(SetReputationRequest) returns (SetReputationResponse);