Merge branch 'release-13' into a0-4251-cherry-pick

Cardinal-Cryptography · Apr 26, 2024 · 268bd7e · 268bd7e
2 parents 99cc979 + 87ebe7c
commit 268bd7e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/Cargo.toml b/bin/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph-node"
-version = "0.13.2"
+version = "0.13.3"
 description = "Aleph node binary"
 build = "build.rs"
 license = "GPL-3.0-or-later"

diff --git a/bin/runtime/Cargo.toml b/bin/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aleph-runtime"
-version = "0.13.2"
+version = "0.13.3"
 license = "GPL-3.0-or-later"
 authors.workspace = true
 edition.workspace = true

diff --git a/bin/runtime/src/lib.rs b/bin/runtime/src/lib.rs
@@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("aleph-node"),
     impl_name: create_runtime_str!("aleph-node"),
     authoring_version: 1,
-    spec_version: 71,
+    spec_version: 73,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 18,
@@ -120,8 +120,9 @@ pub const MICRO_AZERO: Balance = MILLI_AZERO / 1000;
 pub const NANO_AZERO: Balance = MICRO_AZERO / 1000;
 pub const PICO_AZERO: Balance = NANO_AZERO / 1000;
 
-// 75% block weight is dedicated to normal extrinsics
-pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
+// 99% block weight is dedicated to normal extrinsics leaving 1% reserved space for the operational
+// extrinsics.
+pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(99);
 // The whole process for a single block should take 1s, of which 400ms is for creation,
 // 200ms for propagation and 400ms for validation. Hence the block weight should be within 400ms.
 pub const MAX_BLOCK_WEIGHT: Weight =

diff --git a/e2e-tests/src/test/fee.rs b/e2e-tests/src/test/fee.rs
@@ -17,7 +17,7 @@ use crate::{config::setup_test, transfer::setup_for_transfer};
 /// In order to increase the block occupancy we need to transfer funds to a lot of accounts. This
 /// array contains the accounts we will be transferring funds to.
 static DESTINATIONS: Lazy<Vec<AccountId>> = Lazy::new(|| {
-    (0..1000)
+    (0..1600)
         .map(|i| keypair_from_string(&format!("//{i}")).account_id().clone())
         .collect()
 });
@@ -106,10 +106,10 @@ pub async fn fee_calculation() -> anyhow::Result<()> {
 /// amount is equal to the existential deposit of the chain.
 async fn fill_blocks(block_occupancy: BlockOccupancy, blocks: u32, connection: &SignedConnection) {
     let limit = match block_occupancy {
-        // 850 transfers == 37.3% weight < 37.5% == 50% of 75% that is maximum real block occupancy for transfer transactions
-        BlockOccupancy::Low => 850,
-        // above 37.5% block weight
-        BlockOccupancy::High => 1000,
+        // 1100 transfers == 49% weight < 49.5% == 50% of 99% that is maximum real block occupancy for transfer transactions
+        BlockOccupancy::Low => 1100,
+        // above 49.5% block weight
+        BlockOccupancy::High => 1600,
     };
 
     let existential_deposit = connection