Merge branch 'main' into router/tnl/ENG-4253-usv4-integration

src/encoding/evm/approvals/permit2.rs

@@ -23,7 +23,7 @@ use crate::encoding::{
         approvals::protocol_approvals_manager::get_client,
         utils::{biguint_to_u256, bytes_to_address, encode_input},
     },
-    models::{Chain, ChainId},
+    models::Chain,
 };
 
 /// Struct for managing Permit2 operations, including encoding approvals and fetching allowance
@@ -33,7 +33,7 @@ pub struct Permit2 {
     address: Address,
     client: Arc<RootProvider<BoxTransport>>,
     signer: PrivateKeySigner,
-    chain_id: ChainId,
+    chain_id: u64,
     runtime_handle: Handle,
     // Store the runtime to prevent it from being dropped before use.
     // This is required since tycho-execution does not have a pre-existing runtime.
@@ -160,7 +160,7 @@ impl Permit2 {
 
         let domain = eip712_domain! {
             name: "Permit2",
-            chain_id: self.chain_id.id(),
+            chain_id: self.chain_id,
             verifying_contract: self.address,
         };
         let hash = permit_single.eip712_signing_hash(&domain);

src/encoding/evm/tycho_encoder.rs

@@ -26,16 +26,9 @@ impl EVMTychoEncoder {
         strategy_encoder: Box<dyn StrategyEncoder>,
     ) -> Result<Self, EncodingError> {
         let chain: Chain = Chain::from(chain);
-        if chain.name != *"ethereum" {
-            return Err(EncodingError::InvalidInput(
-                "Currently only Ethereum is supported".to_string(),
-            ));
-        }
-        Ok(EVMTychoEncoder {
-            strategy_encoder,
-            native_address: chain.native_token()?,
-            wrapped_address: chain.wrapped_token()?,
-        })
+        let native_address = chain.native_token()?;
+        let wrapped_address = chain.wrapped_token()?;
+        Ok(EVMTychoEncoder { strategy_encoder, native_address, wrapped_address })
     }
 }