Merge branch 'master' into peg/handle-pck-certs

* master:
  Remove bad clippy ignores (#1095)

crates/threshold-signature-server/src/signing_client/protocol_execution/mod.rs

@@ -14,7 +14,6 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //! Handle execution of the signing and DKG protocols
-#![allow(dead_code)]
 mod context;
 
 use entropy_kvdb::kv_manager::KvManager;

crates/threshold-signature-server/src/user/api.rs

@@ -13,77 +13,48 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use std::{
-    str::{from_utf8, FromStr},
-    sync::Arc,
-    time::SystemTime,
-};
+use std::str::FromStr;
 
 use axum::{
     body::{Body, Bytes},
     extract::State,
     http::StatusCode,
-    response::{IntoResponse, Response},
-    routing::{get, post},
-    Json, Router,
+    Json,
 };
 use base64::prelude::{Engine, BASE64_STANDARD};
-use bip39::{Language, Mnemonic};
-use blake2::{Blake2s256, Digest};
 use entropy_client::substrate::get_registered_details;
-use entropy_kvdb::kv_manager::{
-    error::{InnerKvError, KvError},
-    helpers::serialize as key_serialize,
-    value::PartyInfo,
-    KvManager,
-};
+use entropy_kvdb::kv_manager::{helpers::serialize as key_serialize, KvManager};
 use entropy_programs_runtime::{Config as ProgramConfig, Runtime, SignatureRequest};
-use entropy_protocol::{KeyParams, PartyId, SigningSessionInfo, ValidatorInfo};
-use entropy_shared::{
-    HashingAlgorithm, OcwMessageDkg, X25519PublicKey, NETWORK_PARENT_KEY, TOTAL_SIGNERS,
-};
-use futures::{
-    channel::mpsc,
-    future::{join_all, try_join_all, FutureExt},
-    stream::TryStreamExt,
-    Stream, StreamExt,
-};
-use num::{bigint::BigInt, FromPrimitive, Num, ToPrimitive};
-use parity_scale_codec::{Decode, DecodeAll, Encode};
-use rand_core::OsRng;
+use entropy_protocol::SigningSessionInfo;
+use entropy_shared::{HashingAlgorithm, OcwMessageDkg, NETWORK_PARENT_KEY};
+use futures::{channel::mpsc, future::join_all, StreamExt};
+use parity_scale_codec::{Decode, Encode};
 use serde::{Deserialize, Serialize};
-use sp_core::{crypto::AccountId32, H256};
 use subxt::{
     backend::legacy::LegacyRpcMethods,
-    ext::sp_core::{crypto::Ss58Codec, sr25519, sr25519::Signature, Pair},
-    tx::{PairSigner, Signer},
-    utils::{AccountId32 as SubxtAccountId32, MultiAddress},
-    Config, OnlineClient,
+    ext::sp_core::{sr25519, sr25519::Signature, Pair},
+    tx::PairSigner,
+    utils::AccountId32 as SubxtAccountId32,
+    OnlineClient,
 };
-use synedrion::ThresholdKeyShare;
-use tokio::select;
-use tracing::instrument;
 use x25519_dalek::StaticSecret;
-use zeroize::Zeroize;
 
-use super::{ParsedUserInputPartyInfo, ProgramError, UserErr, UserInputPartyInfo};
+use super::UserErr;
 use crate::chain_api::entropy::runtime_types::pallet_registry::pallet::RegisteredInfo;
 use crate::{
     chain_api::{entropy, get_api, get_rpc, EntropyConfig},
     helpers::{
         launch::LATEST_BLOCK_NUMBER_NEW_USER,
-        signing::{do_signing, Hasher},
+        signing::do_signing,
         substrate::{
-            get_oracle_data, get_program, get_signers_from_chain, get_stash_address,
-            get_validators_info, query_chain, submit_transaction,
+            get_oracle_data, get_program, get_signers_from_chain, get_validators_info, query_chain,
+            submit_transaction,
         },
         user::{check_in_registration_group, compute_hash, do_dkg},
-        validator::{get_signer, get_signer_and_x25519_secret},
+        validator::get_signer_and_x25519_secret,
     },
-    signing_client::{ListenerState, ProtocolErr},
     validation::{check_stale, EncryptedSignedMessage},
-    validator::api::check_forbidden_key,
-    AppState, Configuration,
+    AppState,
 };
 
 pub use entropy_client::user::{RelayerSignatureRequest, UserSignatureRequest};

crates/threshold-signature-server/src/user/errors.rs

@@ -15,10 +15,9 @@
 
 //! Errors used in User creation
 
-use std::{io::Cursor, string::FromUtf8Error};
+use std::string::FromUtf8Error;
 
 use axum::{
-    body,
     http::StatusCode,
     response::{IntoResponse, Response},
 };
@@ -27,10 +26,7 @@ use entropy_protocol::{errors::ProtocolExecutionErr, sign_and_encrypt::Encrypted
 use thiserror::Error;
 use tokio::sync::oneshot::error::RecvError;
 
-use crate::{
-    chain_api::entropy,
-    signing_client::{ProtocolErr, SubscribeErr},
-};
+use crate::signing_client::{ProtocolErr, SubscribeErr};
 
 /// Errors related to parsing and evaulating programs.
 #[derive(Error, Debug, PartialEq)]

crates/threshold-signature-server/src/user/mod.rs

@@ -14,16 +14,9 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 //! Functionality and HTTP endpoints relating to user interaction
-#![allow(dead_code)]
-#![allow(unused_imports)]
 pub mod api;
 pub mod errors;
 
-use std::{
-    fs::File,
-    io::{BufWriter, Write},
-};
-
 use entropy_kvdb::kv_manager::value::{KvValue, PartyInfo};
 use serde::{Deserialize, Serialize};
 use subxt::ext::sp_runtime::AccountId32;

crates/threshold-signature-server/src/user/tests.rs

@@ -13,98 +13,62 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use axum::http::StatusCode;
 use base64::prelude::{Engine, BASE64_STANDARD};
-use bip39::{Language, Mnemonic};
-use blake3::hash;
 use entropy_client::substrate::get_registered_details;
 use entropy_client::{
     client as test_client,
-    client::{sign, update_programs},
-    user::get_all_signers_from_chain,
+    client::update_programs,
+    user::{get_all_signers_from_chain, UserSignatureRequest},
 };
-use entropy_kvdb::{
-    clean_tests,
-    encrypted_sled::PasswordMethod,
-    kv_manager::{helpers::deserialize as keyshare_deserialize, value::KvManager},
-};
-use entropy_programs_runtime::{Runtime, SignatureRequest};
+use entropy_kvdb::clean_tests;
+use entropy_programs_runtime::Runtime;
 use entropy_protocol::{
     decode_verifying_key,
-    protocol_transport::{noise::noise_handshake_initiator, SubscribeMessage, WsConnection},
-    KeyParams, KeyShareWithAuxInfo, PartyId, SessionId, SigningSessionInfo, ValidatorInfo,
+    protocol_transport::{noise::noise_handshake_initiator, SubscribeMessage},
+    KeyShareWithAuxInfo, SessionId, SigningSessionInfo, ValidatorInfo,
 };
 use entropy_shared::{
-    HashingAlgorithm, OcwMessageDkg, DAVE_VERIFYING_KEY, DEFAULT_VERIFYING_KEY,
-    DEFAULT_VERIFYING_KEY_NOT_REGISTERED, DEVICE_KEY_HASH, EVE_VERIFYING_KEY, FERDIE_VERIFYING_KEY,
-    NETWORK_PARENT_KEY,
+    HashingAlgorithm, DAVE_VERIFYING_KEY, DEFAULT_VERIFYING_KEY_NOT_REGISTERED, DEVICE_KEY_HASH,
+    EVE_VERIFYING_KEY, NETWORK_PARENT_KEY,
 };
 use entropy_testing_utils::{
     chain_api::{
         entropy::runtime_types::bounded_collections::bounded_vec::BoundedVec as OtherBoundedVec,
         entropy::runtime_types::pallet_registry::pallet::ProgramInstance as OtherProgramInstance,
     },
     constants::{
-        ALICE_STASH_ADDRESS, AUXILARY_DATA_SHOULD_FAIL, AUXILARY_DATA_SHOULD_SUCCEED,
-        FAUCET_PROGRAM, FERDIE_X25519_SECRET_KEY, PREIMAGE_SHOULD_FAIL, PREIMAGE_SHOULD_SUCCEED,
-        TEST_BASIC_TRANSACTION, TEST_INFINITE_LOOP_BYTECODE, TEST_PROGRAM_CUSTOM_HASH,
-        TEST_PROGRAM_WASM_BYTECODE, TSS_ACCOUNTS, X25519_PUBLIC_KEYS,
+        AUXILARY_DATA_SHOULD_SUCCEED, FAUCET_PROGRAM, FERDIE_X25519_SECRET_KEY,
+        PREIMAGE_SHOULD_SUCCEED, TEST_BASIC_TRANSACTION, TEST_INFINITE_LOOP_BYTECODE,
+        TEST_PROGRAM_CUSTOM_HASH, TEST_PROGRAM_WASM_BYTECODE, X25519_PUBLIC_KEYS,
     },
     substrate_context::{
         test_context_stationary, test_node_process_testing_state, testing_context,
-        SubstrateTestingContext,
     },
 };
-use futures::{
-    future::{self, join_all},
-    join, Future, SinkExt, StreamExt,
-};
-use hex_literal::hex;
 use more_asserts as ma;
-use parity_scale_codec::{Decode, DecodeAll, Encode};
-use rand_core::OsRng;
+use parity_scale_codec::{Decode, Encode};
 use schemars::{schema_for, JsonSchema};
 use schnorrkel::{signing_context, Keypair as Sr25519Keypair, Signature as Sr25519Signature};
 use serde::{Deserialize, Serialize};
 use serial_test::serial;
-use sp_core::{crypto::Ss58Codec, Pair as OtherPair, H160};
+use sp_core::{crypto::Ss58Codec, Pair as OtherPair};
 use sp_keyring::{AccountKeyring, Sr25519Keyring};
-use std::{
-    env, fs,
-    path::PathBuf,
-    str,
-    str::FromStr,
-    sync::Arc,
-    time::{Duration, SystemTime},
-};
+use std::{str, str::FromStr, time::Duration};
 use subxt::{
     backend::legacy::LegacyRpcMethods,
-    config::substrate::{BlakeTwo256, SubstrateHeader},
-    config::{DefaultExtrinsicParamsBuilder, PolkadotExtrinsicParamsBuilder as Params},
-    events::EventsClient,
+    config::PolkadotExtrinsicParamsBuilder as Params,
     ext::{
-        sp_core::{hashing::blake2_256, sr25519, sr25519::Signature, Bytes, Pair},
+        sp_core::{hashing::blake2_256, sr25519, sr25519::Signature, Pair},
         sp_runtime::AccountId32,
     },
     tx::{PairSigner, TxStatus},
-    utils::{AccountId32 as subxtAccountId32, MultiAddress, MultiSignature, Static, H256},
-    Config, OnlineClient,
+    utils::{AccountId32 as subxtAccountId32, MultiAddress, MultiSignature},
+    OnlineClient,
 };
-use subxt_signer::ecdsa::PublicKey as EcdsaPublicKey;
+use synedrion::k256::ecdsa::{RecoveryId, Signature as k256Signature, VerifyingKey};
 use synedrion::{ecdsa::VerifyingKey as SynedrionVerifyingKey, DeriveChildKey};
-use synedrion::{
-    k256::ecdsa::{RecoveryId, Signature as k256Signature, VerifyingKey},
-    AuxInfo, ThresholdKeyShare,
-};
-use tokio::select;
-use tokio::{
-    io::{AsyncRead, AsyncReadExt},
-    task::JoinHandle,
-};
-use tokio_tungstenite::{connect_async, tungstenite::Message};
-use x25519_dalek::{PublicKey, StaticSecret};
+use tokio_tungstenite::connect_async;
 
-use super::UserInputPartyInfo;
 use crate::helpers::tests::do_jump_start;
 use crate::{
     chain_api::{
@@ -118,30 +82,23 @@ use crate::{
     helpers::{
         launch::{
             development_mnemonic, load_kv_store, setup_mnemonic, threshold_account_id,
-            Configuration, ValidatorName, DEFAULT_BOB_MNEMONIC, DEFAULT_CHARLIE_MNEMONIC,
-            DEFAULT_ENDPOINT, DEFAULT_MNEMONIC,
+            ValidatorName,
         },
         signing::Hasher,
         substrate::{get_oracle_data, get_signers_from_chain, query_chain, submit_transaction},
         tests::{
-            create_clients, initialize_test_logger, jump_start_network_with_signer, remove_program,
-            run_to_block, setup_client, spawn_testing_validators, store_program_and_register,
-            unsafe_get, ChainSpecType,
+            initialize_test_logger, jump_start_network_with_signer, run_to_block, setup_client,
+            spawn_testing_validators, store_program_and_register, unsafe_get, ChainSpecType,
         },
         user::compute_hash,
         validator::get_signer_and_x25519_secret_from_mnemonic,
     },
     r#unsafe::api::UnsafeQuery,
-    signing_client::ListenerState,
-    user::{
-        api::{
-            check_hash_pointer_out_of_bounds, increment_or_wipe_request_limit, request_limit_check,
-            request_limit_key, RelayerSignatureRequest, RequestLimitStorage, UserRegistrationInfo,
-            UserSignatureRequest,
-        },
-        UserErr,
+    user::api::{
+        check_hash_pointer_out_of_bounds, increment_or_wipe_request_limit, request_limit_check,
+        request_limit_key, RelayerSignatureRequest, RequestLimitStorage,
     },
-    validation::{mnemonic_to_pair, new_mnemonic, EncryptedSignedMessage},
+    validation::EncryptedSignedMessage,
 };
 
 #[tokio::test]