absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 12:19:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expose coins::Pallet::transfer_internal as transfer_fn

Browse Source 
It is safe to call and assumes no preconditions.
This commit is contained in:
Luke Parker
2025-09-03 00:48:15 -04:00
parent fe41b09fd4
commit 2032cf355f
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
substrate/coins/src/lib.rs
View File

@@ -241,7 +241,7 @@ mod pallet {
} }
/// Transfer `balance` from `from` to `to`. /// Transfer `balance` from `from` to `to`.
fn transfer_internal(from: Public, to: Public, balance: Balance) -> Result<(), Error<T, I>> { pub fn transfer_fn(from: Public, to: Public, balance: Balance) -> Result<(), Error<T, I>> {
// update balances of accounts // update balances of accounts
Self::decrease_balance_internal(from, balance)?; Self::decrease_balance_internal(from, balance)?;
Self::increase_balance_internal(to, balance)?; Self::increase_balance_internal(to, balance)?;
@@ -257,7 +257,7 @@ mod pallet {
#[pallet::weight((0, DispatchClass::Normal))] // TODO #[pallet::weight((0, DispatchClass::Normal))] // TODO
pub fn transfer(origin: OriginFor<T>, to: Public, balance: Balance) -> DispatchResult { pub fn transfer(origin: OriginFor<T>, to: Public, balance: Balance) -> DispatchResult {
let from = ensure_signed(origin)?; let from = ensure_signed(origin)?;
Self::transfer_internal(from, to, balance)?; Self::transfer_fn(from, to, balance)?;
Ok(()) Ok(())
} }

16
substrate/validator-sets/src/lib.rs
View File

@@ -633,7 +633,7 @@ mod pallet {
) -> DispatchResult { ) -> DispatchResult {
// TODO: Should this call be part of the `increase_allocation` since we have to have it // TODO: Should this call be part of the `increase_allocation` since we have to have it
// before each call to it? // before each call to it?
Coins::<T>::transfer_internal( Coins::<T>::transfer_fn(
account, account,
Self::account(), Self::account(),
Balance { coin: Coin::Serai, amount }, Balance { coin: Coin::Serai, amount },
@@ -804,11 +804,7 @@ mod pallet {
#[pallet::weight(0)] // TODO #[pallet::weight(0)] // TODO
pub fn allocate(origin: OriginFor<T>, network: NetworkId, amount: Amount) -> DispatchResult { pub fn allocate(origin: OriginFor<T>, network: NetworkId, amount: Amount) -> DispatchResult {
let validator = ensure_signed(origin)?; let validator = ensure_signed(origin)?;
Coins::<T>::transfer_internal( Coins::<T>::transfer_fn(validator, Self::account(), Balance { coin: Coin::Serai, amount })?;
validator,
Self::account(),
Balance { coin: Coin::Serai, amount },
)?;
Abstractions::<T>::increase_allocation(network, validator, amount, false) Abstractions::<T>::increase_allocation(network, validator, amount, false)
.map_err(Error::<T>::AllocationError)?; .map_err(Error::<T>::AllocationError)?;
Ok(()) Ok(())
@@ -822,11 +818,7 @@ mod pallet {
let deallocation_timeline = Abstractions::<T>::decrease_allocation(network, account, amount) let deallocation_timeline = Abstractions::<T>::decrease_allocation(network, account, amount)
.map_err(Error::<T>::DeallocationError)?; .map_err(Error::<T>::DeallocationError)?;
if matches!(deallocation_timeline, DeallocationTimeline::Immediate) { if matches!(deallocation_timeline, DeallocationTimeline::Immediate) {
Coins::<T>::transfer_internal( Coins::<T>::transfer_fn(Self::account(), account, Balance { coin: Coin::Serai, amount })?;
Self::account(),
account,
Balance { coin: Coin::Serai, amount },
)?;
} }
Ok(()) Ok(())
@@ -844,7 +836,7 @@ mod pallet {
let Some(amount) = Self::take_deallocatable_amount(network, session, account) else { let Some(amount) = Self::take_deallocatable_amount(network, session, account) else {
Err(Error::<T>::NonExistentDeallocation)? Err(Error::<T>::NonExistentDeallocation)?
}; };
Coins::<T>::transfer_internal( Coins::<T>::transfer_fn(
Self::account(), Self::account(),
account, account,
Balance { coin: Coin::Serai, amount }, Balance { coin: Coin::Serai, amount },