From 7ce96d0423151db65da201a582c01d68757e0a3f Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Wed, 10 Jan 2024 17:34:34 +0700 Subject: [PATCH] feat: configure chain lock quorum type in dashmate --- Dockerfile | 2 +- .../configs/defaults/getBaseConfigFactory.js | 4 + .../configs/defaults/getLocalConfigFactory.js | 4 + .../defaults/getTestnetConfigFactory.js | 4 + .../configs/getConfigFileMigrationsFactory.js | 16 +++ packages/dashmate/docker-compose.yml | 10 +- .../dashmate/src/config/configJsonSchema.js | 18 ++- packages/rs-drive-abci/.env.local | 62 +++++++++ .../{.env.example => .env.mainnet} | 23 +--- packages/rs-drive-abci/.env.testnet | 62 +++++++++ packages/rs-drive-abci/src/config.rs | 71 ++++------ .../block_end/validator_set_update/v0/mod.rs | 5 +- .../data_contract_update/mod.rs | 4 +- .../tests/strategy_tests/core_update_tests.rs | 12 +- .../tests/strategy_tests/execution.rs | 4 +- .../tests/strategy_tests/failures.rs | 12 +- .../tests/strategy_tests/main.rs | 128 +++++++++--------- .../tests/strategy_tests/query.rs | 12 +- .../strategy_tests/upgrade_fork_tests.rs | 20 +-- scripts/configure_dotenv.sh | 2 +- 20 files changed, 308 insertions(+), 167 deletions(-) create mode 100644 packages/rs-drive-abci/.env.local rename packages/rs-drive-abci/{.env.example => .env.mainnet} (85%) create mode 100644 packages/rs-drive-abci/.env.testnet diff --git a/Dockerfile b/Dockerfile index 25ab93f4373..e7a2d5928db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -236,7 +236,7 @@ RUN mkdir -p /var/log/dash \ /var/lib/dash/rs-drive-abci/db COPY --from=build-drive-abci /artifacts/drive-abci /usr/bin/drive-abci -COPY --from=build-drive-abci /platform/packages/rs-drive-abci/.env.example /var/lib/dash/rs-drive-abci/.env +COPY --from=build-drive-abci /platform/packages/rs-drive-abci/.env.mainnet /var/lib/dash/rs-drive-abci/.env # Create a volume VOLUME /var/lib/dash/rs-drive-abci/db diff --git a/packages/dashmate/configs/defaults/getBaseConfigFactory.js b/packages/dashmate/configs/defaults/getBaseConfigFactory.js index 0f0d404023f..3ba88fc3872 100644 --- a/packages/dashmate/configs/defaults/getBaseConfigFactory.js +++ b/packages/dashmate/configs/defaults/getBaseConfigFactory.js @@ -165,6 +165,10 @@ export default function getBaseConfigFactory(homeDir) { validatorSet: { llmqType: 4, }, + chainLock: { + llmqType: 2, + dkgInterval: 288, + }, epochTime: 788400, }, tenderdash: { diff --git a/packages/dashmate/configs/defaults/getLocalConfigFactory.js b/packages/dashmate/configs/defaults/getLocalConfigFactory.js index 56b87efabc3..84253277c0b 100644 --- a/packages/dashmate/configs/defaults/getLocalConfigFactory.js +++ b/packages/dashmate/configs/defaults/getLocalConfigFactory.js @@ -68,6 +68,10 @@ export default function getLocalConfigFactory(getBaseConfig) { validatorSet: { llmqType: 106, }, + chainLock: { + llmqType: 100, + dkgInterval: 24, + }, }, }, }, diff --git a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js index df5e05056f0..927ec0a8b83 100644 --- a/packages/dashmate/configs/defaults/getTestnetConfigFactory.js +++ b/packages/dashmate/configs/defaults/getTestnetConfigFactory.js @@ -53,6 +53,10 @@ export default function getTestnetConfigFactory(homeDir, getBaseConfig) { validatorSet: { llmqType: 6, }, + chainLock: { + llmqType: 1, + dkgInterval: 24, + }, }, tenderdash: { p2p: { diff --git a/packages/dashmate/configs/getConfigFileMigrationsFactory.js b/packages/dashmate/configs/getConfigFileMigrationsFactory.js index 205271a7234..935b80a43aa 100644 --- a/packages/dashmate/configs/getConfigFileMigrationsFactory.js +++ b/packages/dashmate/configs/getConfigFileMigrationsFactory.js @@ -406,6 +406,22 @@ export default function getConfigFileMigrationsFactory(homeDir, defaultConfigs) return configFile; }, + '1.0.0-dev.1': (configFile) => { + Object.entries(configFile.configs) + .forEach(([name, options]) => { + + let baseConfigName = name; + if (options.group !== null && defaultConfigs.has(options.group)) { + baseConfigName = options.group; + } else if (!defaultConfigs.has(baseConfigName)) { + baseConfigName = 'testnet'; + } + + options.platform.drive.abci.chainLock = defaultConfigs.get(baseConfigName).get('platform.drive.abci.chainLock'); + }); + + return configFile; + }, }; } diff --git a/packages/dashmate/docker-compose.yml b/packages/dashmate/docker-compose.yml index 8ecff50b5b5..a1a9e577b6c 100644 --- a/packages/dashmate/docker-compose.yml +++ b/packages/dashmate/docker-compose.yml @@ -47,14 +47,11 @@ services: volumes: - drive_abci_data:/var/lib/dash/rs-drive-abci/db environment: - - BLOCK_SPACING_MS=3000 # TODO: sync with tenderdash - CHAIN_ID=${PLATFORM_DRIVE_TENDERDASH_GENESIS_CHAIN_ID:-devnet} - CORE_JSON_RPC_USERNAME=${CORE_RPC_USER:?err} - CORE_JSON_RPC_PASSWORD=${CORE_RPC_PASSWORD:?err} - CORE_JSON_RPC_HOST=core - CORE_JSON_RPC_PORT=${CORE_RPC_PORT:?err} - - CORE_ZMQ_HOST=core - - CORE_ZMQ_PORT=29998 - DPNS_MASTER_PUBLIC_KEY=${PLATFORM_DPNS_MASTER_PUBLIC_KEY} - DPNS_SECOND_PUBLIC_KEY=${PLATFORM_DPNS_SECOND_PUBLIC_KEY} - DASHPAY_MASTER_PUBLIC_KEY=${PLATFORM_DASHPAY_MASTER_PUBLIC_KEY} @@ -66,10 +63,9 @@ services: - MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=${PLATFORM_MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY} - WITHDRAWALS_MASTER_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_MASTER_PUBLIC_KEY} - WITHDRAWALS_SECOND_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_SECOND_PUBLIC_KEY} - - QUORUM_SIZE=5 # TODO: sync with Tenderdash - - QUORUM_TYPE=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_LLMQ_TYPE:?err} - - NETWORK=${NETWORK:?err} - - TENDERDASH_P2P_PORT=${PLATFORM_DRIVE_TENDERDASH_P2P_PORT:?err} + - VALIDATOR_SET_QUORUM_TYPE=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_LLMQ_TYPE:?err} + - CHAIN_LOCK_QUORUM_TYPE=${PLATFORM_DRIVE_ABCI_CHAIN_LOCK_LLMQ_TYPE:?err} + - CHAIN_LOCK_QUORUM_WINDOW=${PLATFORM_DRIVE_ABCI_CHAIN_LOCK_DKG_INTERVAL:?err} stop_grace_period: 30s env_file: # Logger settings diff --git a/packages/dashmate/src/config/configJsonSchema.js b/packages/dashmate/src/config/configJsonSchema.js index d60a43e2d9e..b614e1cc9b9 100644 --- a/packages/dashmate/src/config/configJsonSchema.js +++ b/packages/dashmate/src/config/configJsonSchema.js @@ -503,13 +503,29 @@ export default { additionalProperties: false, required: ['llmqType'], }, + chainLock: { + type: 'object', + properties: { + llmqType: { + type: 'number', + // https://github.com/dashpay/dashcore-lib/blob/843176fed9fc81feae43ccf319d99e2dd942fe1f/lib/constants/index.js#L50-L99 + enum: [1, 2, 3, 4, 5, 6, 100, 101, 102, 103, 104, 105, 106, 107], + }, + dkgInterval: { + type: 'integer', + minimum: 0, + }, + }, + additionalProperties: false, + required: ['llmqType', 'dkgInterval'], + }, epochTime: { type: 'integer', minimum: 180, }, }, additionalProperties: false, - required: ['docker', 'logs', 'validatorSet', 'epochTime'], + required: ['docker', 'logs', 'validatorSet', 'chainLock', 'epochTime'], }, tenderdash: { type: 'object', diff --git a/packages/rs-drive-abci/.env.local b/packages/rs-drive-abci/.env.local new file mode 100644 index 00000000000..4c336aa003d --- /dev/null +++ b/packages/rs-drive-abci/.env.local @@ -0,0 +1,62 @@ +# ABCI host and port to listen +ABCI_BIND_ADDRESS="tcp://0.0.0.0:26658" +ABCI_PROMETHEUS_BIND_ADDRESS="http://0.0.0.0:29090" + +# stderr logging for humans +ABCI_LOG_STDOUT_DESTINATION=stdout +ABCI_LOG_STDOUT_LEVEL=info +ABCI_LOG_STDOUT_FORMAT=pretty +ABCI_LOG_STDOUT_COLOR=true + +DB_PATH=/tmp/db + +# Cache size for Data Contracts +DATA_CONTRACTS_GLOBAL_CACHE_SIZE=500 +DATA_CONTRACTS_BLOCK_CACHE_SIZE=200 + +# DashCore JSON-RPC host, port and credentials +# Read more: https://dashcore.readme.io/docs/core-api-ref-remote-procedure-calls +CORE_JSON_RPC_HOST=127.0.0.1 +CORE_JSON_RPC_PORT=9998 +CORE_JSON_RPC_USERNAME=dashrpc +CORE_JSON_RPC_PASSWORD=password + +INITIAL_CORE_CHAINLOCKED_HEIGHT=1243 + +# https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57 +VALIDATOR_SET_LLMQ_TYPE=llmq_test +VALIDATOR_SET_QUORUM_SIZE=3 +VALIDATOR_SET_ROTATION_BLOCK_COUNT=64 + +CHAIN_LOCK_QUORUM_TYPE=llmq_test +CHAIN_LOCK_QUORUM_WINDOW=24 + +# DPNS Contract + +DPNS_MASTER_PUBLIC_KEY=02649a81b760e8635dd3a4fad8911388ed09d7c1680558a890180d4edc8bcece7e +DPNS_SECOND_PUBLIC_KEY=03f5ea3ab4bf594c28997eb8f83873532275ac2edd36e586b137ed42d15d510948 + +# Dashpay Contract + +DASHPAY_MASTER_PUBLIC_KEY=022d6d70c9d24d03904713db17fb74c9201801ba0e3aed0f5d91e89df388e94aa6 +DASHPAY_SECOND_PUBLIC_KEY=028c0a26c87b2e7f1aebbbeace9e687d774e037f5b50a6905b5f6fa24495b502cd + +# Feature flags contract + +FEATURE_FLAGS_MASTER_PUBLIC_KEY=034ee04c509083ecd09e76fa53e0b5331b39120c19607cd04c4f167707dbb42302 +FEATURE_FLAGS_SECOND_PUBLIC_KEY=03c755ae1b79dbcc79020aad3ccdfcb142fc6e74f1afc220fca1e275a87aa12cf8 + +# Masternode reward shares contract + +MASTERNODE_REWARD_SHARES_MASTER_PUBLIC_KEY=02099cc210c7b6c7f566099046ddc92615342db326184940bf3811026ea328c85e +MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=02bf55f97f189895da29824781053140ee66b2bf47760246504fbe502985096af5 + +# Withdrawals contract + +WITHDRAWALS_MASTER_PUBLIC_KEY=027057cdf58628635ef7b75e6b6c90dd996a16929cd68130e16b9328d429e5e03a +WITHDRAWALS_SECOND_PUBLIC_KEY=022084d827fea4823a69aa7c8d3e02fe780eaa0ef1e5e9841af395ba7e40465ab6 + +EPOCH_TIME_LENGTH_S=788400 + +CHAIN_ID=devnet +BLOCK_SPACING_MS=5000 diff --git a/packages/rs-drive-abci/.env.example b/packages/rs-drive-abci/.env.mainnet similarity index 85% rename from packages/rs-drive-abci/.env.example rename to packages/rs-drive-abci/.env.mainnet index cefb0d406ad..a6733bc78b6 100644 --- a/packages/rs-drive-abci/.env.example +++ b/packages/rs-drive-abci/.env.mainnet @@ -10,9 +10,6 @@ ABCI_LOG_STDOUT_COLOR=true DB_PATH=/tmp/db -# GroveDB database file -GROVEDB_LATEST_FILE=${DB_PATH}/latest_state - # Cache size for Data Contracts DATA_CONTRACTS_GLOBAL_CACHE_SIZE=500 DATA_CONTRACTS_BLOCK_CACHE_SIZE=200 @@ -29,18 +26,15 @@ CORE_ZMQ_HOST=127.0.0.1 CORE_ZMQ_PORT=29998 CORE_ZMQ_CONNECTION_RETRIES=16 -NETWORK=testnet - INITIAL_CORE_CHAINLOCKED_HEIGHT=1243 # https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57 -VALIDATOR_SET_QUORUM_TYPE=100 -CHAIN_LOCK_QUORUM_TYPE=100 -CHAIN_LOCK_QUORUM_WINDOW=24 -VALIDATOR_SET_QUORUM_ROTATION_BLOCK_COUNT=64 +VALIDATOR_SET_LLMQ_TYPE=llmq_100_67 +VALIDATOR_SET_QUORUM_SIZE=100 +VALIDATOR_SET_ROTATION_BLOCK_COUNT=64 -DKG_INTERVAL=24 -MIN_QUORUM_VALID_MEMBERS=3 +CHAIN_LOCK_QUORUM_TYPE=llmq_400_60 +CHAIN_LOCK_QUORUM_WINDOW=288 # DPNS Contract @@ -67,10 +61,7 @@ MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=02bf55f97f189895da29824781053140ee66b WITHDRAWALS_MASTER_PUBLIC_KEY=027057cdf58628635ef7b75e6b6c90dd996a16929cd68130e16b9328d429e5e03a WITHDRAWALS_SECOND_PUBLIC_KEY=022084d827fea4823a69aa7c8d3e02fe780eaa0ef1e5e9841af395ba7e40465ab6 -TENDERDASH_P2P_PORT=26656 - EPOCH_TIME_LENGTH_S=788400 -QUORUM_SIZE=5 -QUORUM_TYPE=llmq_25_67 + CHAIN_ID=devnet -BLOCK_SPACING_MS=3000 +BLOCK_SPACING_MS=5000 diff --git a/packages/rs-drive-abci/.env.testnet b/packages/rs-drive-abci/.env.testnet new file mode 100644 index 00000000000..202a78efafb --- /dev/null +++ b/packages/rs-drive-abci/.env.testnet @@ -0,0 +1,62 @@ +# ABCI host and port to listen +ABCI_BIND_ADDRESS="tcp://0.0.0.0:26658" +ABCI_PROMETHEUS_BIND_ADDRESS="http://0.0.0.0:29090" + +# stderr logging for humans +ABCI_LOG_STDOUT_DESTINATION=stdout +ABCI_LOG_STDOUT_LEVEL=info +ABCI_LOG_STDOUT_FORMAT=pretty +ABCI_LOG_STDOUT_COLOR=true + +DB_PATH=/tmp/db + +# Cache size for Data Contracts +DATA_CONTRACTS_GLOBAL_CACHE_SIZE=500 +DATA_CONTRACTS_BLOCK_CACHE_SIZE=200 + +# DashCore JSON-RPC host, port and credentials +# Read more: https://dashcore.readme.io/docs/core-api-ref-remote-procedure-calls +CORE_JSON_RPC_HOST=127.0.0.1 +CORE_JSON_RPC_PORT=9998 +CORE_JSON_RPC_USERNAME=dashrpc +CORE_JSON_RPC_PASSWORD=password + +INITIAL_CORE_CHAINLOCKED_HEIGHT=1243 + +# https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57 +VALIDATOR_SET_LLMQ_TYPE=llmq_25_67 +VALIDATOR_SET_QUORUM_SIZE=25 +VALIDATOR_SET_ROTATION_BLOCK_COUNT=64 + +CHAIN_LOCK_QUORUM_TYPE=llmq_50_60 +CHAIN_LOCK_QUORUM_WINDOW=24 + +# DPNS Contract + +DPNS_MASTER_PUBLIC_KEY=02649a81b760e8635dd3a4fad8911388ed09d7c1680558a890180d4edc8bcece7e +DPNS_SECOND_PUBLIC_KEY=03f5ea3ab4bf594c28997eb8f83873532275ac2edd36e586b137ed42d15d510948 + +# Dashpay Contract + +DASHPAY_MASTER_PUBLIC_KEY=022d6d70c9d24d03904713db17fb74c9201801ba0e3aed0f5d91e89df388e94aa6 +DASHPAY_SECOND_PUBLIC_KEY=028c0a26c87b2e7f1aebbbeace9e687d774e037f5b50a6905b5f6fa24495b502cd + +# Feature flags contract + +FEATURE_FLAGS_MASTER_PUBLIC_KEY=034ee04c509083ecd09e76fa53e0b5331b39120c19607cd04c4f167707dbb42302 +FEATURE_FLAGS_SECOND_PUBLIC_KEY=03c755ae1b79dbcc79020aad3ccdfcb142fc6e74f1afc220fca1e275a87aa12cf8 + +# Masternode reward shares contract + +MASTERNODE_REWARD_SHARES_MASTER_PUBLIC_KEY=02099cc210c7b6c7f566099046ddc92615342db326184940bf3811026ea328c85e +MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=02bf55f97f189895da29824781053140ee66b2bf47760246504fbe502985096af5 + +# Withdrawals contract + +WITHDRAWALS_MASTER_PUBLIC_KEY=027057cdf58628635ef7b75e6b6c90dd996a16929cd68130e16b9328d429e5e03a +WITHDRAWALS_SECOND_PUBLIC_KEY=022084d827fea4823a69aa7c8d3e02fe780eaa0ef1e5e9841af395ba7e40465ab6 + +EPOCH_TIME_LENGTH_S=788400 + +CHAIN_ID=devnet +BLOCK_SPACING_MS=5000 diff --git a/packages/rs-drive-abci/src/config.rs b/packages/rs-drive-abci/src/config.rs index 3e383ec9f09..0910e258374 100644 --- a/packages/rs-drive-abci/src/config.rs +++ b/packages/rs-drive-abci/src/config.rs @@ -76,41 +76,12 @@ impl Default for CoreRpcConfig { } /// Configuration for Dash Core related things -#[derive(Clone, Debug, Serialize, Deserialize)] +#[derive(Clone, Debug, Serialize, Deserialize, Default)] #[serde(default)] pub struct CoreConfig { /// Core RPC config #[serde(flatten)] pub rpc: CoreRpcConfig, - - /// DKG interval - pub dkg_interval: String, // String due to https://github.com/softprops/envy/issues/26 - /// Minimum number of valid members to use the quorum - pub min_quorum_valid_members: String, // String due to https://github.com/softprops/envy/issues/26 -} - -impl CoreConfig { - /// return dkg_interval - pub fn dkg_interval(&self) -> u32 { - self.dkg_interval - .parse::() - .expect("DKG_INTERVAL is not an int") - } - /// Returns minimal number of quorum members - pub fn min_quorum_valid_members(&self) -> u32 { - self.min_quorum_valid_members - .parse::() - .expect("MIN_QUORUM_VALID_MEMBERS is not an int") - } -} -impl Default for CoreConfig { - fn default() -> Self { - Self { - dkg_interval: String::from("24"), - min_quorum_valid_members: String::from("3"), - rpc: Default::default(), - } - } } /// Configuration of the execution part of Dash Platform. @@ -128,10 +99,10 @@ pub struct ExecutionConfig { /// How often should quorums change? #[serde( - default = "ExecutionConfig::default_validator_set_quorum_rotation_block_count", + default = "ExecutionConfig::default_validator_set_rotation_block_count", deserialize_with = "from_str_or_number" )] - pub validator_set_quorum_rotation_block_count: u32, + pub validator_set_rotation_block_count: u32, /// How long in seconds should an epoch last /// It might last a lot longer if the chain is halted @@ -195,15 +166,16 @@ pub struct PlatformConfig { /// The quorum type used for verifying chain locks pub chain_lock_quorum_type: String, + // TODO: It's a test-only param /// The default quorum size - pub quorum_size: u16, + pub validator_set_quorum_size: u16, /// The window for chain locks /// On Mainnet Chain Locks are signed using 400_60: One quorum in every 288 blocks and activeQuorumCount is 4. /// On Testnet Chain Locks are signed using 50_60: One quorum in every 24 blocks and activeQuorumCount is 24. pub chain_lock_quorum_window: u32, - // todo: this should probably be coming from Tenderdash config + // todo: this should probably be coming from Tenderdash config. It's a test only param /// Approximately how often are blocks produced pub block_spacing_ms: u64, @@ -229,7 +201,7 @@ impl ExecutionConfig { true } - fn default_validator_set_quorum_rotation_block_count() -> u32 { + fn default_validator_set_rotation_block_count() -> u32 { 15 } @@ -308,8 +280,8 @@ impl Default for ExecutionConfig { Self { use_document_triggers: ExecutionConfig::default_use_document_triggers(), verify_sum_trees: ExecutionConfig::default_verify_sum_trees(), - validator_set_quorum_rotation_block_count: - ExecutionConfig::default_validator_set_quorum_rotation_block_count(), + validator_set_rotation_block_count: + ExecutionConfig::default_validator_set_rotation_block_count(), epoch_time_length_s: ExecutionConfig::default_epoch_time_length_s(), } } @@ -323,11 +295,28 @@ impl Default for PlatformConfig { #[allow(missing_docs)] impl PlatformConfig { + pub fn default_local() -> Self { + Self { + validator_set_quorum_type: "llmq_test_platform".to_string(), + chain_lock_quorum_type: "llmq_test".to_string(), + validator_set_quorum_size: 3, + chain_lock_quorum_window: 24, + block_spacing_ms: 5000, + drive: Default::default(), + abci: Default::default(), + core: Default::default(), + execution: Default::default(), + db_path: PathBuf::from("/var/lib/dash-platform/data"), + testing_configs: PlatformTestConfig::default(), + initial_protocol_version: 1, + } + } + pub fn default_testnet() -> Self { Self { validator_set_quorum_type: "llmq_25_67".to_string(), chain_lock_quorum_type: "llmq_50_60".to_string(), - quorum_size: 25, + validator_set_quorum_size: 25, chain_lock_quorum_window: 24, block_spacing_ms: 5000, drive: Default::default(), @@ -344,7 +333,7 @@ impl PlatformConfig { Self { validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_400_60".to_string(), - quorum_size: 100, + validator_set_quorum_size: 100, chain_lock_quorum_window: 288, block_spacing_ms: 5000, drive: Default::default(), @@ -409,10 +398,10 @@ mod tests { env::set_var(format!("ABCI_LOG_{}_FORMAT", vector.0), vector.1); } - let envfile = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(".env.example"); + let envfile = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join(".env.local"); dotenvy::from_path(envfile.as_path()).expect("cannot load .env file"); - assert_eq!("5", env::var("QUORUM_SIZE").unwrap()); + assert_eq!("/tmp/db", env::var("DB_PATH").unwrap()); let config = super::PlatformConfig::from_env().expect("expected config from env"); assert!(config.execution.verify_sum_trees); diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs index 3a1ead24fb3..27b5fc37147 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_end/validator_set_update/v0/mod.rs @@ -27,10 +27,7 @@ where let mut perform_rotation = false; if block_execution_context.block_state_info().height() - % self - .config - .execution - .validator_set_quorum_rotation_block_count as u64 + % self.config.execution.validator_set_rotation_block_count as u64 == 0 { tracing::debug!( diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs index 151eca048e8..cd571da9b82 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs @@ -147,10 +147,10 @@ mod tests { .data_contract_owned(); let config = PlatformConfig { - quorum_size: 10, + validator_set_quorum_size: 10, execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 300, diff --git a/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs b/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs index e00b51ffcea..f2480bdcec3 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs @@ -63,12 +63,12 @@ mod tests { let quorum_size = 100; let config = PlatformConfig { - quorum_size, + validator_set_quorum_size: quorum_size, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -171,12 +171,12 @@ mod tests { let quorum_size = 100; let config = PlatformConfig { - quorum_size, + validator_set_quorum_size: quorum_size, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -268,12 +268,12 @@ mod tests { let quorum_size = 100; let config = PlatformConfig { - quorum_size, + validator_set_quorum_size: quorum_size, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, diff --git a/packages/rs-drive-abci/tests/strategy_tests/execution.rs b/packages/rs-drive-abci/tests/strategy_tests/execution.rs index aee63d84097..e4b1a8b1701 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/execution.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/execution.rs @@ -46,7 +46,7 @@ pub(crate) fn run_chain_for_strategy( seed: u64, ) -> ChainExecutionOutcome { let quorum_count = strategy.quorum_count; // We assume 24 quorums - let quorum_size = config.quorum_size; + let quorum_size = config.validator_set_quorum_size; let mut rng = StdRng::seed_from_u64(seed); @@ -613,7 +613,7 @@ pub(crate) fn continue_chain_for_strategy( StrategyRandomness::SeedEntropy(seed) => StdRng::seed_from_u64(seed), StrategyRandomness::RNGEntropy(rng) => rng, }; - let quorum_size = config.quorum_size; + let quorum_size = config.validator_set_quorum_size; let first_block_time = start_time_ms; let mut current_identities = vec![]; let mut signer = strategy.strategy.signer.clone().unwrap_or_default(); diff --git a/packages/rs-drive-abci/tests/strategy_tests/failures.rs b/packages/rs-drive-abci/tests/strategy_tests/failures.rs index afe453ff708..9b35599f375 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/failures.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/failures.rs @@ -83,12 +83,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -170,12 +170,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -218,13 +218,13 @@ mod tests { // We use the dpns contract and we insert two documents both with the same "name" // This is a common scenario we should see quite often let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { //we disable document triggers because we are using dpns and dpns needs a preorder use_document_triggers: false, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, diff --git a/packages/rs-drive-abci/tests/strategy_tests/main.rs b/packages/rs-drive-abci/tests/strategy_tests/main.rs index 519798bd183..422f12db1ad 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/main.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/main.rs @@ -146,12 +146,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..ExecutionConfig::default() }, block_spacing_ms: 3000, @@ -204,12 +204,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..ExecutionConfig::default() }, block_spacing_ms: 3000, @@ -262,12 +262,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..ExecutionConfig::default() }, block_spacing_ms: 3000, @@ -406,12 +406,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..ExecutionConfig::default() }, block_spacing_ms: 3000, @@ -545,12 +545,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -616,12 +616,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -675,12 +675,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: hour_in_ms, @@ -741,12 +741,12 @@ mod tests { let hour_in_s = 60 * 60; let three_mins_in_ms = 1000 * 60 * 3; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, epoch_time_length_s: hour_in_s, ..Default::default() }, @@ -809,12 +809,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 10, + validator_set_quorum_size: 10, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 300, @@ -901,12 +901,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 10, + validator_set_quorum_size: 10, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 300, @@ -978,12 +978,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 10, + validator_set_quorum_size: 10, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 300, @@ -1050,12 +1050,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 10, + validator_set_quorum_size: 10, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 300, @@ -1152,12 +1152,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -1212,12 +1212,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -1298,12 +1298,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -1412,12 +1412,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -1521,12 +1521,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -1607,12 +1607,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -1720,12 +1720,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -1833,12 +1833,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -1962,12 +1962,12 @@ mod tests { let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, epoch_time_length_s: 1576800, ..Default::default() }, @@ -2095,12 +2095,12 @@ mod tests { let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, epoch_time_length_s: 1576800, ..Default::default() }, @@ -2170,12 +2170,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -2256,12 +2256,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -2347,12 +2347,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -2445,12 +2445,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -2507,12 +2507,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 3, + validator_set_quorum_size: 3, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 1, + validator_set_rotation_block_count: 1, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -2666,12 +2666,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 3, + validator_set_quorum_size: 3, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 1, + validator_set_rotation_block_count: 1, epoch_time_length_s: 1576800, ..Default::default() }, @@ -2796,12 +2796,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 3, + validator_set_quorum_size: 3, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 1, + validator_set_rotation_block_count: 1, ..Default::default() }, block_spacing_ms: day_in_ms, @@ -2926,12 +2926,12 @@ mod tests { }; let day_in_ms = 1000 * 60 * 60 * 24; let config = PlatformConfig { - quorum_size: 3, + validator_set_quorum_size: 3, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 1, + validator_set_rotation_block_count: 1, epoch_time_length_s: 1576800, ..Default::default() }, @@ -3070,12 +3070,12 @@ mod tests { }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, @@ -3130,12 +3130,12 @@ mod tests { ..Default::default() }; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 25, + validator_set_rotation_block_count: 25, ..Default::default() }, block_spacing_ms: 3000, diff --git a/packages/rs-drive-abci/tests/strategy_tests/query.rs b/packages/rs-drive-abci/tests/strategy_tests/query.rs index b9d6d0f4dea..fd57d4d83b1 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/query.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/query.rs @@ -408,12 +408,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: hour_in_ms, @@ -521,12 +521,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: hour_in_ms, @@ -635,12 +635,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 100, + validator_set_rotation_block_count: 100, ..Default::default() }, block_spacing_ms: hour_in_ms, diff --git a/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs b/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs index aae849c6ed2..688a663a414 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs @@ -64,12 +64,12 @@ mod tests { }; let twenty_minutes_in_ms = 1000 * 60 * 20; let mut config = PlatformConfig { - quorum_size: 100, + validator_set_quorum_size: 100, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 125, + validator_set_rotation_block_count: 125, epoch_time_length_s: 1576800, ..Default::default() }, @@ -336,12 +336,12 @@ mod tests { let one_hour_in_s = 60 * 60; let thirty_seconds_in_ms = 1000 * 30; let config = PlatformConfig { - quorum_size: 30, + validator_set_quorum_size: 30, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 30, + validator_set_rotation_block_count: 30, epoch_time_length_s: one_hour_in_s, ..Default::default() }, @@ -599,12 +599,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 40, + validator_set_quorum_size: 40, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 80, + validator_set_rotation_block_count: 80, epoch_time_length_s: 1576800, ..Default::default() }, @@ -862,12 +862,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let mut config = PlatformConfig { - quorum_size: 50, + validator_set_quorum_size: 50, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 50, + validator_set_rotation_block_count: 50, epoch_time_length_s: 1576800, ..Default::default() }, @@ -1230,12 +1230,12 @@ mod tests { }; let hour_in_ms = 1000 * 60 * 60; let config = PlatformConfig { - quorum_size: 50, + validator_set_quorum_size: 50, validator_set_quorum_type: "llmq_100_67".to_string(), chain_lock_quorum_type: "llmq_100_67".to_string(), execution: ExecutionConfig { verify_sum_trees: true, - validator_set_quorum_rotation_block_count: 30, + validator_set_rotation_block_count: 30, epoch_time_length_s: 1576800, ..Default::default() }, diff --git a/scripts/configure_dotenv.sh b/scripts/configure_dotenv.sh index 2074b73ca3b..f5f6fa4636b 100755 --- a/scripts/configure_dotenv.sh +++ b/scripts/configure_dotenv.sh @@ -50,7 +50,7 @@ NETWORK=regtest" >>"${SDK_ENV_FILE_PATH}" #EOF # DRIVE: -cp "${DRIVE_PATH}"/.env.example "${DRIVE_PATH}"/.env +cp "${DRIVE_PATH}"/.env.local "${DRIVE_PATH}"/.env # WALLET-LIB: WALLET_LIB_ENV_FILE_PATH=${WALLET_LIB_PATH}/.env