feat: pool server abstraction and local server #268

dancoombs · 2023-07-21T12:23:48Z

Closes #85

src/builder/bundle_sender.rs

src/builder/task.rs

src/cli/node.rs

src/common/grpc/mocks.rs

src/common/protos.rs

src/op_pool/mempool/error.rs

src/op_pool/server/local/client.rs

src/op_pool/server/local/server.rs

src/op_pool/server/local/client.rs

src/op_pool/server/mod.rs

dancoombs · 2023-07-25T22:58:56Z

src/op_pool/mempool/mod.rs

@@ -39,7 +46,7 @@ pub trait Mempool: Send + Sync + 'static {
    ) -> MempoolResult<H256>;

    /// Removes a set of operations from the pool.
-    fn remove_operations<'a>(&self, hashes: impl IntoIterator<Item = &'a H256>);
+    fn remove_operations(&self, hashes: &[H256]);


automock doesn't handle impl Trait 😢

dancoombs · 2023-07-28T19:01:39Z

src/op_pool/mempool/mod.rs

@@ -171,6 +178,102 @@ impl PoolOperation {
    }
 }

+pub struct MempoolGroup<M> {


dancoombs · 2023-07-28T19:02:09Z

src/builder/bundle_sender.rs

 #[derive(Debug)]
 pub struct Settings {
    pub replacement_fee_percent_increase: u64,
    pub max_fee_increases: u64,
 }

 #[derive(Debug)]
-pub struct BundleSender<P, E, T>
+pub struct BundleSenderImpl<P, E, T, C>


Sender is now generic on PoolClient

dancoombs · 2023-07-28T19:02:22Z

src/builder/bundle_proposer.rs

@@ -66,13 +65,14 @@ pub trait BundleProposer: Send + Sync + 'static {
 }

 #[derive(Debug)]
-pub struct BundleProposerImpl<S, E, P>
+pub struct BundleProposerImpl<S, E, P, C>


Proposer is now generic on PoolClient

dancoombs · 2023-07-28T19:02:43Z

src/op_pool/server/local/client.rs

+};
+
+#[derive(Clone, Debug)]
+pub struct LocalPoolClient {


dancoombs · 2023-07-28T19:03:00Z

src/op_pool/server/remote/client.rs

+};
+
+#[derive(Clone, Debug)]
+pub struct RemotePoolClient {


dancoombs · 2023-07-28T19:03:10Z

src/op_pool/server/local/server.rs

+    Ok(handle)
+}
+
+pub struct LocalPoolServer<M> {


dancoombs · 2023-07-28T19:03:52Z

src/op_pool/server/remote/protos.rs

@@ -0,0 +1,210 @@
+use anyhow::{bail, Context};


This is all just moved out of common

dancoombs · 2023-07-28T19:04:08Z

src/op_pool/server/remote/server.rs

@@ -0,0 +1,317 @@
+use std::{collections::HashMap, net::SocketAddr, sync::Arc};


This code is all moved

dancoombs · 2023-07-28T19:07:01Z

src/rpc/debug.rs

@@ -46,16 +43,13 @@ pub trait DebugApi {
    async fn bundler_dump_reputation(&self, entry_point: Address) -> RpcResult<Vec<RpcReputation>>;
 }

-pub struct DebugApi {
-    op_pool_client: op_pool_client::OpPoolClient<Channel>,
+pub struct DebugApi<P> {


Now generic on PoolClient

dancoombs · 2023-07-28T19:07:29Z

src/rpc/eth/mod.rs

@@ -98,23 +97,24 @@ where
 }

 #[derive(Debug)]
-pub struct EthApi<C: JsonRpcClient + 'static> {
+pub struct EthApi<C: JsonRpcClient + 'static, P: PoolClient> {


Now generic on pool client

dphilipson

Nice work! Some initial thoughts, will look more in a bit.

src/builder/bundle_sender.rs

src/op_pool/mempool/mod.rs

src/op_pool/server/local/server.rs

src/op_pool/server/remote/server.rs

dphilipson · 2023-07-31T23:08:25Z

src/builder/task.rs

-        let _builder_loop_guard = {
-            SpawnGuard::spawn_with_guard(async move { bundle_sender.send_bundles_in_loop().await })
+        let mut builder: Box<dyn BundleSender> = match &self.args.pool_client_mode {
+            PoolClientMode::Local { sender } => {


The only difference between the two blocks here is pool_client, right? It's a bit hard to tell visually, unfortunately.

Something I'd like to see is if we can just box the pool client and have an impl

impl PoolClient for Box<dyn PoolClient>

That way we could have the branch just give us a Box<dyn PoolClient> and have all the rest of the config written once outside of the branch. The auto_impl crate might help with this.

But these trait impl macros tend to not work for us, so maybe it won't help.

Yeah, I actually played with this code for a while trying to make this cleaner. auto_impl and async_trait don't seem to work well together.

dphilipson

Looks good to me!

dancoombs force-pushed the danc/local-server branch 6 times, most recently from 14430ff to c70a7da Compare July 22, 2023 18:35

dancoombs force-pushed the danc/builder-server branch from 1ce0f80 to 4a7a0d9 Compare July 25, 2023 17:24

dancoombs force-pushed the danc/local-server branch from c70a7da to 1d6bc1e Compare July 25, 2023 17:49