Skip to content

Commit

Permalink
feat: alias Orders as RollupOrders and HostOrders (#42)
Browse files Browse the repository at this point in the history 
* feat: from conversion for filled structs

* refactor: alias RollupOrders and HostOrders instead of differing
  • Loading branch information
@prestwich
prestwich authored Aug 28, 2024
1 parent ede5854 commit b6612cb
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 147 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [ "crates/*" ]
resolver = "2"

[workspace.package]
version = "0.5.1"
version = "0.6.0"
edition = "2021"
rust-version = "1.76"
authors = ["Zenith Contributors"]
Expand Down
189 changes: 43 additions & 146 deletions crates/types/src/bindings.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#![allow(missing_docs)]
use alloy_primitives::{Address, Bytes, FixedBytes, U256};
use alloy_sol_types::sol;
use HostOrders::TokenPermissions;

sol!(
#[sol(rpc)]
Expand All @@ -21,14 +20,7 @@ sol!(
sol!(
#[sol(rpc)]
#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
HostOrders,
"abi/HostOrders.json"
);

sol!(
#[sol(rpc)]
#[derive(Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
RollupOrders,
Orders,
"abi/RollupOrders.json"
);

Expand All @@ -46,6 +38,26 @@ sol!(
"abi/RollupPassage.json"
);

/// Module alias for [`Orders`].
#[allow(non_snake_case)]
pub mod RollupOrders {
pub use super::Orders::OrdersCalls as RollupOrdersCalls;
pub use super::Orders::OrdersErrors as RollupOrdersErrors;
pub use super::Orders::OrdersEvents as RollupOrdersEvents;
pub use super::Orders::OrdersInstance as RollupOrdersInstance;
pub use super::Orders::*;
}

/// Module alias for [`Orders`].
#[allow(non_snake_case)]
pub mod HostOrders {
pub use super::Orders::OrdersCalls as HostOrdersCalls;
pub use super::Orders::OrdersErrors as HostOrdersErrors;
pub use super::Orders::OrdersEvents as HostOrdersEvents;
pub use super::Orders::OrdersInstance as HostOrdersInstance;
pub use super::Orders::*;
}

// Zenith types
impl Copy for Zenith::BlockHeader {}
impl Copy for Zenith::BlockSubmitted {}
Expand Down Expand Up @@ -220,144 +232,29 @@ impl Passage::EnterConfigured {
}
}

// HostOrders types

impl Copy for HostOrders::Output {}
impl Copy for HostOrders::TokenPermissions {}
impl Copy for HostOrders::AddressEmptyCode {}
impl Copy for HostOrders::FailedCall {}
impl Copy for HostOrders::InsufficientBalance {}
impl Copy for HostOrders::ReentrancyGuardReentrantCall {}
impl Copy for HostOrders::LengthMismatch {}
impl Copy for HostOrders::OutputMismatch {}
impl Copy for HostOrders::SafeERC20FailedOperation {}

impl Clone for HostOrders::HostOrdersEvents {
fn clone(&self) -> Self {
match self {
HostOrders::HostOrdersEvents::Filled(event) => {
HostOrders::HostOrdersEvents::Filled(event.clone())
}
}
}
}

impl HostOrders::Output {
/// Get the token address of the output.
pub const fn token(&self) -> Address {
self.token
}

/// Get the recipient of the output.
pub const fn recipient(&self) -> Address {
self.recipient
}

/// Get the amount of the output.
pub const fn amount(&self) -> U256 {
self.amount
}

/// Get the chain ID of the output.
pub const fn chain_id(&self) -> u32 {
self.chainId
}
}

impl HostOrders::TokenPermissions {
/// Get the token address of the output.
pub const fn token(&self) -> Address {
self.token
}

/// Get the amount of the output.
pub const fn amount(&self) -> U256 {
self.amount
}
}

impl HostOrders::Witness {
/// Get the witness hash of the witness.
pub const fn witness_hash(&self) -> FixedBytes<32> {
self.witnessHash
}

/// Get the witness type string.
pub fn witness_type(&self) -> String {
self.witnessTypeString.clone()
}
}

impl HostOrders::Filled {
/// Get the outputs of the filled order.
pub fn outputs(&self) -> &[HostOrders::Output] {
&self.outputs
}
}

impl HostOrders::PermitBatchTransferFrom {
/// Get the permitted tokens of the batch transfer permit.
pub fn permitted(&self) -> &[TokenPermissions] {
&self.permitted
}

/// Get the nonce of the batch transfer permit.
pub const fn nonce(&self) -> U256 {
self.nonce
}

/// Get the deadline of the batch transfer permit.
pub const fn deadline(&self) -> U256 {
self.deadline
}
}

impl HostOrders::Permit2Batch {
/// Get the permitted tokens of the batch transfer permit.
pub const fn permit(&self) -> &HostOrders::PermitBatchTransferFrom {
&self.permit
}

/// Get the owner of the permit.
pub const fn owner(&self) -> Address {
self.owner
}

/// Get the signature of the permit.
pub fn signature(&self) -> Bytes {
self.signature.clone()
}
}

// RollupOrders types

impl Copy for RollupOrders::Input {}
impl Copy for RollupOrders::Output {}
impl Copy for RollupOrders::Sweep {}
impl Copy for RollupOrders::InsufficientBalance {}
impl Copy for RollupOrders::AddressEmptyCode {}
impl Copy for RollupOrders::LengthMismatch {}
impl Copy for RollupOrders::OrderExpired {}
impl Copy for RollupOrders::OutputMismatch {}
impl Copy for RollupOrders::SafeERC20FailedOperation {}

impl Clone for RollupOrders::RollupOrdersEvents {
impl Copy for Orders::Input {}
impl Copy for Orders::Output {}
impl Copy for Orders::Sweep {}
impl Copy for Orders::InsufficientBalance {}
impl Copy for Orders::AddressEmptyCode {}
impl Copy for Orders::LengthMismatch {}
impl Copy for Orders::OrderExpired {}
impl Copy for Orders::OutputMismatch {}
impl Copy for Orders::SafeERC20FailedOperation {}

impl Clone for Orders::OrdersEvents {
fn clone(&self) -> Self {
match self {
RollupOrders::RollupOrdersEvents::Order(event) => {
RollupOrders::RollupOrdersEvents::Order(event.clone())
}
RollupOrders::RollupOrdersEvents::Sweep(event) => {
RollupOrders::RollupOrdersEvents::Sweep(*event)
}
RollupOrders::RollupOrdersEvents::Filled(event) => {
RollupOrders::RollupOrdersEvents::Filled(event.clone())
}
Self::Order(event) => Self::Order(event.clone()),
Self::Sweep(event) => Self::Sweep(*event),
Self::Filled(event) => Self::Filled(event.clone()),
}
}
}

impl RollupOrders::Input {
impl Orders::Input {
pub const fn token(&self) -> Address {
self.token
}
Expand All @@ -367,7 +264,7 @@ impl RollupOrders::Input {
}
}

impl RollupOrders::Output {
impl Orders::Output {
pub const fn token(&self) -> Address {
self.token
}
Expand All @@ -385,14 +282,14 @@ impl RollupOrders::Output {
}
}

impl RollupOrders::Order {
impl Orders::Order {
/// Get the inputs of the order.
pub fn inputs(&self) -> &[RollupOrders::Input] {
pub fn inputs(&self) -> &[Orders::Input] {
&self.inputs
}

/// Get the outputs of the order.
pub fn outputs(&self) -> &[RollupOrders::Output] {
pub fn outputs(&self) -> &[Orders::Output] {
&self.outputs
}

Expand All @@ -402,7 +299,7 @@ impl RollupOrders::Order {
}
}

impl RollupOrders::Sweep {
impl Orders::Sweep {
pub const fn recipient(&self) -> Address {
self.recipient
}
Expand All @@ -416,8 +313,8 @@ impl RollupOrders::Sweep {
}
}

impl RollupOrders::Filled {
pub fn outputs(&self) -> &[RollupOrders::Output] {
impl Orders::Filled {
pub fn outputs(&self) -> &[Orders::Output] {
self.outputs.as_slice()
}
}
Expand Down

0 comments on commit b6612cb

Please sign in to comment.