Skip to content

Remove old EncodedEthflowOrder #3863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 5, 2025
Merged

Remove old EncodedEthflowOrder #3863

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 1 addition & 74 deletions crates/refunder/src/ethflow_order.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use {
ethrpc::alloy::conversions::IntoAlloy,
number::conversions::big_decimal_to_u256,
};

// Data structure reflecting the contract ethflow order
// https://github.com/cowprotocol/ethflowcontract/blob/main/src/libraries/EthFlowOrder.sol#L19
#[derive(Clone)]
Expand All @@ -20,22 +21,6 @@ pub struct EthflowOrder {
pub quote_id: i64,
}

impl EthflowOrder {
pub fn encode(&self) -> EncodedEthflowOrder {
(
self.buy_token,
self.receiver,
self.sell_amount,
self.buy_amount,
self.app_data,
self.fee_amount,
self.valid_to,
self.partially_fillable,
self.quote_id,
)
}
}

impl From<EthflowOrder> for CoWSwapEthFlow::EthFlowOrder::Data {
fn from(value: EthflowOrder) -> Self {
CoWSwapEthFlow::EthFlowOrder::Data {
Expand All @@ -52,18 +37,6 @@ impl From<EthflowOrder> for CoWSwapEthFlow::EthFlowOrder::Data {
}
}

pub type EncodedEthflowOrder = (
H160, // buyToken
H160, // receiver
U256, // sellAmount
U256, // buyAmount
Bytes<[u8; 32]>, // appData
U256, // feeAmount
u32, // validTo
bool, // flags
i64, // quoteId
);

pub fn order_to_ethflow_data(order: Order, ethflow_order_placement: EthOrderData) -> EthflowOrder {
EthflowOrder {
buy_token: H160(order.buy_token.0),
Expand All @@ -78,49 +51,3 @@ pub fn order_to_ethflow_data(order: Order, ethflow_order_placement: EthOrderData
quote_id: 0i64, // quoteId is not important for refunding and will be ignored
}
}

#[cfg(test)]
mod tests {
use {super::*, database::byte_array::ByteArray, number::conversions::u256_to_big_decimal};

#[test]
fn test_order_to_ethflow_data() {
let buy_token = ByteArray([1u8; 20]);
let receiver = ByteArray([3u8; 20]);
let sell_amount = U256::from_dec_str("1").unwrap();
let buy_amount = U256::from_dec_str("2").unwrap();
let app_data = ByteArray([3u8; 32]);
let fee_amount = U256::from_dec_str("3").unwrap();
let valid_to = 234u32;

let order = Order {
buy_token,
receiver: Some(receiver),
sell_amount: u256_to_big_decimal(&sell_amount),
buy_amount: u256_to_big_decimal(&buy_amount),
valid_to: valid_to.into(),
app_data,
fee_amount: u256_to_big_decimal(&fee_amount),
..Default::default()
};
let ethflow_order = EthOrderData {
valid_to: valid_to.into(),
..Default::default()
};
let expected_encoded_order = (
H160(order.buy_token.0),
H160(order.receiver.unwrap().0),
big_decimal_to_u256(&order.sell_amount).unwrap(),
big_decimal_to_u256(&order.buy_amount).unwrap(),
Bytes(order.app_data.0),
big_decimal_to_u256(&order.fee_amount).unwrap(),
ethflow_order.valid_to as u32,
order.partially_fillable,
0i64,
);
assert_eq!(
order_to_ethflow_data(order, ethflow_order).encode(),
expected_encoded_order
);
}
}
Loading