Merge branch 'main' into Pravdyvy/deterministic-key-derivation

integration_tests/configs/debug/sequencer/sequencer_config.json

@@ -9,11 +9,11 @@
     "port": 3040,
     "initial_accounts": [
         {
-            "addr": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+            "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
             "balance": 10000
         },
         {
-            "addr": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+            "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
             "balance": 20000
         }
     ],

integration_tests/configs/debug/wallet/wallet_config.json

@@ -8,7 +8,7 @@
   "initial_accounts": [
     {
       "Public": {
-        "address": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+        "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
         "pub_sign_key": [
           16,
           162,
@@ -47,7 +47,7 @@
     },
     {
       "Public": {
-        "address": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+        "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
         "pub_sign_key": [
           113,
           121,
@@ -86,7 +86,7 @@
     },
     {
       "Private": {
-        "address": "3oCG8gqdKLMegw4rRfyaMQvuPHpcASt7xwttsmnZLSkw",
+        "account_id": "3oCG8gqdKLMegw4rRfyaMQvuPHpcASt7xwttsmnZLSkw",
         "account": {
           "program_owner": [
             0,
@@ -315,7 +315,7 @@
     },
     {
       "Private": {
-        "address": "AKTcXgJ1xoynta1Ec7y6Jso1z1JQtHqd7aPQ1h9er6xX",
+        "account_id": "AKTcXgJ1xoynta1Ec7y6Jso1z1JQtHqd7aPQ1h9er6xX",
         "account": {
           "program_owner": [
             0,

integration_tests/src/lib.rs

@@ -1,8 +1,8 @@
-use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
 use std::path::PathBuf;
 
 use actix_web::dev::ServerHandle;
 use anyhow::Result;
+use base64::{Engine, engine::general_purpose::STANDARD as BASE64};
 use clap::Parser;
 use common::{
     sequencer_client::SequencerClient,
@@ -44,12 +44,12 @@ pub const TIME_TO_WAIT_FOR_BLOCK_SECONDS: u64 = 12;
 
 pub const NSSA_PROGRAM_FOR_TEST_DATA_CHANGER: &[u8] = include_bytes!("data_changer.bin");
 
-fn make_public_account_input_from_str(addr: &str) -> String {
-    format!("Public/{addr}")
+fn make_public_account_input_from_str(account_id: &str) -> String {
+    format!("Public/{account_id}")
 }
 
-fn make_private_account_input_from_str(addr: &str) -> String {
-    format!("Private/{addr}")
+fn make_private_account_input_from_str(account_id: &str) -> String {
+    format!("Private/{account_id}")
 }
 
 #[allow(clippy::type_complexity)]
@@ -98,13 +98,13 @@ pub async fn post_test(residual: (ServerHandle, JoinHandle<Result<()>>, TempDir)
     let wallet_home = wallet::helperfunctions::get_home().unwrap();
     let persistent_data_home = wallet_home.join("storage.json");
 
-    //Removing persistent accounts after run to not affect other executions
-    //Not necessary an error, if fails as there is tests for failure scenario
+    // Removing persistent accounts after run to not affect other executions
+    // Not necessary an error, if fails as there is tests for failure scenario
     let _ = std::fs::remove_file(persistent_data_home)
         .inspect_err(|err| warn!("Failed to remove persistent data with err {err:#?}"));
 
-    //At this point all of the references to sequencer_core must be lost.
-    //So they are dropped and tempdirs will be dropped too,
+    // At this point all of the references to sequencer_core must be lost.
+    // So they are dropped and tempdirs will be dropped too,
 }
 
 pub async fn main_tests_runner() -> Result<()> {
@@ -176,14 +176,14 @@ mod tests {
     use crate::{make_private_account_input_from_str, make_public_account_input_from_str};
 
     #[test]
-    fn correct_addr_from_prefix() {
-        let addr1 = "cafecafe";
-        let addr2 = "deadbeaf";
+    fn correct_account_id_from_prefix() {
+        let account_id1 = "cafecafe";
+        let account_id2 = "deadbeaf";
 
-        let addr1_pub = make_public_account_input_from_str(addr1);
-        let addr2_priv = make_private_account_input_from_str(addr2);
+        let account_id1_pub = make_public_account_input_from_str(account_id1);
+        let account_id2_priv = make_private_account_input_from_str(account_id2);
 
-        assert_eq!(addr1_pub, "Public/cafecafe".to_string());
-        assert_eq!(addr2_priv, "Private/deadbeaf".to_string());
+        assert_eq!(account_id1_pub, "Public/cafecafe".to_string());
+        assert_eq!(account_id2_priv, "Private/deadbeaf".to_string());
     }
 }

integration_tests/src/main.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-
 use integration_tests::main_tests_runner;
 
 pub const NUM_THREADS: usize = 8;

integration_tests/src/tps_test_utils.rs

@@ -2,8 +2,7 @@ use std::time::Duration;
 
 use key_protocol::key_management::ephemeral_key_holder::EphemeralKeyHolder;
 use nssa::{
-    Account, AccountId, Address, PrivacyPreservingTransaction, PrivateKey, PublicKey,
-    PublicTransaction,
+    Account, AccountId, PrivacyPreservingTransaction, PrivateKey, PublicKey, PublicTransaction,
     privacy_preserving_transaction::{self as pptx, circuit},
     program::Program,
     public_transaction as putx,
@@ -15,13 +14,13 @@ use nssa_core::{
 use sequencer_core::config::{AccountInitialData, CommitmentsInitialData, SequencerConfig};
 
 pub(crate) struct TpsTestManager {
-    public_keypairs: Vec<(PrivateKey, Address)>,
+    public_keypairs: Vec<(PrivateKey, AccountId)>,
     target_tps: u64,
 }
 
 impl TpsTestManager {
-    /// Generates public account keypairs. These are used to populate the config and to generate valid
-    /// public transactions for the tps test.
+    /// Generates public account keypairs. These are used to populate the config and to generate
+    /// valid public transactions for the tps test.
     pub(crate) fn new(target_tps: u64, number_transactions: usize) -> Self {
         let public_keypairs = (1..(number_transactions + 2))
             .map(|i| {
@@ -29,8 +28,8 @@ impl TpsTestManager {
                 private_key_bytes[..8].copy_from_slice(&i.to_le_bytes());
                 let private_key = PrivateKey::try_new(private_key_bytes).unwrap();
                 let public_key = PublicKey::new_from_private_key(&private_key);
-                let address = Address::from(&public_key);
-                (private_key, address)
+                let account_id = AccountId::from(&public_key);
+                (private_key, account_id)
             })
             .collect::<Vec<_>>();
         Self {
@@ -44,7 +43,6 @@ impl TpsTestManager {
         Duration::from_secs_f64(number_transactions as f64 / self.target_tps as f64)
     }
 
-    ///
     /// Build a batch of public transactions to submit to the node.
     pub fn build_public_txs(&self) -> Vec<PublicTransaction> {
         // Create valid public transactions
@@ -71,15 +69,15 @@ impl TpsTestManager {
     }
 
     /// Generates a sequencer configuration with initial balance in a number of public accounts.
-    /// The transactions generated with the function `build_public_txs` will be valid in a node started
-    /// with the config from this method.
+    /// The transactions generated with the function `build_public_txs` will be valid in a node
+    /// started with the config from this method.
     pub(crate) fn generate_tps_test_config(&self) -> SequencerConfig {
         // Create public public keypairs
         let initial_public_accounts = self
             .public_keypairs
             .iter()
-            .map(|(_, addr)| AccountInitialData {
-                addr: addr.to_string(),
+            .map(|(_, account_id)| AccountInitialData {
+                account_id: account_id.to_string(),
                 balance: 10,
             })
             .collect();