chore: remove legacy support in devnet (#1603)

Author: gilcu3

crates/devnet/README.md

@@ -56,6 +56,7 @@ rpcs:
   - url: https://test.rpc.fastnear.com
     rate_limit: 5
     max_concurrency: 30
+infra_ops_path: path-to-infra-ops-repo
 ```
 
 * (Optional) Configure a `funding_account` to use a specific account for funding operations:
@@ -130,12 +131,8 @@ In addition, You can find the VMs created in GCP under [this link](https://conso
 mpc-devnet mpc $MPC_NETWORK_NAME deploy-nomad
 ```
 
-The docker image to be deployed can be change with the `--docker-image` flag. By
-default, devnet assumes that a legacy docker image is deployed (with node
-version strictly older than 2.2.0). For newer versions, one must pass the
-`--not-legacy` flag, because they require different terraform variables (TODO:
-remove the flag [(#710)](https://github.com/near/mpc/issues/710)). A recent
-docker image can be found in our
+The docker image to be deployed can be change with the `--docker-image` flag. A
+recent docker image can be found in our
 [dockerhub](https://hub.docker.com/r/nearone/mpc-node/tags)
 
 Both the `deploy-infra` and `deploy-nomad` commands can be repeated as needed.
@@ -164,8 +161,6 @@ Finally, initialize the contract
 mpc-devnet mpc $MPC_NETWORK_NAME init-contract --init-participants 2 --threshold 2
 ```
 
-(TODO: [(#710)](https://github.com/near/mpc/issues/710) merge these two steps)
-
 The `--init-participants` can be fewer than the total number of participants,
 if we wish to have fewer participants join the network at the beginning.
 

crates/devnet/src/account.rs

@@ -85,7 +85,6 @@ pub struct OperatingAccessKey {
     recent_block_hash: CryptoHash,
     client: Arc<NearRpcClients>,
     signer: Signer,
-    signing_key: SigningKey,
 }
 
 /// Returns {prefix}{random string}{suffix}.
@@ -120,7 +119,6 @@ impl OperatingAccessKey {
             recent_block_hash,
             client,
             signer,
-            signing_key,
         }
     }
 
@@ -302,10 +300,6 @@ impl OperatingAccessKey {
             0,
         )
     }
-
-    pub fn secret_key(&self) -> SigningKey {
-        self.signing_key.clone()
-    }
 }
 
 impl OperatingAccount {

crates/devnet/src/cli.rs

@@ -335,11 +335,6 @@ pub struct MpcTerraformDeployNomadCmd {
     /// The default is `constants::DEFAULT_MPC_DOCKER_IMAGE`.
     #[clap(long)]
     pub docker_image: Option<String>,
-    /// By default, we deploy the default docker image, which is a legacy node, requiring secret
-    /// shares.
-    /// Set this flag if you deploy a newer node that generates its secrets on its own.
-    #[clap(long)]
-    pub not_legacy: bool, // todo: remove [(#710)](https://github.com/near/mpc/issues/710)
 }
 
 #[derive(clap::Parser)]

crates/devnet/src/mpc.rs

@@ -106,35 +106,11 @@ async fn update_mpc_network(
         accounts
             .account_mut(&account_id)
             .set_mpc_participant(MpcParticipantSetup {
-                p2p_private_key,
                 responding_account_id: funded_accounts[i * 2 + 1].clone(),
-                p2p_public_key: Some(p2p_public_key),
+                p2p_public_key,
             });
         mpc_setup.participants.push(account_id);
     }
-
-    // todo: remove this logic [(#710)](https://github.com/near/mpc/issues/710)
-    println!("Generating responding access keys - this step is not required after update to v2.2.");
-    let responding_accounts = mpc_setup
-        .participants
-        .iter()
-        .map(|participant| {
-            accounts
-                .account(participant)
-                .get_mpc_participant()
-                .unwrap()
-                .responding_account_id
-                .clone()
-        })
-        .collect::<Vec<_>>();
-
-    // Ensure that the responding accounts have enough access keys.
-    let futs = accounts
-        .accounts_mut(&responding_accounts)
-        .into_values()
-        .map(|account| account.ensure_have_n_access_keys(mpc_setup.num_responding_access_keys))
-        .collect::<Vec<_>>();
-    futures::future::join_all(futs).await;
 }
 
 impl NewMpcNetworkCmd {
@@ -241,8 +217,7 @@ impl MpcAddKeysCmd {
             let public_data: StaticWebData = response.json::<StaticWebData>().await.unwrap();
 
             let mpc_participant = MpcParticipantSetup {
-                p2p_private_key: participant.p2p_private_key.clone(), // todo: remove this [(#710)](https://github.com/near/mpc/issues/710)
-                p2p_public_key: Some(public_data.near_p2p_public_key),
+                p2p_public_key: public_data.near_p2p_public_key,
                 responding_account_id: participant.responding_account_id.clone(),
             };
 
@@ -399,10 +374,8 @@ struct InitV2Args {
 
 fn mpc_account_to_participant_info(account: &OperatingAccount, index: usize) -> ParticipantInfo {
     let mpc_setup = account.get_mpc_participant().unwrap();
-    let p2p_public_key_bytes: [u8; ed25519_dalek::PUBLIC_KEY_LENGTH] = *mpc_setup
-        .p2p_public_key
-        .expect("P2P key is required for all nodes")
-        .as_bytes();
+    let p2p_public_key_bytes: [u8; ed25519_dalek::PUBLIC_KEY_LENGTH] =
+        *mpc_setup.p2p_public_key.as_bytes();
 
     let near_sdk_public_key =
         near_sdk::PublicKey::from_parts(CurveType::ED25519, p2p_public_key_bytes.to_vec())

crates/devnet/src/terraform.rs

@@ -9,9 +9,8 @@ use crate::cli::{
 };
 use crate::constants::DEFAULT_MPC_DOCKER_IMAGE;
 use crate::devnet::OperatingDevnetSetup;
-use crate::types::{near_crypto_compatible_serialization, MpcNetworkSetup, ParsedConfig};
+use crate::types::{MpcNetworkSetup, ParsedConfig};
 use describe::TerraformInfraShowOutput;
-use ed25519_dalek::{SigningKey, VerifyingKey};
 use near_account_id::AccountId;
 use serde::Serialize;
 use std::path::PathBuf;
@@ -72,52 +71,13 @@ async fn export_terraform_vars(
     name: &str,
     accounts: &OperatingAccounts,
     mpc_setup: &MpcNetworkSetup,
-    not_legacy: bool,
     docker_image: Option<String>,
 ) -> PathBuf {
     let contract = mpc_setup
         .contract
         .clone()
         .expect("Contract is not deployed");
-    let terraform_file = if !not_legacy {
-        // todo: eventually remove [(#710)](https://github.com/near/mpc/issues/710)
-        let mut mpc_nodes = Vec::new();
-        for (i, account_id) in mpc_setup.participants.iter().enumerate() {
-            let account = accounts.account(account_id);
-            let participant = account
-                .get_mpc_participant()
-                .expect("Not an MPC participant");
-            let responding_account = accounts.account(&participant.responding_account_id);
-            let respond_config = RespondConfigFile {
-                account_id: participant.responding_account_id.clone(),
-                access_keys: responding_account
-                    .all_access_keys()
-                    .await
-                    .into_iter()
-                    .map(|k| k.secret_key())
-                    .collect(),
-            };
-
-            let account_sk = account.any_access_key().await.secret_key();
-            let mpc_node = LegacyTerraformMpcNode {
-                account: account_id.clone(),
-                account_pk: account_sk.verifying_key(),
-                account_sk,
-                sign_sk: participant.p2p_private_key.clone(),
-                sign_pk: participant.p2p_private_key.verifying_key(),
-                url: format!("http://mpc-node-{}.service.mpc.consul:3000", i),
-                respond_yaml: serde_yaml::to_string(&respond_config).unwrap(),
-            };
-            mpc_nodes.push(mpc_node);
-        }
-        let terraform_file = LegacyTerraformFile {
-            cluster_prefix: name.to_string(),
-            legacy_mpc_nodes: mpc_nodes,
-            mpc_contract_signer: contract,
-            ssd: mpc_setup.ssd,
-        };
-        serde_json::to_string_pretty(&terraform_file).unwrap()
-    } else {
+    let terraform_file = {
         let mut mpc_nodes = Vec::new();
         for (i, account_id) in mpc_setup.participants.iter().enumerate() {
             let responding_account_id = accounts
@@ -164,29 +124,6 @@ struct TerraformDeployInfraFile {
     ssd: bool,
 }
 
-#[derive(Serialize)]
-struct LegacyTerraformFile {
-    cluster_prefix: String,
-    legacy_mpc_nodes: Vec<LegacyTerraformMpcNode>,
-    mpc_contract_signer: AccountId,
-    ssd: bool,
-}
-
-#[derive(Serialize)]
-struct LegacyTerraformMpcNode {
-    account: AccountId,
-    #[serde(with = "near_crypto_compatible_serialization::verifying_key")]
-    account_pk: VerifyingKey,
-    #[serde(with = "near_crypto_compatible_serialization::signing_key")]
-    account_sk: SigningKey,
-    #[serde(with = "near_crypto_compatible_serialization::verifying_key")]
-    sign_pk: VerifyingKey,
-    #[serde(with = "near_crypto_compatible_serialization::signing_key")]
-    sign_sk: SigningKey,
-    url: String,
-    respond_yaml: String,
-}
-
 #[derive(Serialize)]
 struct TerraformFile {
     cluster_prefix: String,
@@ -205,14 +142,6 @@ struct TerraformMpcNode {
     near_responder_account_id: AccountId,
 }
 
-// From MPC code.
-#[derive(Serialize)]
-pub struct RespondConfigFile {
-    pub account_id: AccountId,
-    #[serde(with = "near_crypto_compatible_serialization::signing_keys")]
-    pub access_keys: Vec<SigningKey>,
-}
-
 impl MpcTerraformDeployInfraCmd {
     pub async fn run(&self, name: &str, config: ParsedConfig) {
         println!(
@@ -294,14 +223,9 @@ impl MpcTerraformDeployNomadCmd {
             .mpc_setups
             .get(name)
             .expect(&format!("MPC network {} does not exist", name));
-        let terraform_vars_file = export_terraform_vars(
-            name,
-            &setup.accounts,
-            mpc_setup,
-            self.not_legacy,
-            self.docker_image.clone(),
-        )
-        .await;
+        let terraform_vars_file =
+            export_terraform_vars(name, &setup.accounts, mpc_setup, self.docker_image.clone())
+                .await;
         let nomad_server_url = mpc_setup
             .nomad_server_url
             .clone()