Merge pull request #241 from propeller-heads/release/hooks

feat: Hooks

Author: tamaralipows

Cargo.lock

@@ -97,7 +97,7 @@ unicode-width = "0.1.13"
 tracing-appender = "0.2.3"
 
 # tycho execution for quickstart
-tycho-execution = "0.118.0"
+tycho-execution = "0.121.0"
 
 [features]
 default = ["evm", "rfq"]

Cargo.toml

@@ -64,8 +64,10 @@ fn register_exchanges(
                     "uniswap_v4",
                     tvl_filter.clone(),
                     Some(uniswap_v4_pool_with_hook_filter),
-                )
+                );
             // COMING SOON!
+            // .exchange::<UniswapV4State>("uniswap_v4_hooks", tvl_filter.clone(),
+            // Some(uniswap_v4_pool_with_euler_hook_filter));
             // .exchange::<EVMPoolState<PreCachedDB>>("vm:maverick_v2", tvl_filter.clone(), None)
         }
         Chain::Base => {

examples/price_printer/main.rs

@@ -150,22 +150,28 @@ impl App {
                 .iter()
                 .map(|a| a.symbol.clone())
                 .join("/");
-            let price = update
-                .states
-                .get(id)
-                .map(|el| el.spot_price(&comp.tokens[0], &comp.tokens[1]))
-                .unwrap_or(Ok(0.0))
-                .expect("Expected spot price as f64");
 
             match update.states.get(id) {
                 Some(state) => {
-                    self.items.push(Data {
-                        component: comp.clone(),
-                        state: state.clone(),
-                        name,
-                        tokens,
-                        price: price.to_string(),
-                    });
+                    // Check if spot_price calculation is successful
+                    match state.spot_price(&comp.tokens[0], &comp.tokens[1]) {
+                        Ok(price) => {
+                            self.items.push(Data {
+                                component: comp.clone(),
+                                state: state.clone(),
+                                name,
+                                tokens,
+                                price: price.to_string(),
+                            });
+                        }
+                        Err(_) => {
+                            // Skip pools with spot_price errors
+                            warn!(
+                                "Skipping pool {comp_id} due to spot_price error",
+                                comp_id = comp.id
+                            );
+                        }
+                    }
                 }
                 None => {
                     warn!("Received update for unknown pool {comp_id}", comp_id = comp.id)
@@ -180,12 +186,20 @@ impl App {
                 .iter()
                 .find_position(|e| e.component.id == eth_address);
             if let Some((index, _)) = entry {
-                let row = self.items.get_mut(index).unwrap();
-                let price = state
-                    .spot_price(&row.component.tokens[0], &row.component.tokens[1])
-                    .expect("Expected spot price as f64");
-                row.price = price.to_string();
-                row.state = state.clone();
+                let row = &self.items[index];
+                match state.spot_price(&row.component.tokens[0], &row.component.tokens[1]) {
+                    Ok(price) => {
+                        // Update the price and state if calculation is successful
+                        let row = self.items.get_mut(index).unwrap();
+                        row.price = price.to_string();
+                        row.state = state.clone();
+                    }
+                    Err(_) => {
+                        // Remove the pool if spot_price calculation fails
+                        warn!("Removing pool {} due to spot_price error", address);
+                        self.items.remove(index);
+                    }
+                }
             }
         }
 

examples/price_printer/ui.rs

@@ -184,6 +184,8 @@ async fn main() {
                     Some(curve_pool_filter),
                 );
             // COMING SOON!
+            // .exchange::<UniswapV4State>("uniswap_v4_hooks", tvl_filter.clone(),
+            // Some(uniswap_v4_pool_with_euler_hook_filter));
             // .exchange::<EVMPoolState<PreCachedDB>>("vm:maverick_v2", tvl_filter.clone(), None);
         }
         Chain::Base => {
@@ -316,8 +318,8 @@ async fn main() {
                     if balance < amount_in {
                         let required = format_token_amount(&amount_in, &sell_token);
                         println!("⚠️ Warning: Insufficient balance for swap. You have {formatted_balance} {sell_symbol} but need {required} {sell_symbol}",
-                            formatted_balance = formatted_balance,
-                            sell_symbol = sell_token.symbol,
+                                 formatted_balance = formatted_balance,
+                                 sell_symbol = sell_token.symbol,
                         );
                         return;
                     }
@@ -541,13 +543,21 @@ fn get_best_swap(
             if HashSet::from([&sell_token, &buy_token])
                 .is_subset(&HashSet::from_iter(tokens.iter()))
             {
-                let amount_out = state
+                let amount_out_result = state
                     .get_amount_out(amount_in.clone(), &sell_token, &buy_token)
                     .map_err(|e| eprintln!("Error calculating amount out for Pool {id:?}: {e:?}"))
                     .ok();
-                if let Some(amount_out) = amount_out {
+
+                if let Some(amount_out) = amount_out_result {
                     amounts_out.insert(id.clone(), amount_out.amount);
                 }
+
+                // If you would like to know how much of each token you are able to swap on the
+                // pool, do
+                // let limits = state
+                //     .get_limits(sell_token.address.clone(), buy_token.address.clone())
+                //     .unwrap();
+
                 // If you would like to save spot prices instead of the amount out, do
                 // let spot_price = state
                 //     .spot_price(&tokens[0], &tokens[1])

examples/quickstart/main.rs

@@ -14,6 +14,33 @@ pub fn balancer_v2_pool_filter(component: &ComponentWithState) -> bool {
     balancer_v2_pool_filter_after_dci_update(component)
 }
 
+/// Filters out pools that have hooks in Uniswap V4
+pub fn uniswap_v4_pool_with_hook_filter(component: &ComponentWithState) -> bool {
+    if let Some(hooks) = component
+        .component
+        .static_attributes
+        .get("hooks")
+    {
+        if hooks.to_vec() != ZERO_ADDRESS_ARR {
+            debug!("Filtering out UniswapV4 pool {} because it has hooks", component.component.id);
+            return false;
+        }
+    }
+    true
+}
+
+pub fn uniswap_v4_pool_with_euler_hook_filter(component: &ComponentWithState) -> bool {
+    if let Some(_hooks_data) = component
+        .component
+        .static_attributes
+        .get("hook_identifier")
+    {
+        // Only Euler pools have a hook_identifier
+        return true;
+    }
+    false
+}
+
 /// Filters out pools that are failing at the moment after DCI update
 pub fn balancer_v2_pool_filter_after_dci_update(component: &ComponentWithState) -> bool {
     const UNSUPPORTED_COMPONENT_IDS: [&str; 6] = [
@@ -161,7 +188,7 @@ pub fn curve_pool_filter(component: &ComponentWithState) -> bool {
                 "Filtering out Curve pool {} because it belongs to an unsupported factory",
                 component.component.id
             );
-            return false
+            return false;
         }
     };
 
@@ -181,27 +208,12 @@ pub fn curve_pool_filter(component: &ComponentWithState) -> bool {
             "Filtering out Curve pool {} because it has a rebasing token that is not supported",
             component.component.id
         );
-        return false
+        return false;
     }
 
     true
 }
 
-/// Filters out pools that have hooks in Uniswap V4
-pub fn uniswap_v4_pool_with_hook_filter(component: &ComponentWithState) -> bool {
-    if let Some(hooks) = component
-        .component
-        .static_attributes
-        .get("hooks")
-    {
-        if hooks.to_vec() != ZERO_ADDRESS_ARR {
-            debug!("Filtering out UniswapV4 pool {} because it has hooks", component.component.id);
-            return false;
-        }
-    }
-    true
-}
-
 /// Filters out pools that rely on ERC4626 in Balancer V3
 pub fn balancer_v3_pool_filter(component: &ComponentWithState) -> bool {
     if let Some(erc4626) = component

src/evm/protocol/filters.rs

@@ -1,2 +1,2 @@
-#![allow(dead_code)]
+#[allow(dead_code)]
 pub const POOL_MANAGER_BYTECODE: &[u8] = include_bytes!("assets/pool_manager_bytecode.bin");