moondance-labs · tmpolaczyk · Mar 22, 2024 · Feb 29, 2024 · Mar 13, 2024 · Mar 13, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
 	"primitives/*",
 	"runtime/dancebox",
 	"runtime/flashbox",
+	"runtime/relay-encoder",
 ]
 resolver = "2"
 
@@ -61,6 +62,7 @@ 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 }
 pallet-stream-payment = { path = "pallets/stream-payment", default-features = false }
+pallet-xcm-core-buyer = { path = "pallets/xcm-core-buyer", default-features = false }
 
 container-chain-template-frontier-runtime = { path = "container-chains/templates/frontier/runtime", default-features = false }
 container-chain-template-simple-runtime = { path = "container-chains/templates/simple/runtime", default-features = false }
@@ -70,6 +72,7 @@ flashbox-runtime = { path = "runtime/flashbox", default-features = false }
 manual-xcm-rpc = { path = "client/manual-xcm" }
 node-common = { path = "client/node-common" }
 runtime-common = { path = "runtime/common", default-features = false }
+tanssi-relay-encoder = { path = "runtime/relay-encoder", default-features = false }
 tc-consensus = { path = "client/consensus" }
 tp-author-noting-inherent = { path = "primitives/author-noting-inherent", default-features = false }
 tp-container-chain-genesis-data = { path = "primitives/container-chain-genesis-data", default-features = false }
@@ -211,6 +214,8 @@ polkadot-node-primitives = { git = "https://github.com/moondance-labs/polkadot-s
 polkadot-parachain-primitives = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
 polkadot-runtime-common = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
 polkadot-runtime-parachains = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
+rococo-runtime = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
+rococo-runtime-constants = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
 staging-xcm = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
 staging-xcm-builder = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }
 staging-xcm-executor = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.6.0", default-features = false }

diff --git a/pallets/data-preservers/src/lib.rs b/pallets/data-preservers/src/lib.rs
@@ -89,7 +89,7 @@ pub mod pallet {
     /// Data preservers pallet.
     #[pallet::pallet]
     #[pallet::without_storage_info]
-    pub struct Pallet<T>(core::marker::PhantomData<T>);
+    pub struct Pallet<T>(PhantomData<T>);
 
     #[pallet::config]
     pub trait Config: frame_system::Config {

diff --git a/pallets/inflation-rewards/src/lib.rs b/pallets/inflation-rewards/src/lib.rs
@@ -57,7 +57,7 @@ pub mod pallet {
     /// Inflation rewards pallet.
     #[pallet::pallet]
     #[pallet::without_storage_info]
-    pub struct Pallet<T>(core::marker::PhantomData<T>);
+    pub struct Pallet<T>(PhantomData<T>);
 
     #[pallet::hooks]
     impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {

diff --git a/pallets/services-payment/src/lib.rs b/pallets/services-payment/src/lib.rs
@@ -14,20 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-//! # Author Noting Pallet
-//!
-//! This pallet notes the author of the different containerChains that have registered:
-//!
-//! The set of container chains is retrieved thanks to the GetContainerChains trait
-//! For each containerChain, we inspect the Header stored in the relayChain as
-//! a generic header. This is the first requirement for containerChains.
-//!
-//! The second requirement is that an Aura digest with the slot number for the containerChains
-//! needs to exist
-//!  
-//! 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.
-
 //! # Services Payment pallet
 //!
 //! This pallet allows for block creation services to be paid for by a

diff --git a/pallets/services-payment/src/mock.rs b/pallets/services-payment/src/mock.rs
@@ -14,20 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-//! # Author Noting Pallet
-//!
-//! This pallet notes the author of the different containerChains that have registered:
-//!
-//! The set of container chains is retrieved thanks to the GetContainerChains trait
-//! For each containerChain, we inspect the Header stored in the relayChain as
-//! a generic header. This is the first requirement for containerChains.
-//!
-//! The second requirement is that an Aura digest with the slot number for the containerChains
-//! needs to exist
-//!  
-//! 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 {
     crate::{
         self as pallet_services_payment, ProvideBlockProductionCost, ProvideCollatorAssignmentCost,

diff --git a/pallets/services-payment/src/tests.rs b/pallets/services-payment/src/tests.rs
@@ -14,20 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
-//! # Author Noting Pallet
-//!
-//! This pallet notes the author of the different containerChains that have registered:
-//!
-//! The set of container chains is retrieved thanks to the GetContainerChains trait
-//! For each containerChain, we inspect the Header stored in the relayChain as
-//! a generic header. This is the first requirement for containerChains.
-//!
-//! The second requirement is that an Aura digest with the slot number for the containerChains
-//! needs to exist
-//!  
-//! 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 {
     crate::{
         mock::*, pallet as pallet_services_payment, BlockProductionCredits,

diff --git a/pallets/xcm-core-buyer/Cargo.toml b/pallets/xcm-core-buyer/Cargo.toml
@@ -0,0 +1,81 @@
+[package]
+name = "pallet-xcm-core-buyer"
+authors = { workspace = true }
+description = "Allows collators to buy parathread cores on demand"
+edition = "2021"
+license = "GPL-3.0-only"
+version = "0.1.0"
+
+[package.metadata.docs.rs]
+targets = [ "x86_64-unknown-linux-gnu" ]
+
+[dependencies]
+
+dp-core = { workspace = true }
+log = { workspace = true }
+serde = { workspace = true, optional = true }
+tp-traits = { workspace = true }
+
+# Polkadot
+staging-xcm = { workspace = true }
+
+# Substrate
+frame-benchmarking = { workspace = true, optional = true }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+parity-scale-codec = { workspace = true }
+scale-info = { workspace = true }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
+
+# Nimbus
+nimbus-primitives = { workspace = true }
+
+[dev-dependencies]
+bounded-collections = { workspace = true }
+num-traits = { workspace = true }
+pallet-balances = { workspace = true, features = [ "std" ] }
+similar-asserts = { workspace = true }
+sp-io = { workspace = true, features = [ "std" ] }
+
+[features]
+default = [ "std" ]
+std = [
+	"bounded-collections/std",
+	"dp-core/std",
+	"frame-benchmarking/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"nimbus-primitives/std",
+	"pallet-balances/std",
+	"parity-scale-codec/std",
+	"scale-info/std",
+	"serde",
+	"serde?/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"staging-xcm/std",
+	"tp-traits/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"nimbus-primitives/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"tp-traits/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"nimbus-primitives/try-runtime",
+	"pallet-balances/try-runtime",
+	"sp-runtime/try-runtime",
+]
diff --git a/pallets/xcm-core-buyer/src/benchmarks.rs b/pallets/xcm-core-buyer/src/benchmarks.rs
@@ -0,0 +1,100 @@
+// Copyright (C) Moondance Labs Ltd.
+// This file is part of Tanssi.
+
+// Tanssi 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.
+
+// Tanssi 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 Tanssi.  If not, see <http://www.gnu.org/licenses/>
+
+#![cfg(feature = "runtime-benchmarks")]
+
+//! Benchmarking
+use {
+    crate::{
+        Call, Config, GetParathreadCollators, GetParathreadParams, InFlightOrders, Pallet,
+        RelayXcmWeightConfig, RelayXcmWeightConfigInner,
+    },
+    core::marker::PhantomData,
+    frame_benchmarking::{account, v2::*},
+    frame_support::{assert_ok, pallet_prelude::Weight, BoundedBTreeSet},
+    frame_system::RawOrigin,
+    sp_std::{collections::btree_set::BTreeSet, vec},
+    tp_traits::{ParaId, ParathreadParams, SlotFrequency},
+};
+
+pub const BUY_EXECUTION_COST: u128 = 50_000_000;
+pub const PLACE_ORDER_WEIGHT_AT_MOST: Weight = Weight::from_parts(1_000_000_000, 100_000);
+
+#[benchmarks]
+mod benchmarks {
+    use super::*;
+
+    #[benchmark]
+    fn force_buy_core(x: Linear<1, 99>) {
+        assert_ok!(Pallet::<T>::set_relay_xcm_weight_config(
+            RawOrigin::Root.into(),
+            Some(RelayXcmWeightConfigInner {
+                buy_execution_cost: BUY_EXECUTION_COST,
+                weight_at_most: PLACE_ORDER_WEIGHT_AT_MOST,
+                _phantom: PhantomData,
+            }),
+        ));
+
+        let para_id = ParaId::from(x + 1);
+        assert_eq!(InFlightOrders::<T>::get(), BTreeSet::new());
+
+        // Mock `x` xcm messages already sent in this block
+        let bbs: BoundedBTreeSet<ParaId, _> = BTreeSet::from_iter((0..x).map(ParaId::from))
+            .try_into()
+            .expect("x is greater than MaxParathreads");
+        InFlightOrders::<T>::put(bbs);
+        assert!(!InFlightOrders::<T>::get().contains(&para_id));
+
+        // For the extrinsic to succeed, we need to ensure that:
+        // * the para_id is a parathread
+        // * it has assigned collators
+        T::GetParathreadParams::set_parathread_params(
+            para_id,
+            Some(ParathreadParams {
+                slot_frequency: SlotFrequency { min: 10, max: 10 },
+            }),
+        );
+        let author: T::AccountId = account("account id", 0u32, 0u32);
+        T::GetAssignedCollators::set_parathread_collators(para_id, vec![author]);
+
+        #[extrinsic_call]
+        Pallet::<T>::force_buy_core(RawOrigin::Root, para_id);
+
+        assert!(InFlightOrders::<T>::get().contains(&para_id));
+    }
+
+    #[benchmark]
+    fn set_relay_xcm_weight_config() {
+        let xcm_weights = RelayXcmWeightConfigInner {
+            buy_execution_cost: BUY_EXECUTION_COST,
+            weight_at_most: PLACE_ORDER_WEIGHT_AT_MOST,
+            _phantom: PhantomData,
+        };
+
+        #[extrinsic_call]
+        Pallet::<T>::set_relay_xcm_weight_config(RawOrigin::Root, Some(xcm_weights.clone()));
+
+        assert_eq!(RelayXcmWeightConfig::<T>::get(), Some(xcm_weights));
+    }
+
+    #[benchmark]
+    fn set_relay_chain() {
+        #[extrinsic_call]
+        Pallet::<T>::set_relay_chain(RawOrigin::Root, Some(T::RelayChain::default()));
+    }
+
+    impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
+}