[Cherrypick] Commit Handler rewrite (#23497)

crates/sui-benchmark/tests/simtest.rs

@@ -850,6 +850,13 @@ mod test {
             if version.as_u64() <= 87 {
                 config.set_record_time_estimate_processed_for_testing(true);
             }
+            config.set_ignore_execution_time_observations_after_certs_closed_for_testing(true);
+            config.set_record_time_estimate_processed_for_testing(true);
+            config.set_prepend_prologue_tx_in_consensus_commit_in_checkpoints_for_testing(true);
+            config.set_consensus_checkpoint_signature_key_includes_digest_for_testing(true);
+            config.set_cancel_for_failed_dkg_early_for_testing(true);
+            config.set_use_mfp_txns_in_load_initial_object_debts_for_testing(true);
+            config.set_authority_capabilities_v2_for_testing(true);
             config
         });
 

crates/sui-bridge/src/e2e_tests/basic.rs

@@ -16,13 +16,10 @@ use crate::events::{
 use crate::sui_transaction_builder::build_add_tokens_on_sui_transaction;
 use crate::types::{AddTokensOnEvmAction, BridgeAction};
 use crate::utils::publish_and_register_coins_return_add_coins_on_sui_action;
-use crate::BRIDGE_ENABLE_PROTOCOL_VERSION;
 use ethers::prelude::*;
 use ethers::types::Address as EthAddress;
 use std::collections::HashSet;
-use sui_json_rpc_api::BridgeReadApiClient;
 use sui_types::crypto::get_key_pair;
-use test_cluster::TestClusterBuilder;
 
 use std::path::Path;
 
@@ -354,21 +351,3 @@ async fn test_committee_registration() {
         .trigger_reconfiguration_if_not_yet_and_assert_bridge_committee_initialized()
         .await;
 }
-
-#[tokio::test]
-async fn test_bridge_api_compatibility() {
-    let test_cluster: test_cluster::TestCluster = TestClusterBuilder::new()
-        .with_protocol_version(BRIDGE_ENABLE_PROTOCOL_VERSION.into())
-        .build()
-        .await;
-
-    test_cluster.trigger_reconfiguration().await;
-    let client = test_cluster.rpc_client();
-    client.get_latest_bridge().await.unwrap();
-    // TODO: assert fields in summary
-
-    client
-        .get_bridge_object_initial_shared_version()
-        .await
-        .unwrap();
-}

crates/sui-bridge/src/e2e_tests/test_utils.rs

@@ -55,7 +55,7 @@ use sui_types::bridge::BridgeSummary;
 use sui_types::bridge::BridgeTrait;
 use sui_types::bridge::{get_bridge, BRIDGE_MODULE_NAME};
 use sui_types::bridge::{TOKEN_ID_BTC, TOKEN_ID_ETH, TOKEN_ID_USDC, TOKEN_ID_USDT};
-use sui_types::committee::TOTAL_VOTING_POWER;
+use sui_types::committee::{ProtocolVersion, TOTAL_VOTING_POWER};
 use sui_types::crypto::get_key_pair;
 use sui_types::crypto::ToFromBytes;
 use sui_types::digests::TransactionDigest;
@@ -72,7 +72,6 @@ use tracing::info;
 use crate::config::{BridgeNodeConfig, EthConfig, SuiConfig};
 use crate::node::run_bridge_node;
 use crate::sui_client::SuiBridgeClient;
-use crate::BRIDGE_ENABLE_PROTOCOL_VERSION;
 use anyhow::anyhow;
 use ethers::prelude::*;
 use move_core_types::ident_str;
@@ -883,7 +882,7 @@ pub struct TestClusterWrapperBuilder {
 impl TestClusterWrapperBuilder {
     pub fn new() -> Self {
         Self {
-            protocol_version: BRIDGE_ENABLE_PROTOCOL_VERSION,
+            protocol_version: ProtocolVersion::MAX.as_u64(),
             bridge_authority_keys: vec![],
             deploy_tokens: false,
         }