From aef309f30dd3c5dfb802ea06f27a4e25e5e3d845 Mon Sep 17 00:00:00 2001 From: Daniil Polyakov Date: Fri, 8 May 2026 01:18:01 +0300 Subject: [PATCH] fix: update configuration files --- .../docker-all-in-one/sequencer_config.json | 10 +- integration_tests/src/config.rs | 1 - sequencer/core/src/config.rs | 2 - sequencer/core/src/lib.rs | 1 - .../configs/debug/sequencer_config.json | 128 +++--------------- .../configs/docker/sequencer_config.json | 128 +++--------------- 6 files changed, 42 insertions(+), 228 deletions(-) diff --git a/configs/docker-all-in-one/sequencer_config.json b/configs/docker-all-in-one/sequencer_config.json index 7c0a4426..207f2e79 100644 --- a/configs/docker-all-in-one/sequencer_config.json +++ b/configs/docker-all-in-one/sequencer_config.json @@ -1,7 +1,5 @@ { "home": "/var/lib/sequencer_service", - "genesis_id": 1, - "is_genesis_random": true, "max_num_tx_in_block": 20, "max_block_size": "1 MiB", "mempool_max_size": 10000, @@ -30,14 +28,14 @@ } }, { - "supply_private_account": { - "npk": [177,64,1,11,87,38,254,159,231,165,1,94,64,137,243,76,249,101,251,129,33,101,189,30,42,11,191,34,103,186,227,230], + "supply_account": { + "account_id": "61EsoYN6gvTLkveh1YSTMG3yJkncpHy5EGmxhSK4ew29", "balance": 10000 } }, { - "supply_private_account": { - "npk": [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], + "supply_account": { + "account_id": "3m6HQmCgmAvsxZtxAHPqqEqoBG4335fCG8TzxigyW7rE", "balance": 20000 } } diff --git a/integration_tests/src/config.rs b/integration_tests/src/config.rs index e225e080..00bdc74a 100644 --- a/integration_tests/src/config.rs +++ b/integration_tests/src/config.rs @@ -77,7 +77,6 @@ pub fn sequencer_config( Ok(SequencerConfig { home, - is_genesis_random: true, max_num_tx_in_block, max_block_size, mempool_max_size, diff --git a/sequencer/core/src/config.rs b/sequencer/core/src/config.rs index 20d27566..371ebc89 100644 --- a/sequencer/core/src/config.rs +++ b/sequencer/core/src/config.rs @@ -29,8 +29,6 @@ pub enum GenesisAction { pub struct SequencerConfig { /// Home dir of sequencer storage. pub home: PathBuf, - /// If `True`, then adds random sequence of bytes to genesis block. - pub is_genesis_random: bool, /// Maximum number of user transactions in a block (excludes the mandatory clock transaction). pub max_num_tx_in_block: usize, /// Maximum block size (includes header, user transactions, and the mandatory clock diff --git a/sequencer/core/src/lib.rs b/sequencer/core/src/lib.rs index db8a6894..bfc49aa9 100644 --- a/sequencer/core/src/lib.rs +++ b/sequencer/core/src/lib.rs @@ -457,7 +457,6 @@ mod tests { SequencerConfig { home, - is_genesis_random: false, max_num_tx_in_block: 10, max_block_size: bytesize::ByteSize::mib(1), mempool_max_size: 10000, diff --git a/sequencer/service/configs/debug/sequencer_config.json b/sequencer/service/configs/debug/sequencer_config.json index 4088fc4a..bfe963ae 100644 --- a/sequencer/service/configs/debug/sequencer_config.json +++ b/sequencer/service/configs/debug/sequencer_config.json @@ -1,7 +1,5 @@ { "home": ".", - "genesis_id": 1, - "is_genesis_random": true, "max_num_tx_in_block": 20, "max_block_size": "1 MiB", "mempool_max_size": 1000, @@ -16,117 +14,29 @@ "node_url": "http://localhost:8080" }, "indexer_rpc_url": "ws://localhost:8779", - "initial_accounts": [ + "genesis": [ { - "account_id": "CbgR6tj5kWx5oziiFptM7jMvrQeYY3Mzaao6ciuhSr2r", - "balance": 10000 - }, - { - "account_id": "2RHZhw9h534Zr3eq2RGhQete2Hh667foECzXPmSkGni2", - "balance": 20000 - } - ], - "initial_commitments": [ - { - "npk": [ - 139, - 19, - 158, - 11, - 155, - 231, - 85, - 206, - 132, - 228, - 220, - 114, - 145, - 89, - 113, - 156, - 238, - 142, - 242, - 74, - 182, - 91, - 43, - 100, - 6, - 190, - 31, - 15, - 31, - 88, - 96, - 204 - ], - "account": { - "program_owner": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "balance": 10000, - "data": [], - "nonce": 0 + "supply_account": { + "account_id": "CbgR6tj5kWx5oziiFptM7jMvrQeYY3Mzaao6ciuhSr2r", + "balance": 10000 } }, { - "npk": [ - 173, - 134, - 33, - 223, - 54, - 226, - 10, - 71, - 215, - 254, - 143, - 172, - 24, - 244, - 243, - 208, - 65, - 112, - 118, - 70, - 217, - 240, - 69, - 100, - 129, - 3, - 121, - 25, - 213, - 132, - 42, - 45 - ], - "account": { - "program_owner": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "balance": 20000, - "data": [], - "nonce": 0 + "supply_account": { + "account_id": "2RHZhw9h534Zr3eq2RGhQete2Hh667foECzXPmSkGni2", + "balance": 20000 + } + }, + { + "supply_account": { + "account_id": "5T7EJX45Vi8rYgVjeiiQbdgM2Eun4Hq5S8uMiupiwWY1", + "balance": 10000 + } + }, + { + "supply_account": { + "account_id": "2ByFEVzfMKC13jvk1nZuFVGYoDVW1iAxvvFnqboV1aAg", + "balance": 20000 } } ], diff --git a/sequencer/service/configs/docker/sequencer_config.json b/sequencer/service/configs/docker/sequencer_config.json index f5a243d5..c9d0e6a6 100644 --- a/sequencer/service/configs/docker/sequencer_config.json +++ b/sequencer/service/configs/docker/sequencer_config.json @@ -1,7 +1,5 @@ { "home": "/var/lib/sequencer_service", - "genesis_id": 1, - "is_genesis_random": true, "max_num_tx_in_block": 20, "max_block_size": "1 MiB", "mempool_max_size": 10000, @@ -16,117 +14,29 @@ "node_url": "http://localhost:18080" }, "indexer_rpc_url": "ws://localhost:8779", - "initial_accounts": [ + "genesis": [ { - "account_id": "CbgR6tj5kWx5oziiFptM7jMvrQeYY3Mzaao6ciuhSr2r", - "balance": 10000 - }, - { - "account_id": "2RHZhw9h534Zr3eq2RGhQete2Hh667foECzXPmSkGni2", - "balance": 20000 - } - ], - "initial_commitments": [ - { - "npk": [ - 139, - 19, - 158, - 11, - 155, - 231, - 85, - 206, - 132, - 228, - 220, - 114, - 145, - 89, - 113, - 156, - 238, - 142, - 242, - 74, - 182, - 91, - 43, - 100, - 6, - 190, - 31, - 15, - 31, - 88, - 96, - 204 - ], - "account": { - "program_owner": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "balance": 10000, - "data": [], - "nonce": 0 + "supply_account": { + "account_id": "CbgR6tj5kWx5oziiFptM7jMvrQeYY3Mzaao6ciuhSr2r", + "balance": 10000 } }, { - "npk": [ - 173, - 134, - 33, - 223, - 54, - 226, - 10, - 71, - 215, - 254, - 143, - 172, - 24, - 244, - 243, - 208, - 65, - 112, - 118, - 70, - 217, - 240, - 69, - 100, - 129, - 3, - 121, - 25, - 213, - 132, - 42, - 45 - ], - "account": { - "program_owner": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "balance": 20000, - "data": [], - "nonce": 0 + "supply_account": { + "account_id": "2RHZhw9h534Zr3eq2RGhQete2Hh667foECzXPmSkGni2", + "balance": 20000 + } + }, + { + "supply_account": { + "account_id": "5T7EJX45Vi8rYgVjeiiQbdgM2Eun4Hq5S8uMiupiwWY1", + "balance": 10000 + } + }, + { + "supply_account": { + "account_id": "2ByFEVzfMKC13jvk1nZuFVGYoDVW1iAxvvFnqboV1aAg", + "balance": 20000 } } ],