Skip to content

Commit 914b13d

Browse files
authored
Cherry pick changes from release-13 (#1681)
1 parent ba81fe3 commit 914b13d

File tree

3 files changed

+44
-43
lines changed

3 files changed

+44
-43
lines changed

Cargo.lock

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bin/runtime/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
7777
spec_name: create_runtime_str!("aleph-node"),
7878
impl_name: create_runtime_str!("aleph-node"),
7979
authoring_version: 1,
80-
spec_version: 71,
80+
spec_version: 73,
8181
impl_version: 1,
8282
apis: RUNTIME_API_VERSIONS,
8383
transaction_version: 18,
@@ -100,8 +100,9 @@ pub const MICRO_AZERO: Balance = MILLI_AZERO / 1000;
100100
pub const NANO_AZERO: Balance = MICRO_AZERO / 1000;
101101
pub const PICO_AZERO: Balance = NANO_AZERO / 1000;
102102

103-
// 75% block weight is dedicated to normal extrinsics
104-
pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
103+
// 99% block weight is dedicated to normal extrinsics leaving 1% reserved space for the operational
104+
// extrinsics.
105+
pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(99);
105106
// The whole process for a single block should take 1s, of which 400ms is for creation,
106107
// 200ms for propagation and 400ms for validation. Hence the block weight should be within 400ms.
107108
pub const MAX_BLOCK_WEIGHT: Weight =

e2e-tests/src/test/fee.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::{config::setup_test, transfer::setup_for_transfer};
1717
/// In order to increase the block occupancy we need to transfer funds to a lot of accounts. This
1818
/// array contains the accounts we will be transferring funds to.
1919
static DESTINATIONS: Lazy<Vec<AccountId>> = Lazy::new(|| {
20-
(0..1200)
20+
(0..1600)
2121
.map(|i| keypair_from_string(&format!("//{i}")).account_id().clone())
2222
.collect()
2323
});
@@ -106,10 +106,10 @@ pub async fn fee_calculation() -> anyhow::Result<()> {
106106
/// amount is equal to the existential deposit of the chain.
107107
async fn fill_blocks(block_occupancy: BlockOccupancy, blocks: u32, connection: &SignedConnection) {
108108
let limit = match block_occupancy {
109-
// 850 transfers == 37.3% weight < 37.5% == 50% of 75% that is maximum real block occupancy for transfer transactions
110-
BlockOccupancy::Low => 850,
111-
// above 37.5% block weight
112-
BlockOccupancy::High => 1200,
109+
// 1100 transfers == 49% weight < 49.5% == 50% of 99% that is maximum real block occupancy for transfer transactions
110+
BlockOccupancy::Low => 1100,
111+
// above 49.5% block weight
112+
BlockOccupancy::High => 1600,
113113
};
114114

115115
let existential_deposit = connection

0 commit comments

Comments
 (0)