Skip to content
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

Feat/upgrade1020 misc 1 #1529

Merged
merged 8 commits into from
Sep 5, 2023
Merged

Feat/upgrade1020 misc 1 #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d030979
feat: add account conversion
mustermeiszer Sep 4, 2023
8b9b0b4
feat: impl runtime conversion for runtimes
mustermeiszer Sep 4, 2023
6a1d3c9
fix: account conversion impl Centrifuge
mustermeiszer Sep 4, 2023
564ccdf
feat: no min_buy_amount for trait orders
mustermeiszer Sep 4, 2023
bc6db23
fix: only root for axelar gateway precompile
mustermeiszer Sep 4, 2023
73410cf
fix: rm warnings
mustermeiszer Sep 4, 2023
627eb51
fix: root for dev is fine
mustermeiszer Sep 4, 2023
0bb7894
fix: clippyyyyy
mustermeiszer Sep 5, 2023
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
313 changes: 205 additions & 108 deletions pallets/order-book/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,27 @@ pub mod pallet {
price: T::SellRatio,
) -> DispatchResult {
let account_id = ensure_signed(origin)?;
Self::place_order(
account_id, asset_in, asset_out, buy_amount, price, buy_amount,

Self::inner_place_order(
account_id,
asset_in,
asset_out,
buy_amount,
price,
buy_amount,
|order| {
let min_amount = TradingPair::<T>::get(&asset_in, &asset_out)?;
Self::is_valid_order(
order.asset_in_id,
order.asset_out_id,
order.buy_amount,
order.max_sell_rate,
order.min_fullfillment_amount,
min_amount,
)
},
)?;

Ok(())
}

Expand All @@ -378,13 +396,29 @@ pub mod pallet {
price: T::SellRatio,
) -> DispatchResult {
let account_id = ensure_signed(origin)?;
let order = <Orders<T>>::get(order_id)?;
ensure!(
account_id == order.placing_account,
Error::<T>::Unauthorised
);
<Self as TokenSwaps<T::AccountId>>::update_order(
account_id, order_id, buy_amount, price, buy_amount,
Self::inner_update_order(
account_id.clone(),
order_id,
buy_amount,
price,
buy_amount,
|order| {
ensure!(
account_id == order.placing_account,
Error::<T>::Unauthorised
);

let min_amount =
TradingPair::<T>::get(&order.asset_in_id, &order.asset_out_id)?;
Self::is_valid_order(
order.asset_in_id,
order.asset_out_id,
order.buy_amount,
order.max_sell_rate,
order.min_fullfillment_amount,
min_amount,
)
},
)
}

Expand Down Expand Up @@ -584,27 +618,15 @@ pub mod pallet {
}
}

impl<T: Config> TokenSwaps<T::AccountId> for Pallet<T>
where
<T as frame_system::Config>::Hash: PartialEq<<T as frame_system::Config>::Hash>,
{
type Balance = T::Balance;
type CurrencyId = T::AssetCurrencyId;
type OrderId = T::OrderIdNonce;
type SellRatio = T::SellRatio;

/// Creates an order.
/// Verify funds available in, and reserve for both chains fee currency
/// for storage fee, and amount of outgoing currency as determined by
/// the buy amount and price.
fn place_order(
account: T::AccountId,
impl<T: Config> Pallet<T> {
fn is_valid_order(
currency_in: T::AssetCurrencyId,
currency_out: T::AssetCurrencyId,
buy_amount: T::Balance,
sell_rate_limit: T::SellRatio,
min_fullfillment_amount: T::Balance,
) -> Result<Self::OrderId, DispatchError> {
min_order_amount: T::Balance,
) -> DispatchResult {
ensure!(currency_in != currency_out, Error::<T>::ConflictingAssetIds);

ensure!(
Expand All @@ -621,107 +643,31 @@ pub mod pallet {
Error::<T>::InvalidMaxPrice
);

<OrderIdNonceStore<T>>::try_mutate(|n| {
*n = n.ensure_add(T::OrderIdNonce::one())?;
Ok::<_, DispatchError>(())
})?;

ensure!(
buy_amount >= min_fullfillment_amount,
Error::<T>::InvalidBuyAmount
);

Self::is_valid_min_order(currency_in, currency_out, buy_amount)?;

let max_sell_amount =
Self::convert_with_ratio(currency_in, currency_out, sell_rate_limit, buy_amount)?;

T::TradeableAsset::hold(currency_out, &account, max_sell_amount)?;

let order_id = <OrderIdNonceStore<T>>::get();
let new_order = Order {
order_id,
placing_account: account.clone(),
asset_in_id: currency_in,
asset_out_id: currency_out,
buy_amount,
max_sell_rate: sell_rate_limit,
initial_buy_amount: buy_amount,
min_fullfillment_amount,
max_sell_amount,
};

<AssetPairOrders<T>>::try_mutate(currency_in, currency_out, |orders| {
orders
.try_push(order_id)
.map_err(|_| Error::<T>::AssetPairOrdersOverflow)
})?;

<Orders<T>>::insert(order_id, new_order.clone());
<UserOrders<T>>::insert(&account, order_id, new_order);
Self::deposit_event(Event::OrderCreated {
creator_account: account,
sell_rate_limit,
order_id,
buy_amount,
currency_in,
currency_out,
min_fullfillment_amount,
});
Ok(order_id)
}

/// Cancel an existing order.
/// Unreserve currency reserved for trade as well storage fee.
fn cancel_order(order: Self::OrderId) -> DispatchResult {
let order = <Orders<T>>::get(order)?;
let account_id = order.placing_account.clone();

Self::unreserve_order(&order)?;
Self::remove_order(order.order_id)?;
Self::deposit_event(Event::OrderCancelled {
account: account_id,
order_id: order.order_id,
});
ensure!(
buy_amount >= min_order_amount,
Error::<T>::InsufficientOrderSize
);

Ok(())
}

/// Update an existing order.
/// Update outgoing asset currency reserved to match new amount or price
/// if either have changed.
fn update_order(
fn inner_update_order(
account: T::AccountId,
order_id: Self::OrderId,
order_id: T::OrderIdNonce,
buy_amount: T::Balance,
sell_rate_limit: T::SellRatio,
min_fullfillment_amount: T::Balance,
validate: impl FnOnce(&OrderOf<T>) -> DispatchResult,
) -> DispatchResult {
ensure!(
buy_amount != T::Balance::zero(),
Error::<T>::InvalidBuyAmount
);

ensure!(
sell_rate_limit != T::SellRatio::zero(),
Error::<T>::InvalidMaxPrice
);

ensure!(
min_fullfillment_amount != <T::Balance>::zero(),
Error::<T>::InvalidMinimumFulfillment
);

ensure!(
buy_amount >= min_fullfillment_amount,
Error::<T>::InvalidBuyAmount
);

let max_sell_amount = <Orders<T>>::try_mutate_exists(
order_id,
|maybe_order| -> Result<T::Balance, DispatchError> {
let mut order = maybe_order.as_mut().ok_or(Error::<T>::OrderNotFound)?;
Self::is_valid_min_order(order.asset_in_id, order.asset_out_id, buy_amount)?;

let max_sell_amount = Self::convert_with_ratio(
order.asset_in_id,
Expand Down Expand Up @@ -758,6 +704,8 @@ pub mod pallet {
order.min_fullfillment_amount = min_fullfillment_amount;
order.max_sell_amount = max_sell_amount;

validate(order)?;

Ok(max_sell_amount)
},
)?;
Expand Down Expand Up @@ -785,6 +733,155 @@ pub mod pallet {
Ok(())
}

fn inner_place_order(
account: T::AccountId,
currency_in: T::AssetCurrencyId,
currency_out: T::AssetCurrencyId,
buy_amount: T::Balance,
sell_rate_limit: T::SellRatio,
min_fullfillment_amount: T::Balance,
validate: impl FnOnce(&OrderOf<T>) -> DispatchResult,
) -> Result<T::OrderIdNonce, DispatchError> {
<OrderIdNonceStore<T>>::try_mutate(|n| {
*n = n.ensure_add(T::OrderIdNonce::one())?;
Ok::<_, DispatchError>(())
})?;

let max_sell_amount =
Self::convert_with_ratio(currency_in, currency_out, sell_rate_limit, buy_amount)?;

T::TradeableAsset::hold(currency_out, &account, max_sell_amount)?;

let order_id = <OrderIdNonceStore<T>>::get();
let new_order = Order {
order_id,
placing_account: account.clone(),
asset_in_id: currency_in,
asset_out_id: currency_out,
buy_amount,
max_sell_rate: sell_rate_limit,
initial_buy_amount: buy_amount,
min_fullfillment_amount,
max_sell_amount,
};

validate(&new_order)?;

<AssetPairOrders<T>>::try_mutate(currency_in, currency_out, |orders| {
orders
.try_push(order_id)
.map_err(|_| Error::<T>::AssetPairOrdersOverflow)
})?;

<Orders<T>>::insert(order_id, new_order.clone());
<UserOrders<T>>::insert(&account, order_id, new_order);
Self::deposit_event(Event::OrderCreated {
creator_account: account,
sell_rate_limit,
order_id,
buy_amount,
currency_in,
currency_out,
min_fullfillment_amount,
});

Ok(order_id)
}
}

impl<T: Config> TokenSwaps<T::AccountId> for Pallet<T>
where
<T as frame_system::Config>::Hash: PartialEq<<T as frame_system::Config>::Hash>,
{
type Balance = T::Balance;
type CurrencyId = T::AssetCurrencyId;
type OrderId = T::OrderIdNonce;
type SellRatio = T::SellRatio;

/// Creates an order.
/// Verify funds available in, and reserve for both chains fee currency
/// for storage fee, and amount of outgoing currency as determined by
/// the buy amount and price.
fn place_order(
account: T::AccountId,
currency_in: T::AssetCurrencyId,
currency_out: T::AssetCurrencyId,
buy_amount: T::Balance,
sell_rate_limit: T::SellRatio,
min_fullfillment_amount: T::Balance,
) -> Result<Self::OrderId, DispatchError> {
Self::inner_place_order(
account,
currency_in,
currency_out,
buy_amount,
sell_rate_limit,
min_fullfillment_amount,
|order| {
// We only check if the trading pair exists not if the minimum amount is
// reached.
let _min_amount = TradingPair::<T>::get(&currency_in, &currency_out)?;
Self::is_valid_order(
order.asset_in_id,
order.asset_out_id,
order.buy_amount,
order.max_sell_rate,
order.min_fullfillment_amount,
T::Balance::zero(),
)
},
)
}

/// Cancel an existing order.
/// Unreserve currency reserved for trade as well storage fee.
fn cancel_order(order: Self::OrderId) -> DispatchResult {
let order = <Orders<T>>::get(order)?;
let account_id = order.placing_account.clone();

Self::unreserve_order(&order)?;
Self::remove_order(order.order_id)?;
Self::deposit_event(Event::OrderCancelled {
account: account_id,
order_id: order.order_id,
});

Ok(())
}

/// Update an existing order.
/// Update outgoing asset currency reserved to match new amount or price
/// if either have changed.
fn update_order(
account: T::AccountId,
order_id: Self::OrderId,
buy_amount: T::Balance,
sell_rate_limit: T::SellRatio,
min_fullfillment_amount: T::Balance,
) -> DispatchResult {
Self::inner_update_order(
account,
order_id,
buy_amount,
sell_rate_limit,
min_fullfillment_amount,
|order| {
// We only check if the trading pair exists not if the minimum amount is
// reached.
let _min_amount =
TradingPair::<T>::get(&order.asset_in_id, &order.asset_out_id)?;
Self::is_valid_order(
order.asset_in_id,
order.asset_out_id,
order.buy_amount,
order.max_sell_rate,
order.min_fullfillment_amount,
T::Balance::zero(),
)
},
)
}

/// Check whether an order is active.
fn is_active(order: Self::OrderId) -> bool {
<Orders<T>>::contains_key(order)
Expand Down
Loading