Merge branch 'main' into encoder/hr/ENG-4083-Validate-SplitSwap

examples/quickstart/main.rs

@@ -1,7 +1,10 @@
 use std::str::FromStr;
 
 use num_bigint::BigUint;
-use tycho_core::{dto::ProtocolComponent, models::Chain, Bytes};
+use tycho_core::{
+    dto::{Chain, ProtocolComponent},
+    Bytes,
+};
 use tycho_execution::encoding::{
     evm::{
         strategy_encoder::strategy_encoder_registry::EVMStrategyEncoderRegistry,

src/encoding/evm/approvals/permit2.rs

@@ -12,7 +12,7 @@ use alloy_sol_types::{eip712_domain, sol, SolStruct, SolValue};
 use chrono::Utc;
 use num_bigint::BigUint;
 use tokio::runtime::Runtime;
-use tycho_core::{models::Chain, Bytes};
+use tycho_core::{dto::Chain, Bytes};
 
 use crate::encoding::{
     errors::EncodingError,

src/encoding/evm/models.rs

@@ -1,4 +1,4 @@
-use tycho_core::models::Chain;
+use tycho_core::dto::Chain;
 
 pub struct ChainId(u64);
 

src/encoding/evm/strategy_encoder/strategy_encoder_registry.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use tycho_core::models::Chain;
+use tycho_core::dto::Chain;
 
 use crate::encoding::{
     errors::EncodingError,

src/encoding/evm/strategy_encoder/strategy_encoders.rs

@@ -7,7 +7,7 @@ use std::{
 use alloy_primitives::{aliases::U24, FixedBytes, U256, U8};
 use alloy_sol_types::SolValue;
 use num_bigint::BigUint;
-use tycho_core::{keccak256, models::Chain, Bytes};
+use tycho_core::{dto::Chain, keccak256, Bytes};
 
 use crate::encoding::{
     errors::EncodingError,

src/encoding/evm/swap_encoder/swap_encoder_registry.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, fs};
 
-use tycho_core::models::Chain;
+use tycho_core::dto::Chain;
 
 use crate::encoding::{
     errors::EncodingError, evm::swap_encoder::builder::SwapEncoderBuilder,

src/encoding/evm/tycho_encoder.rs

@@ -104,7 +104,7 @@ impl<S: StrategyEncoderRegistry> TychoEncoder<S> for EVMTychoEncoder<S> {
 
 #[cfg(test)]
 mod tests {
-    use tycho_core::{dto::ProtocolComponent, models::Chain};
+    use tycho_core::dto::{Chain, ProtocolComponent};
 
     use super::*;
     use crate::encoding::{

src/encoding/strategy_encoder.rs

@@ -1,4 +1,4 @@
-use tycho_core::{models::Chain, Bytes};
+use tycho_core::{dto::Chain, Bytes};
 
 use crate::encoding::{errors::EncodingError, models::Solution, swap_encoder::SwapEncoder};