USDT transaction payment

Cargo.toml

@@ -158,7 +158,6 @@ pallet-assets = { version = "36.0.0", default-features = false }
 pallet-authorship = { version = "35.0.0", default-features = false }
 pallet-session = { version = "35.0.0", default-features = false }
 pallet-timestamp = { version = "34.0.0", default-features = false }
-pallet-asset-tx-payment = { version = "35.0.0", default-features = false }
 pallet-collective = { version = "35.0.0", default-features = false }
 pallet-scheduler = { version = "36.0.0", default-features = false }
 pallet-sudo = { version = "35.0.0", default-features = false }
@@ -175,6 +174,7 @@ pallet-vesting = { version = "35.0.0", default-features = false }
 pallet-staking = { version = "35.0.0", default-features = false }
 pallet-proxy = { version = "35.0.0", default-features = false }
 pallet-identity = { version = "35.0.0", default-features = false }
+pallet-asset-tx-payment = { version = "35.0.0", default-features = false }
 
 # Polkadot (with default disabled)
 pallet-xcm = { version = "14.0.0", default-features = false }

integration-tests/src/tests/mod.rs

@@ -22,5 +22,6 @@ mod evaluator_slash_sideffects;
 mod governance;
 mod oracle;
 mod reserve_backed_transfers;
+mod transaction_payment;
 mod vest;
 mod xcm_config;

integration-tests/src/tests/transaction_payment.rs

@@ -0,0 +1,4 @@
+#[test]
+fn fee_paid_with_foreign_assets() {
+	todo!();
+}

pallets/funding/Cargo.toml

@@ -77,6 +77,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-insecure-randomness-collective-flip/std",
 	"pallet-linear-release/std",
+	"pallet-proxy-bonding/std",
 	"pallet-timestamp/std",
 	"pallet-xcm/std",
 	"parachains-common/std",
@@ -96,7 +97,6 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
-	"pallet-proxy-bonding/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
@@ -107,6 +107,7 @@ runtime-benchmarks = [
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-linear-release/runtime-benchmarks",
+	"pallet-proxy-bonding/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
@@ -117,7 +118,6 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"pallet-proxy-bonding/runtime-benchmarks"
 ]
 try-runtime = [
 	"frame-support/try-runtime",
@@ -126,11 +126,11 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-insecure-randomness-collective-flip/try-runtime",
 	"pallet-linear-release/try-runtime",
+	"pallet-proxy-bonding/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-xcm/try-runtime",
 	"polimec-common-test-utils?/try-runtime",
 	"polimec-common/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-proxy-bonding/try-runtime"
 ]
 on-chain-release-build = []

pallets/proxy-bonding/Cargo.toml

@@ -31,41 +31,41 @@ pallet-assets.workspace = true
 
 
 [features]
-default = ["std"]
+default = [ "std" ]
 
 std = [
-	"frame-system/std",
+	"frame-benchmarking?/std",
 	"frame-support/std",
-	"sp-runtime/std",
-	"polimec-common/std",
+	"frame-system/std",
+	"pallet-assets/std",
+	"pallet-balances/std",
+	"pallet-linear-release/std",
 	"parity-scale-codec/std",
+	"polimec-common/std",
 	"scale-info/std",
-	"frame-benchmarking?/std",
-
+	"serde/std",
+	"sp-core/std",
 	"sp-io/std",
-	"pallet-linear-release/std",
-	"pallet-balances/std",
-	"pallet-assets/std",
-	"serde/std"
+	"sp-runtime/std",
 ]
 
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
-	"sp-runtime/try-runtime",
-	"polimec-common/try-runtime",
-	"pallet-linear-release/try-runtime",
 	"pallet-assets/try-runtime",
-	"pallet-balances/try-runtime"
+	"pallet-balances/try-runtime",
+	"pallet-linear-release/try-runtime",
+	"polimec-common/try-runtime",
+	"sp-runtime/try-runtime",
 ]
 
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
-	"polimec-common/runtime-benchmarks",
-	"pallet-linear-release/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
-	"pallet-balances/runtime-benchmarks"
+	"pallet-balances/runtime-benchmarks",
+	"pallet-linear-release/runtime-benchmarks",
+	"polimec-common/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]

runtimes/polimec/Cargo.toml

@@ -83,6 +83,7 @@ sp-transaction-pool.workspace = true
 sp-version.workspace = true
 sp-genesis-builder.workspace = true
 frame-metadata-hash-extension.workspace = true
+pallet-asset-tx-payment.workspace = true
 
 # Polkadot
 pallet-xcm.workspace = true
@@ -135,6 +136,7 @@ std = [
 	"log/std",
 	"on-slash-vesting/std",
 	"orml-oracle/std",
+	"pallet-asset-tx-payment/std",
 	"pallet-assets/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
@@ -153,6 +155,7 @@ std = [
 	"pallet-oracle-ocw/std",
 	"pallet-parachain-staking/std",
 	"pallet-preimage/std",
+	"pallet-proxy-bonding/std",
 	"pallet-proxy/std",
 	"pallet-scheduler/std",
 	"pallet-session/std",
@@ -175,7 +178,7 @@ std = [
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
 	"sp-core/std",
-#	"sp-debug-derive/std",
+	#	"sp-debug-derive/std",
 	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
@@ -188,7 +191,6 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
-	"pallet-proxy-bonding/std"
 ]
 
 runtime-benchmarks = [
@@ -219,6 +221,7 @@ runtime-benchmarks = [
 	"pallet-oracle-ocw/runtime-benchmarks",
 	"pallet-parachain-staking/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
+	"pallet-proxy-bonding/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
@@ -234,7 +237,6 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
-	"pallet-proxy-bonding/runtime-benchmarks"
 ]
 
 try-runtime = [
@@ -247,6 +249,7 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
 	"orml-oracle/try-runtime",
+	"pallet-asset-tx-payment/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-authorship/try-runtime",
@@ -265,6 +268,7 @@ try-runtime = [
 	"pallet-oracle-ocw/try-runtime",
 	"pallet-parachain-staking/try-runtime",
 	"pallet-preimage/try-runtime",
+	"pallet-proxy-bonding/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-scheduler/try-runtime",
 	"pallet-session/try-runtime",
@@ -279,7 +283,6 @@ try-runtime = [
 	"polkadot-runtime-common/try-runtime",
 	"shared-configuration/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-proxy-bonding/try-runtime"
 ]
 
 # A feature that should be enabled when the runtime should be built for on-chain

runtimes/polimec/src/lib.rs

@@ -26,10 +26,12 @@ use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	construct_runtime,
 	genesis_builder_helper::{build_state, get_preset},
+	instances::Instance1,
 	ord_parameter_types, parameter_types,
 	traits::{
 		fungible::{Credit, HoldConsideration, Inspect},
-		tokens::{self, PayFromAccount, UnityAssetBalanceConversion},
+		fungibles,
+		tokens::{self, ConversionToAssetBalance, PayFromAccount, UnityAssetBalanceConversion},
 		AsEnsureOriginWithArg, ConstU32, Contains, EitherOfDiverse, InstanceFilter, LinearStoragePrice, PrivilegeCmp,
 		TransformOrigin,
 	},
@@ -41,9 +43,10 @@ use pallet_aura::Authorities;
 use pallet_democracy::GetElectorate;
 use pallet_funding::{
 	runtime_api::ProjectParticipationIds, types::AcceptedFundingAsset, BidInfoOf, ContributionInfoOf, DaysToBlocks,
-	EvaluationInfoOf, ProjectDetailsOf, ProjectId, ProjectMetadataOf,
+	EvaluationInfoOf, PriceProviderOf, ProjectDetailsOf, ProjectId, ProjectMetadataOf,
 };
 use parachains_common::{
+	impls::AssetsToBlockAuthor,
 	message_queue::{NarrowOriginToSibling, ParaIdToSibling},
 	AssetIdForTrustBackedAssets as AssetId,
 };
@@ -60,7 +63,7 @@ use sp_runtime::{
 		IdentifyAccount, IdentityLookup, OpaqueKeys, Verify,
 	},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, FixedU128, MultiSignature, SaturatedConversion,
+	ApplyExtrinsicResult, FixedPointNumber, FixedU128, MultiSignature, SaturatedConversion,
 };
 use sp_std::{cmp::Ordering, prelude::*};
 use sp_version::RuntimeVersion;
@@ -87,10 +90,13 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 use sp_version::NativeVersion;
 
 use crate::xcm_config::PriceForSiblingParachainDelivery;
-use polimec_common::USD_UNIT;
+use polimec_common::{ProvideAssetPrice, USD_UNIT};
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
-
+use sp_runtime::{
+	traits::{DispatchInfoOf, PostDispatchInfoOf},
+	transaction_validity::{InvalidTransaction, TransactionValidityError},
+};
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmark_helpers;
 mod custom_migrations;
@@ -1154,6 +1160,34 @@ impl pallet_dispenser::Config for Runtime {
 	type WhitelistedPolicy = DispenserWhitelistedPolicy;
 }
 
+pub struct PLMCToFundingAssetBalance;
+impl ConversionToAssetBalance<Balance, AssetId, Balance> for PLMCToFundingAssetBalance {
+	type Error = InvalidTransaction;
+
+	fn to_asset_balance(plmc_balance: Balance, asset_id: AssetId) -> Result<Balance, Self::Error> {
+		let plmc_price =
+			<PriceProviderOf<Runtime>>::get_decimals_aware_price(PLMC_FOREIGN_ID, USD_DECIMALS, PLMC_DECIMALS)
+				.ok_or(InvalidTransaction::Payment)?;
+		let funding_asset_decimals = <ForeignAssets as fungibles::metadata::Inspect<AccountId>>::decimals(asset_id);
+		let funding_asset_price =
+			<PriceProviderOf<Runtime>>::get_decimals_aware_price(asset_id, USD_DECIMALS, funding_asset_decimals)
+				.ok_or(InvalidTransaction::Payment)?;
+		let usd_balance = plmc_price.saturating_mul_int(plmc_balance);
+		let funding_asset_balance =
+			funding_asset_price.reciprocal().ok_or(InvalidTransaction::Payment)?.saturating_mul_int(usd_balance);
+		Ok(funding_asset_balance)
+	}
+}
+impl pallet_asset_tx_payment::Config for Runtime {
+	type Fungibles = ForeignAssets;
+	type OnChargeAssetTransaction = TxFeeFungiblesAdapter<
+		PLMCToFundingAssetBalance,
+		CreditFungiblesToAccount<AccountId, ForeignAssets, BlockchainOperationTreasury>,
+		AssetsToBlockAuthor<Runtime, ForeignAssetsInstance>,
+	>;
+	type RuntimeEvent = RuntimeEvent;
+}
+
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
 	pub enum Runtime
@@ -1176,6 +1210,7 @@ construct_runtime!(
 		ContributionTokens: pallet_assets::<Instance1> = 13,
 		ForeignAssets: pallet_assets::<Instance2> = 14,
 		Dispenser: pallet_dispenser = 15,
+		AssetTransactionPayment: pallet_asset_tx_payment = 16,
 
 		// Collator support. the order of these 5 are important and shall not change.
 		Authorship: pallet_authorship::{Pallet, Storage} = 20,

runtimes/shared-configuration/Cargo.toml

@@ -40,6 +40,7 @@ pallet-authorship.workspace = true
 pallet-parachain-staking.workspace = true
 pallet-oracle-ocw.workspace = true
 pallet-treasury = {workspace = true, optional = true}
+pallet-asset-tx-payment.workspace = true
 
 [features]
 default = [ "std" ]