Skip to content

Commit

Permalink
Broker: sale price runtime api (paritytech#3485)
Browse files Browse the repository at this point in the history
Defines a runtime api for `pallet-broker` for getting the current price
of a core if there is an ongoing sale.

Closes: paritytech#3413

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
  • Loading branch information
2 people authored and dharjeezy committed Apr 9, 2024
1 parent fb1e688 commit e258f74
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 7 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -593,6 +593,12 @@ impl_runtime_apis! {
}
}

impl pallet_broker::runtime_api::BrokerApi<Block, Balance> for Runtime {
fn sale_price() -> Result<Balance, DispatchError> {
Broker::current_price()
}
}

impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
fn query_info(
uxt: <Block as BlockT>::Extrinsic,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -584,6 +584,12 @@ impl_runtime_apis! {
}
}

impl pallet_broker::runtime_api::BrokerApi<Block, Balance> for Runtime {
fn sale_price() -> Result<Balance, DispatchError> {
Broker::current_price()
}
}

impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
fn query_info(
uxt: <Block as BlockT>::Extrinsic,
Expand Down
20 changes: 20 additions & 0 deletions prdoc/pr_3485.prdoc
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions substrate/frame/broker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1", 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 }
Expand All @@ -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",
Expand Down
28 changes: 24 additions & 4 deletions substrate/frame/broker/src/dispatchable_impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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_cores_for_sale(&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);
Expand All @@ -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_cores_for_sale(&status, &sale)?;

let renewal_id = AllowedRenewalId { core, when: sale.region_begin };
let record = AllowedRenewals::<T>::get(renewal_id).ok_or(Error::<T>::NotAllowed)?;
Expand Down Expand Up @@ -456,4 +455,25 @@ impl<T: Config> Pallet<T> {

Ok(())
}

pub(crate) fn ensure_cores_for_sale(
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 current_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_cores_for_sale(&status, &sale)?;

let now = frame_system::Pallet::<T>::block_number();
Ok(Self::sale_price(&sale, now))
}
}
4 changes: 3 additions & 1 deletion substrate/frame/broker/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ mod tick_impls;
mod types;
mod utility_impls;

pub mod runtime_api;

pub mod weights;
pub use weights::WeightInfo;

Expand Down Expand Up @@ -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>;

Expand Down
31 changes: 31 additions & 0 deletions substrate/frame/broker/src/runtime_api.rs
Original file line number Diff line number Diff line change
@@ -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>;
}
}

0 comments on commit e258f74

Please sign in to comment.