Liquidity.Party/tycho-execution
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tamara
2025-02-20 12:16:07 -05:00
committed by GitHub
parent d65d575003 9693856dca
commit be21d10a41
6 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@@ -1,3 +1,15 @@
## [0.46.0](https://github.com/propeller-heads/tycho-execution/compare/0.45.0...0.46.0) (2025-02-20)
### Features
* add native and weth addresses for supported networks ([83f1955](https://github.com/propeller-heads/tycho-execution/commit/83f1955094693420cd6bf94ff47f145d25ff6624))
### Bug Fixes
* add decode_hex to models ([7dd59db](https://github.com/propeller-heads/tycho-execution/commit/7dd59dbe3450ad15b4dc7eb4478b0422c18a6575))
## [0.45.0](https://github.com/propeller-heads/tycho-execution/compare/0.44.0...0.45.0) (2025-02-20)

2
Cargo.lock generated
View File

@@ -4340,7 +4340,7 @@ dependencies = [
[[package]]
name = "tycho-execution"
version = "0.45.0"
version = "0.46.0"
dependencies = [
"alloy",
"alloy-primitives",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "tycho-execution"
version = "0.45.0"
version = "0.46.0"
edition = "2021"
[[bin]]

6
src/encoding/evm/approvals/permit2.rs
View File

@@ -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);

13
src/encoding/evm/tycho_encoder.rs
View File

@@ -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 })
}
}

58
src/encoding/models.rs
View File

@@ -117,56 +117,52 @@ pub struct EncodingContext {
pub group_token_out: Bytes,
}
#[derive(Clone, PartialEq, Eq, Hash)]
pub struct ChainId(pub u64);
#[derive(Clone, PartialEq, Eq, Hash)]
pub struct Chain {
pub id: ChainId,
pub id: u64,
pub name: String,
}
impl ChainId {
pub fn id(&self) -> u64 {
self.0
}
}
impl From<TychoCoreChain> for ChainId {
fn from(chain: TychoCoreChain) -> Self {
match chain {
TychoCoreChain::Ethereum => ChainId(1),
TychoCoreChain::ZkSync => ChainId(324),
TychoCoreChain::Arbitrum => ChainId(42161),
TychoCoreChain::Starknet => ChainId(0),
TychoCoreChain::Base => ChainId(8453),
}
}
}
impl From<TychoCoreChain> for Chain {
fn from(chain: TychoCoreChain) -> Self {
Chain { id: chain.into(), name: chain.to_string() }
match chain {
TychoCoreChain::Ethereum => Chain { id: 1, name: chain.to_string() },
TychoCoreChain::ZkSync => Chain { id: 324, name: chain.to_string() },
TychoCoreChain::Arbitrum => Chain { id: 42161, name: chain.to_string() },
TychoCoreChain::Starknet => Chain { id: 0, name: chain.to_string() },
TychoCoreChain::Base => Chain { id: 8453, name: chain.to_string() },
}
}
}
impl Chain {
fn decode_hex(&self, hex_str: &str, err_msg: &str) -> Result<Bytes, EncodingError> {
Ok(Bytes::from(
hex::decode(hex_str).map_err(|_| EncodingError::FatalError(err_msg.to_string()))?,
))
}
pub fn native_token(&self) -> Result<Bytes, EncodingError> {
match self.id.id() {
1 => Ok(Bytes::from(hex::decode("0000000000000000000000000000000000000000").map_err(
|_| EncodingError::FatalError("Failed to decode native token".to_string()),
)?)),
let decode_err_msg = "Failed to decode native token";
match self.id {
1 | 8453 | 42161 => {
self.decode_hex("0000000000000000000000000000000000000000", decode_err_msg)
}
324 => self.decode_hex("000000000000000000000000000000000000800A", decode_err_msg),
_ => Err(EncodingError::InvalidInput(format!(
"Native token not set for chain {:?}. Double check the chain is supported.",
self.name
))),
}
}
pub fn wrapped_token(&self) -> Result<Bytes, EncodingError> {
match self.id.id() {
1 => Ok(Bytes::from(hex::decode("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2").map_err(
|_| EncodingError::FatalError("Failed to decode wrapped token".to_string()),
)?)),
let decode_err_msg = "Failed to decode wrapped token";
match self.id {
1 => self.decode_hex("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", decode_err_msg),
8453 => self.decode_hex("4200000000000000000000000000000000000006", decode_err_msg),
324 => self.decode_hex("5AEa5775959fBC2557Cc8789bC1bf90A239D9a91", decode_err_msg),
42161 => self.decode_hex("82aF49447D8a07e3bd95BD0d56f35241523fBab1", decode_err_msg),
_ => Err(EncodingError::InvalidInput(format!(
"Wrapped token not set for chain {:?}. Double check the chain is supported.",
self.name