fix: After merging main fixes

Took 10 minutes

src/encoding/evm/swap_encoder/swap_encoders.rs

@@ -2134,6 +2134,7 @@ mod tests {
                 token_out: token_out.clone(),
                 split: 0f64,
                 user_data: Some(Bytes::from(user_data)),
+                protocol_state: None,
             };
 
             let encoding_context = EncodingContext {
@@ -2147,7 +2148,7 @@ mod tests {
 
             let encoder = BebopSwapEncoder::new(
                 String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
-                TychoCoreChain::Ethereum.into(),
+                Chain::Ethereum,
                 Some(HashMap::from([(
                     "bebop_settlement_address".to_string(),
                     "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F".to_string(),
@@ -2328,6 +2329,7 @@ mod tests {
                 token_out: token_out.clone(),
                 split: 0f64,
                 user_data: Some(Bytes::from(user_data)),
+                protocol_state: None,
             };
 
             let encoding_context = EncodingContext {
@@ -2341,7 +2343,7 @@ mod tests {
 
             let encoder = BebopSwapEncoder::new(
                 String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
-                TychoCoreChain::Ethereum.into(),
+                Chain::Ethereum,
                 Some(HashMap::from([(
                     "bebop_settlement_address".to_string(),
                     "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F".to_string(),

src/encoding/models.rs

@@ -5,7 +5,7 @@ use tycho_common::{
     models::protocol::ProtocolComponent, simulation::protocol_sim::ProtocolSim, Bytes,
 };
 
-use crate::encoding::serde_primitives::biguint_string;
+use crate::encoding::{errors::EncodingError, serde_primitives::biguint_string};
 
 /// Specifies the method for transferring user funds into Tycho execution.
 ///

tests/common/mod.rs

@@ -9,7 +9,8 @@ use alloy::{
 };
 use tycho_common::{models::Chain, Bytes};
 use tycho_execution::encoding::{
-    evm::encoder_builders::TychoRouterEncoderBuilder, models::UserTransferType,
+    evm::encoder_builders::TychoRouterEncoderBuilder,
+    models::{BebopOrderType, UserTransferType},
     tycho_encoder::TychoEncoder,
 };
 

tests/optimized_transfers_integration_tests.rs

@@ -631,6 +631,7 @@ fn test_uniswap_v3_bebop() {
         token_out: usdc.clone(),
         split: 0f64,
         user_data: None,
+        protocol_state: None,
     };
 
     // Second swap: USDC -> ONDO via Bebop RFQ using real order data
@@ -691,6 +692,7 @@ fn test_uniswap_v3_bebop() {
         token_out: ondo.clone(),
         split: 0f64,
         user_data: Some(user_data),
+        protocol_state: None,
     };
 
     let encoder = get_tycho_router_encoder(UserTransferType::TransferFrom);
@@ -716,7 +718,7 @@ fn test_uniswap_v3_bebop() {
         .clone();
 
     let calldata = encode_tycho_router_call(
-        eth_chain().id,
+        eth_chain().id(),
         encoded_solution,
         &solution,
         &UserTransferType::TransferFrom,

tests/protocol_integration_tests.rs

@@ -653,6 +653,7 @@ fn test_single_encoding_strategy_bebop() {
         token_out: token_out.clone(),
         split: 0f64,
         user_data: Some(user_data),
+        protocol_state: None,
     };
 
     let encoder = get_tycho_router_encoder(UserTransferType::TransferFrom);
@@ -678,7 +679,7 @@ fn test_single_encoding_strategy_bebop() {
         .clone();
 
     let calldata = encode_tycho_router_call(
-        eth_chain().id,
+        eth_chain().id(),
         encoded_solution,
         &solution,
         &UserTransferType::TransferFrom,
@@ -780,6 +781,7 @@ fn test_single_encoding_strategy_bebop_aggregate() {
         token_out: token_out.clone(),
         split: 0f64,
         user_data: Some(user_data),
+        protocol_state: None,
     };
 
     // Use TransferFrom for WETH token transfer
@@ -804,7 +806,7 @@ fn test_single_encoding_strategy_bebop_aggregate() {
         .clone();
 
     let calldata = encode_tycho_router_call(
-        eth_chain().id,
+        eth_chain().id(),
         encoded_solution,
         &solution,
         &UserTransferType::None,