Add pallet services payment to runtime

Cargo.toml

@@ -35,6 +35,7 @@ pallet-invulnerables = { path = "pallets/invulnerables", default-features = fals
 pallet-pooled-staking = { path = "pallets/pooled-staking", default-features = false }
 pallet-registrar = { path = "pallets/registrar", default-features = false }
 pallet-registrar-runtime-api = { path = "pallets/registrar/rpc/runtime-api", default-features = false }
+pallet-services-payment = { path = "pallets/services-payment", default-features = false }
 
 ccp-authorities-noting-inherent = { path = "container-chains/primitives/authorities-noting-inherent", default-features = false }
 ccp-xcm = { path = "container-chains/primitives/xcm", default-features = false }

node/src/chain_spec.rs

@@ -359,6 +359,7 @@ fn testnet_genesis(
         // This should initialize it to whatever we have set in the pallet
         polkadot_xcm: PolkadotXcmConfig::default(),
         transaction_payment: Default::default(),
+        services_payment: Default::default(),
     }
 }
 

pallets/services-payment/Cargo.toml

@@ -15,10 +15,9 @@ log = { workspace = true }
 parity-scale-codec = { workspace = true, features = [ "derive", "max-encoded-len" ] }
 scale-info = { workspace = true }
 serde = { workspace = true, optional = true, features = [ "derive" ] }
-
 sp-runtime = { workspace = true }
-
 cumulus-primitives-core = { workspace = true }
+tp-traits = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true }
@@ -36,3 +35,4 @@ std = [
 	"sp-runtime/std",
 ]
 try-runtime = [ "frame-support/try-runtime" ]
+runtime-benchmarks = []

pallets/services-payment/src/lib.rs

@@ -43,6 +43,7 @@ use {
         traits::Currency,
     },
     frame_system::pallet_prelude::*,
+    tp_traits::{AuthorNotingHook, BlockNumber},
 };
 
 #[cfg(test)]
@@ -184,7 +185,6 @@ pub mod pallet {
         _phantom: PhantomData<T>,
     }
 
-    #[cfg(feature = "std")]
     impl<T: Config> Default for GenesisConfig<T> {
         fn default() -> Self {
             Self {
@@ -219,3 +219,28 @@ pub trait OnChargeForBlockCredit<T: Config> {
 pub trait ProvideBlockProductionCost<T: Config> {
     fn block_cost(para_id: &ParaId) -> (BalanceOf<T>, Weight);
 }
+
+// This function should only be used to **reward** a container author.
+// There will be no additional check other than checking if we have already
+// rewarded this author for **in this tanssi block**
+// Any additional check should be done in the calling function
+// TODO: consider passing a vector here
+impl<T: Config> AuthorNotingHook<T::AccountId> for Pallet<T> {
+    fn on_container_author_noted(
+        _author: &T::AccountId,
+        _block_number: BlockNumber,
+        para_id: ParaId,
+    ) -> Weight {
+        let total_weight = T::DbWeight::get().reads_writes(1, 1);
+
+        if let Err(e) = Pallet::<T>::burn_credit_for_para(&para_id) {
+            log::warn!(
+                "Failed to burn credits for container chain {}: {:?}",
+                u32::from(para_id),
+                e
+            );
+        }
+
+        total_weight
+    }
+}

pallets/services-payment/src/mock.rs

@@ -28,15 +28,15 @@
 //! Using those two requirements we can select who the author was based on the collators assigned
 //! to that containerChain, by simply assigning the slot position.
 
-use frame_support::traits::{Currency, WithdrawReasons};
-
 use {
-    crate::{self as payment_services_pallet, OnChargeForBlockCredit, ProvideBlockProductionCost},
+    crate::{self as pallet_services_payment, OnChargeForBlockCredit, ProvideBlockProductionCost},
     cumulus_primitives_core::ParaId,
     frame_support::{
         pallet_prelude::*,
         parameter_types,
-        traits::{tokens::ExistenceRequirement, ConstU32, ConstU64, Everything},
+        traits::{
+            tokens::ExistenceRequirement, ConstU32, ConstU64, Currency, Everything, WithdrawReasons,
+        },
     },
     sp_core::H256,
     sp_runtime::{
@@ -54,7 +54,7 @@ frame_support::construct_runtime!(
     {
         System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
         Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-        PaymentServices: payment_services_pallet::{Pallet, Call, Config<T>, Storage, Event<T>}
+        PaymentServices: pallet_services_payment::{Pallet, Call, Config<T>, Storage, Event<T>}
     }
 );
 
@@ -108,7 +108,7 @@ parameter_types! {
     pub const MaxCreditsStored: u64 = 5;
 }
 
-impl payment_services_pallet::Config for Test {
+impl pallet_services_payment::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type OnChargeForBlockCredit = ChargeForBlockCredit<Test>;
     type Currency = Balances;
@@ -123,7 +123,7 @@ impl OnChargeForBlockCredit<Test> for ChargeForBlockCredit<Test> {
         _para_id: &ParaId,
         _credits: u64,
         fee: u128,
-    ) -> Result<(), payment_services_pallet::Error<Test>> {
+    ) -> Result<(), pallet_services_payment::Error<Test>> {
         use frame_support::traits::tokens::imbalance::Imbalance;
 
         let result = Balances::withdraw(
@@ -133,7 +133,7 @@ impl OnChargeForBlockCredit<Test> for ChargeForBlockCredit<Test> {
             ExistenceRequirement::AllowDeath,
         );
         let imbalance = result
-            .map_err(|_| payment_services_pallet::Error::InsufficientFundsToPurchaseCredits)?;
+            .map_err(|_| pallet_services_payment::Error::InsufficientFundsToPurchaseCredits)?;
 
         if imbalance.peek() != fee {
             panic!("withdrawn balance incorrect");
@@ -178,7 +178,7 @@ impl ExtBuilder {
     }
 }
 
-pub(crate) fn events() -> Vec<payment_services_pallet::Event<Test>> {
+pub(crate) fn events() -> Vec<pallet_services_payment::Event<Test>> {
     System::events()
         .into_iter()
         .map(|r| r.event)

pallets/services-payment/src/tests.rs

@@ -29,7 +29,7 @@
 //! to that containerChain, by simply assigning the slot position.
 
 use {
-    crate::{mock::*, pallet as payment_services_pallet, BlockProductionCredits},
+    crate::{mock::*, pallet as pallet_services_payment, BlockProductionCredits},
     frame_support::{assert_err, assert_ok},
 };
 
@@ -52,7 +52,7 @@ fn purchase_credits_works() {
 
             assert_eq!(
                 events(),
-                vec![payment_services_pallet::Event::CreditsPurchased {
+                vec![pallet_services_payment::Event::CreditsPurchased {
                     para_id: 1.into(),
                     payer: ALICE,
                     fee: 500,
@@ -98,14 +98,14 @@ fn purchase_credits_purchases_zero_when_max_already_stored() {
             assert_eq!(
                 events(),
                 vec![
-                    payment_services_pallet::Event::CreditsPurchased {
+                    pallet_services_payment::Event::CreditsPurchased {
                         para_id,
                         payer: ALICE,
                         fee: 500,
                         credits_purchased: MaxCreditsStored::get(),
                         credits_remaining: MaxCreditsStored::get(),
                     },
-                    payment_services_pallet::Event::CreditsPurchased {
+                    pallet_services_payment::Event::CreditsPurchased {
                         para_id,
                         payer: ALICE,
                         fee: 0,
@@ -156,14 +156,14 @@ fn purchase_credits_purchases_max_possible_when_cant_purchase_all_requested() {
             assert_eq!(
                 events(),
                 vec![
-                    payment_services_pallet::Event::CreditsPurchased {
+                    pallet_services_payment::Event::CreditsPurchased {
                         para_id,
                         payer: ALICE,
                         fee: 100,
                         credits_purchased: amount_purchased,
                         credits_remaining: amount_purchased,
                     },
-                    payment_services_pallet::Event::CreditsPurchased {
+                    pallet_services_payment::Event::CreditsPurchased {
                         para_id,
                         payer: ALICE,
                         fee: 400,
@@ -181,7 +181,7 @@ fn purchase_credits_fails_with_insufficient_balance() {
         // really what we're testing is that purchase_credits fails when OnChargeForBlockCredits does
         assert_err!(
             PaymentServices::purchase_credits(RuntimeOrigin::signed(ALICE), 1.into(), 1, None),
-            payment_services_pallet::Error::<Test>::InsufficientFundsToPurchaseCredits,
+            pallet_services_payment::Error::<Test>::InsufficientFundsToPurchaseCredits,
         );
     });
 }
@@ -191,7 +191,7 @@ fn burn_credit_fails_with_no_credits() {
     ExtBuilder::default().build().execute_with(|| {
         assert_err!(
             PaymentServices::burn_credit_for_para(&1u32.into()),
-            payment_services_pallet::Error::<Test>::InsufficientCredits,
+            pallet_services_payment::Error::<Test>::InsufficientCredits,
         );
     });
 }
@@ -218,7 +218,7 @@ fn burn_credit_works() {
             // now should fail
             assert_err!(
                 PaymentServices::burn_credit_for_para(&para_id),
-                payment_services_pallet::Error::<Test>::InsufficientCredits,
+                pallet_services_payment::Error::<Test>::InsufficientCredits,
             );
         });
 }
@@ -241,7 +241,7 @@ fn burn_credit_fails_for_wrong_para() {
             let wrong_para_id = 2.into();
             assert_err!(
                 PaymentServices::burn_credit_for_para(&wrong_para_id),
-                payment_services_pallet::Error::<Test>::InsufficientCredits,
+                pallet_services_payment::Error::<Test>::InsufficientCredits,
             );
         });
 }
@@ -274,7 +274,7 @@ fn buy_credits_too_expensive_fails() {
                     1u64,
                     Some(FIXED_BLOCK_PRODUCTION_COST - 1),
                 ),
-                payment_services_pallet::Error::<Test>::CreditPriceTooExpensive,
+                pallet_services_payment::Error::<Test>::CreditPriceTooExpensive,
             );
         });
 }

runtime/dancebox/Cargo.toml

@@ -31,6 +31,7 @@ pallet-pooled-staking = { workspace = true }
 pallet-proxy = { workspace = true }
 pallet-registrar = { workspace = true }
 pallet-registrar-runtime-api = { workspace = true }
+pallet-services-payment = { workspace = true }
 tp-core = { workspace = true }
 
 # Moonkit
@@ -154,6 +155,7 @@ std = [
 	"pallet-registrar-runtime-api/std",
 	"pallet-registrar/std",
 	"pallet-session/std",
+	"pallet-services-payment/std",
 	"pallet-sudo/std",
 	"pallet-timestamp/std",
 	"pallet-transaction-payment-rpc-runtime-api/std",
@@ -202,6 +204,7 @@ runtime-benchmarks = [
 	"pallet-invulnerables/runtime-benchmarks",
 	"pallet-pooled-staking/runtime-benchmarks",
 	"pallet-registrar/runtime-benchmarks",
+		"pallet-services-payment/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"pallet-xcm-benchmarks/runtime-benchmarks",
@@ -235,6 +238,7 @@ try-runtime = [
 	"pallet-pooled-staking/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-registrar/try-runtime",
+		"pallet-services-payment/try-runtime",
 	"pallet-root-testing/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",