Skip to content

Commit

Permalink
refactor: fix application of the core chain-wide parameters; chores
Browse files Browse the repository at this point in the history 
Signed-off-by: 0x009922 <[email protected]>
  • Loading branch information
@0x009922
0x009922 committed Jun 11, 2024
1 parent 280be56 commit d75b536
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 64 deletions.
5 changes: 5 additions & 0 deletions config/src/parameters/actual.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ impl ChainWide {
pub fn pipeline_time(&self) -> Duration {
self.block_time + self.commit_time
}

/// Estimates as `block_time + commit_time / 2`
pub fn consensus_estimation(&self) -> Duration {
self.block_time + (self.commit_time / 2)
}
}

impl Default for ChainWide {
Expand Down
12 changes: 5 additions & 7 deletions core/src/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//! [`Block`]s are organised into a linear sequence over time (also known as the block chain).
use std::error::Error as _;

use iroha_config::parameters::defaults::chain_wide::CONSENSUS_ESTIMATION as DEFAULT_CONSENSUS_ESTIMATION;
use iroha_crypto::{HashOf, KeyPair, MerkleTree, SignatureOf, SignaturesOf};
use iroha_data_model::{
block::*,
Expand Down Expand Up @@ -101,7 +100,7 @@ pub enum SignatureVerificationError {
pub struct BlockBuilder<B>(B);

mod pending {
use std::time::SystemTime;
use std::time::{Duration, SystemTime};

use iroha_data_model::transaction::CommittedTransaction;

Expand Down Expand Up @@ -149,6 +148,7 @@ mod pending {
prev_block_hash: Option<HashOf<SignedBlock>>,
view_change_index: usize,
transactions: &[CommittedTransaction],
consensus_estimation: Duration,
) -> BlockHeader {
BlockHeader {
height: prev_height
Expand All @@ -171,7 +171,7 @@ mod pending {
view_change_index: view_change_index
.try_into()
.expect("INTERNAL BUG: Number of view changes exceeds u32::MAX"),
consensus_estimation_ms: DEFAULT_CONSENSUS_ESTIMATION
consensus_estimation_ms: consensus_estimation
.as_millis()
.try_into()
.expect("INTERNAL BUG: Time should fit into u64"),
Expand Down Expand Up @@ -222,6 +222,7 @@ mod pending {
state.latest_block_hash(),
view_change_index,
&transactions,
state.config.consensus_estimation(),
),
transactions,
commit_topology: self.0.commit_topology.ordered_peers,
Expand Down Expand Up @@ -500,10 +501,7 @@ mod valid {
transactions_hash: None,
timestamp_ms: 0,
view_change_index: 0,
consensus_estimation_ms: DEFAULT_CONSENSUS_ESTIMATION
.as_millis()
.try_into()
.expect("Time should fit into u64"),
consensus_estimation_ms: 4_000,
},
transactions: Vec::new(),
commit_topology: UniqueVec::new(),
Expand Down
21 changes: 11 additions & 10 deletions core/src/smartcontracts/isi/world.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,14 @@ pub mod isi {
let parameter = self.parameter;
let parameter_id = parameter.id.clone();

let world = &mut state_transaction.world;
if !world.parameters.swap_remove(&parameter) {
if !state_transaction.world.parameters.swap_remove(&parameter) {
return Err(FindError::Parameter(parameter_id).into());
}

world.parameters.insert(parameter);

world.emit_events(Some(ConfigurationEvent::Changed(parameter_id)));
state_transaction.world.parameters.insert(parameter.clone());
state_transaction
.world
.emit_events(Some(ConfigurationEvent::Changed(parameter_id)));
state_transaction.try_apply_core_parameter(parameter);

Ok(())
}
Expand All @@ -340,16 +340,17 @@ pub mod isi {
let parameter = self.parameter;
let parameter_id = parameter.id.clone();

let world = &mut state_transaction.world;
if !world.parameters.insert(parameter) {
if !state_transaction.world.parameters.insert(parameter.clone()) {
return Err(RepetitionError {
instruction_type: InstructionType::NewParameter,
id: IdBox::ParameterId(parameter_id),
}
.into());
}

world.emit_events(Some(ConfigurationEvent::Created(parameter_id)));
state_transaction
.world
.emit_events(Some(ConfigurationEvent::Created(parameter_id)));
state_transaction.try_apply_core_parameter(parameter);

Ok(())
}
Expand Down
129 changes: 97 additions & 32 deletions core/src/state.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
//! This module provides the [`State`] — an in-memory representation of the current blockchain state.
use std::{
borrow::Borrow, collections::BTreeSet, marker::PhantomData, num::NonZeroUsize, sync::Arc,
borrow::Borrow,
collections::BTreeSet,
marker::PhantomData,
num::{NonZeroU32, NonZeroUsize},
sync::Arc,
time::Duration,
};

Expand Down Expand Up @@ -1252,7 +1256,6 @@ impl<'state> StateBlock<'state> {

self.block_hashes.push(block_hash);

self.apply_parameters();
self.world.events_buffer.push(
BlockEvent {
header: block.as_ref().header().clone(),
Expand All @@ -1266,20 +1269,18 @@ impl<'state> StateBlock<'state> {

/// Create time event using previous and current blocks
fn create_time_event(&self, block: &CommittedBlock) -> TimeEvent {
use iroha_config::parameters::defaults::chain_wide::CONSENSUS_ESTIMATION as DEFAULT_CONSENSUS_ESTIMATION;

let prev_interval = self.latest_block_ref().map(|latest_block| {
let header = &latest_block.as_ref().header();

TimeInterval {
since: header.timestamp(),
length: DEFAULT_CONSENSUS_ESTIMATION,
length: header.consensus_estimation(),
}
});

let interval = TimeInterval {
since: block.as_ref().header().timestamp(),
length: DEFAULT_CONSENSUS_ESTIMATION,
length: block.as_ref().header().consensus_estimation(),
};

TimeEvent {
Expand Down Expand Up @@ -1336,32 +1337,6 @@ impl<'state> StateBlock<'state> {

errors.is_empty().then_some(()).ok_or(errors)
}

fn apply_parameters(&mut self) {
use iroha_data_model::parameter::default::*;

macro_rules! update_params {
($($param:expr => $config:expr),+ $(,)?) => {
$(if let Some(param) = self.world.query_param($param) {
$config = param;
})+
};
}

update_params! {
WSV_DOMAIN_METADATA_LIMITS => self.config.domain_metadata_limits,
WSV_ASSET_DEFINITION_METADATA_LIMITS => self.config.asset_definition_metadata_limits,
WSV_ACCOUNT_METADATA_LIMITS => self.config.account_metadata_limits,
WSV_ASSET_METADATA_LIMITS => self.config.asset_metadata_limits,
WSV_TRIGGER_METADATA_LIMITS => self.config.trigger_metadata_limits,
WSV_IDENT_LENGTH_LIMITS => self.config.ident_length_limits,
EXECUTOR_FUEL_LIMIT => self.config.executor_runtime.fuel_limit,
EXECUTOR_MAX_MEMORY => self.config.executor_runtime.max_memory_bytes,
WASM_FUEL_LIMIT => self.config.wasm_runtime.fuel_limit,
WASM_MAX_MEMORY => self.config.wasm_runtime.max_memory_bytes,
TRANSACTION_LIMITS => self.config.transaction_limits,
}
}
}

impl StateTransaction<'_, '_> {
Expand All @@ -1373,6 +1348,96 @@ impl StateTransaction<'_, '_> {
self.world.apply();
}

/// If given [`Parameter`] represents some of the core chain-wide
/// parameters ([`Config`]), apply it
pub fn try_apply_core_parameter(&mut self, parameter: Parameter) {
use iroha_data_model::parameter::default::*;

struct Reader(Option<Parameter>);

impl Reader {
fn try_and_then<T: TryFrom<ParameterValueBox>>(
self,
id: &str,
fun: impl FnOnce(T),
) -> Self {
if let Some(param) = self.0 {
if param.id().name().as_ref() == id {
if let Some(value) = param.val.try_into().ok() {
fun(value);
}
Self(None)
} else {
Self(Some(param))
}
} else {
Self(None)
}
}

fn try_and_write<T: TryFrom<ParameterValueBox>>(
self,
id: &str,
destination: &mut T,
) -> Self {
self.try_and_then(id, |value| {
*destination = value;
})
}
}

Reader(Some(parameter))
.try_and_then(MAX_TRANSACTIONS_IN_BLOCK, |value| {
if let Some(checked) = NonZeroU32::new(value) {
self.config.max_transactions_in_block = checked;
}
})
.try_and_then(BLOCK_TIME, |value| {
self.config.block_time = Duration::from_millis(value);
})
.try_and_then(COMMIT_TIME_LIMIT, |value| {
self.config.commit_time = Duration::from_millis(value);
})
.try_and_write(
WSV_DOMAIN_METADATA_LIMITS,
&mut self.config.domain_metadata_limits,
)
.try_and_write(
WSV_ASSET_DEFINITION_METADATA_LIMITS,
&mut self.config.asset_definition_metadata_limits,
)
.try_and_write(
WSV_ACCOUNT_METADATA_LIMITS,
&mut self.config.account_metadata_limits,
)
.try_and_write(
WSV_ASSET_METADATA_LIMITS,
&mut self.config.asset_metadata_limits,
)
.try_and_write(
WSV_TRIGGER_METADATA_LIMITS,
&mut self.config.trigger_metadata_limits,
)
.try_and_write(
WSV_IDENT_LENGTH_LIMITS,
&mut self.config.ident_length_limits,
)
.try_and_write(
EXECUTOR_FUEL_LIMIT,
&mut self.config.executor_runtime.fuel_limit,
)
.try_and_write(
EXECUTOR_MAX_MEMORY,
&mut self.config.executor_runtime.max_memory_bytes,
)
.try_and_write(WASM_FUEL_LIMIT, &mut self.config.wasm_runtime.fuel_limit)
.try_and_write(
WASM_MAX_MEMORY,
&mut self.config.wasm_runtime.max_memory_bytes,
)
.try_and_write(TRANSACTION_LIMITS, &mut self.config.transaction_limits);
}

fn process_executable(&mut self, executable: &Executable, authority: AccountId) -> Result<()> {
match executable {
Executable::Instructions(instructions) => {
Expand Down
17 changes: 3 additions & 14 deletions core/src/sumeragi/main_loop.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,20 +359,9 @@ impl Sumeragi {
}

fn update_params(&mut self, state_block: &StateBlock<'_>) {
use iroha_data_model::parameter::default::*;

if let Some(block_time) = state_block.world.query_param(BLOCK_TIME) {
self.block_time = Duration::from_millis(block_time);
}
if let Some(commit_time) = state_block.world.query_param(COMMIT_TIME_LIMIT) {
self.commit_time = Duration::from_millis(commit_time);
}
if let Some(max_txs_in_block) = state_block
.world
.query_param::<u32, _>(MAX_TRANSACTIONS_IN_BLOCK)
{
self.max_txs_in_block = max_txs_in_block as usize;
}
self.block_time = state_block.config.block_time;
self.commit_time = state_block.config.commit_time;
self.max_txs_in_block = state_block.config.max_transactions_in_block.get() as usize;
}

fn cache_transaction(&mut self, state_block: &StateBlock<'_>) {
Expand Down
7 changes: 6 additions & 1 deletion data_model/src/block.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,14 @@ impl BlockHeader {
}

/// Creation timestamp
pub fn timestamp(&self) -> Duration {
pub const fn timestamp(&self) -> Duration {
Duration::from_millis(self.timestamp_ms)
}

/// Consensus estimation
pub const fn consensus_estimation(&self) -> Duration {
Duration::from_millis(self.consensus_estimation_ms)
}
}

impl SignedBlockV1 {
Expand Down

0 comments on commit d75b536

Please sign in to comment.