chore: merge main

examples/quickstart/main.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use num_bigint::BigUint;
 use tycho_core::{
-    dto::{Chain as TychoCoreChain, ProtocolComponent},
+    models::{protocol::ProtocolComponent, Chain as TychoCoreChain},
     Bytes,
 };
 use tycho_execution::encoding::{

src/bin/tycho-encode.rs

@@ -2,7 +2,7 @@ use std::io::{self, Read};
 
 use clap::{Parser, Subcommand};
 use serde_json::Value;
-use tycho_core::dto::Chain;
+use tycho_core::models::Chain;
 use tycho_execution::encoding::{
     errors::EncodingError, evm::encoder_builder::EVMEncoderBuilder, models::Solution,
     tycho_encoder::TychoEncoder,

src/encoding/evm/approvals/permit2.rs

@@ -183,7 +183,7 @@ mod tests {
 
     use alloy_primitives::Uint;
     use num_bigint::BigUint;
-    use tycho_core::dto::Chain as TychoCoreChain;
+    use tycho_core::models::Chain as TychoCoreChain;
 
     use super::*;
 

src/encoding/evm/encoder_builder.rs

@@ -1,4 +1,4 @@
-use tycho_core::dto::Chain;
+use tycho_core::models::Chain;
 
 use crate::encoding::{
     errors::EncodingError,

src/encoding/evm/strategy_encoder/group_swaps.rs

@@ -74,7 +74,7 @@ mod tests {
     use std::str::FromStr;
 
     use alloy_primitives::hex;
-    use tycho_core::{dto::ProtocolComponent, Bytes};
+    use tycho_core::{models::protocol::ProtocolComponent, Bytes};
 
     use super::*;
     use crate::encoding::models::Swap;

src/encoding/evm/strategy_encoder/strategy_encoders.rs

@@ -89,7 +89,7 @@ pub struct SplitSwapStrategyEncoder {
 impl SplitSwapStrategyEncoder {
     pub fn new(
         swapper_pk: String,
-        blockchain: tycho_core::dto::Chain,
+        blockchain: tycho_core::models::Chain,
         swap_encoder_registry: SwapEncoderRegistry,
     ) -> Result<Self, EncodingError> {
         let chain = Chain::from(blockchain);
@@ -331,7 +331,7 @@ mod tests {
     use num_bigint::{BigInt, BigUint};
     use rstest::rstest;
     use tycho_core::{
-        dto::{Chain as TychoCoreChain, ProtocolComponent},
+        models::{protocol::ProtocolComponent, Chain as TychoCoreChain},
         Bytes,
     };
 

src/encoding/evm/strategy_encoder/strategy_validators.rs

@@ -178,7 +178,7 @@ impl SplitSwapValidator {
 mod tests {
     use std::str::FromStr;
 
-    use tycho_core::{dto::ProtocolComponent, Bytes};
+    use tycho_core::{models::protocol::ProtocolComponent, Bytes};
 
     use super::*;
     use crate::encoding::models::Swap;

src/encoding/evm/swap_encoder/swap_encoder_registry.rs

@@ -19,7 +19,7 @@ impl SwapEncoderRegistry {
     /// executors' addresses in the file at the given path.
     pub fn new(
         executors_file_path: Option<String>,
-        blockchain: tycho_core::dto::Chain,
+        blockchain: tycho_core::models::Chain,
     ) -> Result<Self, EncodingError> {
         let chain = Chain::from(blockchain);
         let config_str = if let Some(ref path) = executors_file_path {

src/encoding/evm/swap_encoder/swap_encoders.rs

@@ -291,7 +291,7 @@ mod tests {
 
     use alloy::hex::encode;
     use num_bigint::BigInt;
-    use tycho_core::{dto::ProtocolComponent, Bytes};
+    use tycho_core::{models::protocol::ProtocolComponent, Bytes};
 
     use super::*;
 
@@ -479,7 +479,6 @@ mod tests {
             .unwrap();
         let hex_swap = encode(&encoded_swap);
 
-        println!("{}", hex_swap);
         assert_eq!(
             hex_swap,
             String::from(concat!(

src/encoding/evm/tycho_encoder.rs

@@ -22,7 +22,7 @@ pub struct EVMTychoEncoder {
 
 impl EVMTychoEncoder {
     pub fn new(
-        chain: tycho_core::dto::Chain,
+        chain: tycho_core::models::Chain,
         strategy_encoder: Box<dyn StrategyEncoder>,
     ) -> Result<Self, EncodingError> {
         let chain: Chain = Chain::from(chain);
@@ -119,7 +119,7 @@ impl TychoEncoder for EVMTychoEncoder {
 mod tests {
     use std::str::FromStr;
 
-    use tycho_core::dto::{Chain as TychoCoreChain, ProtocolComponent};
+    use tycho_core::models::{protocol::ProtocolComponent, Chain as TychoCoreChain};
 
     use super::*;
     use crate::encoding::{

src/encoding/models.rs

@@ -2,7 +2,7 @@ use hex;
 use num_bigint::BigUint;
 use serde::{Deserialize, Serialize};
 use tycho_core::{
-    dto::{Chain as TychoCoreChain, ProtocolComponent},
+    models::{protocol::ProtocolComponent, Chain as TychoCoreChain},
     Bytes,
 };
 
@@ -187,7 +187,7 @@ mod tests {
                 tokens: vec![],
                 protocol_type_name: "".to_string(),
                 chain: Default::default(),
-                contract_ids: vec![],
+                contract_addresses: vec![],
                 static_attributes: Default::default(),
                 change: Default::default(),
                 creation_tx: Default::default(),