Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Companion for #13352 #2180

Merged
paritytech-processbot merged 20 commits into from
Mar 2, 2023
Merged

Companion for #13352 #2180

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fc48530
Assets balances
Feb 13, 2023
a564871
Update docs
Feb 13, 2023
8afb7ee
Merge branch 'master' into js/assets-balances
Feb 13, 2023
d744cac
AssetsApi with MultiLocation as preparation for multi pallet_assets i…
bkontur Feb 15, 2023
139da1a
typo for check-docs job
bkontur Feb 15, 2023
2287f4f
Merge remote-tracking branch 'origin/master' into js/assets-balances
Feb 21, 2023
a409db4
WIP: AssetsApi return MultiAsset instead of (MultiLocation, Balance)
bkontur Feb 21, 2023
d865e3a
Merge remote-tracking branch 'origin/master' into js/assets-balances
Feb 23, 2023
9d2390a
WIP: assets_api + conversion refactor
bkontur Feb 23, 2023
a9f5fdd
WIP: assets_api + conversion refactor
bkontur Feb 23, 2023
33218cf
Finished asset runtimes
bkontur Feb 23, 2023
958b978
Refactor AssetsApi to FungiblesApi
bkontur Feb 26, 2023
170d869
Refactor
bkontur Feb 26, 2023
32bdfcf
Fix check-rust-docs
bkontur Feb 26, 2023
9d52fa6
Removed todo
bkontur Feb 26, 2023
17193eb
Fix check-rust-doc
bkontur Feb 26, 2023
0f5f909
Merge remote-tracking branch 'origin/master' into js/assets-balances
bkontur Feb 27, 2023
2ead68e
Update parachains/runtimes/assets/common/Cargo.toml
jsidorenko Mar 2, 2023
79b2a9d
Merge remote-tracking branch 'origin/master' into js/assets-balances
bkontur Mar 2, 2023
572ae0f
update lockfile for {"substrate", "polkadot"}
Mar 2, 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
Prev Previous commit
Next Next commit
Removed todo
  • Loading branch information
@bkontur
bkontur committed Feb 26, 2023
commit 9d52fa692f3a378a01bfd9cb067660890d712019
1 change: 0 additions & 1 deletion parachains/runtimes/assets/common/src/fungible_conversion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use xcm_builder::ConvertedConcreteId;
use xcm_executor::traits::{Convert, MatchesFungibles};

/// Converting any [`(AssetId, Balance)`] to [`MultiAsset`]
// TODO: could be replaced by [`Convert<(AssetId, Balance), MultiAsset>`] and/or move to Polkadot repo [`xcm`] module - issue https://github.com/paritytech/polkadot/pull/6760
pub trait MultiAssetConverter<AssetId, Balance, ConvertAssetId, ConvertBalance>:
MatchesFungibles<AssetId, Balance>
where
Expand Down