Add option to start in a pre-jumpstarted state to genesis config

crates/client/src/tests.rs

@@ -17,10 +17,11 @@ use crate::{
 };
 use entropy_testing_utils::{
     constants::{TEST_PROGRAM_WASM_BYTECODE, TSS_ACCOUNTS},
-    helpers::{derive_mock_pck_verifying_key, encode_verifying_key},
-    jump_start_network, spawn_testing_validators,
+    helpers::{
+        derive_mock_pck_verifying_key, encode_verifying_key, spawn_tss_nodes_and_start_chain,
+    },
     substrate_context::test_context_stationary,
-    test_node_process_testing_state, ChainSpecType,
+    ChainSpecType,
 };
 use serial_test::serial;
 use sp_core::{sr25519, Pair, H256};
@@ -134,18 +135,8 @@ async fn test_store_and_remove_program() {
 async fn test_remove_program_reference_counter() {
     let program_owner = AccountKeyring::Ferdie.pair();
 
-    let (_validator_ips, _validator_ids) =
-        spawn_testing_validators(ChainSpecType::Integration).await;
-
-    let force_authoring = true;
-    let substrate_context = &test_node_process_testing_state(force_authoring).await[0];
-    let api = get_api(&substrate_context.ws_url).await.unwrap();
-    let rpc = get_rpc(&substrate_context.ws_url).await.unwrap();
-
-    // Jumpstart the network
-    let alice = AccountKeyring::Alice;
-    let signer = PairSigner::<EntropyConfig, sr25519::Pair>::new(alice.clone().into());
-    jump_start_network(&api, &rpc, &signer).await;
+    let (_ctx, api, rpc, _validator_ips, _validator_ids) =
+        spawn_tss_nodes_and_start_chain(ChainSpecType::IntegrationJumpStarted).await;
 
     // Store a program
     let program_pointer = store_program(

crates/protocol/src/execute_protocol.rs

@@ -377,7 +377,7 @@ pub async fn execute_reshare(
     (ThresholdKeyShare<KeyParams, PartyId>, AuxInfo<KeyParams, PartyId>),
     ProtocolExecutionErr,
 > {
-    tracing::debug!("Executing proactive refresh");
+    tracing::info!("Executing reshare");
     tracing::debug!("Signing with {:?}", &threshold_pair.public());
 
     let pair = PairWrapper(threshold_pair.clone());
@@ -394,9 +394,13 @@ pub async fn execute_reshare(
     .map_err(ProtocolExecutionErr::SessionCreation)?;
 
     let (new_key_share, chans) = execute_protocol_generic(chans, session, session_id_hash).await?;
+
+    tracing::info!("Completed reshare protocol");
+
     let aux_info = if let Some(aux_info) = aux_info_option {
         aux_info
     } else {
+        tracing::info!("Executing aux gen session as part of reshare");
         // Now run an aux gen session
         let session_id_hash_aux_data = session_id.blake2(Some(Subsession::AuxGen))?;
         let session = make_aux_gen_session(

crates/shared/src/constants.rs

@@ -75,7 +75,7 @@ pub const MAX_SIGNERS: u8 = 15;
 pub const SIGNER_THRESHOLD: u8 = 2;
 
 /// For testing to line up chain mock data and reshare_test
-pub const TEST_RESHARE_BLOCK_NUMBER: u32 = 22;
+pub const TEST_RESHARE_BLOCK_NUMBER: u32 = 10;
 
 /// Program version number, must be incremented if version number changes
 pub const PROGRAM_VERSION_NUMBER: u8 = 0;

crates/testing-utils/src/helpers.rs

@@ -16,8 +16,8 @@
 use crate::{
     chain_api::{get_api, get_rpc, EntropyConfig},
     spawn_testing_validators,
-    substrate_context::{test_context_stationary, test_node_process_testing_state},
-    ChainSpecType,
+    substrate_context::test_node_process_testing_state,
+    ChainSpecType, TestNodeProcess,
 };
 use entropy_protocol::PartyId;
 use rand::{rngs::StdRng, SeedableRng};
@@ -26,31 +26,28 @@ pub use tdx_quote::encode_verifying_key;
 
 /// A helper for setting up tests which starts both a set of TS servers and a chain node and returns
 /// the chain API as well as IP addresses and PartyId of the started validators
+///
+/// Note that since this function does not reside in entropy-tss, cfg(test) will be false when the
+/// TSS nodes are set up, meaning the unsafe API will not be enabled
 pub async fn spawn_tss_nodes_and_start_chain(
     chain_spec_type: ChainSpecType,
-) -> (OnlineClient<EntropyConfig>, LegacyRpcMethods<EntropyConfig>, Vec<String>, Vec<PartyId>) {
+) -> (
+    Vec<TestNodeProcess<EntropyConfig>>,
+    OnlineClient<EntropyConfig>,
+    LegacyRpcMethods<EntropyConfig>,
+    Vec<String>,
+    Vec<PartyId>,
+) {
     let (validator_ips, validator_ids) = spawn_testing_validators(chain_spec_type).await;
 
-    let (api, rpc) = match chain_spec_type {
-        ChainSpecType::Development => {
-            let substrate_context = test_context_stationary().await;
-            (
-                get_api(&substrate_context.node_proc.ws_url).await.unwrap(),
-                get_rpc(&substrate_context.node_proc.ws_url).await.unwrap(),
-            )
-        },
-        ChainSpecType::Integration => {
-            // Here we need to use `--chain=integration-tests` and force authoring otherwise we won't be
-            // able to get our chain in the right state to be jump started.
-            let force_authoring = true;
-            let substrate_context = &&test_node_process_testing_state(force_authoring).await[0];
-            (
-                get_api(&substrate_context.ws_url).await.unwrap(),
-                get_rpc(&substrate_context.ws_url).await.unwrap(),
-            )
-        },
-    };
-    (api, rpc, validator_ips, validator_ids)
+    // Here we need to force authoring otherwise we won't be able to get our chain in the right
+    // state to be jump started.
+    let force_authoring = true;
+    let substrate_context = test_node_process_testing_state(chain_spec_type, force_authoring).await;
+    let api = get_api(&substrate_context[0].ws_url).await.unwrap();
+    let rpc = get_rpc(&substrate_context[0].ws_url).await.unwrap();
+
+    (substrate_context, api, rpc, validator_ips, validator_ids)
 }
 
 /// Get the mock PCK that will be used for a given TSS account ID

crates/testing-utils/src/lib.rs

@@ -22,8 +22,6 @@ pub mod create_test_keyshares;
 pub mod helpers;
 mod node_proc;
 pub mod substrate_context;
-pub use entropy_tss::helpers::tests::{
-    jump_start_network_with_signer as jump_start_network, spawn_testing_validators, ChainSpecType,
-};
+pub use entropy_tss::helpers::tests::{spawn_testing_validators, ChainSpecType};
 pub use node_proc::TestNodeProcess;
 pub use substrate_context::*;

crates/testing-utils/src/substrate_context.rs

@@ -13,6 +13,7 @@
 // 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 entropy_tss::helpers::tests::ChainSpecType;
 use sp_keyring::AccountKeyring;
 use subxt::{config::substrate::SubstrateExtrinsicParams, OnlineClient};
 
@@ -110,6 +111,7 @@ pub async fn test_node_process_stationary() -> TestNodeProcess<EntropyConfig> {
 ///
 /// Allowing `force_authoring` will produce blocks.
 pub async fn test_node_process_testing_state(
+    chain_spec_type: ChainSpecType,
     force_authoring: bool,
 ) -> Vec<TestNodeProcess<EntropyConfig>> {
     let alice_bootnode = Some(
@@ -118,30 +120,30 @@ pub async fn test_node_process_testing_state(
     );
     let result = test_node(
         AccountKeyring::Alice,
-        "--chain=integration-tests".to_string(),
+        format!("--chain={}", chain_spec_type),
         force_authoring,
         None,
     )
     .await;
     let result_bob = test_node_process_with(
         AccountKeyring::Bob,
-        "--chain=integration-tests".to_string(),
+        format!("--chain={}", chain_spec_type),
         force_authoring,
         alice_bootnode.clone(),
         Some("http://127.0.0.1:3002".into()),
     )
     .await;
     let result_charlie = test_node_process_with(
         AccountKeyring::Charlie,
-        "--chain=integration-tests".to_string(),
+        format!("--chain={}", chain_spec_type),
         force_authoring,
         alice_bootnode.clone(),
         Some("http://127.0.0.1:3003".into()),
     )
     .await;
     let result_dave = test_node_process_with(
         AccountKeyring::Dave,
-        "--chain=integration-tests".to_string(),
+        format!("--chain={}", chain_spec_type),
         force_authoring,
         alice_bootnode.clone(),
         Some("http://127.0.0.1:3004".into()),