feat: migrate mev share dependencies

Cargo.toml

@@ -11,6 +11,12 @@ members = [
 
 default-members = ["bin/artemis", "bin/cli"]
 
+[workspace.dependencies]
+## eth
+ethers = { version = "2", features = ["ws", "rustls"]}
+ethers-signers = "2.0"
+
+
 [profile.release]
 panic = 'abort'
 

crates/artemis-core/Cargo.toml

@@ -8,10 +8,9 @@ edition = "2021"
 [dependencies]
 
 ## eth
-ethers = { version = "2", features = ["ws", "rustls"]}
+ethers.workspace = true
 opensea-stream = { git = "https://github.com/FrankieIsLost/opensea-stream-rs"}
-mev-share = "0.1.1"
-matchmaker = { path = "../../crates/clients/matchmaker" }
+mev-share = "0.1.4"
 ethers-flashbots = { git = "https://github.com/FrankieIsLost/ethers-flashbots", features = ["rustls"] }
 
 ## async
@@ -20,8 +19,10 @@ futures = "0.3"
 reqwest = { version = "0.11.14", default-features = false, features = ["rustls-tls"] }
 tokio = { version = "1.18", features = ["full"] }
 tokio-stream = { version = "0.1", features = ['sync'] }
+jsonrpsee = { version = "0.18", features = ["client", "async-client"] }
 
 ## misc
 anyhow = "1.0.70"
 thiserror = "1.0.40"
 tracing = "0.1.37"
+tower = "0.4.13"

crates/artemis-core/src/executors/mev_share_executor.rs

@@ -1,35 +1,46 @@
 use crate::types::Executor;
 use anyhow::Result;
 use async_trait::async_trait;
-use ethers::{signers::Signer, types::Chain};
+use ethers::signers::Signer;
 use futures::{stream, StreamExt};
-use matchmaker::{client::Client, types::BundleRequest};
+use jsonrpsee::http_client::{
+    transport::{self},
+    HttpClientBuilder,
+};
+use mev_share::rpc::{FlashbotsSignerLayer, MevApiClient, SendBundleRequest};
+
 use tracing::{error, info};
 
 /// An executor that sends bundles to the MEV-share Matchmaker.
-pub struct MevshareExecutor<S> {
-    matchmaker_client: Client<S>,
+pub struct MevshareExecutor {
+    mev_share_client: Box<dyn MevApiClient + Send + Sync>,
 }
 
-/// List of bundles to send to the Matchmaker.
-pub type Bundles = Vec<BundleRequest>;
-
-impl<S: Signer + Clone + 'static> MevshareExecutor<S> {
-    pub fn new(signer: S, chain: Chain) -> Self {
+impl MevshareExecutor {
+    pub fn new(signer: impl Signer + Clone + 'static) -> Self {
+        // Set up flashbots-style auth middleware
+        let http = HttpClientBuilder::default()
+            .set_middleware(
+                tower::ServiceBuilder::new()
+                    .map_err(transport::Error::Http)
+                    .layer(FlashbotsSignerLayer::new(signer)),
+            )
+            .build("https://relay.flashbots.net:443")
+            .expect("failed to build HTTP client");
         Self {
-            matchmaker_client: Client::new(signer, chain),
+            mev_share_client: Box::new(http),
         }
     }
 }
 
 #[async_trait]
-impl<S: Signer + Clone + 'static> Executor<Bundles> for MevshareExecutor<S> {
+impl Executor<Vec<SendBundleRequest>> for MevshareExecutor {
     /// Send bundles to the matchmaker.
-    async fn execute(&self, action: Bundles) -> Result<()> {
+    async fn execute(&self, action: Vec<SendBundleRequest>) -> Result<()> {
         let bodies = stream::iter(action)
             .map(|bundle| {
-                let client = &self.matchmaker_client;
-                async move { client.send_bundle(&bundle).await }
+                let client = &self.mev_share_client;
+                async move { client.send_bundle(bundle).await }
             })
             .buffer_unordered(5);