refactor!: don't send public key with signature

Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
hyperledger · May 8, 2024 · 5fc6223 · 5fc6223
1 parent 85cfd97
commit 5fc6223
Show file tree

Hide file tree

Showing 50 changed files with 1,253 additions and 1,635 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -292,7 +292,7 @@ impl Iroha {
             &config.block_sync,
             sumeragi.clone(),
             Arc::clone(&kura),
-            config.common.peer_id(),
+            config.common.peer_id.clone(),
             network.clone(),
             Arc::clone(&state),
         )

diff --git a/client/benches/tps/utils.rs b/client/benches/tps/utils.rs
@@ -4,11 +4,11 @@ use eyre::{Result, WrapErr};
 use iroha_client::{
     client::Client,
     data_model::{
+        events::pipeline::{BlockEventFilter, BlockStatus},
         parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
         prelude::*,
     },
 };
-use iroha_data_model::events::pipeline::{BlockEventFilter, BlockStatus};
 use nonzero_ext::nonzero;
 use serde::Deserialize;
 use test_network::*;

diff --git a/client/examples/million_accounts_genesis.rs b/client/examples/million_accounts_genesis.rs
@@ -2,9 +2,10 @@
 use std::{thread, time::Duration};
 
 use iroha::samples::{construct_executor, get_config};
-use iroha_client::data_model::prelude::*;
-use iroha_crypto::KeyPair;
-use iroha_data_model::isi::InstructionBox;
+use iroha_client::{
+    crypto::KeyPair,
+    data_model::{isi::InstructionBox, prelude::*},
+};
 use iroha_genesis::{GenesisNetwork, RawGenesisBlock, RawGenesisBlockBuilder};
 use iroha_primitives::unique_vec;
 use test_network::{

diff --git a/client/examples/register_1000_triggers.rs b/client/examples/register_1000_triggers.rs
@@ -3,8 +3,10 @@
 use std::str::FromStr;
 
 use iroha::samples::{construct_executor, get_config};
-use iroha_client::{client::Client, data_model::prelude::*};
-use iroha_data_model::trigger::TriggerId;
+use iroha_client::{
+    client::Client,
+    data_model::{prelude::*, trigger::TriggerId},
+};
 use iroha_genesis::{GenesisNetwork, RawGenesisBlock, RawGenesisBlockBuilder};
 use iroha_primitives::unique_vec;
 use test_network::{

diff --git a/client/src/client.rs b/client/src/client.rs
@@ -14,13 +14,6 @@ use eyre::{eyre, Result, WrapErr};
 use futures_util::StreamExt;
 use http_default::{AsyncWebSocketStream, WebSocketStream};
 pub use iroha_config::client_api::ConfigDTO;
-use iroha_data_model::{
-    events::pipeline::{
-        BlockEventFilter, BlockStatus, PipelineEventBox, PipelineEventFilterBox,
-        TransactionEventFilter, TransactionStatus,
-    },
-    query::QueryOutputBox,
-};
 use iroha_logger::prelude::*;
 use iroha_telemetry::metrics::Status;
 use iroha_torii_const::uri as torii_uri;
@@ -35,9 +28,13 @@ use crate::{
     crypto::{HashOf, KeyPair},
     data_model::{
         block::SignedBlock,
+        events::pipeline::{
+            BlockEventFilter, BlockStatus, PipelineEventBox, PipelineEventFilterBox,
+            TransactionEventFilter, TransactionStatus,
+        },
         isi::Instruction,
         prelude::*,
-        query::{predicate::PredicateBox, Pagination, Query, Sorting},
+        query::{predicate::PredicateBox, Pagination, Query, QueryOutputBox, Sorting},
         BatchedResponse, ChainId, ValidationFail,
     },
     http::{Method as HttpMethod, RequestBuilder, Response, StatusCode},
@@ -70,17 +67,17 @@ pub type QueryResult<T> = core::result::Result<T, ClientQueryError>;
 /// Trait for signing transactions
 pub trait Sign {
     /// Sign transaction with provided key pair.
-    fn sign(self, key_pair: &crate::crypto::KeyPair) -> SignedTransaction;
+    fn sign(self, key_pair: &KeyPair) -> SignedTransaction;
 }
 
 impl Sign for TransactionBuilder {
-    fn sign(self, key_pair: &crate::crypto::KeyPair) -> SignedTransaction {
+    fn sign(self, key_pair: &KeyPair) -> SignedTransaction {
         self.sign(key_pair)
     }
 }
 
 impl Sign for SignedTransaction {
-    fn sign(self, key_pair: &crate::crypto::KeyPair) -> SignedTransaction {
+    fn sign(self, key_pair: &KeyPair) -> SignedTransaction {
         self.sign(key_pair)
     }
 }

diff --git a/client/src/config.rs b/client/src/config.rs
@@ -9,14 +9,16 @@ use iroha_config::{
     base,
     base::{FromEnv, StdEnv, UnwrapPartial},
 };
-use iroha_crypto::KeyPair;
-use iroha_data_model::{prelude::*, ChainId};
 use iroha_primitives::small::SmallStr;
 use serde::{Deserialize, Serialize};
 use serde_with::{DeserializeFromStr, SerializeDisplay};
 use url::Url;
 
-use crate::config::user::RootPartial;
+use crate::{
+    config::user::RootPartial,
+    crypto::KeyPair,
+    data_model::{prelude::*, ChainId},
+};
 
 mod user;
 

diff --git a/client/src/config/user.rs b/client/src/config/user.rs
@@ -7,13 +7,15 @@ use std::{fs::File, io::Read, path::Path, str::FromStr, time::Duration};
 pub use boilerplate::*;
 use eyre::{eyre, Context, Report};
 use iroha_config::base::{Emitter, ErrorsCollection};
-use iroha_crypto::{KeyPair, PrivateKey, PublicKey};
-use iroha_data_model::{account::AccountId, ChainId};
 use merge::Merge;
 use serde_with::DeserializeFromStr;
 use url::Url;
 
-use crate::config::BasicAuth;
+use crate::{
+    config::BasicAuth,
+    crypto::{KeyPair, PrivateKey, PublicKey},
+    data_model::{account::AccountId, ChainId},
+};
 
 impl RootPartial {
     /// Reads the partial layer from TOML

diff --git a/client/src/config/user/boilerplate.rs b/client/src/config/user/boilerplate.rs
@@ -8,15 +8,17 @@ use iroha_config::base::{
     Emitter, FromEnv, HumanDuration, Merge, ParseEnvResult, UnwrapPartial, UnwrapPartialResult,
     UserField,
 };
-use iroha_crypto::{PrivateKey, PublicKey};
-use iroha_data_model::{account::AccountId, ChainId};
 use serde::Deserialize;
 
-use crate::config::{
-    base::{FromEnvResult, ReadEnv},
-    user::{Account, OnlyHttpUrl, Root, Transaction},
-    BasicAuth, DEFAULT_TRANSACTION_NONCE, DEFAULT_TRANSACTION_STATUS_TIMEOUT,
-    DEFAULT_TRANSACTION_TIME_TO_LIVE,
+use crate::{
+    config::{
+        base::{FromEnvResult, ReadEnv},
+        user::{Account, OnlyHttpUrl, Root, Transaction},
+        BasicAuth, DEFAULT_TRANSACTION_NONCE, DEFAULT_TRANSACTION_STATUS_TIMEOUT,
+        DEFAULT_TRANSACTION_TIME_TO_LIVE,
+    },
+    crypto::{PrivateKey, PublicKey},
+    data_model::{account::AccountId, ChainId},
 };
 
 #[derive(Debug, Clone, Deserialize, Eq, PartialEq, Default, Merge)]

diff --git a/client/src/query_builder.rs b/client/src/query_builder.rs
@@ -1,10 +1,10 @@
 use std::fmt::Debug;
 
-use iroha_data_model::query::QueryOutputBox;
-
 use crate::{
     client::{Client, QueryOutput, QueryResult},
-    data_model::query::{predicate::PredicateBox, sorting::Sorting, FetchSize, Pagination, Query},
+    data_model::query::{
+        predicate::PredicateBox, sorting::Sorting, FetchSize, Pagination, Query, QueryOutputBox,
+    },
 };
 
 pub struct QueryRequestBuilder<'a, R> {

diff --git a/client/tests/integration/asset.rs b/client/tests/integration/asset.rs
@@ -4,14 +4,14 @@ use eyre::Result;
 use iroha_client::{
     client::{self, QueryResult},
     crypto::{KeyPair, PublicKey},
-    data_model::prelude::*,
+    data_model::{
+        asset::{AssetId, AssetValue, AssetValueType},
+        isi::error::{InstructionEvaluationError, InstructionExecutionError, Mismatch, TypeError},
+        prelude::*,
+        transaction::error::TransactionRejectionReason,
+    },
 };
 use iroha_config::parameters::actual::Root as Config;
-use iroha_data_model::{
-    asset::{AssetId, AssetValue, AssetValueType},
-    isi::error::{InstructionEvaluationError, InstructionExecutionError, Mismatch, TypeError},
-    transaction::error::TransactionRejectionReason,
-};
 use serde_json::json;
 use test_network::*;
 

diff --git a/client/tests/integration/burn_public_keys.rs b/client/tests/integration/burn_public_keys.rs
@@ -1,9 +1,8 @@
 use iroha_client::{
     client::{account, transaction, Client},
     crypto::{HashOf, KeyPair, PublicKey},
-    data_model::{isi::Instruction, prelude::*},
+    data_model::{isi::Instruction, prelude::*, query::TransactionQueryOutput},
 };
-use iroha_data_model::query::TransactionQueryOutput;
 use test_network::*;
 
 fn submit(

diff --git a/client/tests/integration/domain_owner_permissions.rs b/client/tests/integration/domain_owner_permissions.rs
@@ -1,9 +1,11 @@
 use eyre::Result;
 use iroha_client::{
     crypto::KeyPair,
-    data_model::{account::SignatureCheckCondition, prelude::*},
+    data_model::{
+        account::SignatureCheckCondition, prelude::*,
+        transaction::error::TransactionRejectionReason,
+    },
 };
-use iroha_data_model::transaction::error::TransactionRejectionReason;
 use serde_json::json;
 use test_network::*;
 

diff --git a/client/tests/integration/events/pipeline.rs b/client/tests/integration/events/pipeline.rs
@@ -4,19 +4,17 @@ use eyre::Result;
 use iroha_client::{
     crypto::HashOf,
     data_model::{
+        events::pipeline::{
+            BlockEvent, BlockEventFilter, BlockStatus, TransactionEventFilter, TransactionStatus,
+        },
+        isi::error::InstructionExecutionError,
         parameter::{default::MAX_TRANSACTIONS_IN_BLOCK, ParametersBuilder},
         prelude::*,
+        transaction::error::TransactionRejectionReason,
+        ValidationFail,
     },
 };
 use iroha_config::parameters::actual::Root as Config;
-use iroha_data_model::{
-    events::pipeline::{
-        BlockEvent, BlockEventFilter, BlockStatus, TransactionEventFilter, TransactionStatus,
-    },
-    isi::error::InstructionExecutionError,
-    transaction::error::TransactionRejectionReason,
-    ValidationFail,
-};
 use test_network::*;
 
 // Needed to re-enable ignored tests.

diff --git a/client/tests/integration/extra_functional/offline_peers.rs b/client/tests/integration/extra_functional/offline_peers.rs
@@ -1,13 +1,13 @@
 use eyre::Result;
 use iroha_client::{
     client::{self, Client, QueryResult},
+    crypto::KeyPair,
     data_model::{
         peer::{Peer as DataModelPeer, PeerId},
         prelude::*,
     },
 };
 use iroha_config::parameters::actual::Root as Config;
-use iroha_crypto::KeyPair;
 use iroha_primitives::addr::socket_addr;
 use test_network::*;
 use tokio::runtime::Runtime;

diff --git a/client/tests/integration/mod.rs b/client/tests/integration/mod.rs
@@ -1,5 +1,7 @@
-use iroha_crypto::KeyPair;
-use iroha_data_model::account::{Account, AccountId, NewAccount};
+use iroha_client::{
+    crypto::KeyPair,
+    data_model::account::{Account, AccountId, NewAccount},
+};
 
 mod add_account;
 mod add_domain;

diff --git a/client/tests/integration/non_mintable.rs b/client/tests/integration/non_mintable.rs
@@ -3,9 +3,8 @@ use std::str::FromStr as _;
 use eyre::Result;
 use iroha_client::{
     client::{self, QueryResult},
-    data_model::{metadata::UnlimitedMetadata, prelude::*},
+    data_model::{isi::InstructionBox, metadata::UnlimitedMetadata, prelude::*},
 };
-use iroha_data_model::isi::InstructionBox;
 use test_network::*;
 
 #[test]

diff --git a/client/tests/integration/permissions.rs b/client/tests/integration/permissions.rs
@@ -4,10 +4,10 @@ use eyre::Result;
 use iroha_client::{
     client::{self, Client, QueryResult},
     crypto::KeyPair,
-    data_model::prelude::*,
-};
-use iroha_data_model::{
-    permission::PermissionToken, role::RoleId, transaction::error::TransactionRejectionReason,
+    data_model::{
+        permission::PermissionToken, prelude::*, role::RoleId,
+        transaction::error::TransactionRejectionReason,
+    },
 };
 use iroha_genesis::GenesisNetwork;
 use serde_json::json;

diff --git a/client/tests/integration/roles.rs b/client/tests/integration/roles.rs
@@ -4,9 +4,8 @@ use eyre::Result;
 use iroha_client::{
     client::{self, QueryResult},
     crypto::KeyPair,
-    data_model::prelude::*,
+    data_model::{prelude::*, transaction::error::TransactionRejectionReason},
 };
-use iroha_data_model::transaction::error::TransactionRejectionReason;
 use serde_json::json;
 use test_network::*;
 

diff --git a/client/tests/integration/sorting.rs b/client/tests/integration/sorting.rs
@@ -5,14 +5,14 @@ use iroha_client::{
     client::{self, QueryResult},
     data_model::{
         account::Account,
+        isi::InstructionBox,
         prelude::*,
         query::{
             predicate::{string, value, PredicateBox},
             Pagination, Sorting,
         },
     },
 };
-use iroha_data_model::isi::InstructionBox;
 use nonzero_ext::nonzero;
 use test_network::*;
 

diff --git a/client/tests/integration/transfer_asset.rs b/client/tests/integration/transfer_asset.rs
@@ -3,13 +3,14 @@ use std::str::FromStr;
 use iroha_client::{
     client::{self, QueryResult},
     crypto::KeyPair,
-    data_model::{isi::Instruction, prelude::*, Registered},
-};
-use iroha_data_model::{
-    account::{Account, AccountId},
-    asset::{Asset, AssetDefinition},
-    isi::InstructionBox,
-    name::Name,
+    data_model::{
+        account::{Account, AccountId},
+        asset::{Asset, AssetDefinition},
+        isi::{Instruction, InstructionBox},
+        name::Name,
+        prelude::*,
+        Registered,
+    },
 };
 use test_network::*;
 

diff --git a/client/tests/integration/triggers/data_trigger.rs b/client/tests/integration/triggers/data_trigger.rs
@@ -1,6 +1,8 @@
 use eyre::Result;
-use iroha_client::{client, data_model::prelude::*};
-use iroha_data_model::asset::AssetValue;
+use iroha_client::{
+    client,
+    data_model::{asset::AssetValue, prelude::*},
+};
 use test_network::*;
 
 use crate::integration::new_account_with_random_public_key;

diff --git a/client/tests/integration/triggers/time_trigger.rs b/client/tests/integration/triggers/time_trigger.rs
@@ -3,10 +3,13 @@ use std::{str::FromStr as _, time::Duration};
 use eyre::Result;
 use iroha_client::{
     client::{self, Client, QueryResult},
-    data_model::{prelude::*, transaction::WasmSmartContract},
+    data_model::{
+        events::pipeline::{BlockEventFilter, BlockStatus},
+        prelude::*,
+        transaction::WasmSmartContract,
+    },
 };
 use iroha_config::parameters::defaults::chain_wide::DEFAULT_CONSENSUS_ESTIMATION;
-use iroha_data_model::events::pipeline::{BlockEventFilter, BlockStatus};
 use iroha_logger::info;
 use test_network::*;
 

diff --git a/client/tests/integration/tx_chain_id.rs b/client/tests/integration/tx_chain_id.rs
@@ -1,7 +1,6 @@
 use std::str::FromStr;
 
-use iroha_crypto::KeyPair;
-use iroha_data_model::prelude::*;
+use iroha_client::{crypto::KeyPair, data_model::prelude::*};
 use iroha_primitives::numeric::numeric;
 use test_network::*;