From 89d91651c7c56b7da94bec51859e5dd5cf848141 Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Mon, 7 Oct 2024 17:44:37 -0700 Subject: [PATCH 1/6] sweep --- aptos-move/framework/aptos-framework/doc/block.md | 3 +-- testsuite/forge-cli/src/main.rs | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/aptos-move/framework/aptos-framework/doc/block.md b/aptos-move/framework/aptos-framework/doc/block.md index f5c4430007732..01d2f74e8ffbb 100644 --- a/aptos-move/framework/aptos-framework/doc/block.md +++ b/aptos-move/framework/aptos-framework/doc/block.md @@ -48,7 +48,6 @@ This module defines a struct storing the metadata of the block and new block eve use 0x1::option; use 0x1::randomness; use 0x1::reconfiguration; -use 0x1::reconfiguration_with_dkg; use 0x1::stake; use 0x1::state_storage; use 0x1::system_addresses; @@ -717,7 +716,7 @@ The runtime always runs this before executing the transactions in a block. randomness::on_new_block(&vm, epoch, round, randomness_seed); if (timestamp - reconfiguration::last_reconfiguration_time() >= epoch_interval) { - reconfiguration_with_dkg::try_start(); + // reconfiguration_with_dkg::try_start(); }; } diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index 3deb5ebfa71c4..d40daf979cdd4 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -1165,14 +1165,11 @@ fn background_traffic_for_sweep_with_latency(criteria: &[(f32, f32)]) -> Option< fn realistic_env_load_sweep_test() -> ForgeConfig { realistic_env_sweep_wrap(20, 10, LoadVsPerfBenchmark { test: Box::new(PerformanceBenchmark), - workloads: Workloads::TPS(vec![10, 100, 1000, 3000, 5000, 7000]), + workloads: Workloads::TPS(vec![10, 5000, 10000]), criteria: [ (9, 0.9, 0.9, 1.2, 0), - (95, 0.9, 1.0, 1.2, 0), - (950, 1.2, 1.3, 2.0, 0), - (2900, 1.4, 2.2, 2.5, 0), (4800, 2.0, 2.5, 3.0, 0), - (6700, 2.5, 3.5, 5.0, 0), + (9000, 5.0, 7.0, 9.0, 0), // TODO add 9k or 10k. Allow some expired transactions (high-load) ] .into_iter() From da08e7070b1f9cfda265a1393c545c0636b843d2 Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Thu, 10 Oct 2024 17:25:57 -0700 Subject: [PATCH 2/6] 10k --- aptos-move/framework/aptos-framework/doc/block.md | 3 ++- testsuite/forge-cli/src/main.rs | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aptos-move/framework/aptos-framework/doc/block.md b/aptos-move/framework/aptos-framework/doc/block.md index 01d2f74e8ffbb..f5c4430007732 100644 --- a/aptos-move/framework/aptos-framework/doc/block.md +++ b/aptos-move/framework/aptos-framework/doc/block.md @@ -48,6 +48,7 @@ This module defines a struct storing the metadata of the block and new block eve use 0x1::option; use 0x1::randomness; use 0x1::reconfiguration; +use 0x1::reconfiguration_with_dkg; use 0x1::stake; use 0x1::state_storage; use 0x1::system_addresses; @@ -716,7 +717,7 @@ The runtime always runs this before executing the transactions in a block. randomness::on_new_block(&vm, epoch, round, randomness_seed); if (timestamp - reconfiguration::last_reconfiguration_time() >= epoch_interval) { - // reconfiguration_with_dkg::try_start(); + reconfiguration_with_dkg::try_start(); }; } diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index d40daf979cdd4..717753bd65d95 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -1165,10 +1165,8 @@ fn background_traffic_for_sweep_with_latency(criteria: &[(f32, f32)]) -> Option< fn realistic_env_load_sweep_test() -> ForgeConfig { realistic_env_sweep_wrap(20, 10, LoadVsPerfBenchmark { test: Box::new(PerformanceBenchmark), - workloads: Workloads::TPS(vec![10, 5000, 10000]), + workloads: Workloads::TPS(vec![10000]), criteria: [ - (9, 0.9, 0.9, 1.2, 0), - (4800, 2.0, 2.5, 3.0, 0), (9000, 5.0, 7.0, 9.0, 0), // TODO add 9k or 10k. Allow some expired transactions (high-load) ] From 473e4eee22fc0caf2e1a02b6f091a88754a6e713 Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Thu, 10 Oct 2024 17:36:09 -0700 Subject: [PATCH 3/6] enable opt sig --- config/src/config/consensus_config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/src/config/consensus_config.rs b/config/src/config/consensus_config.rs index f907072edfb67..9f760316c38c2 100644 --- a/config/src/config/consensus_config.rs +++ b/config/src/config/consensus_config.rs @@ -321,7 +321,7 @@ impl Default for ConsensusConfig { num_bounded_executor_tasks: 16, enable_pre_commit: true, max_pending_rounds_in_commit_vote_cache: 100, - optimistic_sig_verification: false, + optimistic_sig_verification: true, enable_round_timeout_msg: false, } } From e676e1464151366badab0da690be0e1b46593587 Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Thu, 10 Oct 2024 22:50:16 -0700 Subject: [PATCH 4/6] enable co --- config/src/config/consensus_observer_config.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/src/config/consensus_observer_config.rs b/config/src/config/consensus_observer_config.rs index 0ca55c31d50e9..d7ba59d9fb812 100644 --- a/config/src/config/consensus_observer_config.rs +++ b/config/src/config/consensus_observer_config.rs @@ -9,9 +9,9 @@ use serde::{Deserialize, Serialize}; use serde_yaml::Value; // Useful constants for enabling consensus observer on different node types -const ENABLE_ON_VALIDATORS: bool = false; -const ENABLE_ON_VALIDATOR_FULLNODES: bool = false; -const ENABLE_ON_PUBLIC_FULLNODES: bool = false; +const ENABLE_ON_VALIDATORS: bool = true; +const ENABLE_ON_VALIDATOR_FULLNODES: bool = true; +const ENABLE_ON_PUBLIC_FULLNODES: bool = true; #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)] #[serde(default, deny_unknown_fields)] From 2d1a1731b3bb31ac82e6762a1de34c3e19600f0c Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Thu, 10 Oct 2024 22:51:46 -0700 Subject: [PATCH 5/6] test --- testsuite/forge-cli/src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index c342359c9bf43..69c7e1730e6ed 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -684,7 +684,8 @@ fn get_land_blocking_test( ) -> Option { let test = match test_name { "land_blocking" | "realistic_env_max_load" => { - realistic_env_max_load_test(duration, test_cmd, 7, 5) + // realistic_env_max_load_test(duration, test_cmd, 7, 5) + realistic_env_load_sweep_test() }, "compat" => compat(), "framework_upgrade" => framework_upgrade(), @@ -1174,7 +1175,7 @@ fn background_traffic_for_sweep_with_latency(criteria: &[(f32, f32)]) -> Option< } fn realistic_env_load_sweep_test() -> ForgeConfig { - realistic_env_sweep_wrap(20, 10, LoadVsPerfBenchmark { + realistic_env_sweep_wrap(100, 20, LoadVsPerfBenchmark { test: Box::new(PerformanceBenchmark), workloads: Workloads::TPS(vec![10000]), criteria: [ From ccaf19944b25b33cc07d4c7007ac9ae5dc847229 Mon Sep 17 00:00:00 2001 From: danielxiangzl Date: Fri, 11 Oct 2024 12:29:10 -0700 Subject: [PATCH 6/6] omit signed batchinfo verify --- consensus/consensus-types/src/proof_of_store.rs | 5 ++++- testsuite/forge-cli/src/main.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/consensus/consensus-types/src/proof_of_store.rs b/consensus/consensus-types/src/proof_of_store.rs index 3f06a6cf0f274..46ba215e4af12 100644 --- a/consensus/consensus-types/src/proof_of_store.rs +++ b/consensus/consensus-types/src/proof_of_store.rs @@ -260,7 +260,10 @@ impl SignedBatchInfo { ); } - Ok(validator.verify(self.signer, &self.info, &self.signature)?) + // daniel hack + Ok(()) + + // Ok(validator.verify(self.signer, &self.info, &self.signature)?) } pub fn signature(&self) -> &bls12381::Signature { diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs index 69c7e1730e6ed..1d44f04e1482c 100644 --- a/testsuite/forge-cli/src/main.rs +++ b/testsuite/forge-cli/src/main.rs @@ -1175,7 +1175,7 @@ fn background_traffic_for_sweep_with_latency(criteria: &[(f32, f32)]) -> Option< } fn realistic_env_load_sweep_test() -> ForgeConfig { - realistic_env_sweep_wrap(100, 20, LoadVsPerfBenchmark { + realistic_env_sweep_wrap(100, 10, LoadVsPerfBenchmark { test: Box::new(PerformanceBenchmark), workloads: Workloads::TPS(vec![10000]), criteria: [