diff --git a/crates/iroha/src/client.rs b/crates/iroha/src/client.rs
index ecdd1da2e2..8a31b09f7f 100644
--- a/crates/iroha/src/client.rs
+++ b/crates/iroha/src/client.rs
@@ -972,134 +972,6 @@ mod blocks_api {
     pub type AsyncBlockStream = stream_api::AsyncStream<flow::Events>;
 }
 
-pub mod account {
-    //! Module with queries for account
-    use super::*;
-
-    /// Construct a query to get all accounts
-    pub const fn all() -> FindAccounts {
-        FindAccounts
-    }
-
-    /// Construct a query to get all accounts containing specified asset
-    pub fn all_with_asset(asset_definition_id: AssetDefinitionId) -> FindAccountsWithAsset {
-        FindAccountsWithAsset::new(asset_definition_id)
-    }
-}
-
-pub mod asset {
-    //! Module with queries for assets
-    use super::*;
-
-    /// Construct a query to get all assets
-    pub const fn all() -> FindAssets {
-        FindAssets
-    }
-
-    /// Construct a query to get all asset definitions
-    pub const fn all_definitions() -> FindAssetsDefinitions {
-        FindAssetsDefinitions
-    }
-}
-
-pub mod block {
-    //! Module with queries related to blocks
-
-    use super::*;
-
-    /// Construct a query to find all blocks
-    pub const fn all() -> FindBlocks {
-        FindBlocks
-    }
-
-    /// Construct a query to find all block headers
-    pub const fn all_headers() -> FindBlockHeaders {
-        FindBlockHeaders
-    }
-}
-
-pub mod domain {
-    //! Module with queries for domains
-    use super::*;
-
-    /// Construct a query to get all domains
-    pub const fn all() -> FindDomains {
-        FindDomains
-    }
-}
-
-pub mod transaction {
-    //! Module with queries for transactions
-
-    use super::*;
-
-    /// Construct a query to find all transactions
-    pub fn all() -> FindTransactions {
-        FindTransactions
-    }
-}
-
-pub mod trigger {
-    //! Module with queries for triggers
-    use super::*;
-
-    /// Construct a query to get all active trigger ids
-    pub fn all_ids() -> FindActiveTriggerIds {
-        FindActiveTriggerIds
-    }
-}
-
-pub mod permission {
-    //! Module with queries for permission tokens
-    use super::*;
-
-    /// Construct a query to get all [`Permission`] granted
-    /// to account with given [`Id`][AccountId]
-    pub fn by_account_id(account_id: AccountId) -> FindPermissionsByAccountId {
-        FindPermissionsByAccountId::new(account_id)
-    }
-}
-
-pub mod role {
-    //! Module with queries for roles
-    use super::*;
-
-    /// Construct a query to retrieve all roles
-    pub const fn all() -> FindRoles {
-        FindRoles
-    }
-
-    /// Construct a query to retrieve all role ids
-    pub const fn all_ids() -> FindRoleIds {
-        FindRoleIds
-    }
-
-    /// Construct a query to retrieve all roles for an account
-    pub fn by_account_id(account_id: AccountId) -> FindRolesByAccountId {
-        FindRolesByAccountId::new(account_id)
-    }
-}
-
-pub mod parameter {
-    //! Module with queries for config parameters
-    use super::*;
-
-    /// Construct a query to retrieve all config parameters
-    pub const fn all() -> FindParameters {
-        FindParameters
-    }
-}
-
-pub mod executor {
-    //! Queries for executor entities
-    use super::*;
-
-    /// Retrieve executor data model
-    pub const fn data_model() -> FindExecutorDataModel {
-        FindExecutorDataModel
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use iroha_primitives::small::SmallStr;
diff --git a/crates/iroha/tests/asset.rs b/crates/iroha/tests/asset.rs
index e605b0c343..faf5f71fcc 100644
--- a/crates/iroha/tests/asset.rs
+++ b/crates/iroha/tests/asset.rs
@@ -1,6 +1,5 @@
 use eyre::Result;
 use iroha::{
-    client,
     crypto::KeyPair,
     data_model::{
         asset::{AssetId, AssetType, AssetValue},
@@ -41,7 +40,7 @@ fn client_register_asset_should_add_asset_once_but_not_twice() -> Result<()> {
     // Registering an asset to an account which doesn't have one
     // should result in asset being created
     let asset = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?
         .into_iter()
@@ -76,7 +75,7 @@ fn unregister_asset_should_remove_asset_from_account() -> Result<()> {
 
     // Check for asset to be registered
     let assets = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?;
 
@@ -88,7 +87,7 @@ fn unregister_asset_should_remove_asset_from_account() -> Result<()> {
 
     // ... and check that it is removed after Unregister
     let assets = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?;
 
@@ -125,7 +124,7 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount() ->
     test_client.submit_transaction_blocking(&tx)?;
 
     let asset = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?
         .into_iter()
@@ -159,7 +158,7 @@ fn client_add_big_asset_quantity_to_existing_asset_should_increase_asset_amount(
     test_client.submit_transaction_blocking(&tx)?;
 
     let asset = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?
         .into_iter()
@@ -194,7 +193,7 @@ fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
     test_client.submit_transaction_blocking(&tx)?;
 
     let asset = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?
         .into_iter()
@@ -215,7 +214,7 @@ fn client_add_asset_with_decimal_should_increase_asset_amount() -> Result<()> {
     test_client.submit_blocking(mint)?;
 
     let asset = test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?
         .into_iter()
@@ -339,7 +338,7 @@ fn transfer_asset_definition() {
         .expect("Failed to submit transaction");
 
     let asset_definition = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(asset_definition_id.clone()))
         .execute_single()
         .expect("Failed to execute Iroha Query");
@@ -354,7 +353,7 @@ fn transfer_asset_definition() {
         .expect("Failed to submit transaction");
 
     let asset_definition = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(asset_definition_id))
         .execute_single()
         .expect("Failed to execute Iroha Query");
diff --git a/crates/iroha/tests/asset_propagation.rs b/crates/iroha/tests/asset_propagation.rs
index 342152e2dc..fb8ed7403b 100644
--- a/crates/iroha/tests/asset_propagation.rs
+++ b/crates/iroha/tests/asset_propagation.rs
@@ -1,8 +1,5 @@
 use eyre::Result;
-use iroha::{
-    client,
-    data_model::{parameter::BlockParameter, prelude::*},
-};
+use iroha::data_model::{parameter::BlockParameter, prelude::*};
 use iroha_test_network::*;
 use iroha_test_samples::gen_account_in;
 use nonzero_ext::nonzero;
@@ -46,7 +43,7 @@ fn client_add_asset_quantity_to_existing_asset_should_increase_asset_amount_on_a
     // Then
     let asset = peer_b
         .client()
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?
         .into_iter()
diff --git a/crates/iroha/tests/extra_functional/multiple_blocks_created.rs b/crates/iroha/tests/extra_functional/multiple_blocks_created.rs
index 43ff51ec13..e99f5bc26f 100644
--- a/crates/iroha/tests/extra_functional/multiple_blocks_created.rs
+++ b/crates/iroha/tests/extra_functional/multiple_blocks_created.rs
@@ -97,7 +97,7 @@ async fn multiple_blocks_created() -> Result<()> {
         let definition = asset_definition_id.clone();
         let assets = spawn_blocking(move || {
             client
-                .query(client::asset::all())
+                .query(FindAssets::new())
                 .filter_with(|asset| {
                     asset.id.account.eq(account_id) & asset.id.definition_id.eq(definition)
                 })
diff --git a/crates/iroha/tests/extra_functional/normal.rs b/crates/iroha/tests/extra_functional/normal.rs
index 09daf1f2d4..198564e51c 100644
--- a/crates/iroha/tests/extra_functional/normal.rs
+++ b/crates/iroha/tests/extra_functional/normal.rs
@@ -43,7 +43,7 @@ fn transactions_should_be_applied() -> Result<()> {
     iroha.submit_blocking(mint_asset)?;
 
     iroha
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.eq(asset_id))
         .execute_single()?;
 
diff --git a/crates/iroha/tests/extra_functional/offline_peers.rs b/crates/iroha/tests/extra_functional/offline_peers.rs
index 33344eb66d..430b45b634 100644
--- a/crates/iroha/tests/extra_functional/offline_peers.rs
+++ b/crates/iroha/tests/extra_functional/offline_peers.rs
@@ -45,7 +45,7 @@ async fn genesis_block_is_committed_with_some_offline_peers() -> Result<()> {
         .client();
     spawn_blocking(move || -> Result<()> {
         let assets = client
-            .query(client::asset::all())
+            .query(FindAssets::new())
             .filter_with(|asset| asset.id.account.eq(alice_id))
             .execute_all()?;
         let asset = assets
diff --git a/crates/iroha/tests/extra_functional/restart_peer.rs b/crates/iroha/tests/extra_functional/restart_peer.rs
index b6681c4b64..7e0091d5e2 100644
--- a/crates/iroha/tests/extra_functional/restart_peer.rs
+++ b/crates/iroha/tests/extra_functional/restart_peer.rs
@@ -54,7 +54,7 @@ async fn restarted_peer_should_restore_its_state() -> Result<()> {
     let client = peer_b.client();
     let asset = spawn_blocking(move || {
         client
-            .query(client::asset::all())
+            .query(FindAssets::new())
             .filter_with(|asset| asset.id.account.eq(ALICE_ID.clone()))
             .execute_all()
     })
diff --git a/crates/iroha/tests/extra_functional/unregister_peer.rs b/crates/iroha/tests/extra_functional/unregister_peer.rs
index 8593b49fa0..23c023394c 100644
--- a/crates/iroha/tests/extra_functional/unregister_peer.rs
+++ b/crates/iroha/tests/extra_functional/unregister_peer.rs
@@ -98,7 +98,7 @@ async fn find_asset(
     let client = client.clone();
     let asset = spawn_blocking(move || {
         client
-            .query(client::asset::all())
+            .query(FindAssets::new())
             .filter_with(|asset| asset.id.account.eq(account_id.clone()))
             .execute_all()
     })
diff --git a/crates/iroha/tests/multisig.rs b/crates/iroha/tests/multisig.rs
index 9d1e82767b..a4cc6f6f14 100644
--- a/crates/iroha/tests/multisig.rs
+++ b/crates/iroha/tests/multisig.rs
@@ -3,7 +3,6 @@ use std::collections::BTreeMap;
 use executor_custom_data_model::multisig::{MultisigArgs, MultisigRegisterArgs};
 use eyre::Result;
 use iroha::{
-    client,
     crypto::KeyPair,
     data_model::{
         asset::{AssetDefinition, AssetDefinitionId},
@@ -120,7 +119,7 @@ fn mutlisig() -> Result<()> {
 
     // Check that asset definition isn't created yet
     let err = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(asset_definition_id.clone()))
         .execute_single()
         .expect_err("asset definition shouldn't be created before enough votes are collected");
@@ -138,7 +137,7 @@ fn mutlisig() -> Result<()> {
 
     // Check that new asset definition was created and multisig account is owner
     let asset_definition = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(asset_definition_id.clone()))
         .execute_single()
         .expect("asset definition should be created after enough votes are collected");
diff --git a/crates/iroha/tests/non_mintable.rs b/crates/iroha/tests/non_mintable.rs
index 15e446e118..dab0592a53 100644
--- a/crates/iroha/tests/non_mintable.rs
+++ b/crates/iroha/tests/non_mintable.rs
@@ -1,8 +1,5 @@
 use eyre::Result;
-use iroha::{
-    client,
-    data_model::{isi::InstructionBox, prelude::*},
-};
+use iroha::data_model::{isi::InstructionBox, prelude::*};
 use iroha_test_network::*;
 use iroha_test_samples::ALICE_ID;
 
@@ -33,7 +30,7 @@ fn non_mintable_asset_can_be_minted_once_but_not_twice() -> Result<()> {
     // We can register and mint the non-mintable token
     test_client.submit_transaction_blocking(&tx)?;
     assert!(test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?
         .iter()
@@ -72,7 +69,7 @@ fn non_mintable_asset_cannot_be_minted_if_registered_with_non_zero_value() -> Re
         register_asset.clone().into(),
     ])?;
     assert!(test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?
         .iter()
@@ -116,7 +113,7 @@ fn non_mintable_asset_can_be_minted_if_registered_with_zero_value() -> Result<()
         mint.into(),
     ])?;
     assert!(test_client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id.clone()))
         .execute_all()?
         .iter()
diff --git a/crates/iroha/tests/pagination.rs b/crates/iroha/tests/pagination.rs
index 72eb240afd..b0be0fb713 100644
--- a/crates/iroha/tests/pagination.rs
+++ b/crates/iroha/tests/pagination.rs
@@ -1,6 +1,6 @@
 use eyre::Result;
 use iroha::{
-    client::{asset, Client},
+    client::Client,
     data_model::{asset::AssetDefinition, prelude::*},
 };
 use iroha_test_network::*;
@@ -14,7 +14,7 @@ fn limits_should_work() -> Result<()> {
     register_assets(&client)?;
 
     let vec = client
-        .query(asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .with_pagination(Pagination {
             limit: Some(nonzero!(7_u64)),
             offset: 1,
@@ -32,7 +32,7 @@ fn reported_length_should_be_accurate() -> Result<()> {
     register_assets(&client)?;
 
     let mut iter = client
-        .query(asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .with_pagination(Pagination {
             limit: Some(nonzero!(7_u64)),
             offset: 1,
@@ -66,7 +66,7 @@ fn fetch_size_should_work() -> Result<()> {
     register_assets(&client)?;
 
     let query = QueryWithParams::new(
-        QueryWithFilter::new(asset::all_definitions(), CompoundPredicate::PASS).into(),
+        QueryWithFilter::new(FindAssetsDefinitions::new(), CompoundPredicate::PASS).into(),
         QueryParams::new(
             Pagination {
                 limit: Some(nonzero!(7_u64)),
diff --git a/crates/iroha/tests/permissions.rs b/crates/iroha/tests/permissions.rs
index 3bb8ea0d8a..13559c9c5f 100644
--- a/crates/iroha/tests/permissions.rs
+++ b/crates/iroha/tests/permissions.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use eyre::Result;
 use iroha::{
-    client::{self, Client},
+    client::Client,
     crypto::KeyPair,
     data_model::{
         permission::Permission, prelude::*, role::RoleId,
@@ -48,7 +48,7 @@ async fn genesis_transactions_are_validated_by_executor() {
 
 fn get_assets(iroha: &Client, id: &AccountId) -> Vec<Asset> {
     iroha
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(id.clone()))
         .execute_all()
         .expect("Failed to execute request.")
@@ -178,14 +178,14 @@ fn account_can_query_only_its_own_domain() -> Result<()> {
 
     // Alice can query the domain in which her account exists.
     assert!(client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .filter_with(|domain| domain.id.eq(domain_id))
         .execute_single()
         .is_ok());
 
     // Alice cannot query other domains.
     assert!(client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .filter_with(|domain| domain.id.eq(new_domain_id))
         .execute_single()
         .is_err());
@@ -390,7 +390,7 @@ fn associated_permissions_removed_on_unregister() {
 
     // check that bob indeed have granted permission
     assert!(iroha
-        .query(client::permission::by_account_id(bob_id.clone()))
+        .query(FindPermissionsByAccountId::new(bob_id.clone()))
         .execute_all()
         .expect("failed to get permissions for bob")
         .into_iter()
@@ -406,7 +406,7 @@ fn associated_permissions_removed_on_unregister() {
 
     // check that permission is removed from bob
     assert!(!iroha
-        .query(client::permission::by_account_id(bob_id))
+        .query(FindPermissionsByAccountId::new(bob_id))
         .execute_all()
         .expect("failed to get permissions for bob")
         .into_iter()
@@ -440,7 +440,7 @@ fn associated_permissions_removed_from_role_on_unregister() {
 
     // check that role indeed have permission
     assert!(iroha
-        .query(client::role::all())
+        .query(FindRoles::new())
         .filter_with(|role| role.id.eq(role_id.clone()))
         .execute_single()
         .expect("failed to get role")
@@ -457,7 +457,7 @@ fn associated_permissions_removed_from_role_on_unregister() {
 
     // check that permission is removed from role
     assert!(!iroha
-        .query(client::role::all())
+        .query(FindRoles::new())
         .filter_with(|role| role.id.eq(role_id.clone()))
         .execute_single()
         .expect("failed to get role")
diff --git a/crates/iroha/tests/queries/account.rs b/crates/iroha/tests/queries/account.rs
index cb9327ecc9..adc64c8156 100644
--- a/crates/iroha/tests/queries/account.rs
+++ b/crates/iroha/tests/queries/account.rs
@@ -19,7 +19,7 @@ fn find_accounts_with_asset() -> Result<()> {
 
     // Checking results before all
     let received_asset_definition = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(definition_id.clone()))
         .execute_single()?;
 
@@ -58,7 +58,7 @@ fn find_accounts_with_asset() -> Result<()> {
 
     // Checking results
     let received_asset_definition = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .filter_with(|asset_definition| asset_definition.id.eq(definition_id.clone()))
         .execute_single()?;
 
@@ -69,7 +69,7 @@ fn find_accounts_with_asset() -> Result<()> {
     );
 
     let found_accounts = test_client
-        .query(client::account::all_with_asset(definition_id))
+        .query(FindAccountsWithAsset::new(definition_id))
         .execute_all()?;
     let found_ids = found_accounts
         .into_iter()
diff --git a/crates/iroha/tests/queries/mod.rs b/crates/iroha/tests/queries/mod.rs
index bb7c70ac7a..b6a3f2f356 100644
--- a/crates/iroha/tests/queries/mod.rs
+++ b/crates/iroha/tests/queries/mod.rs
@@ -19,7 +19,7 @@ fn too_big_fetch_size_is_not_allowed() {
     let client = network.client();
 
     let err = client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .with_fetch_size(FetchSize::new(Some(MAX_FETCH_SIZE.checked_add(1).unwrap())))
         .execute()
         .expect_err("Should fail");
@@ -31,3 +31,44 @@ fn too_big_fetch_size_is_not_allowed() {
         ))
     ));
 }
+
+#[test]
+fn find_blocks_reversed() -> eyre::Result<()> {
+    let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+    let client = network.client();
+
+    client.submit_blocking(Register::domain(Domain::new("domain1".parse()?)))?;
+
+    let blocks = client.query(FindBlocks).execute_all()?;
+    assert_eq!(blocks.len(), 2);
+    assert_eq!(blocks[1].header().prev_block_hash, None);
+    assert_eq!(
+        blocks[0].header().prev_block_hash,
+        Some(blocks[1].header().hash())
+    );
+
+    Ok(())
+}
+
+#[test]
+fn find_transactions_reversed() -> eyre::Result<()> {
+    let (network, _rt) = NetworkBuilder::new().start_blocking()?;
+    let client = network.client();
+
+    let register_domain = Register::domain(Domain::new("domain1".parse()?));
+    client.submit_blocking(register_domain.clone())?;
+
+    let txs = client.query(FindTransactions).execute_all()?;
+
+    // check that latest transaction is register domain
+    let Executable::Instructions(instructions) = txs[0].transaction.value.instructions() else {
+        panic!("Expected instructions");
+    };
+    assert_eq!(instructions.len(), 1);
+    assert_eq!(
+        instructions[0],
+        InstructionBox::Register(register_domain.into())
+    );
+
+    Ok(())
+}
diff --git a/crates/iroha/tests/queries/query_errors.rs b/crates/iroha/tests/queries/query_errors.rs
index a7af9fd226..233b14e580 100644
--- a/crates/iroha/tests/queries/query_errors.rs
+++ b/crates/iroha/tests/queries/query_errors.rs
@@ -11,7 +11,7 @@ fn non_existent_account_is_specific_error() {
     let client = network.client();
 
     let err = client
-        .query(client::account::all())
+        .query(FindAccounts::new())
         .filter_with(|account| account.id.eq(gen_account_in("regalia").0))
         .execute_single()
         .expect_err("Should error");
diff --git a/crates/iroha/tests/queries/role.rs b/crates/iroha/tests/queries/role.rs
index dde318bbc5..37219d8af7 100644
--- a/crates/iroha/tests/queries/role.rs
+++ b/crates/iroha/tests/queries/role.rs
@@ -38,7 +38,7 @@ fn find_roles() -> Result<()> {
 
     // Checking results
     let found_role_ids = test_client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .execute_all()?
         .into_iter();
 
@@ -69,7 +69,7 @@ fn find_role_ids() -> Result<()> {
     let role_ids = HashSet::from(role_ids);
 
     // Checking results
-    let found_role_ids = test_client.query(client::role::all_ids()).execute_all()?;
+    let found_role_ids = test_client.query(FindRoleIds::new()).execute_all()?;
     let found_role_ids = found_role_ids.into_iter().collect::<HashSet<_>>();
 
     assert!(role_ids.is_subset(&found_role_ids));
@@ -90,7 +90,7 @@ fn find_role_by_id() -> Result<()> {
     test_client.submit_blocking(register_role)?;
 
     let found_role = test_client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .filter_with(|role| role.id.eq(role_id))
         .execute_single()?;
 
@@ -108,7 +108,7 @@ fn find_unregistered_role_by_id() {
     let role_id: RoleId = "root".parse().expect("Valid");
 
     let found_role = test_client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .filter_with(|role| role.id.eq(role_id))
         .execute_single();
 
@@ -146,7 +146,7 @@ fn find_roles_by_account_id() -> Result<()> {
 
     // Checking results
     let found_role_ids = test_client
-        .query(client::role::by_account_id(alice_id))
+        .query(FindRolesByAccountId::new(alice_id))
         .execute_all()?;
     let found_role_ids = found_role_ids.into_iter().collect::<HashSet<_>>();
 
diff --git a/crates/iroha/tests/roles.rs b/crates/iroha/tests/roles.rs
index 437e2ccfea..829f98bdb3 100644
--- a/crates/iroha/tests/roles.rs
+++ b/crates/iroha/tests/roles.rs
@@ -1,9 +1,6 @@
 use executor_custom_data_model::permissions::CanControlDomainLives;
 use eyre::Result;
-use iroha::{
-    client,
-    data_model::{prelude::*, transaction::error::TransactionRejectionReason},
-};
+use iroha::data_model::{prelude::*, transaction::error::TransactionRejectionReason};
 use iroha_executor_data_model::permission::account::CanModifyAccountMetadata;
 use iroha_test_network::*;
 use iroha_test_samples::{gen_account_in, ALICE_ID};
@@ -66,7 +63,7 @@ fn register_and_grant_role_for_metadata_access() -> Result<()> {
 
     // Making request to find Alice's roles
     let found_role_ids = test_client
-        .query(client::role::by_account_id(alice_id))
+        .query(FindRolesByAccountId::new(alice_id))
         .execute_all()?;
     assert!(found_role_ids.contains(&role_id));
 
@@ -99,7 +96,7 @@ fn unregistered_role_removed_from_account() -> Result<()> {
 
     // Check that Mouse has root role
     let found_mouse_roles = test_client
-        .query(client::role::by_account_id(mouse_id.clone()))
+        .query(FindRolesByAccountId::new(mouse_id.clone()))
         .execute_all()?;
     assert!(found_mouse_roles.contains(&role_id));
 
@@ -109,7 +106,7 @@ fn unregistered_role_removed_from_account() -> Result<()> {
 
     // Check that Mouse doesn't have the root role
     let found_mouse_roles = test_client
-        .query(client::role::by_account_id(mouse_id.clone()))
+        .query(FindRolesByAccountId::new(mouse_id.clone()))
         .execute_all()?;
     assert!(!found_mouse_roles.contains(&role_id));
 
@@ -169,7 +166,7 @@ fn role_permissions_are_deduplicated() {
         .expect("failed to register role");
 
     let role = test_client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .filter_with(|role| role.id.eq(role_id))
         .execute_single()
         .expect("failed to find role");
@@ -224,7 +221,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
 
     // Alice can't modify Mouse's metadata without proper permission
     assert!(!test_client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?
         .iter()
         .any(|permission| {
@@ -241,7 +238,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
         .sign(mouse_keypair.private_key());
     test_client.submit_transaction_blocking(&grant_role_permission_tx)?;
     assert!(test_client
-        .query(client::role::by_account_id(alice_id.clone()))
+        .query(FindRolesByAccountId::new(alice_id.clone()))
         .execute_all()?
         .iter()
         .any(|account_role_id| *account_role_id == role_id));
@@ -253,7 +250,7 @@ fn grant_revoke_role_permissions() -> Result<()> {
         .sign(mouse_keypair.private_key());
     test_client.submit_transaction_blocking(&revoke_role_permission_tx)?;
     assert!(!test_client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?
         .iter()
         .any(|permission| {
diff --git a/crates/iroha/tests/set_parameter.rs b/crates/iroha/tests/set_parameter.rs
index af366ffc93..f06fc3c704 100644
--- a/crates/iroha/tests/set_parameter.rs
+++ b/crates/iroha/tests/set_parameter.rs
@@ -1,10 +1,7 @@
 use eyre::Result;
-use iroha::{
-    client,
-    data_model::{
-        parameter::{BlockParameter, Parameter, Parameters},
-        prelude::*,
-    },
+use iroha::data_model::{
+    parameter::{BlockParameter, Parameter, Parameters},
+    prelude::*,
 };
 use iroha_test_network::*;
 use nonzero_ext::nonzero;
@@ -18,7 +15,7 @@ fn can_change_parameter_value() -> Result<()> {
         .start_blocking()?;
     let test_client = network.client();
 
-    let old_params: Parameters = test_client.query_single(client::parameter::all())?;
+    let old_params: Parameters = test_client.query_single(FindParameters::new())?;
     assert_eq!(old_params.block.max_transactions, nonzero!(16u64));
 
     let new_value = nonzero!(32u64);
@@ -26,7 +23,7 @@ fn can_change_parameter_value() -> Result<()> {
         BlockParameter::MaxTransactions(new_value),
     )))?;
 
-    let params = test_client.query_single(client::parameter::all())?;
+    let params = test_client.query_single(FindParameters::new())?;
     assert_eq!(params.block.max_transactions, new_value);
 
     Ok(())
diff --git a/crates/iroha/tests/sorting.rs b/crates/iroha/tests/sorting.rs
index 041b160d13..008327d6b4 100644
--- a/crates/iroha/tests/sorting.rs
+++ b/crates/iroha/tests/sorting.rs
@@ -2,7 +2,7 @@ use std::collections::HashSet;
 
 use eyre::{Result, WrapErr as _};
 use iroha::{
-    client::{self, QueryResult},
+    client::QueryResult,
     crypto::KeyPair,
     data_model::{
         account::Account, name::Name, prelude::*,
@@ -151,7 +151,7 @@ fn correct_sorting_of_entities() {
         .expect("Valid");
 
     let res = test_client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .with_sorting(Sorting::by_metadata_key(sort_by_metadata_key.clone()))
         .filter_with(|asset_definition| asset_definition.id.name.starts_with("xor_"))
         .execute_all()
@@ -201,7 +201,7 @@ fn correct_sorting_of_entities() {
         .expect("Valid");
 
     let res = test_client
-        .query(client::account::all())
+        .query(FindAccounts::new())
         .with_sorting(Sorting::by_metadata_key(sort_by_metadata_key.clone()))
         .filter_with(|account| account.id.domain_id.eq(domain_id))
         .execute_all()
@@ -237,7 +237,7 @@ fn correct_sorting_of_entities() {
         .expect("Valid");
 
     let res = test_client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .with_sorting(Sorting::by_metadata_key(sort_by_metadata_key.clone()))
         .filter_with(|domain| domain.id.name.starts_with("neverland"))
         .execute_all()
@@ -273,7 +273,7 @@ fn correct_sorting_of_entities() {
         .expect("Valid");
 
     let res = test_client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .with_sorting(Sorting::by_metadata_key(sort_by_metadata_key))
         .filter_with(|domain| domain.id.name.starts_with("neverland_"))
         .execute()
@@ -339,7 +339,7 @@ fn sort_only_elements_which_have_sorting_key() -> Result<()> {
         .wrap_err("Failed to register accounts")?;
 
     let res = test_client
-        .query(client::account::all())
+        .query(FindAccounts::new())
         .with_sorting(Sorting::by_metadata_key(sort_by_metadata_key))
         .filter_with(|account| account.id.domain_id.eq(domain_id))
         .execute_all()
diff --git a/crates/iroha/tests/transfer_asset.rs b/crates/iroha/tests/transfer_asset.rs
index aed42d9599..0384b29705 100644
--- a/crates/iroha/tests/transfer_asset.rs
+++ b/crates/iroha/tests/transfer_asset.rs
@@ -1,12 +1,9 @@
-use iroha::{
-    client,
-    data_model::{
-        account::{Account, AccountId},
-        asset::{Asset, AssetDefinition},
-        isi::{Instruction, InstructionBox},
-        prelude::*,
-        Registered,
-    },
+use iroha::data_model::{
+    account::{Account, AccountId},
+    asset::{Asset, AssetDefinition},
+    isi::{Instruction, InstructionBox},
+    prelude::*,
+    Registered,
 };
 use iroha_test_network::*;
 use iroha_test_samples::{gen_account_in, ALICE_ID};
@@ -58,7 +55,7 @@ fn simulate_transfer_store_asset() {
         .submit_blocking(transfer_asset)
         .expect("Failed to transfer asset.");
     assert!(iroha
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
         .execute_all()
         .unwrap()
@@ -112,7 +109,7 @@ fn simulate_transfer<T>(
         .submit_blocking(transfer_asset)
         .expect("Failed to transfer asset.");
     assert!(iroha
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(mouse_id.clone()))
         .execute_all()
         .unwrap()
diff --git a/crates/iroha/tests/transfer_domain.rs b/crates/iroha/tests/transfer_domain.rs
index 0c9250e051..e7cfaa0f2a 100644
--- a/crates/iroha/tests/transfer_domain.rs
+++ b/crates/iroha/tests/transfer_domain.rs
@@ -1,6 +1,5 @@
 use eyre::Result;
 use iroha::{
-    client,
     crypto::KeyPair,
     data_model::{prelude::*, transaction::error::TransactionRejectionReason},
 };
@@ -331,7 +330,7 @@ fn domain_owner_transfer() -> Result<()> {
     test_client.submit_blocking(Register::account(bob))?;
 
     let domain = test_client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .filter_with(|domain| domain.id.eq(kingdom_id.clone()))
         .execute_single()?;
 
@@ -346,7 +345,7 @@ fn domain_owner_transfer() -> Result<()> {
         .expect("Failed to submit transaction");
 
     let domain = test_client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .filter_with(|domain| domain.id.eq(kingdom_id.clone()))
         .execute_single()?;
     assert_eq!(domain.owned_by(), &bob_id);
@@ -381,7 +380,7 @@ fn not_allowed_to_transfer_other_user_domain() -> Result<()> {
     let client = network.client();
 
     let domain = client
-        .query(client::domain::all())
+        .query(FindDomains::new())
         .filter_with(|domain| domain.id.eq(foo_domain.clone()))
         .execute_single()?;
     assert_eq!(domain.owned_by(), &user1);
diff --git a/crates/iroha/tests/triggers/by_call_trigger.rs b/crates/iroha/tests/triggers/by_call_trigger.rs
index edebfc6e86..c9f6344c2c 100644
--- a/crates/iroha/tests/triggers/by_call_trigger.rs
+++ b/crates/iroha/tests/triggers/by_call_trigger.rs
@@ -313,7 +313,7 @@ fn only_account_with_permission_can_register_trigger() -> Result<()> {
     test_client.submit_blocking(Register::account(rabbit_account))?;
 
     test_client
-        .query(client::account::all())
+        .query(FindAccounts::new())
         .filter_with(|account| account.id.eq(rabbit_account_id.clone()))
         .execute_single()
         .expect("Account not found");
diff --git a/crates/iroha/tests/triggers/data_trigger.rs b/crates/iroha/tests/triggers/data_trigger.rs
index b882356b21..d571d2b414 100644
--- a/crates/iroha/tests/triggers/data_trigger.rs
+++ b/crates/iroha/tests/triggers/data_trigger.rs
@@ -14,7 +14,7 @@ fn must_execute_both_triggers() -> Result<()> {
 
     let get_asset_value = |iroha: &client::Client, asset_id: AssetId| -> Numeric {
         match *iroha
-            .query(client::asset::all())
+            .query(FindAssets::new())
             .filter_with(|asset| asset.id.eq(asset_id))
             .execute_single()
             .unwrap()
diff --git a/crates/iroha/tests/triggers/mod.rs b/crates/iroha/tests/triggers/mod.rs
index 329e0f06ec..7dbe855dd1 100644
--- a/crates/iroha/tests/triggers/mod.rs
+++ b/crates/iroha/tests/triggers/mod.rs
@@ -18,7 +18,7 @@ mod trigger_rollback;
 
 fn get_asset_value(client: &Client, asset_id: AssetId) -> Numeric {
     let asset = client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.eq(asset_id))
         .execute_single()
         .unwrap();
diff --git a/crates/iroha/tests/triggers/time_trigger.rs b/crates/iroha/tests/triggers/time_trigger.rs
index ce870abce3..62903a303b 100644
--- a/crates/iroha/tests/triggers/time_trigger.rs
+++ b/crates/iroha/tests/triggers/time_trigger.rs
@@ -195,7 +195,7 @@ fn mint_nft_for_every_user_every_1_sec() -> Result<()> {
         let start_pattern = "nft_number_";
         let end_pattern = format!("_for_{}#{}", account_id.signatory(), account_id.domain());
         let assets = test_client
-            .query(client::asset::all())
+            .query(FindAssets::new())
             .filter_with(|asset| asset.id.account.eq(account_id.clone()))
             .execute_all()?;
         let count: u64 = assets
diff --git a/crates/iroha/tests/triggers/trigger_rollback.rs b/crates/iroha/tests/triggers/trigger_rollback.rs
index 9d807c326e..1e1711ce8a 100644
--- a/crates/iroha/tests/triggers/trigger_rollback.rs
+++ b/crates/iroha/tests/triggers/trigger_rollback.rs
@@ -37,7 +37,7 @@ fn failed_trigger_revert() -> Result<()> {
 
     //Then
     let query_result = client
-        .query(client::asset::all_definitions())
+        .query(FindAssetsDefinitions::new())
         .execute_all()?;
     assert!(query_result
         .iter()
diff --git a/crates/iroha/tests/tx_history.rs b/crates/iroha/tests/tx_history.rs
index adcafebcf4..2c002a5231 100644
--- a/crates/iroha/tests/tx_history.rs
+++ b/crates/iroha/tests/tx_history.rs
@@ -1,8 +1,5 @@
 use eyre::Result;
-use iroha::{
-    client::transaction,
-    data_model::{prelude::*, query::parameters::Pagination},
-};
+use iroha::data_model::{prelude::*, query::parameters::Pagination};
 use iroha_test_network::*;
 use iroha_test_samples::ALICE_ID;
 use nonzero_ext::nonzero;
@@ -42,7 +39,7 @@ fn client_has_rejected_and_accepted_txs_should_return_tx_history() -> Result<()>
     }
 
     let transactions = client
-        .query(transaction::all())
+        .query(FindTransactions::new())
         .filter_with(|tx| tx.transaction.value.authority.eq(account_id.clone()))
         .with_pagination(Pagination {
             limit: Some(nonzero!(50_u64)),
@@ -51,16 +48,18 @@ fn client_has_rejected_and_accepted_txs_should_return_tx_history() -> Result<()>
         .execute_all()?;
     assert_eq!(transactions.len(), 50);
 
-    let mut prev_creation_time = core::time::Duration::from_millis(0);
+    let mut prev_creation_time = None;
     transactions
         .iter()
         .map(AsRef::as_ref)
         .map(AsRef::as_ref)
         .for_each(|tx| {
             assert_eq!(tx.authority(), &account_id);
-            //check sorted
-            assert!(tx.creation_time() >= prev_creation_time);
-            prev_creation_time = tx.creation_time();
+            //check sorted descending
+            if let Some(prev_creation_time) = prev_creation_time {
+                assert!(tx.creation_time() <= prev_creation_time);
+            }
+            prev_creation_time = Some(tx.creation_time());
         });
     Ok(())
 }
diff --git a/crates/iroha/tests/tx_rollback.rs b/crates/iroha/tests/tx_rollback.rs
index 4c11cf5531..d7b8c42bbe 100644
--- a/crates/iroha/tests/tx_rollback.rs
+++ b/crates/iroha/tests/tx_rollback.rs
@@ -1,5 +1,5 @@
 use eyre::Result;
-use iroha::{client, data_model::prelude::*};
+use iroha::data_model::prelude::*;
 use iroha_test_network::*;
 use iroha_test_samples::ALICE_ID;
 
@@ -21,16 +21,14 @@ fn client_sends_transaction_with_invalid_instruction_should_not_see_any_changes(
 
     //Then;
     let query_result = client
-        .query(client::asset::all())
+        .query(FindAssets::new())
         .filter_with(|asset| asset.id.account.eq(account_id))
         .execute_all()?;
 
     assert!(query_result
         .iter()
         .all(|asset| *asset.id().definition() != wrong_asset_definition_id));
-    let definition_query_result = client
-        .query(client::asset::all_definitions())
-        .execute_all()?;
+    let definition_query_result = client.query(FindAssetsDefinitions::new()).execute_all()?;
     assert!(definition_query_result
         .iter()
         .all(|asset| *asset.id() != wrong_asset_definition_id));
diff --git a/crates/iroha/tests/upgrade.rs b/crates/iroha/tests/upgrade.rs
index cadffa048e..4e456510de 100644
--- a/crates/iroha/tests/upgrade.rs
+++ b/crates/iroha/tests/upgrade.rs
@@ -2,7 +2,7 @@ use executor_custom_data_model::permissions::CanControlDomainLives;
 use eyre::Result;
 use futures_util::TryStreamExt as _;
 use iroha::{
-    client::{self, Client},
+    client::Client,
     data_model::{
         parameter::{Parameter, SmartContractParameter},
         prelude::*,
@@ -81,7 +81,7 @@ fn executor_upgrade_should_run_migration() -> Result<()> {
     // Check that Alice has permission to unregister Wonderland
     let alice_id = ALICE_ID.clone();
     let alice_permissions = client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?;
     let can_unregister_domain = CanUnregisterDomain {
         domain: "wonderland".parse()?,
@@ -108,7 +108,7 @@ fn executor_upgrade_should_run_migration() -> Result<()> {
 
     // Check that Alice has `CanControlDomainLives` permission
     let alice_permissions = client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?;
     let can_control_domain_lives = CanControlDomainLives;
     assert!(alice_permissions.iter().any(|permission| {
@@ -143,7 +143,7 @@ fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
 
     // Check that `TEST_ROLE` has permission
     assert!(client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .execute_all()?
         .into_iter()
         .find(|role| role.id == test_role_id)
@@ -158,7 +158,7 @@ fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
     // Check that Alice has permission
     let alice_id = ALICE_ID.clone();
     assert!(client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?
         .iter()
         .any(|permission| {
@@ -176,7 +176,7 @@ fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
 
     // Check that `TEST_ROLE` doesn't have permission
     assert!(!client
-        .query(client::role::all())
+        .query(FindRoles::new())
         .execute_all()?
         .into_iter()
         .find(|role| role.id == test_role_id)
@@ -190,7 +190,7 @@ fn executor_upgrade_should_revoke_removed_permissions() -> Result<()> {
 
     // Check that Alice doesn't have permission
     assert!(!client
-        .query(client::permission::by_account_id(alice_id.clone()))
+        .query(FindPermissionsByAccountId::new(alice_id.clone()))
         .execute_all()?
         .iter()
         .any(|permission| {
@@ -306,7 +306,7 @@ fn migration_fail_should_not_cause_any_effects() {
     let assert_domain_does_not_exist = |client: &Client, domain_id: &DomainId| {
         assert!(
             client
-                .query(client::domain::all())
+                .query(FindDomains::new())
                 .filter_with(|domain| domain.id.eq(domain_id.clone()))
                 .execute_single_opt()
                 .expect("Query failed")
diff --git a/crates/iroha_cli/src/main.rs b/crates/iroha_cli/src/main.rs
index 6afb8ee703..7da333bf27 100644
--- a/crates/iroha_cli/src/main.rs
+++ b/crates/iroha_cli/src/main.rs
@@ -374,8 +374,6 @@ mod blocks {
 }
 
 mod domain {
-    use iroha::client;
-
     use super::*;
 
     /// Arguments for domain subcommand
@@ -430,7 +428,7 @@ mod domain {
         fn run(self, context: &mut dyn RunContext) -> Result<()> {
             let client = context.client_from_config();
 
-            let query = client.query(client::domain::all());
+            let query = client.query(FindDomains::new());
 
             let query = match self {
                 List::All => query,
@@ -545,8 +543,6 @@ mod domain {
 mod account {
     use std::fmt::Debug;
 
-    use iroha::client::{self};
-
     use super::{Permission as DataModelPermission, *};
 
     /// subcommands for account subcommand
@@ -606,7 +602,7 @@ mod account {
         fn run(self, context: &mut dyn RunContext) -> Result<()> {
             let client = context.client_from_config();
 
-            let query = client.query(client::account::all());
+            let query = client.query(FindAccounts::new());
 
             let query = match self {
                 List::All => query,
@@ -686,10 +682,7 @@ mod account {
 }
 
 mod asset {
-    use iroha::{
-        client::{self, asset},
-        data_model::name::Name,
-    };
+    use iroha::data_model::name::Name;
 
     use super::*;
 
@@ -799,7 +792,7 @@ mod asset {
             fn run(self, context: &mut dyn RunContext) -> Result<()> {
                 let client = context.client_from_config();
 
-                let query = client.query(client::asset::all_definitions());
+                let query = client.query(FindAssetsDefinitions::new());
 
                 let query = match self {
                     List::All => query,
@@ -911,7 +904,7 @@ mod asset {
             let Self { id: asset_id } = self;
             let client = context.client_from_config();
             let asset = client
-                .query(asset::all())
+                .query(FindAssets::new())
                 .filter_with(|asset| asset.id.eq(asset_id))
                 .execute_single()
                 .wrap_err("Failed to get asset.")?;
@@ -933,7 +926,7 @@ mod asset {
         fn run(self, context: &mut dyn RunContext) -> Result<()> {
             let client = context.client_from_config();
 
-            let query = client.query(client::asset::all());
+            let query = client.query(FindAssets::new());
 
             let query = match self {
                 List::All => query,
diff --git a/crates/iroha_core/src/smartcontracts/isi/tx.rs b/crates/iroha_core/src/smartcontracts/isi/tx.rs
index e12fd93073..f97999d84d 100644
--- a/crates/iroha_core/src/smartcontracts/isi/tx.rs
+++ b/crates/iroha_core/src/smartcontracts/isi/tx.rs
@@ -22,12 +22,14 @@ use nonzero_ext::nonzero;
 use super::*;
 use crate::smartcontracts::ValidQuery;
 
+/// Iterates transactions of a block in reverse order
 pub(crate) struct BlockTransactionIter(Arc<SignedBlock>, usize);
 pub(crate) struct BlockTransactionRef(Arc<SignedBlock>, usize);
 
 impl BlockTransactionIter {
     fn new(block: Arc<SignedBlock>) -> Self {
-        Self(block, 0)
+        let n_transactions = block.transactions().len();
+        Self(block, n_transactions)
     }
 }
 
@@ -35,11 +37,9 @@ impl Iterator for BlockTransactionIter {
     type Item = BlockTransactionRef;
 
     fn next(&mut self) -> Option<Self::Item> {
-        if self.1 < self.0.transactions().len() {
-            let res = Some(BlockTransactionRef(Arc::clone(&self.0), self.1));
-
-            self.1 += 1;
-            return res;
+        if self.1 != 0 {
+            self.1 -= 1;
+            return Some(BlockTransactionRef(Arc::clone(&self.0), self.1));
         }
 
         None
@@ -69,6 +69,7 @@ impl ValidQuery for FindTransactions {
     ) -> Result<impl Iterator<Item = Self::Item>, QueryExecutionFail> {
         Ok(state_ro
             .all_blocks(nonzero!(1_usize))
+            .rev()
             .flat_map(BlockTransactionIter::new)
             .map(|tx| TransactionQueryOutput {
                 block_hash: tx.block_hash(),
diff --git a/crates/iroha_data_model/src/query/mod.rs b/crates/iroha_data_model/src/query/mod.rs
index c2ed143790..ea9f06dc43 100644
--- a/crates/iroha_data_model/src/query/mod.rs
+++ b/crates/iroha_data_model/src/query/mod.rs
@@ -751,7 +751,7 @@ pub mod asset {
         #[derive(Copy, Display)]
         #[display(fmt = "Find all asset definitions")]
         #[ffi_type]
-        pub struct FindAssetsDefinitions; // TODO: Should it be renamed to [`FindAllAssetDefinitions`?
+        pub struct FindAssetsDefinitions;
 
         /// [`FindAssetQuantityById`] Iroha Query gets [`AssetId`] as input and finds [`Asset::quantity`]
         /// value if [`Asset`] is presented in Iroha Peer.
diff --git a/pytests/iroha_cli_tests/poetry.lock b/pytests/iroha_cli_tests/poetry.lock
index b8a127643d..f974ce35b8 100644
--- a/pytests/iroha_cli_tests/poetry.lock
+++ b/pytests/iroha_cli_tests/poetry.lock
@@ -340,43 +340,43 @@ files = [
 
 [[package]]
 name = "mypy"
-version = "1.12.1"
+version = "1.13.0"
 description = "Optional static typing for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "mypy-1.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3d7d4371829184e22fda4015278fbfdef0327a4b955a483012bd2d423a788801"},
-    {file = "mypy-1.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f59f1dfbf497d473201356966e353ef09d4daec48caeacc0254db8ef633a28a5"},
-    {file = "mypy-1.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b947097fae68004b8328c55161ac9db7d3566abfef72d9d41b47a021c2fba6b1"},
-    {file = "mypy-1.12.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96af62050971c5241afb4701c15189ea9507db89ad07794a4ee7b4e092dc0627"},
-    {file = "mypy-1.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:d90da248f4c2dba6c44ddcfea94bb361e491962f05f41990ff24dbd09969ce20"},
-    {file = "mypy-1.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1230048fec1380faf240be6385e709c8570604d2d27ec6ca7e573e3bc09c3735"},
-    {file = "mypy-1.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:02dcfe270c6ea13338210908f8cadc8d31af0f04cee8ca996438fe6a97b4ec66"},
-    {file = "mypy-1.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5a437c9102a6a252d9e3a63edc191a3aed5f2fcb786d614722ee3f4472e33f6"},
-    {file = "mypy-1.12.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:186e0c8346efc027ee1f9acf5ca734425fc4f7dc2b60144f0fbe27cc19dc7931"},
-    {file = "mypy-1.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:673ba1140a478b50e6d265c03391702fa11a5c5aff3f54d69a62a48da32cb811"},
-    {file = "mypy-1.12.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9fb83a7be97c498176fb7486cafbb81decccaef1ac339d837c377b0ce3743a7f"},
-    {file = "mypy-1.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:389e307e333879c571029d5b93932cf838b811d3f5395ed1ad05086b52148fb0"},
-    {file = "mypy-1.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:94b2048a95a21f7a9ebc9fbd075a4fcd310410d078aa0228dbbad7f71335e042"},
-    {file = "mypy-1.12.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ee5932370ccf7ebf83f79d1c157a5929d7ea36313027b0d70a488493dc1b179"},
-    {file = "mypy-1.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:19bf51f87a295e7ab2894f1d8167622b063492d754e69c3c2fed6563268cb42a"},
-    {file = "mypy-1.12.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d34167d43613ffb1d6c6cdc0cc043bb106cac0aa5d6a4171f77ab92a3c758bcc"},
-    {file = "mypy-1.12.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:427878aa54f2e2c5d8db31fa9010c599ed9f994b3b49e64ae9cd9990c40bd635"},
-    {file = "mypy-1.12.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5fcde63ea2c9f69d6be859a1e6dd35955e87fa81de95bc240143cf00de1f7f81"},
-    {file = "mypy-1.12.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d54d840f6c052929f4a3d2aab2066af0f45a020b085fe0e40d4583db52aab4e4"},
-    {file = "mypy-1.12.1-cp313-cp313-win_amd64.whl", hash = "sha256:20db6eb1ca3d1de8ece00033b12f793f1ea9da767334b7e8c626a4872090cf02"},
-    {file = "mypy-1.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b16fe09f9c741d85a2e3b14a5257a27a4f4886c171d562bc5a5e90d8591906b8"},
-    {file = "mypy-1.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0dcc1e843d58f444fce19da4cce5bd35c282d4bde232acdeca8279523087088a"},
-    {file = "mypy-1.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e10ba7de5c616e44ad21005fa13450cd0de7caaa303a626147d45307492e4f2d"},
-    {file = "mypy-1.12.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0e6fe449223fa59fbee351db32283838a8fee8059e0028e9e6494a03802b4004"},
-    {file = "mypy-1.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:dc6e2a2195a290a7fd5bac3e60b586d77fc88e986eba7feced8b778c373f9afe"},
-    {file = "mypy-1.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:de5b2a8988b4e1269a98beaf0e7cc71b510d050dce80c343b53b4955fff45f19"},
-    {file = "mypy-1.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:843826966f1d65925e8b50d2b483065c51fc16dc5d72647e0236aae51dc8d77e"},
-    {file = "mypy-1.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9fe20f89da41a95e14c34b1ddb09c80262edcc295ad891f22cc4b60013e8f78d"},
-    {file = "mypy-1.12.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8135ffec02121a75f75dc97c81af7c14aa4ae0dda277132cfcd6abcd21551bfd"},
-    {file = "mypy-1.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:a7b76fa83260824300cc4834a3ab93180db19876bce59af921467fd03e692810"},
-    {file = "mypy-1.12.1-py3-none-any.whl", hash = "sha256:ce561a09e3bb9863ab77edf29ae3a50e65685ad74bba1431278185b7e5d5486e"},
-    {file = "mypy-1.12.1.tar.gz", hash = "sha256:f5b3936f7a6d0e8280c9bdef94c7ce4847f5cdfc258fbb2c29a8c1711e8bb96d"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6607e0f1dd1fb7f0aca14d936d13fd19eba5e17e1cd2a14f808fa5f8f6d8f60a"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8a21be69bd26fa81b1f80a61ee7ab05b076c674d9b18fb56239d72e21d9f4c80"},
+    {file = "mypy-1.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7b2353a44d2179846a096e25691d54d59904559f4232519d420d64da6828a3a7"},
+    {file = "mypy-1.13.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0730d1c6a2739d4511dc4253f8274cdd140c55c32dfb0a4cf8b7a43f40abfa6f"},
+    {file = "mypy-1.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:c5fc54dbb712ff5e5a0fca797e6e0aa25726c7e72c6a5850cfd2adbc1eb0a372"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:581665e6f3a8a9078f28d5502f4c334c0c8d802ef55ea0e7276a6e409bc0d82d"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3ddb5b9bf82e05cc9a627e84707b528e5c7caaa1c55c69e175abb15a761cec2d"},
+    {file = "mypy-1.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:20c7ee0bc0d5a9595c46f38beb04201f2620065a93755704e141fcac9f59db2b"},
+    {file = "mypy-1.13.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3790ded76f0b34bc9c8ba4def8f919dd6a46db0f5a6610fb994fe8efdd447f73"},
+    {file = "mypy-1.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51f869f4b6b538229c1d1bcc1dd7d119817206e2bc54e8e374b3dfa202defcca"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e"},
+    {file = "mypy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2"},
+    {file = "mypy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0"},
+    {file = "mypy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62"},
+    {file = "mypy-1.13.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8"},
+    {file = "mypy-1.13.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7"},
+    {file = "mypy-1.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:100fac22ce82925f676a734af0db922ecfea991e1d7ec0ceb1e115ebe501301a"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bcb0bb7f42a978bb323a7c88f1081d1b5dee77ca86f4100735a6f541299d8fb"},
+    {file = "mypy-1.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bde31fc887c213e223bbfc34328070996061b0833b0a4cfec53745ed61f3519b"},
+    {file = "mypy-1.13.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:07de989f89786f62b937851295ed62e51774722e5444a27cecca993fc3f9cd74"},
+    {file = "mypy-1.13.0-cp38-cp38-win_amd64.whl", hash = "sha256:4bde84334fbe19bad704b3f5b78c4abd35ff1026f8ba72b29de70dda0916beb6"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0246bcb1b5de7f08f2826451abd947bf656945209b140d16ed317f65a17dc7dc"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7f5b7deae912cf8b77e990b9280f170381fdfbddf61b4ef80927edd813163732"},
+    {file = "mypy-1.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7029881ec6ffb8bc233a4fa364736789582c738217b133f1b55967115288a2bc"},
+    {file = "mypy-1.13.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3e38b980e5681f28f033f3be86b099a247b13c491f14bb8b1e1e134d23bb599d"},
+    {file = "mypy-1.13.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6789be98a2017c912ae6ccb77ea553bbaf13d27605d2ca20a76dfbced631b24"},
+    {file = "mypy-1.13.0-py3-none-any.whl", hash = "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a"},
+    {file = "mypy-1.13.0.tar.gz", hash = "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e"},
 ]
 
 [package.dependencies]
@@ -385,6 +385,7 @@ typing-extensions = ">=4.6.0"
 
 [package.extras]
 dmypy = ["psutil (>=4.0)"]
+faster-cache = ["orjson"]
 install-types = ["pip"]
 mypyc = ["setuptools (>=50)"]
 reports = ["lxml"]
diff --git a/pytests/iroha_torii_tests/poetry.lock b/pytests/iroha_torii_tests/poetry.lock
index 188334a3e2..5147b2f796 100644
--- a/pytests/iroha_torii_tests/poetry.lock
+++ b/pytests/iroha_torii_tests/poetry.lock
@@ -329,43 +329,43 @@ files = [
 
 [[package]]
 name = "mypy"
-version = "1.12.1"
+version = "1.13.0"
 description = "Optional static typing for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "mypy-1.12.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3d7d4371829184e22fda4015278fbfdef0327a4b955a483012bd2d423a788801"},
-    {file = "mypy-1.12.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f59f1dfbf497d473201356966e353ef09d4daec48caeacc0254db8ef633a28a5"},
-    {file = "mypy-1.12.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b947097fae68004b8328c55161ac9db7d3566abfef72d9d41b47a021c2fba6b1"},
-    {file = "mypy-1.12.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96af62050971c5241afb4701c15189ea9507db89ad07794a4ee7b4e092dc0627"},
-    {file = "mypy-1.12.1-cp310-cp310-win_amd64.whl", hash = "sha256:d90da248f4c2dba6c44ddcfea94bb361e491962f05f41990ff24dbd09969ce20"},
-    {file = "mypy-1.12.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1230048fec1380faf240be6385e709c8570604d2d27ec6ca7e573e3bc09c3735"},
-    {file = "mypy-1.12.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:02dcfe270c6ea13338210908f8cadc8d31af0f04cee8ca996438fe6a97b4ec66"},
-    {file = "mypy-1.12.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a5a437c9102a6a252d9e3a63edc191a3aed5f2fcb786d614722ee3f4472e33f6"},
-    {file = "mypy-1.12.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:186e0c8346efc027ee1f9acf5ca734425fc4f7dc2b60144f0fbe27cc19dc7931"},
-    {file = "mypy-1.12.1-cp311-cp311-win_amd64.whl", hash = "sha256:673ba1140a478b50e6d265c03391702fa11a5c5aff3f54d69a62a48da32cb811"},
-    {file = "mypy-1.12.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9fb83a7be97c498176fb7486cafbb81decccaef1ac339d837c377b0ce3743a7f"},
-    {file = "mypy-1.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:389e307e333879c571029d5b93932cf838b811d3f5395ed1ad05086b52148fb0"},
-    {file = "mypy-1.12.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:94b2048a95a21f7a9ebc9fbd075a4fcd310410d078aa0228dbbad7f71335e042"},
-    {file = "mypy-1.12.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ee5932370ccf7ebf83f79d1c157a5929d7ea36313027b0d70a488493dc1b179"},
-    {file = "mypy-1.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:19bf51f87a295e7ab2894f1d8167622b063492d754e69c3c2fed6563268cb42a"},
-    {file = "mypy-1.12.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:d34167d43613ffb1d6c6cdc0cc043bb106cac0aa5d6a4171f77ab92a3c758bcc"},
-    {file = "mypy-1.12.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:427878aa54f2e2c5d8db31fa9010c599ed9f994b3b49e64ae9cd9990c40bd635"},
-    {file = "mypy-1.12.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5fcde63ea2c9f69d6be859a1e6dd35955e87fa81de95bc240143cf00de1f7f81"},
-    {file = "mypy-1.12.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:d54d840f6c052929f4a3d2aab2066af0f45a020b085fe0e40d4583db52aab4e4"},
-    {file = "mypy-1.12.1-cp313-cp313-win_amd64.whl", hash = "sha256:20db6eb1ca3d1de8ece00033b12f793f1ea9da767334b7e8c626a4872090cf02"},
-    {file = "mypy-1.12.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b16fe09f9c741d85a2e3b14a5257a27a4f4886c171d562bc5a5e90d8591906b8"},
-    {file = "mypy-1.12.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0dcc1e843d58f444fce19da4cce5bd35c282d4bde232acdeca8279523087088a"},
-    {file = "mypy-1.12.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e10ba7de5c616e44ad21005fa13450cd0de7caaa303a626147d45307492e4f2d"},
-    {file = "mypy-1.12.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0e6fe449223fa59fbee351db32283838a8fee8059e0028e9e6494a03802b4004"},
-    {file = "mypy-1.12.1-cp38-cp38-win_amd64.whl", hash = "sha256:dc6e2a2195a290a7fd5bac3e60b586d77fc88e986eba7feced8b778c373f9afe"},
-    {file = "mypy-1.12.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:de5b2a8988b4e1269a98beaf0e7cc71b510d050dce80c343b53b4955fff45f19"},
-    {file = "mypy-1.12.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:843826966f1d65925e8b50d2b483065c51fc16dc5d72647e0236aae51dc8d77e"},
-    {file = "mypy-1.12.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9fe20f89da41a95e14c34b1ddb09c80262edcc295ad891f22cc4b60013e8f78d"},
-    {file = "mypy-1.12.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8135ffec02121a75f75dc97c81af7c14aa4ae0dda277132cfcd6abcd21551bfd"},
-    {file = "mypy-1.12.1-cp39-cp39-win_amd64.whl", hash = "sha256:a7b76fa83260824300cc4834a3ab93180db19876bce59af921467fd03e692810"},
-    {file = "mypy-1.12.1-py3-none-any.whl", hash = "sha256:ce561a09e3bb9863ab77edf29ae3a50e65685ad74bba1431278185b7e5d5486e"},
-    {file = "mypy-1.12.1.tar.gz", hash = "sha256:f5b3936f7a6d0e8280c9bdef94c7ce4847f5cdfc258fbb2c29a8c1711e8bb96d"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6607e0f1dd1fb7f0aca14d936d13fd19eba5e17e1cd2a14f808fa5f8f6d8f60a"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8a21be69bd26fa81b1f80a61ee7ab05b076c674d9b18fb56239d72e21d9f4c80"},
+    {file = "mypy-1.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7b2353a44d2179846a096e25691d54d59904559f4232519d420d64da6828a3a7"},
+    {file = "mypy-1.13.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0730d1c6a2739d4511dc4253f8274cdd140c55c32dfb0a4cf8b7a43f40abfa6f"},
+    {file = "mypy-1.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:c5fc54dbb712ff5e5a0fca797e6e0aa25726c7e72c6a5850cfd2adbc1eb0a372"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:581665e6f3a8a9078f28d5502f4c334c0c8d802ef55ea0e7276a6e409bc0d82d"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3ddb5b9bf82e05cc9a627e84707b528e5c7caaa1c55c69e175abb15a761cec2d"},
+    {file = "mypy-1.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:20c7ee0bc0d5a9595c46f38beb04201f2620065a93755704e141fcac9f59db2b"},
+    {file = "mypy-1.13.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3790ded76f0b34bc9c8ba4def8f919dd6a46db0f5a6610fb994fe8efdd447f73"},
+    {file = "mypy-1.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51f869f4b6b538229c1d1bcc1dd7d119817206e2bc54e8e374b3dfa202defcca"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e"},
+    {file = "mypy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2"},
+    {file = "mypy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0"},
+    {file = "mypy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62"},
+    {file = "mypy-1.13.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8"},
+    {file = "mypy-1.13.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7"},
+    {file = "mypy-1.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:100fac22ce82925f676a734af0db922ecfea991e1d7ec0ceb1e115ebe501301a"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bcb0bb7f42a978bb323a7c88f1081d1b5dee77ca86f4100735a6f541299d8fb"},
+    {file = "mypy-1.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bde31fc887c213e223bbfc34328070996061b0833b0a4cfec53745ed61f3519b"},
+    {file = "mypy-1.13.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:07de989f89786f62b937851295ed62e51774722e5444a27cecca993fc3f9cd74"},
+    {file = "mypy-1.13.0-cp38-cp38-win_amd64.whl", hash = "sha256:4bde84334fbe19bad704b3f5b78c4abd35ff1026f8ba72b29de70dda0916beb6"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0246bcb1b5de7f08f2826451abd947bf656945209b140d16ed317f65a17dc7dc"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7f5b7deae912cf8b77e990b9280f170381fdfbddf61b4ef80927edd813163732"},
+    {file = "mypy-1.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7029881ec6ffb8bc233a4fa364736789582c738217b133f1b55967115288a2bc"},
+    {file = "mypy-1.13.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3e38b980e5681f28f033f3be86b099a247b13c491f14bb8b1e1e134d23bb599d"},
+    {file = "mypy-1.13.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6789be98a2017c912ae6ccb77ea553bbaf13d27605d2ca20a76dfbced631b24"},
+    {file = "mypy-1.13.0-py3-none-any.whl", hash = "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a"},
+    {file = "mypy-1.13.0.tar.gz", hash = "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e"},
 ]
 
 [package.dependencies]
@@ -374,6 +374,7 @@ typing-extensions = ">=4.6.0"
 
 [package.extras]
 dmypy = ["psutil (>=4.0)"]
+faster-cache = ["orjson"]
 install-types = ["pip"]
 mypyc = ["setuptools (>=50)"]
 reports = ["lxml"]
@@ -812,4 +813,4 @@ test = ["websockets"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "688ebfcbb55a12f50f2d342d8673e6eb046b587852d49a1409215d2fc8621ead"
+content-hash = "732726543f476389890299281685f743e29b342ef0820458f708cc86f74a60cd"
diff --git a/pytests/iroha_torii_tests/pyproject.toml b/pytests/iroha_torii_tests/pyproject.toml
index 3d686094d5..f319a95a15 100644
--- a/pytests/iroha_torii_tests/pyproject.toml
+++ b/pytests/iroha_torii_tests/pyproject.toml
@@ -17,7 +17,7 @@ jsonschema = "^4.23.0"
 pyyaml = "^6.0.2"
 toml = "^0.10.2"
 black = "^24.10.0"
-mypy = "^1.12.1"
+mypy = "^1.13.0"
 flake8 = "^7.1.1"
 types-toml = "^0.10.8.20240310"
 types-requests = "^2.32.0.20241016"