From b5afcba4c4527d1583c74ced14d36d22b45b7906 Mon Sep 17 00:00:00 2001 From: Pravdyvy Date: Mon, 16 Mar 2026 17:02:22 +0200 Subject: [PATCH] fix: moved constants into consts --- key_protocol/src/initial_state.rs | 180 +++++++++++++++++------------- 1 file changed, 104 insertions(+), 76 deletions(-) diff --git a/key_protocol/src/initial_state.rs b/key_protocol/src/initial_state.rs index 8011d471..3af9182f 100644 --- a/key_protocol/src/initial_state.rs +++ b/key_protocol/src/initial_state.rs @@ -8,6 +8,74 @@ use crate::key_management::{ secret_holders::{PrivateKeyHolder, SecretSpendingKey}, }; +const PRIVATE_KEY_PUB_ACC_A: [u8; 32] = [ + 16, 162, 106, 154, 236, 125, 52, 184, 35, 100, 238, 174, 69, 197, 41, 77, 187, 10, 118, 75, 0, + 11, 148, 238, 185, 181, 133, 17, 220, 72, 124, 77, +]; + +const PRIVATE_KEY_PUB_ACC_B: [u8; 32] = [ + 113, 121, 64, 177, 204, 85, 229, 214, 178, 6, 109, 191, 29, 154, 63, 38, 242, 18, 244, 219, 8, + 208, 35, 136, 23, 127, 207, 237, 216, 169, 190, 27, +]; + +const SSK_PRIV_ACC_A: [u8; 32] = [ + 93, 13, 190, 240, 250, 33, 108, 195, 176, 40, 144, 61, 4, 28, 58, 112, 53, 161, 42, 238, 155, + 27, 23, 176, 208, 121, 15, 229, 165, 180, 99, 143, +]; + +const SSK_PRIV_ACC_B: [u8; 32] = [ + 48, 175, 124, 10, 230, 240, 166, 14, 249, 254, 157, 226, 208, 124, 122, 177, 203, 139, 192, + 180, 43, 120, 55, 151, 50, 21, 113, 22, 254, 83, 148, 56, +]; + +const NSK_PRIV_ACC_A: [u8; 32] = [ + 25, 21, 186, 59, 180, 224, 101, 64, 163, 208, 228, 43, 13, 185, 100, 123, 156, 47, 80, 179, 72, + 51, 115, 11, 180, 99, 21, 201, 48, 194, 118, 144, +]; + +const NSK_PRIV_ACC_B: [u8; 32] = [ + 99, 82, 190, 140, 234, 10, 61, 163, 15, 211, 179, 54, 70, 166, 87, 5, 182, 68, 117, 244, 217, + 23, 99, 9, 4, 177, 230, 125, 109, 91, 160, 30, +]; + +const VSK_PRIV_ACC_A: [u8; 32] = [ + 5, 85, 114, 119, 141, 187, 202, 170, 122, 253, 198, 81, 150, 8, 155, 21, 192, 65, 24, 124, 116, + 98, 110, 106, 137, 90, 165, 239, 80, 13, 222, 30, +]; + +const VSK_PRIV_ACC_B: [u8; 32] = [ + 205, 32, 76, 251, 255, 236, 96, 119, 61, 111, 65, 100, 75, 218, 12, 22, 17, 170, 55, 226, 21, + 154, 161, 34, 208, 74, 27, 1, 119, 13, 88, 128, +]; + +const VPK_PRIV_ACC_A: [u8; 33] = [ + 2, 210, 206, 38, 213, 4, 182, 198, 220, 47, 93, 148, 61, 84, 148, 250, 158, 45, 8, 81, 48, 80, + 46, 230, 87, 210, 47, 204, 76, 58, 214, 167, 81, +]; + +const VPK_PRIV_ACC_B: [u8; 33] = [ + 2, 79, 110, 46, 203, 29, 206, 205, 18, 86, 27, 189, 104, 103, 113, 181, 110, 53, 78, 172, 11, + 171, 190, 18, 126, 214, 81, 77, 192, 154, 58, 195, 238, +]; + +const NPK_PRIV_ACC_A: [u8; 32] = [ + 167, 108, 50, 153, 74, 47, 151, 188, 140, 79, 195, 31, 181, 9, 40, 167, 201, 32, 175, 129, 45, + 245, 223, 193, 210, 170, 247, 128, 167, 140, 155, 129, +]; + +const NPK_PRIV_ACC_B: [u8; 32] = [ + 32, 67, 72, 164, 106, 53, 66, 239, 141, 15, 52, 230, 136, 177, 2, 236, 207, 243, 134, 135, 210, + 143, 87, 232, 215, 128, 194, 120, 113, 224, 4, 165, +]; + +const DEFAULT_PROGRAM_OWNER: [u32; 8] = [0, 0, 0, 0, 0, 0, 0, 0]; + +const PUB_ACC_A_INITIAL_BALANCE: u128 = 10000; +const PUB_ACC_B_INITIAL_BALANCE: u128 = 20000; + +const PRIV_ACC_A_INITIAL_BALANCE: u128 = 10000; +const PRIV_ACC_B_INITIAL_BALANCE: u128 = 20000; + #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] pub struct PublicAccountPublicInitialData { pub account_id: AccountId, @@ -34,17 +102,9 @@ pub struct PrivateAccountPrivateInitialData { } pub fn initial_pub_accounts_private_keys() -> Vec { - let acc1_pub_sign_key = PrivateKey::try_new([ - 16, 162, 106, 154, 236, 125, 52, 184, 35, 100, 238, 174, 69, 197, 41, 77, 187, 10, 118, 75, - 0, 11, 148, 238, 185, 181, 133, 17, 220, 72, 124, 77, - ]) - .unwrap(); + let acc1_pub_sign_key = PrivateKey::try_new(PRIVATE_KEY_PUB_ACC_A).unwrap(); - let acc2_pub_sign_key = PrivateKey::try_new([ - 113, 121, 64, 177, 204, 85, 229, 214, 178, 6, 109, 191, 29, 154, 63, 38, 242, 18, 244, 219, - 8, 208, 35, 136, 23, 127, 207, 237, 216, 169, 190, 27, - ]) - .unwrap(); + let acc2_pub_sign_key = PrivateKey::try_new(PRIVATE_KEY_PUB_ACC_B).unwrap(); vec![ PublicAccountPrivateInitialData { @@ -60,61 +120,31 @@ pub fn initial_pub_accounts_private_keys() -> Vec Vec { let key_chain_1 = KeyChain { - secret_spending_key: SecretSpendingKey([ - 93, 13, 190, 240, 250, 33, 108, 195, 176, 40, 144, 61, 4, 28, 58, 112, 53, 161, 42, - 238, 155, 27, 23, 176, 208, 121, 15, 229, 165, 180, 99, 143, - ]), + secret_spending_key: SecretSpendingKey(SSK_PRIV_ACC_A), private_key_holder: PrivateKeyHolder { - nullifier_secret_key: [ - 25, 21, 186, 59, 180, 224, 101, 64, 163, 208, 228, 43, 13, 185, 100, 123, 156, 47, - 80, 179, 72, 51, 115, 11, 180, 99, 21, 201, 48, 194, 118, 144, - ], - viewing_secret_key: [ - 5, 85, 114, 119, 141, 187, 202, 170, 122, 253, 198, 81, 150, 8, 155, 21, 192, 65, - 24, 124, 116, 98, 110, 106, 137, 90, 165, 239, 80, 13, 222, 30, - ], + nullifier_secret_key: NSK_PRIV_ACC_A, + viewing_secret_key: VSK_PRIV_ACC_A, }, - nullifer_public_key: NullifierPublicKey([ - 167, 108, 50, 153, 74, 47, 151, 188, 140, 79, 195, 31, 181, 9, 40, 167, 201, 32, 175, - 129, 45, 245, 223, 193, 210, 170, 247, 128, 167, 140, 155, 129, - ]), - viewing_public_key: Secp256k1Point(vec![ - 2, 210, 206, 38, 213, 4, 182, 198, 220, 47, 93, 148, 61, 84, 148, 250, 158, 45, 8, 81, - 48, 80, 46, 230, 87, 210, 47, 204, 76, 58, 214, 167, 81, - ]), + nullifer_public_key: NullifierPublicKey(NPK_PRIV_ACC_A), + viewing_public_key: Secp256k1Point(VPK_PRIV_ACC_A.to_vec()), }; let key_chain_2 = KeyChain { - secret_spending_key: SecretSpendingKey([ - 48, 175, 124, 10, 230, 240, 166, 14, 249, 254, 157, 226, 208, 124, 122, 177, 203, 139, - 192, 180, 43, 120, 55, 151, 50, 21, 113, 22, 254, 83, 148, 56, - ]), + secret_spending_key: SecretSpendingKey(SSK_PRIV_ACC_B), private_key_holder: PrivateKeyHolder { - nullifier_secret_key: [ - 99, 82, 190, 140, 234, 10, 61, 163, 15, 211, 179, 54, 70, 166, 87, 5, 182, 68, 117, - 244, 217, 23, 99, 9, 4, 177, 230, 125, 109, 91, 160, 30, - ], - viewing_secret_key: [ - 205, 32, 76, 251, 255, 236, 96, 119, 61, 111, 65, 100, 75, 218, 12, 22, 17, 170, - 55, 226, 21, 154, 161, 34, 208, 74, 27, 1, 119, 13, 88, 128, - ], + nullifier_secret_key: NSK_PRIV_ACC_B, + viewing_secret_key: VSK_PRIV_ACC_B, }, - nullifer_public_key: NullifierPublicKey([ - 32, 67, 72, 164, 106, 53, 66, 239, 141, 15, 52, 230, 136, 177, 2, 236, 207, 243, 134, - 135, 210, 143, 87, 232, 215, 128, 194, 120, 113, 224, 4, 165, - ]), - viewing_public_key: Secp256k1Point(vec![ - 2, 79, 110, 46, 203, 29, 206, 205, 18, 86, 27, 189, 104, 103, 113, 181, 110, 53, 78, - 172, 11, 171, 190, 18, 126, 214, 81, 77, 192, 154, 58, 195, 238, - ]), + nullifer_public_key: NullifierPublicKey(NPK_PRIV_ACC_B), + viewing_public_key: Secp256k1Point(VPK_PRIV_ACC_B.to_vec()), }; vec![ PrivateAccountPrivateInitialData { account_id: AccountId::from(&key_chain_1.nullifer_public_key), account: Account { - program_owner: [0, 0, 0, 0, 0, 0, 0, 0], - balance: 10000, + program_owner: DEFAULT_PROGRAM_OWNER, + balance: PRIV_ACC_A_INITIAL_BALANCE, data: Data::default(), nonce: 0, }, @@ -123,8 +153,8 @@ pub fn initial_priv_accounts_private_keys() -> Vec Vec { vec![ PublicAccountPublicInitialData { account_id: initial_account_ids[0], - balance: 10000, + balance: PUB_ACC_A_INITIAL_BALANCE, }, PublicAccountPublicInitialData { account_id: initial_account_ids[1], - balance: 20000, + balance: PUB_ACC_B_INITIAL_BALANCE, }, ] } @@ -197,6 +227,12 @@ mod tests { use super::*; + const PUB_ACC_A_TEXT_ADDR: &str = "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV"; + const PUB_ACC_B_TEXT_ADDR: &str = "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo"; + + const PRIV_ACC_A_TEXT_ADDR: &str = "5ya25h4Xc9GAmrGB2WrTEnEWtQKJwRwQx3Xfo2tucNcE"; + const PRIV_ACC_B_TEXT_ADDR: &str = "E8HwiTyQe4H9HK7icTvn95HQMnzx49mP9A2ddtMLpNaN"; + #[test] fn test_pub_state_consistency() { let init_accs_private_data = initial_pub_accounts_private_keys(); @@ -215,18 +251,16 @@ mod tests { assert_eq!( init_accs_pub_data[0], PublicAccountPublicInitialData { - account_id: AccountId::from_str("6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV") - .unwrap(), - balance: 10000, + account_id: AccountId::from_str(PUB_ACC_A_TEXT_ADDR).unwrap(), + balance: PUB_ACC_A_INITIAL_BALANCE, } ); assert_eq!( init_accs_pub_data[1], PublicAccountPublicInitialData { - account_id: AccountId::from_str("7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo") - .unwrap(), - balance: 20000, + account_id: AccountId::from_str(PUB_ACC_B_TEXT_ADDR).unwrap(), + balance: PUB_ACC_B_INITIAL_BALANCE, } ) } @@ -312,11 +346,11 @@ mod tests { assert_eq!( init_private_accs_keys[0].account_id.to_string(), - "5ya25h4Xc9GAmrGB2WrTEnEWtQKJwRwQx3Xfo2tucNcE" + PRIV_ACC_A_TEXT_ADDR ); assert_eq!( init_private_accs_keys[1].account_id.to_string(), - "E8HwiTyQe4H9HK7icTvn95HQMnzx49mP9A2ddtMLpNaN" + PRIV_ACC_B_TEXT_ADDR ); assert_eq!( @@ -331,13 +365,10 @@ mod tests { assert_eq!( init_comms[0], PrivateAccountPublicInitialData { - npk: NullifierPublicKey([ - 167, 108, 50, 153, 74, 47, 151, 188, 140, 79, 195, 31, 181, 9, 40, 167, 201, - 32, 175, 129, 45, 245, 223, 193, 210, 170, 247, 128, 167, 140, 155, 129, - ]), + npk: NullifierPublicKey(NPK_PRIV_ACC_A), account: Account { - program_owner: [0, 0, 0, 0, 0, 0, 0, 0], - balance: 10000, + program_owner: DEFAULT_PROGRAM_OWNER, + balance: PRIV_ACC_A_INITIAL_BALANCE, data: Data::default(), nonce: 0, }, @@ -347,13 +378,10 @@ mod tests { assert_eq!( init_comms[1], PrivateAccountPublicInitialData { - npk: NullifierPublicKey([ - 32, 67, 72, 164, 106, 53, 66, 239, 141, 15, 52, 230, 136, 177, 2, 236, 207, - 243, 134, 135, 210, 143, 87, 232, 215, 128, 194, 120, 113, 224, 4, 165, - ]), + npk: NullifierPublicKey(NPK_PRIV_ACC_B), account: Account { - program_owner: [0, 0, 0, 0, 0, 0, 0, 0], - balance: 20000, + program_owner: DEFAULT_PROGRAM_OWNER, + balance: PRIV_ACC_B_INITIAL_BALANCE, data: Data::default(), nonce: 0, },