Merge pull request #310 from logos-blockchain/marvin/public_account_id

Update domain sep for public account ids
2026-02-17 20:03:21 +00:00 · 2026-02-10 09:02:13 -05:00 · 2026-02-10 09:02:13 -05:00 · b0f00b2751
commit b0f00b2751
parent 1dd0f16a5c 8959b1652c
12 changed files with 32 additions and 31 deletions
--- a/integration_tests/configs/sequencer/sequencer_config.json
+++ b/integration_tests/configs/sequencer/sequencer_config.json
@ -9,11 +9,11 @@
    "port": 0,
    "initial_accounts": [
        {
-            "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+            "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
            "balance": 10000
        },
        {
-            "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+            "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
            "balance": 20000
        }
    ],
--- a/integration_tests/configs/wallet/wallet_config.json
+++ b/integration_tests/configs/wallet/wallet_config.json
@ -9,7 +9,7 @@
  "initial_accounts": [
    {
      "Public": {
-        "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+        "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
        "pub_sign_key": [
          16,
          162,
@ -48,7 +48,7 @@
    },
    {
      "Public": {
-        "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+        "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
        "pub_sign_key": [
          113,
          121,
--- a/integration_tests/src/lib.rs
+++ b/integration_tests/src/lib.rs
@ -21,8 +21,8 @@ use wallet::{WalletCore, config::WalletConfigOverrides};
 // TODO: Remove this and control time from tests
 pub const TIME_TO_WAIT_FOR_BLOCK_SECONDS: u64 = 12;

-pub const ACC_SENDER: &str = "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy";
-pub const ACC_RECEIVER: &str = "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw";
+pub const ACC_SENDER: &str = "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV";
+pub const ACC_RECEIVER: &str = "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo";

 pub const ACC_SENDER_PRIVATE: &str = "3oCG8gqdKLMegw4rRfyaMQvuPHpcASt7xwttsmnZLSkw";
 pub const ACC_RECEIVER_PRIVATE: &str = "AKTcXgJ1xoynta1Ec7y6Jso1z1JQtHqd7aPQ1h9er6xX";
--- a/key_protocol/src/key_management/key_tree/mod.rs
+++ b/key_protocol/src/key_management/key_tree/mod.rs
@ -345,8 +345,8 @@ mod tests {

        assert!(tree.key_map.contains_key(&ChainIndex::root()));
        assert!(tree.account_id_map.contains_key(&AccountId::new([
-            185, 32, 154, 134, 186, 139, 229, 220, 43, 231, 207, 9, 34, 87, 157, 107, 12, 55, 133,
-            177, 85, 96, 169, 108, 20, 243, 163, 138, 28, 74, 50, 14
+            172, 82, 222, 249, 164, 16, 148, 184, 219, 56, 92, 145, 203, 220, 251, 89, 214, 178,
+            38, 30, 108, 202, 251, 241, 148, 200, 125, 185, 93, 227, 189, 247
        ])));
    }

--- a/nssa/src/public_transaction/transaction.rs
+++ b/nssa/src/public_transaction/transaction.rs
@ -288,12 +288,12 @@ pub mod tests {
        let tx = transaction_for_tests();
        let expected_signer_account_ids = vec![
            AccountId::new([
-                208, 122, 210, 232, 75, 39, 250, 0, 194, 98, 240, 161, 238, 160, 255, 53, 202, 9,
-                115, 84, 126, 106, 16, 111, 114, 241, 147, 194, 220, 131, 139, 68,
+                148, 179, 206, 253, 199, 51, 82, 86, 232, 2, 152, 122, 80, 243, 54, 207, 237, 112,
+                83, 153, 44, 59, 204, 49, 128, 84, 160, 227, 216, 149, 97, 102,
            ]),
            AccountId::new([
-                231, 174, 119, 197, 239, 26, 5, 153, 147, 68, 175, 73, 159, 199, 138, 23, 5, 57,
-                141, 98, 237, 6, 207, 46, 20, 121, 246, 222, 248, 154, 57, 188,
+                30, 145, 107, 3, 207, 73, 192, 230, 160, 63, 238, 207, 18, 69, 54, 216, 103, 244,
+                92, 94, 124, 248, 42, 16, 141, 19, 119, 18, 14, 226, 140, 204,
            ]),
        ];
        let signer_account_ids = tx.signer_account_ids();
--- a/nssa/src/signature/public_key.rs
+++ b/nssa/src/signature/public_key.rs
@ -48,7 +48,8 @@ impl PublicKey {

 impl From<&PublicKey> for AccountId {
    fn from(key: &PublicKey) -> Self {
-        const PUBLIC_ACCOUNT_ID_PREFIX: &[u8; 32] = b"/NSSA/v0.2/AccountId/Public/\x00\x00\x00\x00";
+        const PUBLIC_ACCOUNT_ID_PREFIX: &[u8; 32] =
+            b"/LEE/v0.3/AccountId/Public/\x00\x00\x00\x00\x00";

        let mut hasher = Sha256::new();
        hasher.update(PUBLIC_ACCOUNT_ID_PREFIX);
--- a/sequencer_core/src/lib.rs
+++ b/sequencer_core/src/lib.rs
@ -302,13 +302,13 @@ mod tests {

    fn setup_sequencer_config() -> SequencerConfig {
        let acc1_account_id: Vec<u8> = vec![
-            208, 122, 210, 232, 75, 39, 250, 0, 194, 98, 240, 161, 238, 160, 255, 53, 202, 9, 115,
-            84, 126, 106, 16, 111, 114, 241, 147, 194, 220, 131, 139, 68,
+            148, 179, 206, 253, 199, 51, 82, 86, 232, 2, 152, 122, 80, 243, 54, 207, 237, 112, 83,
+            153, 44, 59, 204, 49, 128, 84, 160, 227, 216, 149, 97, 102,
        ];

        let acc2_account_id: Vec<u8> = vec![
-            231, 174, 119, 197, 239, 26, 5, 153, 147, 68, 175, 73, 159, 199, 138, 23, 5, 57, 141,
-            98, 237, 6, 207, 46, 20, 121, 246, 222, 248, 154, 57, 188,
+            30, 145, 107, 3, 207, 73, 192, 230, 160, 63, 238, 207, 18, 69, 54, 216, 103, 244, 92,
+            94, 124, 248, 42, 16, 141, 19, 119, 18, 14, 226, 140, 204,
        ];

        let initial_acc1 = AccountInitialData {
--- a/sequencer_rpc/src/process.rs
+++ b/sequencer_rpc/src/process.rs
@ -355,13 +355,13 @@ mod tests {
        let tempdir = tempdir().unwrap();
        let home = tempdir.path().to_path_buf();
        let acc1_id: Vec<u8> = vec![
-            208, 122, 210, 232, 75, 39, 250, 0, 194, 98, 240, 161, 238, 160, 255, 53, 202, 9, 115,
-            84, 126, 106, 16, 111, 114, 241, 147, 194, 220, 131, 139, 68,
+            148, 179, 206, 253, 199, 51, 82, 86, 232, 2, 152, 122, 80, 243, 54, 207, 237, 112, 83,
+            153, 44, 59, 204, 49, 128, 84, 160, 227, 216, 149, 97, 102,
        ];

        let acc2_id: Vec<u8> = vec![
-            231, 174, 119, 197, 239, 26, 5, 153, 147, 68, 175, 73, 159, 199, 138, 23, 5, 57, 141,
-            98, 237, 6, 207, 46, 20, 121, 246, 222, 248, 154, 57, 188,
+            30, 145, 107, 3, 207, 73, 192, 230, 160, 63, 238, 207, 18, 69, 54, 216, 103, 244, 92,
+            94, 124, 248, 42, 16, 141, 19, 119, 18, 14, 226, 140, 204,
        ];

        let initial_acc1 = AccountInitialData {
@ -401,8 +401,8 @@ mod tests {
        let balance_to_move = 10;
        let tx = common::test_utils::create_transaction_native_token_transfer(
            [
-                208, 122, 210, 232, 75, 39, 250, 0, 194, 98, 240, 161, 238, 160, 255, 53, 202, 9,
-                115, 84, 126, 106, 16, 111, 114, 241, 147, 194, 220, 131, 139, 68,
+                148, 179, 206, 253, 199, 51, 82, 86, 232, 2, 152, 122, 80, 243, 54, 207, 237, 112,
+                83, 153, 44, 59, 204, 49, 128, 84, 160, 227, 216, 149, 97, 102,
            ],
            0,
            [2; 32],
--- a/sequencer_runner/configs/docker/sequencer_config.json
+++ b/sequencer_runner/configs/docker/sequencer_config.json
@ -9,11 +9,11 @@
    "port": 3040,
    "initial_accounts": [
        {
-            "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+            "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
            "balance": 10000
        },
        {
-            "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+            "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
            "balance": 20000
        }
    ],
--- a/wallet/configs/debug/wallet_config.json
+++ b/wallet/configs/debug/wallet_config.json
@ -8,7 +8,7 @@
  "initial_accounts": [
    {
      "Public": {
-        "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+        "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
        "pub_sign_key": [
          16,
          162,
@ -47,7 +47,7 @@
    },
    {
      "Public": {
-        "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+        "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
        "pub_sign_key": [
          113,
          121,
--- a/wallet/src/chain_storage.rs
+++ b/wallet/src/chain_storage.rs
@ -167,7 +167,7 @@ mod tests {
        let initial_acc1 = serde_json::from_str(
            r#"{
            "Public": {
-                "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+                "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
                "pub_sign_key": [
                    16,
                    162,
@ -210,7 +210,7 @@ mod tests {
        let initial_acc2 = serde_json::from_str(
            r#"{
            "Public": {
-                "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+                "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
                "pub_sign_key": [
                    113,
                    121,
--- a/wallet/src/config.rs
+++ b/wallet/src/config.rs
@ -235,7 +235,7 @@ impl Default for WalletConfig {
                [
        {
            "Public": {
-                "account_id": "BLgCRDXYdQPMMWVHYRFGQZbgeHx9frkipa8GtpG2Syqy",
+                "account_id": "6iArKUXxhUJqS7kCaPNhwMWt3ro71PDyBj7jwAyE2VQV",
                "pub_sign_key": [
                    16,
                    162,
@ -274,7 +274,7 @@ impl Default for WalletConfig {
        },
        {
            "Public": {
-                "account_id": "Gj1mJy5W7J5pfmLRujmQaLfLMWidNxQ6uwnhb666ZwHw",
+                "account_id": "7wHg9sbJwc6h3NP1S9bekfAzB8CHifEcxKswCKUt3YQo",
                "pub_sign_key": [
                    113,
                    121,