Asset Conversion release to westmint

parachains/common/Cargo.toml

@@ -11,6 +11,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
 scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
+num-traits = { version = "0.2", default-features = false}
 
 # Substrate
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
@@ -33,6 +34,7 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
 
 # Cumulus
 pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
+cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
 cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false }
 
 [dev-dependencies]
@@ -47,7 +49,6 @@ default = ["std"]
 std = [
 	"frame-support/std",
 	"frame-system/std",
-	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
@@ -56,6 +57,7 @@ std = [
 	"sp-io/std",
 	"sp-std/std",
 	"pallet-collator-selection/std",
+	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"xcm/std",
 	"xcm-executor/std",

parachains/common/src/impls.rs

@@ -15,7 +15,6 @@
 
 //! Auxiliary struct/enums for parachain runtimes.
 //! Taken from polkadot/runtime/common (at a21cd64) and adapted for parachains.
-
 use frame_support::traits::{
 	fungibles::{self, Balanced, Credit},
 	Contains, ContainsPair, Currency, Get, Imbalance, OnUnbalanced,

parachains/common/src/lib.rs

@@ -42,7 +42,7 @@ mod types {
 	/// Balance of an account.
 	pub type Balance = u128;
 
-	/// Index of a transaction in the chain.
+	/// Index of a transaction in a block.
 	pub type Index = u32;
 
 	/// A hash of some data used by the chain.

parachains/integration-tests/emulated/assets/asset-hub-westend/Cargo.toml

@@ -16,6 +16,7 @@ sp-core = { default-features = false, git = "https://github.com/paritytech/subst
 sp-weights = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-asset-conversion = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
 
 # Polkadot
 polkadot-core-primitives = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }

parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs

@@ -26,7 +26,8 @@ pub use integration_tests_common::{
 	},
 	AccountId, AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver,
 	AssetHubWestendSender, Collectives, CollectivesPallet, CollectivesReceiver, CollectivesSender,
-	PenpalWestend, Westend, WestendPallet, WestendReceiver, WestendSender,
+	PenpalWestend, PenpalWestendPallet, PenpalWestendReceiver, PenpalWestendSender, Westend,
+	WestendPallet, WestendReceiver, WestendSender,
 };
 pub use polkadot_core_primitives::InboundDownwardMessage;
 pub use xcm::{

parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/mod.rs

@@ -15,5 +15,6 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 mod reserve_transfer;
+mod swap;
 mod teleport;
 mod transact;