feat: make it work with both ws and http and specify multicall address from cli

Author: gakonst

src/borrowers.rs

@@ -48,10 +48,11 @@ impl<P: JsonRpcClient> Borrowers<P> {
     /// Constructor
     pub async fn new(
         controller: Address,
+        multicall: Option<Address>,
         client: Arc<Client<P, Wallet>>,
         borrowers: HashMap<Address, Borrower>,
     ) -> Self {
-        let multicall = Multicall::new(client.clone(), None)
+        let multicall = Multicall::new(client.clone(), multicall)
             .await
             .expect("could not initialize multicall");
         Borrowers {

src/keeper.rs

@@ -39,6 +39,7 @@ impl<P: JsonRpcClient> Keeper<P> {
         liquidations: Address,
         uniswap: Address,
         flashloan: Address,
+        multicall: Option<Address>,
         min_profit: U256,
         state: Option<State>,
     ) -> Result<Keeper<P>> {
@@ -47,11 +48,12 @@ impl<P: JsonRpcClient> Keeper<P> {
             None => (HashMap::new(), HashMap::new(), 0.into()),
         };
 
-        let borrowers = Borrowers::new(controller, client.clone(), borrowers).await;
+        let borrowers = Borrowers::new(controller, multicall, client.clone(), borrowers).await;
         let liquidator = Liquidator::new(
             liquidations,
             uniswap,
             flashloan,
+            multicall,
             min_profit,
             client.clone(),
             vaults,

src/liquidations.rs

@@ -54,11 +54,12 @@ impl<P: JsonRpcClient> Liquidator<P> {
         liquidations: Address,
         uniswap: Address,
         flashloan: Address,
+        multicall: Option<Address>,
         min_profit: U256,
         client: Arc<Client<P, Wallet>>,
         auctions: HashMap<Address, Auction>,
     ) -> Self {
-        let multicall = Multicall::new(client.clone(), None)
+        let multicall = Multicall::new(client.clone(), multicall)
             .await
             .expect("could not initialize multicall");
 

src/main.rs

@@ -2,7 +2,7 @@ use ethers::prelude::*;
 use yield_liquidator::keeper::Keeper;
 
 use gumdrop::Options;
-use std::{path::PathBuf, sync::Arc, time::Duration};
+use std::{convert::TryFrom, path::PathBuf, sync::Arc, time::Duration};
 use tracing::info;
 use tracing_subscriber::{filter::EnvFilter, fmt::Subscriber};
 
@@ -35,6 +35,11 @@ struct Opts {
     )]
     flashloan: Address,
 
+    #[options(
+        help = "the address of the Multicall contract (optional for any of the deployed testnets)"
+    )]
+    multicall: Option<Address>,
+
     #[options(
         help = "the Ethereum node HTTP endpoint",
         default = "http://localhost:8545"
@@ -65,9 +70,19 @@ async fn main() -> anyhow::Result<()> {
 
     let opts = Opts::parse_args_default_or_exit();
 
-    let ws = Ws::connect(opts.url.clone()).await?;
-    let provider = Provider::new(ws);
-    // let provider = Provider::<Http>::try_from(opts.url.clone())?;
+    if opts.url.starts_with("http") {
+        let provider = Provider::<Http>::try_from(opts.url.clone())?;
+        run(opts, provider).await?;
+    } else {
+        let ws = Ws::connect(opts.url.clone()).await?;
+        let provider = Provider::new(ws);
+        run(opts, provider).await?;
+    }
+
+    Ok(())
+}
+
+async fn run<P: JsonRpcClient>(opts: Opts, provider: Provider<P>) -> anyhow::Result<()> {
     let wallet: Wallet = opts.private_key.parse()?;
     let client = wallet
         .connect(provider)
@@ -79,6 +94,7 @@ async fn main() -> anyhow::Result<()> {
     info!("Controller: {:?}", opts.controller);
     info!("Liquidations: {:?}", opts.liquidations);
     info!("Uniswap: {:?}", opts.uniswap);
+    info!("Multicall: {:?}", opts.multicall);
     info!("FlashLiquidator {:?}", opts.flashloan);
     info!("Persistent data will be stored at: {:?}", opts.file);
 
@@ -96,6 +112,7 @@ async fn main() -> anyhow::Result<()> {
         opts.liquidations,
         opts.uniswap,
         opts.flashloan,
+        opts.multicall,
         opts.min_profit,
         state,
     )