mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-10 06:27:57 +00:00
Statemint runtimes to accept sufficient assets as xcm fee payment (#1278)
* point to my branch * girazoki-add-TakeFirstAssetTrader-to-utility * Commit lock * point at custom branch * add new trader to statemine runtimes * compiles * Back to master * Update last tomls * Imports up * remove non-needing imports * FMT * log messages properly * Use TakeRevenue instead of HandleCredit * Introduce xcm fee handler * check total supply in tests * FMT * fix test * Start decoupling balance calculation into different traits * Make traits a bit more generic * PR suggestions * add import * import well * Place xcmfeesassethandler into parachains common * fix tests * config parameters * Min amount to fee receiver * Make minimum amount for block author to be at least the ED * Doc in AssetFeeAsExistentialDepositMultiplier * saturating sub * make sure we dont enter twice * FMT * fmt again * adapt tests * Add doc and struct for weight refund * Doc * More doc * PR suggestions * store all info related to asset payment as multiasset * return AssetNotFound instead of TooExpensive * Use asset transactor to deposit fee * uninstall from statemint * R for RUntime and CON for BalanceConverter * Rework logic to avoid unnecesary match and error * Rework ED check, also in case of refund * rework typo * In case refund makes drop below ED, just refund the difference * fix test westmint * clone id * move test imports to preamble * move test imports to preamble * test-utils with builderS * lock file updated * remove unused imports Co-authored-by: Stephen Shelton <steve@brewcraft.org> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: joepetrowski <joe@parity.io>
This commit is contained in:
@@ -21,9 +21,16 @@
|
||||
|
||||
use codec::Encode;
|
||||
use cumulus_primitives_core::UpwardMessageSender;
|
||||
use frame_support::{
|
||||
traits::tokens::{fungibles, fungibles::Inspect},
|
||||
weights::Weight,
|
||||
};
|
||||
use sp_runtime::{traits::Saturating, SaturatedConversion};
|
||||
|
||||
use sp_std::marker::PhantomData;
|
||||
use xcm::{latest::prelude::*, WrapVersion};
|
||||
|
||||
use xcm_builder::TakeRevenue;
|
||||
use xcm_executor::traits::{MatchesFungibles, TransactAsset, WeightTrader};
|
||||
/// Xcm router which recognises the `Parent` destination and handles it by sending the message into
|
||||
/// the given UMP `UpwardMessageSender` implementation. Thus this essentially adapts an
|
||||
/// `UpwardMessageSender` trait impl into a `SendXcm` trait impl.
|
||||
@@ -51,3 +58,212 @@ impl<T: UpwardMessageSender, W: WrapVersion> SendXcm for ParentAsUmp<T, W> {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Contains information to handle refund/payment for xcm-execution
|
||||
#[derive(Clone, Eq, PartialEq, Debug)]
|
||||
struct AssetTraderRefunder {
|
||||
// The amount of weight bought minus the weigh already refunded
|
||||
weight_outstanding: Weight,
|
||||
// The concrete asset containing the asset location and outstanding balance
|
||||
outstanding_concrete_asset: MultiAsset,
|
||||
}
|
||||
|
||||
/// Charges for exercution in the first multiasset of those selected for fee payment
|
||||
/// Only succeeds for Concrete Fungible Assets
|
||||
/// First tries to convert the this MultiAsset into a local assetId
|
||||
/// Then charges for this assetId as described by FeeCharger
|
||||
/// Weight, paid balance, local asset Id and the multilocation is stored for
|
||||
/// later refund purposes
|
||||
/// Important: Errors if the Trader is being called twice by 2 BuyExecution instructions
|
||||
/// Alternatively we could just return payment in the aforementioned case
|
||||
pub struct TakeFirstAssetTrader<
|
||||
AccountId,
|
||||
FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
|
||||
Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
|
||||
ConcreteAssets: fungibles::Mutate<AccountId> + fungibles::Transfer<AccountId> + fungibles::Balanced<AccountId>,
|
||||
HandleRefund: TakeRevenue,
|
||||
>(
|
||||
Option<AssetTraderRefunder>,
|
||||
PhantomData<(AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund)>,
|
||||
);
|
||||
impl<
|
||||
AccountId,
|
||||
FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
|
||||
Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
|
||||
ConcreteAssets: fungibles::Mutate<AccountId>
|
||||
+ fungibles::Transfer<AccountId>
|
||||
+ fungibles::Balanced<AccountId>,
|
||||
HandleRefund: TakeRevenue,
|
||||
> WeightTrader
|
||||
for TakeFirstAssetTrader<AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund>
|
||||
{
|
||||
fn new() -> Self {
|
||||
Self(None, PhantomData)
|
||||
}
|
||||
// We take first multiasset
|
||||
// Check whether we can convert fee to asset_fee (is_sufficient, min_deposit)
|
||||
// If everything goes well, we charge.
|
||||
fn buy_weight(
|
||||
&mut self,
|
||||
weight: Weight,
|
||||
payment: xcm_executor::Assets,
|
||||
) -> Result<xcm_executor::Assets, XcmError> {
|
||||
log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::buy_weight weight: {:?}, payment: {:?}", weight, payment);
|
||||
|
||||
// Make sure we dont enter twice
|
||||
if self.0.is_some() {
|
||||
return Err(XcmError::NotWithdrawable)
|
||||
}
|
||||
|
||||
// We take the very first multiasset from payment
|
||||
let multiassets: MultiAssets = payment.clone().into();
|
||||
|
||||
// Take the first multiasset from the selected MultiAssets
|
||||
let first = multiassets.get(0).ok_or(XcmError::AssetNotFound)?;
|
||||
|
||||
// Get the local asset id in which we can pay for fees
|
||||
let (local_asset_id, _) =
|
||||
Matcher::matches_fungibles(&first).map_err(|_| XcmError::AssetNotFound)?;
|
||||
|
||||
// Calculate how much we should charge in the asset_id for such amount of weight
|
||||
// Require at least a payment of minimum_balance
|
||||
// Necessary for fully collateral-backed assets
|
||||
let asset_balance: u128 = FeeCharger::charge_weight_in_fungibles(local_asset_id, weight)
|
||||
.map(|amount| {
|
||||
let minimum_balance = ConcreteAssets::minimum_balance(local_asset_id);
|
||||
if amount < minimum_balance {
|
||||
minimum_balance
|
||||
} else {
|
||||
amount
|
||||
}
|
||||
})?
|
||||
.try_into()
|
||||
.map_err(|_| XcmError::Overflow)?;
|
||||
|
||||
// Convert to the same kind of multiasset, with the required fungible balance
|
||||
let required = first.id.clone().into_multiasset(asset_balance.into());
|
||||
|
||||
// Substract payment
|
||||
let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?;
|
||||
|
||||
// record weight and multiasset
|
||||
self.0 = Some(AssetTraderRefunder {
|
||||
weight_outstanding: weight,
|
||||
outstanding_concrete_asset: required,
|
||||
});
|
||||
|
||||
Ok(unused)
|
||||
}
|
||||
|
||||
fn refund_weight(&mut self, weight: Weight) -> Option<MultiAsset> {
|
||||
log::trace!(target: "xcm::weight", "TakeFirstAssetTrader::refund_weight weight: {:?}", weight);
|
||||
if let Some(AssetTraderRefunder {
|
||||
mut weight_outstanding,
|
||||
outstanding_concrete_asset: MultiAsset { id, fun },
|
||||
}) = self.0.clone()
|
||||
{
|
||||
let weight = weight.min(weight_outstanding);
|
||||
|
||||
// Get the local asset id in which we can refund fees
|
||||
let (local_asset_id, outstanding_balance) =
|
||||
Matcher::matches_fungibles(&(id.clone(), fun).into()).ok()?;
|
||||
|
||||
let minimum_balance = ConcreteAssets::minimum_balance(local_asset_id);
|
||||
|
||||
// Calculate asset_balance
|
||||
// This read should have already be cached in buy_weight
|
||||
let (asset_balance, outstanding_minus_substracted) =
|
||||
FeeCharger::charge_weight_in_fungibles(local_asset_id, weight).ok().map(
|
||||
|asset_balance| {
|
||||
// Require at least a drop of minimum_balance
|
||||
// Necessary for fully collateral-backed assets
|
||||
if outstanding_balance.saturating_sub(asset_balance) > minimum_balance {
|
||||
(asset_balance, outstanding_balance.saturating_sub(asset_balance))
|
||||
}
|
||||
// If the amount to be refunded leaves the remaining balance below ED,
|
||||
// we just refund the exact amount that guarantees at least ED will be
|
||||
// dropped
|
||||
else {
|
||||
(outstanding_balance.saturating_sub(minimum_balance), minimum_balance)
|
||||
}
|
||||
},
|
||||
)?;
|
||||
|
||||
// Convert balances into u128
|
||||
let outstanding_minus_substracted: u128 =
|
||||
outstanding_minus_substracted.saturated_into();
|
||||
let asset_balance: u128 = asset_balance.saturated_into();
|
||||
|
||||
// Construct outstanding_concrete_asset with the same location id and substracted balance
|
||||
let outstanding_concrete_asset: MultiAsset =
|
||||
(id.clone(), outstanding_minus_substracted).into();
|
||||
|
||||
// Substract from existing weight and balance
|
||||
weight_outstanding = weight_outstanding.saturating_sub(weight);
|
||||
|
||||
// Override AssetTraderRefunder
|
||||
self.0 = Some(AssetTraderRefunder { weight_outstanding, outstanding_concrete_asset });
|
||||
|
||||
// Only refund if positive
|
||||
if asset_balance > 0 {
|
||||
Some((id, asset_balance).into())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<
|
||||
AccountId,
|
||||
FeeCharger: ChargeWeightInFungibles<AccountId, ConcreteAssets>,
|
||||
Matcher: MatchesFungibles<ConcreteAssets::AssetId, ConcreteAssets::Balance>,
|
||||
ConcreteAssets: fungibles::Mutate<AccountId>
|
||||
+ fungibles::Transfer<AccountId>
|
||||
+ fungibles::Balanced<AccountId>,
|
||||
HandleRefund: TakeRevenue,
|
||||
> Drop for TakeFirstAssetTrader<AccountId, FeeCharger, Matcher, ConcreteAssets, HandleRefund>
|
||||
{
|
||||
fn drop(&mut self) {
|
||||
if let Some(asset_trader) = self.0.clone() {
|
||||
HandleRefund::take_revenue(asset_trader.outstanding_concrete_asset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// XCM fee depositor to which we implement the TakeRevenue trait
|
||||
/// It receives a Transact implemented argument, a 32 byte convertible acocuntId, and the fee receiver account
|
||||
/// FungiblesMutateAdapter should be identical to that implemented by WithdrawAsset
|
||||
pub struct XcmFeesTo32ByteAccount<FungiblesMutateAdapter, AccountId, ReceiverAccount>(
|
||||
PhantomData<(FungiblesMutateAdapter, AccountId, ReceiverAccount)>,
|
||||
);
|
||||
impl<
|
||||
FungiblesMutateAdapter: TransactAsset,
|
||||
AccountId: Clone + Into<[u8; 32]>,
|
||||
ReceiverAccount: frame_support::traits::Get<Option<AccountId>>,
|
||||
> TakeRevenue for XcmFeesTo32ByteAccount<FungiblesMutateAdapter, AccountId, ReceiverAccount>
|
||||
{
|
||||
fn take_revenue(revenue: MultiAsset) {
|
||||
if let Some(receiver) = ReceiverAccount::get() {
|
||||
let ok = FungiblesMutateAdapter::deposit_asset(
|
||||
&revenue,
|
||||
&(X1(AccountId32 { network: Any, id: receiver.into() }).into()),
|
||||
)
|
||||
.is_ok();
|
||||
|
||||
debug_assert!(ok, "`deposit_asset` cannot generally fail; qed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// ChargeWeightInFungibles trait, which converts a given amount of weight
|
||||
/// and an assetId, and it returns the balance amount that should be charged
|
||||
/// in such assetId for that amount of weight
|
||||
pub trait ChargeWeightInFungibles<AccountId, Assets: fungibles::Inspect<AccountId>> {
|
||||
fn charge_weight_in_fungibles(
|
||||
asset_id: <Assets as Inspect<AccountId>>::AssetId,
|
||||
weight: Weight,
|
||||
) -> Result<<Assets as Inspect<AccountId>>::Balance, XcmError>;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user