Land XCM Builder

gavofyork · shawntabrizi · commit fbff79d3561f · 2020-10-07T17:56:31.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,6 +41,7 @@ members = [
 	"service",
 	"validation",
 	"xcm",
+	"xcm/xcm-builder",
 	"xcm/xcm-executor",
 	"node/collation-generation",
 	"node/core/av-store",
diff --git a/node/collation-generation/src/lib.rs b/node/collation-generation/src/lib.rs
@@ -407,7 +407,7 @@ mod tests {
 			Arc::new(CollationGenerationConfig {
 				key: CollatorPair::generate().0,
 				collator: Box::new(|_: Hash, _vd: &ValidationData| {
-					Box::new(TestCollator)
+					TestCollator.boxed()
 				}),
 				para_id: para_id.into(),
 			})
diff --git a/node/overseer/src/lib.rs b/node/overseer/src/lib.rs
@@ -1876,7 +1876,7 @@ mod tests {
 	fn test_collator_generation_msg() -> CollationGenerationMessage {
 		CollationGenerationMessage::Initialize(CollationGenerationConfig {
 			key: CollatorPair::generate().0,
-			collator: Box::new(|_, _| Box::new(TestCollator)),
+			collator: Box::new(|_, _| TestCollator.boxed()),
 			para_id: Default::default(),
 		})
 	}
diff --git a/node/primitives/src/lib.rs b/node/primitives/src/lib.rs
@@ -35,6 +35,7 @@ use polkadot_statement_table::{
 	},
 	v1::Misbehavior as TableMisbehavior,
 };
+use std::pin::Pin;
 
 pub use sp_core::traits::SpawnNamed;
 
@@ -289,7 +290,7 @@ pub struct CollationGenerationConfig {
 	/// Will be called with the hash of the relay chain block the parachain
 	/// block should be build on and the [`ValidationData`] that provides
 	/// information about the state of the parachain on the relay chain.
-	pub collator: Box<dyn Fn(Hash, &ValidationData) -> Box<dyn Future<Output = Option<Collation>> + Unpin + Send> + Send + Sync>,
+	pub collator: Box<dyn Fn(Hash, &ValidationData) -> Pin<Box<dyn Future<Output = Option<Collation>> + Send>> + Send + Sync>,
 	/// The parachain that this collator collates for
 	pub para_id: ParaId,
 }
diff --git a/parachain/src/primitives.rs b/parachain/src/primitives.rs
@@ -124,9 +124,21 @@ impl Id {
 	}
 
 	/// Returns `true` if this parachain runs with system-level privileges.
+	/// Use IsSystem instead.
+	#[deprecated]
 	pub fn is_system(&self) -> bool { self.0 < USER_INDEX_START }
 }
 
+pub trait IsSystem {
+	fn is_system(&self) -> bool;
+}
+
+impl IsSystem for Id {
+	fn is_system(&self) -> bool {
+		self.0 < USER_INDEX_START
+	}
+}
+
 impl sp_std::ops::Add<u32> for Id {
 	type Output = Self;
 
diff --git a/roadmap/implementers-guide/src/node/collators/collation-generation.md b/roadmap/implementers-guide/src/node/collators/collation-generation.md
@@ -39,7 +39,7 @@ struct CollationGenerationConfig {
   /// Collate will be called with the relay chain hash the parachain should build 
   /// a block on and the `ValidationData` that provides information about the state
   /// of the parachain on the relay chain.
-  collator: Box<dyn Fn(Hash, &ValidationData) -> Box<dyn Future<Output = Option<Collation>>>>
+  collator: Box<dyn Fn(Hash, &ValidationData) -> Pin<Box<dyn Future<Output = Option<Collation>>>>>
   para_id: ParaId,
 }
 ```
diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml
@@ -7,3 +7,10 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = [ "derive" ] }
+
+[features]
+default = ["std"]
+wasm-api = []
+std = [
+	"codec/std",
+]
diff --git a/xcm/xcm-builder/Cargo.toml b/xcm/xcm-builder/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2018"
+name = "xcm-builder"
+description = "Tools & types for building with XCM and its executor."
+version = "0.8.22"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
+
+xcm = { path = "..", default-features = false }
+xcm-executor = { path = "../xcm-executor", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
+
+# Polkadot dependencies
+polkadot-parachain = { path = "../../parachain", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"polkadot-parachain/std",
+	"sp-std/std",
+	"sp-arithmetic/std",
+	"sp-core/std",
+	"sp-runtime/std",
+	"xcm/std",
+	"xcm-executor/std",
+]
diff --git a/xcm/xcm-builder/src/currency_adapter.rs b/xcm/xcm-builder/src/currency_adapter.rs
@@ -0,0 +1,54 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+use sp_std::{result, convert::TryInto, marker::PhantomData};
+use xcm::v0::{Error, Result, MultiAsset, MultiLocation};
+use sp_arithmetic::traits::SaturatedConversion;
+use frame_support::traits::{ExistenceRequirement::AllowDeath, WithdrawReason};
+use xcm_executor::traits::{MatchesFungible, LocationConversion, TransactAsset};
+
+pub struct CurrencyAdapter<Currency, Matcher, AccountIdConverter, AccountId>(
+	PhantomData<Currency>,
+	PhantomData<Matcher>,
+	PhantomData<AccountIdConverter>,
+	PhantomData<AccountId>,
+);
+
+impl<
+	Matcher: MatchesFungible<Currency::Balance>,
+	AccountIdConverter: LocationConversion<AccountId>,
+	Currency: frame_support::traits::Currency<AccountId>,
+	AccountId,	// can't get away without it since Currency is generic over it.
+> TransactAsset for CurrencyAdapter<Currency, Matcher, AccountIdConverter, AccountId> {
+
+	fn deposit_asset(what: &MultiAsset, who: &MultiLocation) -> Result {
+		// Check we handle this asset.
+		let amount = Matcher::matches_fungible(&what).ok_or(())?.saturated_into();
+		let who = AccountIdConverter::from_location(who).ok_or(())?;
+		let balance_amount = amount.try_into().map_err(|_| ())?;
+		let _imbalance = Currency::deposit_creating(&who, balance_amount);
+		Ok(())
+	}
+
+	fn withdraw_asset(what: &MultiAsset, who: &MultiLocation) -> result::Result<MultiAsset, Error> {
+		// Check we handle this asset.
+		let amount = Matcher::matches_fungible(&what).ok_or(())?.saturated_into();
+		let who = AccountIdConverter::from_location(who).ok_or(())?;
+		let balance_amount = amount.try_into().map_err(|_| ())?;
+		Currency::withdraw(&who, balance_amount, WithdrawReason::Transfer.into(), AllowDeath).map_err(|_| ())?;
+		Ok(what.clone())
+	}
+}
diff --git a/xcm/xcm-builder/src/lib.rs b/xcm/xcm-builder/src/lib.rs
@@ -0,0 +1,56 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+mod location_conversion;
+pub use location_conversion::{
+	Account32Hash, ParentIsDefault, ChildParachainConvertsVia, SiblingParachainConvertsVia, AccountId32Aliases
+};
+
+mod origin_conversion;
+pub use origin_conversion::{
+	SovereignSignedViaLocation, ParentAsSuperuser, ChildSystemParachainAsSuperuser, SiblingSystemParachainAsSuperuser,
+	ChildParachainAsNative, SiblingParachainAsNative, RelayChainAsNative, SignedAccountId32AsNative
+};
+
+mod currency_adapter;
+pub use currency_adapter::CurrencyAdapter;
+
+use sp_std::marker::PhantomData;
+use xcm_executor::traits::InvertLocation;
+use xcm::v0::{MultiLocation, Junction};
+use frame_support::traits::Get;
+
+/// Simple location inverter; give it this location's ancestry and it'll
+pub struct LocationInverter<Ancestry>(PhantomData<Ancestry>);
+
+impl<Ancestry: Get<MultiLocation>> InvertLocation for LocationInverter<Ancestry> {
+	fn invert_location(location: &MultiLocation) -> MultiLocation {
+		let mut ancestry = Ancestry::get();
+		let mut result = location.clone();
+		for (i, j) in location.iter_rev()
+			.map(|j| match j {
+				Junction::Parent => ancestry.take_first().unwrap_or(Junction::OnlyChild),
+				_ => Junction::Parent,
+			})
+			.enumerate()
+		{
+			*result.at_mut(i).expect("location and result begin equal; same size; qed") = j;
+		}
+		result
+	}
+}
diff --git a/xcm/xcm-builder/src/location_conversion.rs b/xcm/xcm-builder/src/location_conversion.rs
@@ -0,0 +1,126 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Polkadot is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+use sp_std::marker::PhantomData;
+use sp_io::hashing::blake2_256;
+use sp_runtime::traits::AccountIdConversion;
+use frame_support::traits::Get;
+use codec::Encode;
+use xcm::v0::{MultiLocation, NetworkId, Junction};
+use xcm_executor::traits::LocationConversion;
+
+pub struct Account32Hash<Network, AccountId>(PhantomData<(Network, AccountId)>);
+
+impl<
+	Network: Get<NetworkId>,
+	AccountId: From<[u8; 32]> + Into<[u8; 32]>,
+> LocationConversion<AccountId> for Account32Hash<Network, AccountId> {
+	fn from_location(location: &MultiLocation) -> Option<AccountId> {
+		Some(("multiloc", location).using_encoded(blake2_256).into())
+	}
+
+	fn try_into_location(who: AccountId) -> Result<MultiLocation, AccountId> {
+		Err(who)
+	}
+}
+
+pub struct ParentIsDefault<AccountId>(PhantomData<AccountId>);
+
+impl<
+	AccountId: Default + Eq,
+> LocationConversion<AccountId> for ParentIsDefault<AccountId> {
+	fn from_location(location: &MultiLocation) -> Option<AccountId> {
+		if let MultiLocation::X1(Junction::Parent) = location {
+			Some(AccountId::default())
+		} else {
+			None
+		}
+	}
+
+	fn try_into_location(who: AccountId) -> Result<MultiLocation, AccountId> {
+		if who == AccountId::default() {
+			Ok(Junction::Parent.into())
+		} else {
+			Err(who)
+		}
+	}
+}
+
+pub struct ChildParachainConvertsVia<ParaId, AccountId>(PhantomData<(ParaId, AccountId)>);
+
+impl<
+	ParaId: From<u32> + Into<u32> + AccountIdConversion<AccountId>,
+	AccountId,
+> LocationConversion<AccountId> for ChildParachainConvertsVia<ParaId, AccountId> {
+	fn from_location(location: &MultiLocation) -> Option<AccountId> {
+		if let MultiLocation::X1(Junction::Parachain { id }) = location {
+			Some(ParaId::from(*id).into_account())
+		} else {
+			None
+		}
+	}
+
+	fn try_into_location(who: AccountId) -> Result<MultiLocation, AccountId> {
+		if let Some(id) = ParaId::try_from_account(&who) {
+			Ok(Junction::Parachain { id: id.into() }.into())
+		} else {
+			Err(who)
+		}
+	}
+}
+
+pub struct SiblingParachainConvertsVia<ParaId, AccountId>(PhantomData<(ParaId, AccountId)>);
+
+impl<
+	ParaId: From<u32> + Into<u32> + AccountIdConversion<AccountId>,
+	AccountId,
+> LocationConversion<AccountId> for SiblingParachainConvertsVia<ParaId, AccountId> {
+	fn from_location(location: &MultiLocation) -> Option<AccountId> {
+		if let MultiLocation::X2(Junction::Parent, Junction::Parachain { id }) = location {
+			Some(ParaId::from(*id).into_account())
+		} else {
+			None
+		}
+	}
+
+	fn try_into_location(who: AccountId) -> Result<MultiLocation, AccountId> {
+		if let Some(id) = ParaId::try_from_account(&who) {
+			Ok([Junction::Parent, Junction::Parachain { id: id.into() }].into())
+		} else {
+			Err(who)
+		}
+	}
+}
+
+pub struct AccountId32Aliases<Network, AccountId>(PhantomData<(Network, AccountId)>);
+
+impl<
+	Network: Get<NetworkId>,
+	AccountId: From<[u8; 32]> + Into<[u8; 32]>,
+> LocationConversion<AccountId> for AccountId32Aliases<Network, AccountId> {
+	fn from_location(location: &MultiLocation) -> Option<AccountId> {
+		if let MultiLocation::X1(Junction::AccountId32 { id, network }) = location {
+			if matches!(network, NetworkId::Any) || network == &Network::get() {
+				return Some((*id).into())
+			}
+		}
+		None
+	}
+
+	fn try_into_location(who: AccountId) -> Result<MultiLocation, AccountId> {
+		Ok(Junction::AccountId32 { id: who.into(), network: Network::get() }.into())
+	}
+}
diff --git a/xcm/xcm-builder/src/origin_conversion.rs b/xcm/xcm-builder/src/origin_conversion.rs

Original file line number	Diff line number	Diff line change
`@@ -1876,7 +1876,7 @@ mod tests {`
`1876`	`1876`	`fn test_collator_generation_msg() -> CollationGenerationMessage {`
`1877`	`1877`	`CollationGenerationMessage::Initialize(CollationGenerationConfig {`
`1878`	`1878`	`key: CollatorPair::generate().0,`
`1879`		`- collator: Box::new(\|_, _\| Box::new(TestCollator)),`
	`1879`	`+ collator: Box::new(\|_, _\| TestCollator.boxed()),`
`1880`	`1880`	`para_id: Default::default(),`
`1881`	`1881`	`})`
`1882`	`1882`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ struct CollationGenerationConfig {`
`39`	`39`	`/// Collate will be called with the relay chain hash the parachain should build`
`40`	`40`	/// a block on and the `ValidationData` that provides information about the state
`41`	`41`	`/// of the parachain on the relay chain.`
`42`		`- collator: Box<dyn Fn(Hash, &ValidationData) -> Box<dyn Future<Output = Option<Collation>>>>`
	`42`	`+ collator: Box<dyn Fn(Hash, &ValidationData) -> Pin<Box<dyn Future<Output = Option<Collation>>>>>`
`43`	`43`	`para_id: ParaId,`
`44`	`44`	`}`
`45`	`45`	```