Broker: sale price runtime api

cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs

@@ -64,7 +64,7 @@ use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::Block as BlockT,
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, MultiAddress, Perbill,
+	ApplyExtrinsicResult, DispatchError, MultiAddress, Perbill,
 };
 use sp_std::prelude::*;
 #[cfg(feature = "std")]
@@ -591,6 +591,12 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl pallet_broker::runtime_api::BrokerApi<Block, Balance> for Runtime {
+		fn sale_price() -> Result<Balance, DispatchError> {
+			Broker::api_sale_price()
+		}
+	}
+
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
 		fn query_info(
 			uxt: <Block as BlockT>::Extrinsic,

cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs

@@ -64,7 +64,7 @@ use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::Block as BlockT,
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, MultiAddress, Perbill,
+	ApplyExtrinsicResult, DispatchError, MultiAddress, Perbill,
 };
 use sp_std::prelude::*;
 #[cfg(feature = "std")]
@@ -582,6 +582,12 @@ impl_runtime_apis! {
 		}
 	}
 
+	impl pallet_broker::runtime_api::BrokerApi<Block, Balance> for Runtime {
+		fn sale_price() -> Result<Balance, DispatchError> {
+			Broker::api_sale_price()
+		}
+	}
+
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
 		fn query_info(
 			uxt: <Block as BlockT>::Extrinsic,

prdoc/pr_3485.prdoc

@@ -0,0 +1,20 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "Broker: sale price runtime api"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      Defines a runtime api for `pallet-broker` for getting the current price 
+      of a core in the ongoing sale.
+
+  - audience: Runtime User
+    description: |
+      Defines a runtime api for `pallet-broker` for getting the current price 
+      of a core in the ongoing sale.
+
+crates:
+  - name: pallet-broker
+  - name: coretime-rococo-runtime
+  - name: coretime-westend-runtime

substrate/frame/broker/Cargo.toml

@@ -18,6 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 bitvec = { version = "1.0.0", default-features = false }
+sp-api = { path = "../../primitives/api", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false }
 sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false }
 sp-core = { path = "../../primitives/core", default-features = false }
@@ -39,6 +40,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"scale-info/std",
+	"sp-api/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
 	"sp-io/std",

substrate/frame/broker/src/dispatchable_impls.rs

@@ -105,8 +105,8 @@ impl<T: Config> Pallet<T> {
 	) -> Result<RegionId, DispatchError> {
 		let status = Status::<T>::get().ok_or(Error::<T>::Uninitialized)?;
 		let mut sale = SaleInfo::<T>::get().ok_or(Error::<T>::NoSales)?;
-		ensure!(sale.first_core < status.core_count, Error::<T>::Unavailable);
-		ensure!(sale.cores_sold < sale.cores_offered, Error::<T>::SoldOut);
+		Self::ensure_core_availability(&status, &sale)?;
+
 		let now = frame_system::Pallet::<T>::block_number();
 		ensure!(now > sale.sale_start, Error::<T>::TooEarly);
 		let price = Self::sale_price(&sale, now);
@@ -131,8 +131,7 @@ impl<T: Config> Pallet<T> {
 		let config = Configuration::<T>::get().ok_or(Error::<T>::Uninitialized)?;
 		let status = Status::<T>::get().ok_or(Error::<T>::Uninitialized)?;
 		let mut sale = SaleInfo::<T>::get().ok_or(Error::<T>::NoSales)?;
-		ensure!(sale.first_core < status.core_count, Error::<T>::Unavailable);
-		ensure!(sale.cores_sold < sale.cores_offered, Error::<T>::SoldOut);
+		Self::ensure_core_availability(&status, &sale)?;
 
 		let renewal_id = AllowedRenewalId { core, when: sale.region_begin };
 		let record = AllowedRenewals::<T>::get(renewal_id).ok_or(Error::<T>::NotAllowed)?;
@@ -438,6 +437,7 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
+
 	pub(crate) fn do_swap_leases(id: TaskId, other: TaskId) -> DispatchResult {
 		let mut id_leases_count = 0;
 		let mut other_leases_count = 0;
@@ -455,4 +455,25 @@ impl<T: Config> Pallet<T> {
 
 		Ok(())
 	}
+
+  pub(crate) fn ensure_core_availability(
+		status: &StatusRecord,
+		sale: &SaleInfoRecordOf<T>,
+	) -> Result<(), DispatchError> {
+		ensure!(sale.first_core < status.core_count, Error::<T>::Unavailable);
+		ensure!(sale.cores_sold < sale.cores_offered, Error::<T>::SoldOut);
+
+		Ok(())
+	}
+
+	/// If there is an ongoing sale returns the current price of a core.
+	pub fn api_sale_price() -> Result<BalanceOf<T>, DispatchError> {
+		let status = Status::<T>::get().ok_or(Error::<T>::Uninitialized)?;
+		let sale = SaleInfo::<T>::get().ok_or(Error::<T>::NoSales)?;
+
+		Self::ensure_core_availability(&status, &sale)?;
+
+		let now = frame_system::Pallet::<T>::block_number();
+		Ok(Self::sale_price(&sale, now))
+	}
 }

substrate/frame/broker/src/lib.rs

@@ -36,6 +36,8 @@ mod tick_impls;
 mod types;
 mod utility_impls;
 
+pub mod runtime_api;
+
 pub mod weights;
 pub use weights::WeightInfo;
 
@@ -132,7 +134,7 @@ pub mod pallet {
 	pub type AllowedRenewals<T> =
 		StorageMap<_, Twox64Concat, AllowedRenewalId, AllowedRenewalRecordOf<T>, OptionQuery>;
 
-	/// The current (unassigned) Regions.
+	/// The current (unassigned or provisionally assigend) Regions.
 	#[pallet::storage]
 	pub type Regions<T> = StorageMap<_, Blake2_128Concat, RegionId, RegionRecordOf<T>, OptionQuery>;
 

substrate/frame/broker/src/runtime_api.rs

@@ -0,0 +1,31 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Runtime API definition for the FRAME Broker pallet.
+
+use codec::Codec;
+use sp_runtime::DispatchError;
+
+sp_api::decl_runtime_apis! {
+	pub trait BrokerApi<Balance>
+	where
+		Balance: Codec
+	{
+		/// If there is an ongoing sale returns the current price of a core.
+		fn sale_price() -> Result<Balance, DispatchError>;
+	}
+}