MultiAsset Treasury Spend Over XCM. Companion PR for Substrate #13607

parachain/Cargo.toml

@@ -17,7 +17,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "master",
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 polkadot-core-primitives = { path = "../core-primitives", default-features = false }
 derive_more = "0.99.11"
-bounded-collections = { version = "0.1.5", default-features = false }
+bounded-collections = { version = "0.1.7", default-features = false }
 
 # all optional crates.
 serde = { version = "1.0.137", default-features = false, features = [ "derive" ], optional = true }

runtime/common/src/impls.rs

@@ -59,6 +59,17 @@ where
 	}
 }
 
+#[cfg(feature = "runtime-benchmarks")]
+pub struct JunctionsBenchmarkHelper;
+#[cfg(feature = "runtime-benchmarks")]
+impl<AssetKind: From<xcm::latest::MultiLocation>> pallet_treasury::BenchmarkHelper<AssetKind>
+	for JunctionsBenchmarkHelper
+{
+	fn create_asset_kind(_id: u32) -> AssetKind {
+		xcm::latest::Junctions::Here.into_location().into()
+	}
+}
+
 pub fn era_payout(
 	total_staked: Balance,
 	total_stakable: Balance,
@@ -104,7 +115,7 @@ mod tests {
 	use frame_support::{
 		dispatch::DispatchClass,
 		parameter_types,
-		traits::{ConstU32, FindAuthor},
+		traits::{tokens::PayFromAccount, ConstU32, FindAuthor},
 		weights::Weight,
 		PalletId,
 	};
@@ -195,9 +206,14 @@ mod tests {
 	parameter_types! {
 		pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 		pub const MaxApprovals: u32 = 100;
+		pub TreasuryAccount: AccountId = Treasury::account_id();
 	}
 
 	impl pallet_treasury::Config for Test {
+		type PalletId = TreasuryPalletId;
+		type AssetKind = ();
+		type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+		type BalanceConverter = ();
 		type Currency = pallet_balances::Pallet<Test>;
 		type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
 		type RejectOrigin = frame_system::EnsureRoot<AccountId>;
@@ -209,11 +225,12 @@ mod tests {
 		type SpendPeriod = ();
 		type Burn = ();
 		type BurnDestination = ();
-		type PalletId = TreasuryPalletId;
 		type SpendFunds = ();
 		type MaxApprovals = MaxApprovals;
 		type WeightInfo = ();
 		type SpendOrigin = frame_support::traits::NeverEnsureOrigin<u64>;
+		#[cfg(feature = "runtime-benchmarks")]
+		type BenchmarkHelper = pallet_treasury::NilBenchmarkHelper;
 	}
 
 	pub struct OneAuthor;

runtime/kusama/src/lib.rs

@@ -55,10 +55,10 @@ use frame_election_provider_support::{
 	generate_solution_type, onchain, NposSolution, SequentialPhragmen,
 };
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, ord_parameter_types, parameter_types,
 	traits::{
-		ConstU32, Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem,
-		PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
+		tokens::ConversionFromAssetBalance, ConstU32, Contains, EitherOf, EitherOfDiverse,
+		InstanceFilter, KeyOwnerProofSystem, PrivilegeCmp,ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
 	PalletId, RuntimeDebug,
@@ -73,8 +73,8 @@ use sp_mmr_primitives as mmr;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
-		OpaqueKeys, SaturatedConversion, Verify,
+		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto,
+		Extrinsic as ExtrinsicT, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
@@ -97,6 +97,7 @@ pub use sp_runtime::BuildStorage;
 
 /// Constant values used within the runtime.
 use kusama_runtime_constants::{currency::*, fee::*, time::*};
+use xcm::v3::{AssetId, Fungibility};
 
 // Weights used in the runtime.
 mod weights;
@@ -109,10 +110,12 @@ pub mod xcm_config;
 
 // Governance configurations.
 pub mod governance;
+use crate::xcm_config::Statemine;
 use governance::{
 	pallet_custom_origins, AuctionAdmin, Fellows, GeneralAdmin, LeaseAdmin, StakingAdmin,
 	Treasurer, TreasurySpender,
 };
+use xcm_builder::{HasDestination, PayOverXcm};
 
 #[cfg(test)]
 mod tests;
@@ -619,10 +622,75 @@ parameter_types! {
 	pub const MaxKeys: u32 = 10_000;
 	pub const MaxPeerInHeartbeats: u32 = 10_000;
 	pub const MaxPeerDataEncodingSize: u32 = 1_000;
+	// PayOverXcmTimeout is set to 3 x the spend period to provide buffer before status messages
+	// are deleted from storage
+	pub const PayOverXcmTimeout: BlockNumber = 6 * 3 * DAYS;
+}
+
+ord_parameter_types! {
+	pub const TreasuryAccountId: AccountId = AccountIdConversion::<AccountId>::into_account_truncating(&TreasuryPalletId::get());
+}
+
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub struct AssetKind<AssetId> {
+	destination: xcm::latest::MultiLocation,
+	asset_id: AssetId,
+	amount: Fungibility,
+}
+
+impl From<AssetKind<AssetId>> for xcm::latest::AssetId {
+	fn from(item: AssetKind<AssetId>) -> Self {
+		item.asset_id
+	}
+}
+
+impl HasDestination for AssetKind<AssetId> {
+	fn destination(&self) -> xcm::latest::MultiLocation {
+		self.destination
+	}
+}
+
+impl pallet_treasury::Asset<AssetKind<xcm::v3::AssetId>, xcm::v3::Fungibility>
+	for AssetKind<AssetId>
+{
+	fn asset_kind(&self) -> Self {
+		*self
+	}
+	fn amount(&self) -> xcm::v3::Fungibility {
+		self.amount
+	}
+}
+
+pub struct FungibleBalanceConverter;
+impl<AssetId, OutBalance: core::convert::From<u128>>
+	ConversionFromAssetBalance<Fungibility, AssetId, OutBalance> for FungibleBalanceConverter
+{
+	type Error = ();
+	fn from_asset_balance(
+		balance: Fungibility,
+		_asset_id: AssetId,
+	) -> Result<OutBalance, Self::Error> {
+		match balance {
+			Fungibility::Fungible(b) => Ok(b.into()),
+			Fungibility::NonFungible(_) => Ok(0.into()),
+		}
+	}
 }
 
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
+	type AssetId = AssetKind<AssetId>;
+	type AssetKind = AssetKind<AssetId>;
+	// type AssetKind = MultiAsset;
+	type Paymaster = PayOverXcm<
+		TreasuryAccountId,
+		xcm_config::XcmRouter,
+		XcmPallet,
+		PayOverXcmTimeout,
+		Self::AccountId,
+		Self::AssetKind,
+	>;
+	type BalanceConverter = FungibleBalanceConverter;
 	type Currency = Balances;
 	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
 	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
@@ -638,6 +706,9 @@ impl pallet_treasury::Config for Runtime {
 	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
 	type SpendFunds = Bounties;
 	type SpendOrigin = TreasurySpender;
+	type MaxPaymentRetries = ConstU32<5>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::JunctionsBenchmarkHelper;
 }
 
 parameter_types! {

runtime/kusama/src/weights/pallet_treasury.rs

@@ -65,6 +65,22 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	}
 	/// Storage: Treasury ProposalCount (r:1 w:1)
 	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
+	/// Storage: Treasury Approvals (r:1 w:1)
+	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+	/// Storage: Treasury Proposals (r:0 w:1)
+	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+	fn spend_local() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3376`
+		// Minimum execution time: 14_516_000 picoseconds.
+		Weight::from_parts(14_898_000, 0)
+			.saturating_add(Weight::from_parts(0, 3376))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: Treasury ProposalCount (r:1 w:1)
+	/// Proof: Treasury ProposalCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
 	/// Storage: Treasury Proposals (r:0 w:1)
 	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
 	fn propose_spend() -> Weight {
@@ -148,4 +164,32 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
 	}
+	/// Storage: Treasury Deactivated (r:1 w:1)
+	/// Proof: Treasury Deactivated (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: Balances InactiveIssuance (r:1 w:1)
+	/// Proof: Balances InactiveIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
+	/// Storage: Treasury Approvals (r:1 w:1)
+	/// Proof: Treasury Approvals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+	/// Storage: Treasury Proposals (r:100 w:100)
+	/// Proof: Treasury Proposals (max_values: None, max_size: Some(108), added: 2583, mode: MaxEncodedLen)
+	/// Storage: System Account (r:201 w:201)
+	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// Storage: Bounties BountyApprovals (r:1 w:1)
+	/// Proof: Bounties BountyApprovals (max_values: Some(1), max_size: Some(402), added: 897, mode: MaxEncodedLen)
+	/// The range of component `p` is `[0, 100]`.
+	fn on_initialize_pending_payments(p: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `297 + p * (251 ±0)`
+		//  Estimated: `11359 + p * (7789 ±0)`
+		// Minimum execution time: 57_179_000 picoseconds.
+		Weight::from_parts(61_547_634, 0)
+			.saturating_add(Weight::from_parts(0, 11359))
+			// Standard Error: 30_382
+			.saturating_add(Weight::from_parts(32_012_031, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
+			.saturating_add(T::DbWeight::get().writes(5))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
+			.saturating_add(Weight::from_parts(0, 7789).saturating_mul(p.into()))
+	}
 }

runtime/polkadot/src/lib.rs

@@ -37,15 +37,17 @@ use runtime_parachains::{
 	scheduler as parachains_scheduler, session_info as parachains_session_info,
 	shared as parachains_shared,
 };
+use scale_info::TypeInfo;
 
+use crate::xcm_config::Statemint;
 use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use beefy_primitives::crypto::{AuthorityId as BeefyId, Signature as BeefySignature};
 use frame_election_provider_support::{generate_solution_type, onchain, SequentialPhragmen};
 use frame_support::{
-	construct_runtime, parameter_types,
+	construct_runtime, ord_parameter_types, parameter_types,
 	traits::{
-		ConstU32, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier,
-		PrivilegeCmp, ProcessMessage, ProcessMessageError, WithdrawReasons,
+		tokens::ConversionFromAssetBalance, ConstU32, EitherOf, EitherOfDiverse, InstanceFilter,
+		KeyOwnerProofSystem, LockIdentifier, PrivilegeCmp, ProcessMessage, ProcessMessageError, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, WeightMeter},
 	PalletId, RuntimeDebug,
@@ -70,8 +72,8 @@ use sp_runtime::{
 	curve::PiecewiseLinear,
 	generic, impl_opaque_keys,
 	traits::{
-		AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto, Extrinsic as ExtrinsicT,
-		OpaqueKeys, SaturatedConversion, Verify,
+		AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto,
+		Extrinsic as ExtrinsicT, OpaqueKeys, SaturatedConversion, Verify,
 	},
 	transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
 	ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
@@ -82,7 +84,7 @@ use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*};
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 use static_assertions::const_assert;
-use xcm::latest::Junction;
+use xcm::{latest::{AssetId, Junction}, v3::Fungibility};
 
 pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
@@ -109,6 +111,7 @@ use governance::{
 	old::CouncilCollective, pallet_custom_origins, AuctionAdmin, FellowshipAdmin, GeneralAdmin,
 	LeaseAdmin, StakingAdmin, Treasurer, TreasurySpender,
 };
+use xcm_builder::{HasDestination, PayOverXcm};
 
 pub mod xcm_config;
 
@@ -657,10 +660,74 @@ parameter_types! {
 	pub const MaxPeerDataEncodingSize: u32 = 1_000;
 	pub const RootSpendOriginMaxAmount: Balance = Balance::MAX;
 	pub const CouncilSpendOriginMaxAmount: Balance = Balance::MAX;
+	// PayOverXcmTimeout is set to 3 x the spend period to provide buffer before status messages
+	// are deleted from storage
+	pub const PayOverXcmTimeout: BlockNumber = 6 * 3 * DAYS;
 }
 
+ord_parameter_types! {
+	pub const TreasuryAccountId: AccountId = AccountIdConversion::<AccountId>::into_account_truncating(&TreasuryPalletId::get());
+}
+
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+pub struct AssetKind<AssetId> {
+	destination: xcm::latest::MultiLocation,
+	asset_id: AssetId,
+	amount: Fungibility,
+}
+
+impl From<AssetKind<AssetId>> for xcm::latest::AssetId {
+	fn from(item: AssetKind<AssetId>) -> Self {
+		item.asset_id
+	}
+}
+
+impl HasDestination for AssetKind<AssetId> {
+	fn destination(&self) -> xcm::latest::MultiLocation {
+		self.destination
+	}
+}
+
+impl pallet_treasury::Asset<AssetKind<xcm::v3::AssetId>, xcm::v3::Fungibility>
+	for AssetKind<AssetId>
+{
+	fn asset_kind(&self) -> Self {
+		*self
+	}
+	fn amount(&self) -> xcm::v3::Fungibility {
+		self.amount
+	}
+}
+
+pub struct FungibleBalanceConverter;
+impl<AssetId, OutBalance: core::convert::From<u128>>
+	ConversionFromAssetBalance<Fungibility, AssetId, OutBalance> for FungibleBalanceConverter
+{
+	type Error = ();
+	fn from_asset_balance(
+		balance: Fungibility,
+		_asset_id: AssetId,
+	) -> Result<OutBalance, Self::Error> {
+		match balance {
+			Fungibility::Fungible(b) => Ok(b.into()),
+			Fungibility::NonFungible(_) => Ok(0.into()),
+		}
+	}
+}
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
+	type AssetId = AssetKind<AssetId>;
+	type AssetKind = AssetKind<AssetId>;
+	// type AssetKind = MultiAsset;
+	type Paymaster = PayOverXcm<
+		TreasuryAccountId,
+		xcm_config::XcmRouter,
+		XcmPallet,
+		PayOverXcmTimeout,
+		Self::AccountId,
+		Self::AssetKind,
+	>;
+	type BalanceConverter = FungibleBalanceConverter;
 	type Currency = Balances;
 	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
 	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
@@ -676,6 +743,9 @@ impl pallet_treasury::Config for Runtime {
 	type MaxApprovals = MaxApprovals;
 	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
 	type SpendOrigin = TreasurySpender;
+	type MaxPaymentRetries = ConstU32<5>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = runtime_common::impls::JunctionsBenchmarkHelper;
 }
 
 parameter_types! {