A0-1502: Finality version e2e test

.github/scripts/run_consensus.sh

@@ -12,6 +12,9 @@ OVERRIDE_DOCKER_COMPOSE=${OVERRIDE_DOCKER_COMPOSE:-""}
 # default minimum validator count
 MIN_VALIDATOR_COUNT=4
 
+# default minimum validator count
+MIN_VALIDATOR_COUNT=4
+
 export NODE_IMAGE=aleph-node:latest
 
 mkdir -p docker/data/

.github/workflows/e2e-tests-main-devnet.yml

@@ -545,7 +545,7 @@ jobs:
       - name: Run e2e test
         uses: ./.github/actions/run-e2e-test
         with:
-          test-case: version_upgrade::schedule_version_change
+          test-case: finality_version::schedule_version_change
         env:
           UPGRADE_VERSION: 1
           UPGRADE_SESSION: 3
@@ -658,6 +658,21 @@ jobs:
 #        run: |
 #          ./scripts/catchup_version_upgrade_test.sh
 
+  run-e2e-finality-version-change:
+    needs: [build-test-docker, build-test-client]
+    name: Run finality version change test
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v2
+
+      - name: Run e2e test
+        uses: ./.github/actions/run-e2e-test
+        with:
+          test-case: finality_version::finality_version_change
+          follow-up-finalization-check: true
+        timeout-minutes: 10
+
   check-e2e-test-suite-completion:
     needs: [
       run-e2e-finalization-test,
@@ -687,6 +702,7 @@ jobs:
       run-e2e-adder-contract-test,
 #      run-e2e-failing-version-upgrade,
 #      run-e2e-version-upgrade-catchup,
+      run-e2e-finality-version-change,
     ]
     name: Check e2e test suite completion
     runs-on: ubuntu-20.04

aleph-client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "aleph_client"
-# TODO bump major version when API stablize
-version = "2.5.0"
+# TODO: bump major version when API stablizes
+version = "2.6.0"
 edition = "2021"
 license = "Apache 2.0"
 

aleph-client/src/aleph_zero.rs

@@ -6409,10 +6409,9 @@ pub mod api {
                         "FinalityVersion",
                         vec![],
                         [
-                            134u8, 19u8, 94u8, 247u8, 125u8, 18u8, 148u8, 160u8, 167u8, 235u8,
-                            174u8, 4u8, 107u8, 69u8, 55u8, 187u8, 249u8, 13u8, 129u8, 99u8, 116u8,
-                            158u8, 38u8, 29u8, 239u8, 112u8, 150u8, 92u8, 151u8, 197u8, 223u8,
-                            30u8,
+                            99u8, 158u8, 103u8, 180u8, 128u8, 32u8, 84u8, 110u8, 229u8, 2u8, 3u8,
+                            114u8, 95u8, 125u8, 230u8, 210u8, 56u8, 85u8, 38u8, 136u8, 49u8, 206u8,
+                            6u8, 136u8, 193u8, 164u8, 251u8, 60u8, 125u8, 91u8, 205u8, 144u8,
                         ],
                     )
                 }
@@ -19533,9 +19532,9 @@ pub mod api {
         let runtime_metadata_hash = client.metadata().metadata_hash(&PALLETS);
         if runtime_metadata_hash
             != [
-                155u8, 236u8, 207u8, 138u8, 149u8, 114u8, 96u8, 168u8, 143u8, 247u8, 148u8, 106u8,
-                148u8, 203u8, 48u8, 129u8, 14u8, 48u8, 155u8, 234u8, 78u8, 212u8, 73u8, 65u8,
-                212u8, 201u8, 174u8, 194u8, 72u8, 70u8, 240u8, 233u8,
+                10u8, 121u8, 157u8, 11u8, 147u8, 107u8, 235u8, 73u8, 90u8, 254u8, 82u8, 183u8,
+                112u8, 64u8, 213u8, 99u8, 23u8, 17u8, 10u8, 91u8, 124u8, 231u8, 209u8, 172u8, 59u8,
+                160u8, 15u8, 142u8, 149u8, 200u8, 95u8, 164u8,
             ]
         {
             Err(::subxt::error::MetadataError::IncompatibleMetadata)

aleph-client/src/pallets/aleph.rs

@@ -1,8 +1,9 @@
 use codec::Encode;
-use primitives::{BlockNumber, SessionIndex};
+use primitives::{BlockNumber, SessionIndex, Version};
 use subxt::rpc_params;
 
 use crate::{
+    api,
     api::runtime_types::{
         pallet_aleph::pallet::Call::set_emergency_finalizer, primitives::app::Public,
         sp_core::ed25519::Public as EdPublic,
@@ -13,6 +14,11 @@ use crate::{
     Connection, Pair, RootConnection, SudoCall, TxStatus,
 };
 
+#[async_trait::async_trait]
+pub trait AlephApi {
+    async fn finality_version(&self, at: Option<BlockHash>) -> Version;
+}
+
 #[async_trait::async_trait]
 pub trait AlephSudoApi {
     async fn set_emergency_finalizer(
@@ -37,6 +43,17 @@ pub trait AlephRpc {
         hash: BlockHash,
         key_pair: AlephKeyPair,
     ) -> anyhow::Result<()>;
+
+    async fn next_session_finality_version(&self, at: Option<BlockHash>) -> Version;
+}
+
+#[async_trait::async_trait]
+impl AlephApi for Connection {
+    async fn finality_version(&self, at: Option<BlockHash>) -> Version {
+        let addrs = api::storage().aleph().finality_version();
+
+        self.get_storage_entry(&addrs, at).await
+    }
 }
 
 #[async_trait::async_trait]
@@ -84,4 +101,12 @@ impl AlephRpc for Connection {
 
         Ok(())
     }
+
+    async fn next_session_finality_version(&self, hash: Option<BlockHash>) -> Version {
+        let method = "state_call";
+        let api_method = "AlephSessionApi_next_session_finality_version";
+        let params = rpc_params![api_method, "0x", hash];
+
+        self.rpc_call(method.to_string(), params).await.unwrap()
+    }
 }

bin/node/src/chain_spec.rs

@@ -5,8 +5,9 @@ use aleph_primitives::{
     AuthorityId as AlephId, ADDRESSES_ENCODING, TOKEN, TOKEN_DECIMALS,
 };
 use aleph_runtime::{
-    AccountId, AuraConfig, BalancesConfig, ElectionsConfig, GenesisConfig, Perbill, SessionConfig,
-    SessionKeys, StakingConfig, SudoConfig, SystemConfig, VestingConfig, WASM_BINARY,
+    AccountId, AlephConfig, AuraConfig, BalancesConfig, ElectionsConfig, GenesisConfig, Perbill,
+    SessionConfig, SessionKeys, StakingConfig, SudoConfig, SystemConfig, VestingConfig,
+    WASM_BINARY,
 };
 use libp2p::PeerId;
 use pallet_staking::{Forcing, StakerStatus};
@@ -398,6 +399,9 @@ fn generate_genesis_config(
             min_nominator_bond: MIN_NOMINATOR_BOND,
             ..Default::default()
         },
+        aleph: AlephConfig {
+            ..Default::default()
+        },
         treasury: Default::default(),
         vesting: VestingConfig { vesting: vec![] },
         nomination_pools: Default::default(),

bin/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aleph-runtime"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Cardinal Cryptography"]
 edition = "2021"
 homepage = "https://alephzero.org"

bin/runtime/src/lib.rs

@@ -104,7 +104,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: 45,
+    spec_version: 46,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 14,

e2e-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "aleph-e2e-client"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2021"
 license = "Apache 2.0"
 

e2e-tests/src/finality_version.rs

@@ -0,0 +1,41 @@
+use aleph_client::{
+    pallets::aleph::{AlephApi, AlephRpc},
+    utility::BlocksApi,
+    Connection,
+};
+use log::info;
+use primitives::{BlockNumber, Version};
+
+pub async fn check_finality_version_at_block(
+    connection: &Connection,
+    block_number: BlockNumber,
+    expected_version: Version,
+) {
+    info!(
+        "Checking current session finality version for block {}",
+        block_number
+    );
+    let block_hash = connection
+        .get_block_hash(block_number)
+        .await
+        .expect("Should have been able to get a block hash!");
+    let finality_version = connection.finality_version(block_hash).await;
+    assert_eq!(finality_version, expected_version);
+}
+
+pub async fn check_next_session_finality_version_at_block(
+    connection: &Connection,
+    block_number: BlockNumber,
+    expected_version: Version,
+) {
+    info!(
+        "Checking next session finality version for block {}",
+        block_number
+    );
+    let block_hash = connection
+        .get_block_hash(block_number)
+        .await
+        .expect("Should have been able to get a block hash!");
+    let next_finality_version = connection.next_session_finality_version(block_hash).await;
+    assert_eq!(next_finality_version, expected_version);
+}

e2e-tests/src/lib.rs

@@ -7,6 +7,8 @@ mod config;
 #[cfg(test)]
 mod elections;
 #[cfg(test)]
+mod finality_version;
+#[cfg(test)]
 mod rewards;
 #[cfg(test)]
 mod test;

e2e-tests/src/test/adder.rs

@@ -90,6 +90,6 @@ impl AdderInstance {
 
     pub async fn get_name(&self, conn: &Connection) -> Result<Option<String>> {
         let res: Option<String> = self.contract.contract_read0(conn, "get_name").await?;
-        Ok(res.map(|name| name.replace("\0", "")))
+        Ok(res.map(|name| name.replace('\0', "")))
     }
 }