mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-14 05:05:50 +00:00
Asset conversion get_pool_id fix (Ord does not count with is_native flag) (#14572)
* Asset conversion `get_pool_id` fix (`Ord` does not count with `is_native` flag) * Removed unnecessery clones + added `pool_account` to `PoolCreated` event * Fix bench compile * Fix bench * Improved `MultiAssetIdConverter::try_convert` * Removed `into_multiasset_id` from converter and moved to `BenchmarkHelper` * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_asset_conversion * Fixed doc * Typo * Removed `NativeOrAssetId` (test/mock) impl from types.rs to mock.rs... * Typo + 0u32 -> 0 * Update frame/asset-conversion/src/benchmarking.rs Co-authored-by: Jegor Sidorenko <5252494+jsidorenko@users.noreply.github.com> * Typo * ".git/.scripts/commands/fmt/fmt.sh" * Fix from Jegor * Try to fix the other failing benchmark * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_asset_conversion * Update frame/asset-conversion/src/lib.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update frame/asset-conversion/src/types.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update frame/transaction-payment/asset-conversion-tx-payment/src/mock.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update frame/asset-conversion/src/mock.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update bin/node/runtime/src/impls.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update frame/asset-conversion/src/lib.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Update bin/node/runtime/src/impls.rs Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> * Reverted NativeOrAssetId --------- Co-authored-by: command-bot <> Co-authored-by: Jegor Sidorenko <5252494+jsidorenko@users.noreply.github.com> Co-authored-by: Jegor Sidorenko <jegor@parity.io> Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com>
This commit is contained in:
Branislav Kontur
@@ -55,7 +55,9 @@ where
|
||||
{
|
||||
let caller: T::AccountId = whitelisted_caller();
|
||||
let caller_lookup = T::Lookup::unlookup(caller.clone());
|
||||
if let Ok(asset_id) = T::MultiAssetIdConverter::try_convert(asset) {
|
||||
if let MultiAssetIdConversionResult::Converted(asset_id) =
|
||||
T::MultiAssetIdConverter::try_convert(asset)
|
||||
{
|
||||
T::Currency::set_balance(&caller, BalanceOf::<T>::max_value().div(1000u32.into()));
|
||||
assert_ok!(T::Assets::create(asset_id.clone(), caller.clone(), true, 1.into()));
|
||||
assert_ok!(T::Assets::mint_into(asset_id, &caller, INITIAL_ASSET_BALANCE.into()));
|
||||
@@ -106,18 +108,23 @@ benchmarks! {
|
||||
|
||||
create_pool {
|
||||
let asset1 = T::MultiAssetIdConverter::get_native();
|
||||
let asset2 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(0_u32));
|
||||
let asset2 = T::BenchmarkHelper::multiasset_id(0);
|
||||
let (caller, _) = create_asset::<T>(&asset2);
|
||||
}: _(SystemOrigin::Signed(caller.clone()), asset1.clone(), asset2.clone())
|
||||
verify {
|
||||
let lp_token = get_lp_token_id::<T>();
|
||||
let pool_id = (asset1.clone(), asset2.clone());
|
||||
assert_last_event::<T>(Event::PoolCreated { creator: caller.clone(), pool_id, lp_token }.into());
|
||||
assert_last_event::<T>(Event::PoolCreated {
|
||||
creator: caller.clone(),
|
||||
pool_account: AssetConversion::<T>::get_pool_account(&pool_id),
|
||||
pool_id,
|
||||
lp_token,
|
||||
}.into());
|
||||
}
|
||||
|
||||
add_liquidity {
|
||||
let asset1 = T::MultiAssetIdConverter::get_native();
|
||||
let asset2 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(0));
|
||||
let asset2 = T::BenchmarkHelper::multiasset_id(0);
|
||||
let (lp_token, caller, _) = create_asset_and_pool::<T>(&asset1, &asset2);
|
||||
let ed: u128 = T::Currency::minimum_balance().into();
|
||||
let add_amount = 1000 + ed;
|
||||
@@ -141,7 +148,7 @@ benchmarks! {
|
||||
|
||||
remove_liquidity {
|
||||
let asset1 = T::MultiAssetIdConverter::get_native();
|
||||
let asset2 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(0));
|
||||
let asset2 = T::BenchmarkHelper::multiasset_id(0);
|
||||
let (lp_token, caller, _) = create_asset_and_pool::<T>(&asset1, &asset2);
|
||||
let ed: u128 = T::Currency::minimum_balance().into();
|
||||
let add_amount = 100 * ed;
|
||||
@@ -170,8 +177,8 @@ benchmarks! {
|
||||
|
||||
swap_exact_tokens_for_tokens {
|
||||
let native = T::MultiAssetIdConverter::get_native();
|
||||
let asset1 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(1));
|
||||
let asset2 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(2));
|
||||
let asset1 = T::BenchmarkHelper::multiasset_id(1);
|
||||
let asset2 = T::BenchmarkHelper::multiasset_id(2);
|
||||
let (_, caller, _) = create_asset_and_pool::<T>(&native, &asset1);
|
||||
let (_, _) = create_asset::<T>(&asset2);
|
||||
let ed: u128 = T::Currency::minimum_balance().into();
|
||||
@@ -187,6 +194,87 @@ benchmarks! {
|
||||
caller.clone(),
|
||||
)?;
|
||||
|
||||
let path;
|
||||
let swap_amount;
|
||||
// if we only allow the native-asset pools, then the worst case scenario would be to swap
|
||||
// asset1-native-asset2
|
||||
if !T::AllowMultiAssetPools::get() {
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), native.clone(), asset2.clone())?;
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
native.clone(),
|
||||
asset2.clone(),
|
||||
(500 * ed).into(),
|
||||
1000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
path = vec![asset1.clone(), native.clone(), asset2.clone()];
|
||||
swap_amount = 100.into();
|
||||
} else {
|
||||
let asset3 = T::BenchmarkHelper::multiasset_id(3);
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset1.clone(), asset2.clone())?;
|
||||
let (_, _) = create_asset::<T>(&asset3);
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset2.clone(), asset3.clone())?;
|
||||
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
asset1.clone(),
|
||||
asset2.clone(),
|
||||
200.into(),
|
||||
2000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
asset2.clone(),
|
||||
asset3.clone(),
|
||||
2000.into(),
|
||||
2000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
path = vec![native.clone(), asset1.clone(), asset2.clone(), asset3.clone()];
|
||||
swap_amount = ed.into();
|
||||
}
|
||||
|
||||
let path: BoundedVec<_, T::MaxSwapPathLength> = BoundedVec::try_from(path).unwrap();
|
||||
let native_balance = T::Currency::balance(&caller);
|
||||
let asset1_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(1), &caller);
|
||||
}: _(SystemOrigin::Signed(caller.clone()), path, swap_amount, 1.into(), caller.clone(), false)
|
||||
verify {
|
||||
if !T::AllowMultiAssetPools::get() {
|
||||
let new_asset1_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(1), &caller);
|
||||
assert_eq!(new_asset1_balance, asset1_balance - 100.into());
|
||||
} else {
|
||||
let new_native_balance = T::Currency::balance(&caller);
|
||||
assert_eq!(new_native_balance, native_balance - ed.into());
|
||||
}
|
||||
}
|
||||
|
||||
swap_tokens_for_exact_tokens {
|
||||
let native = T::MultiAssetIdConverter::get_native();
|
||||
let asset1 = T::BenchmarkHelper::multiasset_id(1);
|
||||
let asset2 = T::BenchmarkHelper::multiasset_id(2);
|
||||
let (_, caller, _) = create_asset_and_pool::<T>(&native, &asset1);
|
||||
let (_, _) = create_asset::<T>(&asset2);
|
||||
let ed: u128 = T::Currency::minimum_balance().into();
|
||||
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
native.clone(),
|
||||
asset1.clone(),
|
||||
(1000 * ed).into(),
|
||||
500.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
|
||||
let path;
|
||||
// if we only allow the native-asset pools, then the worst case scenario would be to swap
|
||||
// asset1-native-asset2
|
||||
@@ -204,8 +292,8 @@ benchmarks! {
|
||||
)?;
|
||||
path = vec![asset1.clone(), native.clone(), asset2.clone()];
|
||||
} else {
|
||||
let asset3 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(3));
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset1.clone(), asset2.clone())?;
|
||||
let asset3 = T::BenchmarkHelper::multiasset_id(3);
|
||||
let (_, _) = create_asset::<T>(&asset3);
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset2.clone(), asset3.clone())?;
|
||||
|
||||
@@ -213,86 +301,7 @@ benchmarks! {
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
asset1.clone(),
|
||||
asset2.clone(),
|
||||
200.into(),
|
||||
2000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
asset2.clone(),
|
||||
asset3.clone(),
|
||||
2000.into(),
|
||||
2000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
path = vec![native.clone(), asset1.clone(), asset2.clone(), asset3.clone()];
|
||||
}
|
||||
|
||||
let path: BoundedVec<_, T::MaxSwapPathLength> = BoundedVec::try_from(path).unwrap();
|
||||
let native_balance = T::Currency::balance(&caller);
|
||||
let asset1_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(1), &caller);
|
||||
}: _(SystemOrigin::Signed(caller.clone()), path, ed.into(), 1.into(), caller.clone(), false)
|
||||
verify {
|
||||
if !T::AllowMultiAssetPools::get() {
|
||||
let new_asset1_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(1), &caller);
|
||||
assert_eq!(new_asset1_balance, asset1_balance - 100.into());
|
||||
} else {
|
||||
let new_native_balance = T::Currency::balance(&caller);
|
||||
assert_eq!(new_native_balance, native_balance - ed.into());
|
||||
}
|
||||
}
|
||||
|
||||
swap_tokens_for_exact_tokens {
|
||||
let native = T::MultiAssetIdConverter::get_native();
|
||||
let asset1 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(1));
|
||||
let asset2 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(2));
|
||||
let (_, caller, _) = create_asset_and_pool::<T>(&native, &asset1);
|
||||
let (_, _) = create_asset::<T>(&asset2);
|
||||
let ed: u128 = T::Currency::minimum_balance().into();
|
||||
let add_native = 1000 + ed;
|
||||
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
native.clone(),
|
||||
asset1.clone(),
|
||||
add_native.into(),
|
||||
200.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
|
||||
let path;
|
||||
// if we only allow the native-asset pools, then the worst case scenario would be to swap
|
||||
// asset1-native-asset2
|
||||
if !T::AllowMultiAssetPools::get() {
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), native.clone(), asset2.clone())?;
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
native.clone(),
|
||||
asset2.clone(),
|
||||
(500 + ed).into(),
|
||||
1000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
caller.clone(),
|
||||
)?;
|
||||
path = vec![asset1.clone(), native.clone(), asset2.clone()];
|
||||
} else {
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset1.clone(), asset2.clone())?;
|
||||
let asset3 = T::MultiAssetIdConverter::into_multiasset_id(&T::BenchmarkHelper::asset_id(3));
|
||||
let (_, _) = create_asset::<T>(&asset3);
|
||||
AssetConversion::<T>::create_pool(SystemOrigin::Signed(caller.clone()).into(), asset2.clone(), asset3.clone())?;
|
||||
|
||||
AssetConversion::<T>::add_liquidity(
|
||||
SystemOrigin::Signed(caller.clone()).into(),
|
||||
asset1.clone(),
|
||||
asset2.clone(),
|
||||
200.into(),
|
||||
2000.into(),
|
||||
0.into(),
|
||||
0.into(),
|
||||
@@ -314,7 +323,7 @@ benchmarks! {
|
||||
let path: BoundedVec<_, T::MaxSwapPathLength> = BoundedVec::try_from(path).unwrap();
|
||||
let asset2_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(2), &caller);
|
||||
let asset3_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(3), &caller);
|
||||
}: _(SystemOrigin::Signed(caller.clone()), path.clone(), 100.into(), add_native.into(), caller.clone(), false)
|
||||
}: _(SystemOrigin::Signed(caller.clone()), path.clone(), 100.into(), (1000 * ed).into(), caller.clone(), false)
|
||||
verify {
|
||||
if !T::AllowMultiAssetPools::get() {
|
||||
let new_asset2_balance = T::Assets::balance(T::BenchmarkHelper::asset_id(2), &caller);
|
||||
|
||||
Reference in New Issue
Block a user