From 6a179c58a84854574208f786604d1b72dbed15d9 Mon Sep 17 00:00:00 2001
From: Lu Zhang <8418040+longbowlu@users.noreply.github.com>
Date: Mon, 24 Jun 2024 15:31:38 -0700
Subject: [PATCH] revert "Cherry pick 18359 to 1.28.0 (#18386)" (#18392)
This reverts commit 1d48056a7519a34f6a3f25436e1942787acd365a.
## Description
Describe the changes or additions included in this PR.
## Test plan
How did you test the new or updated feature?
---
## Release notes
Check each box that your changes affect. If none of the boxes relate to
your changes, release notes aren't required.
For each box you select, include information after the relevant heading
that describes the impact of your changes that a user might notice and
any actions they must take to implement updates.
- [ ] Protocol:
- [ ] Nodes (Validators and Full nodes):
- [ ] Indexer:
- [ ] JSON-RPC:
- [ ] GraphQL:
- [ ] CLI:
- [ ] Rust SDK:
---
Cargo.lock | 1 -
crates/sui-framework/docs/bridge/committee.md | 38 ---
crates/sui-framework/docs/bridge/message.md | 3 +-
.../packages/bridge/sources/committee.move | 9 -
.../packages/bridge/sources/message.move | 3 +-
crates/sui-framework/published_api.txt | 3 -
crates/sui-open-rpc/spec/openrpc.json | 2 +-
crates/sui-protocol-config/src/lib.rs | 4 +-
...ocol_config__test__Mainnet_version_52.snap | 275 ----------------
...ocol_config__test__Testnet_version_52.snap | 284 -----------------
...sui_protocol_config__test__version_52.snap | 294 ------------------
...ests__genesis_config_snapshot_matches.snap | 2 +-
..._populated_genesis_snapshot_matches-2.snap | 30 +-
crates/sui/Cargo.toml | 1 -
crates/sui/src/validator_commands.rs | 17 -
15 files changed, 20 insertions(+), 946 deletions(-)
delete mode 100644 crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_52.snap
delete mode 100644 crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_52.snap
delete mode 100644 crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_52.snap
diff --git a/Cargo.lock b/Cargo.lock
index bdddc02c4fe0b..f31dca3a259fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11769,7 +11769,6 @@ dependencies = [
"toml 0.7.4",
"tracing",
"unescape",
- "url",
]
[[package]]
diff --git a/crates/sui-framework/docs/bridge/committee.md b/crates/sui-framework/docs/bridge/committee.md
index 06f0c9db7a5ca..5547592870a1d 100644
--- a/crates/sui-framework/docs/bridge/committee.md
+++ b/crates/sui-framework/docs/bridge/committee.md
@@ -7,7 +7,6 @@ title: Module `0xb::committee`
- [Struct `BlocklistValidatorEvent`](#0xb_committee_BlocklistValidatorEvent)
- [Struct `BridgeCommittee`](#0xb_committee_BridgeCommittee)
- [Struct `CommitteeUpdateEvent`](#0xb_committee_CommitteeUpdateEvent)
-- [Struct `CommitteeMemberUrlUpdateEvent`](#0xb_committee_CommitteeMemberUrlUpdateEvent)
- [Struct `CommitteeMember`](#0xb_committee_CommitteeMember)
- [Struct `CommitteeMemberRegistration`](#0xb_committee_CommitteeMemberRegistration)
- [Constants](#@Constants_0)
@@ -138,39 +137,6 @@ title: Module `0xb::committee`
-
-
-
-
-## Struct `CommitteeMemberUrlUpdateEvent`
-
-
-
-struct CommitteeMemberUrlUpdateEvent has copy, drop
-
-
-
-
-
-Fields
-
-
-
--
-
member: vector<u8>
-
--
-
-
--
-
new_url: vector<u8>
-
--
-
-
-
-
-
@@ -697,10 +663,6 @@ title: Module `0xb::committee`
let (_, member) = self.members.get_entry_by_idx_mut(idx);
if (member.sui_address == ctx.sender()) {
member.http_rest_url = new_url;
- emit (CommitteeMemberUrlUpdateEvent {
- member: member.bridge_pubkey_bytes,
- new_url
- });
return
};
idx = idx + 1;
diff --git a/crates/sui-framework/docs/bridge/message.md b/crates/sui-framework/docs/bridge/message.md
index fdd0e56a30174..684821ede7ab6 100644
--- a/crates/sui-framework/docs/bridge/message.md
+++ b/crates/sui-framework/docs/bridge/message.md
@@ -622,8 +622,7 @@ Emergency op payload is just a single byte
public fun extract_blocklist_payload(message: &BridgeMessage): Blocklist {
- // blocklist payload should consist of one byte blocklist type, and list of 20 bytes evm addresses
- // derived from ECDSA public keys
+ // blocklist payload should consist of one byte blocklist type, and list of 33 bytes ecdsa pub keys
let mut bcs = bcs::new(message.payload);
let blocklist_type = bcs.peel_u8();
let mut address_count = bcs.peel_u8();
diff --git a/crates/sui-framework/packages/bridge/sources/committee.move b/crates/sui-framework/packages/bridge/sources/committee.move
index 1e987013be9e8..74f76bc852243 100644
--- a/crates/sui-framework/packages/bridge/sources/committee.move
+++ b/crates/sui-framework/packages/bridge/sources/committee.move
@@ -53,11 +53,6 @@ module bridge::committee {
stake_participation_percentage: u64
}
- public struct CommitteeMemberUrlUpdateEvent has copy, drop {
- member: vector,
- new_url: vector,
- }
-
public struct CommitteeMember has copy, drop, store {
/// The Sui Address of the validator
sui_address: address,
@@ -279,10 +274,6 @@ module bridge::committee {
let (_, member) = self.members.get_entry_by_idx_mut(idx);
if (member.sui_address == ctx.sender()) {
member.http_rest_url = new_url;
- emit (CommitteeMemberUrlUpdateEvent {
- member: member.bridge_pubkey_bytes,
- new_url
- });
return
};
idx = idx + 1;
diff --git a/crates/sui-framework/packages/bridge/sources/message.move b/crates/sui-framework/packages/bridge/sources/message.move
index e46d30b0e1aa9..889eaf09d6e8d 100644
--- a/crates/sui-framework/packages/bridge/sources/message.move
+++ b/crates/sui-framework/packages/bridge/sources/message.move
@@ -124,8 +124,7 @@ module bridge::message {
}
public fun extract_blocklist_payload(message: &BridgeMessage): Blocklist {
- // blocklist payload should consist of one byte blocklist type, and list of 20 bytes evm addresses
- // derived from ECDSA public keys
+ // blocklist payload should consist of one byte blocklist type, and list of 33 bytes ecdsa pub keys
let mut bcs = bcs::new(message.payload);
let blocklist_type = bcs.peel_u8();
let mut address_count = bcs.peel_u8();
diff --git a/crates/sui-framework/published_api.txt b/crates/sui-framework/published_api.txt
index bb8f32435f51e..8b168d86584a8 100644
--- a/crates/sui-framework/published_api.txt
+++ b/crates/sui-framework/published_api.txt
@@ -3883,9 +3883,6 @@ BridgeCommittee
CommitteeUpdateEvent
public struct
0xb::committee
-CommitteeMemberUrlUpdateEvent
- public struct
- 0xb::committee
CommitteeMember
public struct
0xb::committee
diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
index fe6f32ad5fc4a..1f6237018ce94 100644
--- a/crates/sui-open-rpc/spec/openrpc.json
+++ b/crates/sui-open-rpc/spec/openrpc.json
@@ -1293,7 +1293,7 @@
"name": "Result",
"value": {
"minSupportedProtocolVersion": "1",
- "maxSupportedProtocolVersion": "52",
+ "maxSupportedProtocolVersion": "51",
"protocolVersion": "6",
"featureFlags": {
"accept_zklogin_in_multisig": false,
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
index 51f16a16aca43..6f52334fc0bea 100644
--- a/crates/sui-protocol-config/src/lib.rs
+++ b/crates/sui-protocol-config/src/lib.rs
@@ -16,7 +16,7 @@ use tracing::{info, warn};
/// The minimum and maximum protocol versions supported by this build.
const MIN_PROTOCOL_VERSION: u64 = 1;
-const MAX_PROTOCOL_VERSION: u64 = 52;
+const MAX_PROTOCOL_VERSION: u64 = 51;
// Record history of protocol version allocations here:
//
@@ -147,7 +147,6 @@ const MAX_PROTOCOL_VERSION: u64 = 52;
// Prepose consensus commit prologue in checkpoints.
// Set number of leaders per round for Mysticeti commits.
// Version 51: Switch to DKG V1.
-// Version 52: Emit `CommitteeMemberUrlUpdateEvent` when updating bridge node url.
#[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
pub struct ProtocolVersion(u64);
@@ -2420,7 +2419,6 @@ impl ProtocolConfig {
51 => {
cfg.random_beacon_dkg_version = Some(1);
}
- 52 => {}
// Use this template when making changes:
//
// // modify an existing constant.
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_52.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_52.snap
deleted file mode 100644
index d55babc9fe610..0000000000000
--- a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_52.snap
+++ /dev/null
@@ -1,275 +0,0 @@
----
-source: crates/sui-protocol-config/src/lib.rs
-expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
----
-version: 52
-feature_flags:
- package_upgrades: true
- commit_root_state_digest: true
- advance_epoch_start_time_in_safe_mode: true
- loaded_child_objects_fixed: true
- missing_type_is_compatibility_error: true
- scoring_decision_with_validity_cutoff: true
- consensus_order_end_of_epoch_last: true
- disallow_adding_abilities_on_upgrade: true
- disable_invariant_violation_check_in_swap_loc: true
- advance_to_highest_supported_protocol_version: true
- ban_entry_init: true
- package_digest_hash_module: true
- disallow_change_struct_type_params_on_upgrade: true
- no_extraneous_module_bytes: true
- narwhal_versioned_metadata: true
- zklogin_auth: true
- consensus_transaction_ordering: ByGasPrice
- simplified_unwrap_then_delete: true
- upgraded_multisig_supported: true
- txn_base_cost_as_multiplier: true
- shared_object_deletion: true
- narwhal_new_leader_election_schedule: true
- loaded_child_object_format: true
- enable_jwk_consensus_updates: true
- end_of_epoch_transaction_supported: true
- simple_conservation_checks: true
- loaded_child_object_format_type: true
- receive_objects: true
- enable_effects_v2: true
- narwhal_certificate_v2: true
- verify_legacy_zklogin_address: true
- recompute_has_public_transfer_in_execution: true
- accept_zklogin_in_multisig: true
- include_consensus_digest_in_prologue: true
- hardened_otw_check: true
- allow_receiving_object_id: true
- enable_coin_deny_list: true
- enable_group_ops_native_functions: true
- reject_mutable_random_on_entry_functions: true
- consensus_network: Tonic
- zklogin_max_epoch_upper_bound_delta: 30
- reshare_at_same_initial_version: true
- resolve_abort_locations_to_package_id: true
- mysticeti_use_committed_subdag_digest: true
- fresh_vm_on_framework_upgrade: true
- mysticeti_num_leaders_per_round: 1
-max_tx_size_bytes: 131072
-max_input_objects: 2048
-max_size_written_objects: 5000000
-max_size_written_objects_system_tx: 50000000
-max_serialized_tx_effects_size_bytes: 524288
-max_serialized_tx_effects_size_bytes_system_tx: 8388608
-max_gas_payment_objects: 256
-max_modules_in_publish: 64
-max_package_dependencies: 32
-max_arguments: 512
-max_type_arguments: 16
-max_type_argument_depth: 16
-max_pure_argument_size: 16384
-max_programmable_tx_commands: 1024
-move_binary_format_version: 6
-min_move_binary_format_version: 6
-binary_module_handles: 100
-binary_struct_handles: 300
-binary_function_handles: 1500
-binary_function_instantiations: 750
-binary_signatures: 1000
-binary_constant_pool: 4000
-binary_identifiers: 10000
-binary_address_identifiers: 100
-binary_struct_defs: 200
-binary_struct_def_instantiations: 100
-binary_function_defs: 1000
-binary_field_handles: 500
-binary_field_instantiations: 250
-binary_friend_decls: 100
-max_move_object_size: 256000
-max_move_package_size: 102400
-max_publish_or_upgrade_per_ptb: 5
-max_tx_gas: 50000000000
-max_gas_price: 100000
-max_gas_computation_bucket: 5000000
-gas_rounding_step: 1000
-max_loop_depth: 5
-max_generic_instantiation_length: 32
-max_function_parameters: 128
-max_basic_blocks: 1024
-max_value_stack_size: 1024
-max_type_nodes: 256
-max_push_size: 10000
-max_struct_definitions: 200
-max_function_definitions: 1000
-max_fields_in_struct: 32
-max_dependency_depth: 100
-max_num_event_emit: 1024
-max_num_new_move_object_ids: 2048
-max_num_new_move_object_ids_system_tx: 32768
-max_num_deleted_move_object_ids: 2048
-max_num_deleted_move_object_ids_system_tx: 32768
-max_num_transferred_move_object_ids: 2048
-max_num_transferred_move_object_ids_system_tx: 32768
-max_event_emit_size: 256000
-max_event_emit_size_total: 65536000
-max_move_vector_len: 262144
-max_move_identifier_len: 128
-max_move_value_depth: 128
-max_back_edges_per_function: 10000
-max_back_edges_per_module: 10000
-max_verifier_meter_ticks_per_function: 16000000
-max_meter_ticks_per_module: 16000000
-max_meter_ticks_per_package: 16000000
-object_runtime_max_num_cached_objects: 1000
-object_runtime_max_num_cached_objects_system_tx: 16000
-object_runtime_max_num_store_entries: 1000
-object_runtime_max_num_store_entries_system_tx: 16000
-base_tx_cost_fixed: 1000
-package_publish_cost_fixed: 1000
-base_tx_cost_per_byte: 0
-package_publish_cost_per_byte: 80
-obj_access_cost_read_per_byte: 15
-obj_access_cost_mutate_per_byte: 40
-obj_access_cost_delete_per_byte: 40
-obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
-obj_data_cost_refundable: 100
-obj_metadata_cost_non_refundable: 50
-storage_rebate_rate: 9900
-storage_fund_reinvest_rate: 500
-reward_slashing_rate: 10000
-storage_gas_price: 76
-max_transactions_per_checkpoint: 10000
-max_checkpoint_size_bytes: 31457280
-buffer_stake_for_protocol_upgrade_bps: 5000
-address_from_bytes_cost_base: 52
-address_to_u256_cost_base: 52
-address_from_u256_cost_base: 52
-dynamic_field_hash_type_and_key_cost_base: 100
-dynamic_field_hash_type_and_key_type_cost_per_byte: 2
-dynamic_field_hash_type_and_key_value_cost_per_byte: 2
-dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
-dynamic_field_add_child_object_cost_base: 100
-dynamic_field_add_child_object_type_cost_per_byte: 10
-dynamic_field_add_child_object_value_cost_per_byte: 10
-dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
-dynamic_field_borrow_child_object_cost_base: 100
-dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
-dynamic_field_borrow_child_object_type_cost_per_byte: 10
-dynamic_field_remove_child_object_cost_base: 100
-dynamic_field_remove_child_object_child_cost_per_byte: 2
-dynamic_field_remove_child_object_type_cost_per_byte: 2
-dynamic_field_has_child_object_cost_base: 100
-dynamic_field_has_child_object_with_ty_cost_base: 100
-dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
-dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
-event_emit_cost_base: 52
-event_emit_value_size_derivation_cost_per_byte: 2
-event_emit_tag_size_derivation_cost_per_byte: 5
-event_emit_output_cost_per_byte: 10
-object_borrow_uid_cost_base: 52
-object_delete_impl_cost_base: 52
-object_record_new_uid_cost_base: 52
-transfer_transfer_internal_cost_base: 52
-transfer_freeze_object_cost_base: 52
-transfer_share_object_cost_base: 52
-transfer_receive_object_cost_base: 52
-tx_context_derive_id_cost_base: 52
-types_is_one_time_witness_cost_base: 52
-types_is_one_time_witness_type_tag_cost_per_byte: 2
-types_is_one_time_witness_type_cost_per_byte: 2
-validator_validate_metadata_cost_base: 52
-validator_validate_metadata_data_cost_per_byte: 2
-crypto_invalid_arguments_cost: 100
-bls12381_bls12381_min_sig_verify_cost_base: 52
-bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
-bls12381_bls12381_min_pk_verify_cost_base: 52
-bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_keccak256_cost_base: 52
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_sha256_cost_base: 52
-ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_k1_decompress_pubkey_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_keccak256_cost_base: 52
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_sha256_cost_base: 52
-ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
-ecvrf_ecvrf_verify_cost_base: 52
-ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
-ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
-ed25519_ed25519_verify_cost_base: 52
-ed25519_ed25519_verify_msg_cost_per_byte: 2
-ed25519_ed25519_verify_msg_cost_per_block: 2
-groth16_prepare_verifying_key_bls12381_cost_base: 52
-groth16_prepare_verifying_key_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
-hash_blake2b256_cost_base: 52
-hash_blake2b256_data_cost_per_byte: 2
-hash_blake2b256_data_cost_per_block: 2
-hash_keccak256_cost_base: 52
-hash_keccak256_data_cost_per_byte: 2
-hash_keccak256_data_cost_per_block: 2
-group_ops_bls12381_decode_scalar_cost: 52
-group_ops_bls12381_decode_g1_cost: 52
-group_ops_bls12381_decode_g2_cost: 52
-group_ops_bls12381_decode_gt_cost: 52
-group_ops_bls12381_scalar_add_cost: 52
-group_ops_bls12381_g1_add_cost: 52
-group_ops_bls12381_g2_add_cost: 52
-group_ops_bls12381_gt_add_cost: 52
-group_ops_bls12381_scalar_sub_cost: 52
-group_ops_bls12381_g1_sub_cost: 52
-group_ops_bls12381_g2_sub_cost: 52
-group_ops_bls12381_gt_sub_cost: 52
-group_ops_bls12381_scalar_mul_cost: 52
-group_ops_bls12381_g1_mul_cost: 52
-group_ops_bls12381_g2_mul_cost: 52
-group_ops_bls12381_gt_mul_cost: 52
-group_ops_bls12381_scalar_div_cost: 52
-group_ops_bls12381_g1_div_cost: 52
-group_ops_bls12381_g2_div_cost: 52
-group_ops_bls12381_gt_div_cost: 52
-group_ops_bls12381_g1_hash_to_base_cost: 52
-group_ops_bls12381_g2_hash_to_base_cost: 52
-group_ops_bls12381_g1_hash_to_cost_per_byte: 2
-group_ops_bls12381_g2_hash_to_cost_per_byte: 2
-group_ops_bls12381_g1_msm_base_cost: 52
-group_ops_bls12381_g2_msm_base_cost: 52
-group_ops_bls12381_g1_msm_base_cost_per_input: 52
-group_ops_bls12381_g2_msm_base_cost_per_input: 52
-group_ops_bls12381_msm_max_len: 32
-group_ops_bls12381_pairing_cost: 52
-hmac_hmac_sha3_256_cost_base: 52
-hmac_hmac_sha3_256_input_cost_per_byte: 2
-hmac_hmac_sha3_256_input_cost_per_block: 2
-check_zklogin_id_cost_base: 200
-check_zklogin_issuer_cost_base: 200
-scoring_decision_mad_divisor: 2.3
-scoring_decision_cutoff_value: 2.5
-execution_version: 3
-consensus_bad_nodes_stake_threshold: 20
-max_jwk_votes_per_validator_per_epoch: 240
-max_age_of_jwk_in_epochs: 1
-random_beacon_reduction_allowed_delta: 800
-random_beacon_dkg_version: 1
-consensus_max_transaction_size_bytes: 262144
-consensus_max_transactions_in_block_bytes: 6291456
-max_deferral_rounds_for_congestion_control: 10
-
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_52.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_52.snap
deleted file mode 100644
index 29ff56e8e2ca1..0000000000000
--- a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_52.snap
+++ /dev/null
@@ -1,284 +0,0 @@
----
-source: crates/sui-protocol-config/src/lib.rs
-expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
----
-version: 52
-feature_flags:
- package_upgrades: true
- commit_root_state_digest: true
- advance_epoch_start_time_in_safe_mode: true
- loaded_child_objects_fixed: true
- missing_type_is_compatibility_error: true
- scoring_decision_with_validity_cutoff: true
- consensus_order_end_of_epoch_last: true
- disallow_adding_abilities_on_upgrade: true
- disable_invariant_violation_check_in_swap_loc: true
- advance_to_highest_supported_protocol_version: true
- ban_entry_init: true
- package_digest_hash_module: true
- disallow_change_struct_type_params_on_upgrade: true
- no_extraneous_module_bytes: true
- narwhal_versioned_metadata: true
- zklogin_auth: true
- consensus_transaction_ordering: ByGasPrice
- simplified_unwrap_then_delete: true
- upgraded_multisig_supported: true
- txn_base_cost_as_multiplier: true
- shared_object_deletion: true
- narwhal_new_leader_election_schedule: true
- loaded_child_object_format: true
- enable_jwk_consensus_updates: true
- end_of_epoch_transaction_supported: true
- simple_conservation_checks: true
- loaded_child_object_format_type: true
- receive_objects: true
- random_beacon: true
- bridge: true
- enable_effects_v2: true
- narwhal_certificate_v2: true
- verify_legacy_zklogin_address: true
- recompute_has_public_transfer_in_execution: true
- accept_zklogin_in_multisig: true
- include_consensus_digest_in_prologue: true
- hardened_otw_check: true
- allow_receiving_object_id: true
- enable_coin_deny_list: true
- enable_group_ops_native_functions: true
- reject_mutable_random_on_entry_functions: true
- consensus_choice: Mysticeti
- consensus_network: Tonic
- zklogin_max_epoch_upper_bound_delta: 30
- mysticeti_leader_scoring_and_schedule: true
- reshare_at_same_initial_version: true
- resolve_abort_locations_to_package_id: true
- mysticeti_use_committed_subdag_digest: true
- fresh_vm_on_framework_upgrade: true
- mysticeti_num_leaders_per_round: 1
-max_tx_size_bytes: 131072
-max_input_objects: 2048
-max_size_written_objects: 5000000
-max_size_written_objects_system_tx: 50000000
-max_serialized_tx_effects_size_bytes: 524288
-max_serialized_tx_effects_size_bytes_system_tx: 8388608
-max_gas_payment_objects: 256
-max_modules_in_publish: 64
-max_package_dependencies: 32
-max_arguments: 512
-max_type_arguments: 16
-max_type_argument_depth: 16
-max_pure_argument_size: 16384
-max_programmable_tx_commands: 1024
-move_binary_format_version: 6
-min_move_binary_format_version: 6
-binary_module_handles: 100
-binary_struct_handles: 300
-binary_function_handles: 1500
-binary_function_instantiations: 750
-binary_signatures: 1000
-binary_constant_pool: 4000
-binary_identifiers: 10000
-binary_address_identifiers: 100
-binary_struct_defs: 200
-binary_struct_def_instantiations: 100
-binary_function_defs: 1000
-binary_field_handles: 500
-binary_field_instantiations: 250
-binary_friend_decls: 100
-max_move_object_size: 256000
-max_move_package_size: 102400
-max_publish_or_upgrade_per_ptb: 5
-max_tx_gas: 50000000000
-max_gas_price: 100000
-max_gas_computation_bucket: 5000000
-gas_rounding_step: 1000
-max_loop_depth: 5
-max_generic_instantiation_length: 32
-max_function_parameters: 128
-max_basic_blocks: 1024
-max_value_stack_size: 1024
-max_type_nodes: 256
-max_push_size: 10000
-max_struct_definitions: 200
-max_function_definitions: 1000
-max_fields_in_struct: 32
-max_dependency_depth: 100
-max_num_event_emit: 1024
-max_num_new_move_object_ids: 2048
-max_num_new_move_object_ids_system_tx: 32768
-max_num_deleted_move_object_ids: 2048
-max_num_deleted_move_object_ids_system_tx: 32768
-max_num_transferred_move_object_ids: 2048
-max_num_transferred_move_object_ids_system_tx: 32768
-max_event_emit_size: 256000
-max_event_emit_size_total: 65536000
-max_move_vector_len: 262144
-max_move_identifier_len: 128
-max_move_value_depth: 128
-max_back_edges_per_function: 10000
-max_back_edges_per_module: 10000
-max_verifier_meter_ticks_per_function: 16000000
-max_meter_ticks_per_module: 16000000
-max_meter_ticks_per_package: 16000000
-object_runtime_max_num_cached_objects: 1000
-object_runtime_max_num_cached_objects_system_tx: 16000
-object_runtime_max_num_store_entries: 1000
-object_runtime_max_num_store_entries_system_tx: 16000
-base_tx_cost_fixed: 1000
-package_publish_cost_fixed: 1000
-base_tx_cost_per_byte: 0
-package_publish_cost_per_byte: 80
-obj_access_cost_read_per_byte: 15
-obj_access_cost_mutate_per_byte: 40
-obj_access_cost_delete_per_byte: 40
-obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
-obj_data_cost_refundable: 100
-obj_metadata_cost_non_refundable: 50
-storage_rebate_rate: 9900
-storage_fund_reinvest_rate: 500
-reward_slashing_rate: 10000
-storage_gas_price: 76
-max_transactions_per_checkpoint: 10000
-max_checkpoint_size_bytes: 31457280
-buffer_stake_for_protocol_upgrade_bps: 5000
-address_from_bytes_cost_base: 52
-address_to_u256_cost_base: 52
-address_from_u256_cost_base: 52
-dynamic_field_hash_type_and_key_cost_base: 100
-dynamic_field_hash_type_and_key_type_cost_per_byte: 2
-dynamic_field_hash_type_and_key_value_cost_per_byte: 2
-dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
-dynamic_field_add_child_object_cost_base: 100
-dynamic_field_add_child_object_type_cost_per_byte: 10
-dynamic_field_add_child_object_value_cost_per_byte: 10
-dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
-dynamic_field_borrow_child_object_cost_base: 100
-dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
-dynamic_field_borrow_child_object_type_cost_per_byte: 10
-dynamic_field_remove_child_object_cost_base: 100
-dynamic_field_remove_child_object_child_cost_per_byte: 2
-dynamic_field_remove_child_object_type_cost_per_byte: 2
-dynamic_field_has_child_object_cost_base: 100
-dynamic_field_has_child_object_with_ty_cost_base: 100
-dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
-dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
-event_emit_cost_base: 52
-event_emit_value_size_derivation_cost_per_byte: 2
-event_emit_tag_size_derivation_cost_per_byte: 5
-event_emit_output_cost_per_byte: 10
-object_borrow_uid_cost_base: 52
-object_delete_impl_cost_base: 52
-object_record_new_uid_cost_base: 52
-transfer_transfer_internal_cost_base: 52
-transfer_freeze_object_cost_base: 52
-transfer_share_object_cost_base: 52
-transfer_receive_object_cost_base: 52
-tx_context_derive_id_cost_base: 52
-types_is_one_time_witness_cost_base: 52
-types_is_one_time_witness_type_tag_cost_per_byte: 2
-types_is_one_time_witness_type_cost_per_byte: 2
-validator_validate_metadata_cost_base: 52
-validator_validate_metadata_data_cost_per_byte: 2
-crypto_invalid_arguments_cost: 100
-bls12381_bls12381_min_sig_verify_cost_base: 52
-bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
-bls12381_bls12381_min_pk_verify_cost_base: 52
-bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_keccak256_cost_base: 52
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_sha256_cost_base: 52
-ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_k1_decompress_pubkey_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_keccak256_cost_base: 52
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_sha256_cost_base: 52
-ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
-ecvrf_ecvrf_verify_cost_base: 52
-ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
-ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
-ed25519_ed25519_verify_cost_base: 52
-ed25519_ed25519_verify_msg_cost_per_byte: 2
-ed25519_ed25519_verify_msg_cost_per_block: 2
-groth16_prepare_verifying_key_bls12381_cost_base: 52
-groth16_prepare_verifying_key_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
-hash_blake2b256_cost_base: 52
-hash_blake2b256_data_cost_per_byte: 2
-hash_blake2b256_data_cost_per_block: 2
-hash_keccak256_cost_base: 52
-hash_keccak256_data_cost_per_byte: 2
-hash_keccak256_data_cost_per_block: 2
-group_ops_bls12381_decode_scalar_cost: 52
-group_ops_bls12381_decode_g1_cost: 52
-group_ops_bls12381_decode_g2_cost: 52
-group_ops_bls12381_decode_gt_cost: 52
-group_ops_bls12381_scalar_add_cost: 52
-group_ops_bls12381_g1_add_cost: 52
-group_ops_bls12381_g2_add_cost: 52
-group_ops_bls12381_gt_add_cost: 52
-group_ops_bls12381_scalar_sub_cost: 52
-group_ops_bls12381_g1_sub_cost: 52
-group_ops_bls12381_g2_sub_cost: 52
-group_ops_bls12381_gt_sub_cost: 52
-group_ops_bls12381_scalar_mul_cost: 52
-group_ops_bls12381_g1_mul_cost: 52
-group_ops_bls12381_g2_mul_cost: 52
-group_ops_bls12381_gt_mul_cost: 52
-group_ops_bls12381_scalar_div_cost: 52
-group_ops_bls12381_g1_div_cost: 52
-group_ops_bls12381_g2_div_cost: 52
-group_ops_bls12381_gt_div_cost: 52
-group_ops_bls12381_g1_hash_to_base_cost: 52
-group_ops_bls12381_g2_hash_to_base_cost: 52
-group_ops_bls12381_g1_hash_to_cost_per_byte: 2
-group_ops_bls12381_g2_hash_to_cost_per_byte: 2
-group_ops_bls12381_g1_msm_base_cost: 52
-group_ops_bls12381_g2_msm_base_cost: 52
-group_ops_bls12381_g1_msm_base_cost_per_input: 52
-group_ops_bls12381_g2_msm_base_cost_per_input: 52
-group_ops_bls12381_msm_max_len: 32
-group_ops_bls12381_pairing_cost: 52
-hmac_hmac_sha3_256_cost_base: 52
-hmac_hmac_sha3_256_input_cost_per_byte: 2
-hmac_hmac_sha3_256_input_cost_per_block: 2
-check_zklogin_id_cost_base: 200
-check_zklogin_issuer_cost_base: 200
-scoring_decision_mad_divisor: 2.3
-scoring_decision_cutoff_value: 2.5
-execution_version: 3
-consensus_bad_nodes_stake_threshold: 20
-max_jwk_votes_per_validator_per_epoch: 240
-max_age_of_jwk_in_epochs: 1
-random_beacon_reduction_allowed_delta: 800
-random_beacon_reduction_lower_bound: 1600
-random_beacon_dkg_timeout_round: 3000
-random_beacon_min_round_interval_ms: 200
-random_beacon_dkg_version: 1
-consensus_max_transaction_size_bytes: 262144
-consensus_max_transactions_in_block_bytes: 6291456
-max_deferral_rounds_for_congestion_control: 10
-min_checkpoint_interval_ms: 200
-checkpoint_summary_version_specific_data: 1
-
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_52.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_52.snap
deleted file mode 100644
index 6c1c844f151b4..0000000000000
--- a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_52.snap
+++ /dev/null
@@ -1,294 +0,0 @@
----
-source: crates/sui-protocol-config/src/lib.rs
-expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
----
-version: 52
-feature_flags:
- package_upgrades: true
- commit_root_state_digest: true
- advance_epoch_start_time_in_safe_mode: true
- loaded_child_objects_fixed: true
- missing_type_is_compatibility_error: true
- scoring_decision_with_validity_cutoff: true
- consensus_order_end_of_epoch_last: true
- disallow_adding_abilities_on_upgrade: true
- disable_invariant_violation_check_in_swap_loc: true
- advance_to_highest_supported_protocol_version: true
- ban_entry_init: true
- package_digest_hash_module: true
- disallow_change_struct_type_params_on_upgrade: true
- no_extraneous_module_bytes: true
- narwhal_versioned_metadata: true
- zklogin_auth: true
- consensus_transaction_ordering: ByGasPrice
- simplified_unwrap_then_delete: true
- upgraded_multisig_supported: true
- txn_base_cost_as_multiplier: true
- shared_object_deletion: true
- narwhal_new_leader_election_schedule: true
- loaded_child_object_format: true
- enable_jwk_consensus_updates: true
- end_of_epoch_transaction_supported: true
- simple_conservation_checks: true
- loaded_child_object_format_type: true
- receive_objects: true
- random_beacon: true
- bridge: true
- enable_effects_v2: true
- narwhal_certificate_v2: true
- verify_legacy_zklogin_address: true
- recompute_has_public_transfer_in_execution: true
- accept_zklogin_in_multisig: true
- include_consensus_digest_in_prologue: true
- hardened_otw_check: true
- allow_receiving_object_id: true
- enable_poseidon: true
- enable_coin_deny_list: true
- enable_group_ops_native_functions: true
- enable_group_ops_native_function_msm: true
- reject_mutable_random_on_entry_functions: true
- consensus_choice: Mysticeti
- consensus_network: Tonic
- zklogin_max_epoch_upper_bound_delta: 30
- mysticeti_leader_scoring_and_schedule: true
- reshare_at_same_initial_version: true
- resolve_abort_locations_to_package_id: true
- mysticeti_use_committed_subdag_digest: true
- enable_vdf: true
- record_consensus_determined_version_assignments_in_prologue: true
- fresh_vm_on_framework_upgrade: true
- prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
- mysticeti_num_leaders_per_round: 1
- enable_coin_deny_list_v2: true
-max_tx_size_bytes: 131072
-max_input_objects: 2048
-max_size_written_objects: 5000000
-max_size_written_objects_system_tx: 50000000
-max_serialized_tx_effects_size_bytes: 524288
-max_serialized_tx_effects_size_bytes_system_tx: 8388608
-max_gas_payment_objects: 256
-max_modules_in_publish: 64
-max_package_dependencies: 32
-max_arguments: 512
-max_type_arguments: 16
-max_type_argument_depth: 16
-max_pure_argument_size: 16384
-max_programmable_tx_commands: 1024
-move_binary_format_version: 7
-min_move_binary_format_version: 6
-binary_module_handles: 100
-binary_struct_handles: 300
-binary_function_handles: 1500
-binary_function_instantiations: 750
-binary_signatures: 1000
-binary_constant_pool: 4000
-binary_identifiers: 10000
-binary_address_identifiers: 100
-binary_struct_defs: 200
-binary_struct_def_instantiations: 100
-binary_function_defs: 1000
-binary_field_handles: 500
-binary_field_instantiations: 250
-binary_friend_decls: 100
-max_move_object_size: 256000
-max_move_package_size: 102400
-max_publish_or_upgrade_per_ptb: 5
-max_tx_gas: 50000000000
-max_gas_price: 100000
-max_gas_computation_bucket: 5000000
-gas_rounding_step: 1000
-max_loop_depth: 5
-max_generic_instantiation_length: 32
-max_function_parameters: 128
-max_basic_blocks: 1024
-max_value_stack_size: 1024
-max_type_nodes: 256
-max_push_size: 10000
-max_struct_definitions: 200
-max_function_definitions: 1000
-max_fields_in_struct: 32
-max_dependency_depth: 100
-max_num_event_emit: 1024
-max_num_new_move_object_ids: 2048
-max_num_new_move_object_ids_system_tx: 32768
-max_num_deleted_move_object_ids: 2048
-max_num_deleted_move_object_ids_system_tx: 32768
-max_num_transferred_move_object_ids: 2048
-max_num_transferred_move_object_ids_system_tx: 32768
-max_event_emit_size: 256000
-max_event_emit_size_total: 65536000
-max_move_vector_len: 262144
-max_move_identifier_len: 128
-max_move_value_depth: 128
-max_back_edges_per_function: 10000
-max_back_edges_per_module: 10000
-max_verifier_meter_ticks_per_function: 16000000
-max_meter_ticks_per_module: 16000000
-max_meter_ticks_per_package: 16000000
-object_runtime_max_num_cached_objects: 1000
-object_runtime_max_num_cached_objects_system_tx: 16000
-object_runtime_max_num_store_entries: 1000
-object_runtime_max_num_store_entries_system_tx: 16000
-base_tx_cost_fixed: 1000
-package_publish_cost_fixed: 1000
-base_tx_cost_per_byte: 0
-package_publish_cost_per_byte: 80
-obj_access_cost_read_per_byte: 15
-obj_access_cost_mutate_per_byte: 40
-obj_access_cost_delete_per_byte: 40
-obj_access_cost_verify_per_byte: 200
-gas_model_version: 8
-obj_data_cost_refundable: 100
-obj_metadata_cost_non_refundable: 50
-storage_rebate_rate: 9900
-storage_fund_reinvest_rate: 500
-reward_slashing_rate: 10000
-storage_gas_price: 76
-max_transactions_per_checkpoint: 10000
-max_checkpoint_size_bytes: 31457280
-buffer_stake_for_protocol_upgrade_bps: 5000
-address_from_bytes_cost_base: 52
-address_to_u256_cost_base: 52
-address_from_u256_cost_base: 52
-dynamic_field_hash_type_and_key_cost_base: 100
-dynamic_field_hash_type_and_key_type_cost_per_byte: 2
-dynamic_field_hash_type_and_key_value_cost_per_byte: 2
-dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
-dynamic_field_add_child_object_cost_base: 100
-dynamic_field_add_child_object_type_cost_per_byte: 10
-dynamic_field_add_child_object_value_cost_per_byte: 10
-dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
-dynamic_field_borrow_child_object_cost_base: 100
-dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
-dynamic_field_borrow_child_object_type_cost_per_byte: 10
-dynamic_field_remove_child_object_cost_base: 100
-dynamic_field_remove_child_object_child_cost_per_byte: 2
-dynamic_field_remove_child_object_type_cost_per_byte: 2
-dynamic_field_has_child_object_cost_base: 100
-dynamic_field_has_child_object_with_ty_cost_base: 100
-dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
-dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
-event_emit_cost_base: 52
-event_emit_value_size_derivation_cost_per_byte: 2
-event_emit_tag_size_derivation_cost_per_byte: 5
-event_emit_output_cost_per_byte: 10
-object_borrow_uid_cost_base: 52
-object_delete_impl_cost_base: 52
-object_record_new_uid_cost_base: 52
-transfer_transfer_internal_cost_base: 52
-transfer_freeze_object_cost_base: 52
-transfer_share_object_cost_base: 52
-transfer_receive_object_cost_base: 52
-tx_context_derive_id_cost_base: 52
-types_is_one_time_witness_cost_base: 52
-types_is_one_time_witness_type_tag_cost_per_byte: 2
-types_is_one_time_witness_type_cost_per_byte: 2
-validator_validate_metadata_cost_base: 52
-validator_validate_metadata_data_cost_per_byte: 2
-crypto_invalid_arguments_cost: 100
-bls12381_bls12381_min_sig_verify_cost_base: 52
-bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
-bls12381_bls12381_min_pk_verify_cost_base: 52
-bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
-bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_keccak256_cost_base: 52
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_k1_ecrecover_sha256_cost_base: 52
-ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_k1_decompress_pubkey_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_keccak256_cost_base: 52
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
-ecdsa_r1_ecrecover_sha256_cost_base: 52
-ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
-ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
-ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
-ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
-ecvrf_ecvrf_verify_cost_base: 52
-ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
-ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
-ed25519_ed25519_verify_cost_base: 52
-ed25519_ed25519_verify_msg_cost_per_byte: 2
-ed25519_ed25519_verify_msg_cost_per_block: 2
-groth16_prepare_verifying_key_bls12381_cost_base: 52
-groth16_prepare_verifying_key_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
-groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_bn254_cost_base: 52
-groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
-groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
-hash_blake2b256_cost_base: 52
-hash_blake2b256_data_cost_per_byte: 2
-hash_blake2b256_data_cost_per_block: 2
-hash_keccak256_cost_base: 52
-hash_keccak256_data_cost_per_byte: 2
-hash_keccak256_data_cost_per_block: 2
-poseidon_bn254_cost_base: 260
-poseidon_bn254_cost_per_block: 10
-group_ops_bls12381_decode_scalar_cost: 52
-group_ops_bls12381_decode_g1_cost: 52
-group_ops_bls12381_decode_g2_cost: 52
-group_ops_bls12381_decode_gt_cost: 52
-group_ops_bls12381_scalar_add_cost: 52
-group_ops_bls12381_g1_add_cost: 52
-group_ops_bls12381_g2_add_cost: 52
-group_ops_bls12381_gt_add_cost: 52
-group_ops_bls12381_scalar_sub_cost: 52
-group_ops_bls12381_g1_sub_cost: 52
-group_ops_bls12381_g2_sub_cost: 52
-group_ops_bls12381_gt_sub_cost: 52
-group_ops_bls12381_scalar_mul_cost: 52
-group_ops_bls12381_g1_mul_cost: 52
-group_ops_bls12381_g2_mul_cost: 52
-group_ops_bls12381_gt_mul_cost: 52
-group_ops_bls12381_scalar_div_cost: 52
-group_ops_bls12381_g1_div_cost: 52
-group_ops_bls12381_g2_div_cost: 52
-group_ops_bls12381_gt_div_cost: 52
-group_ops_bls12381_g1_hash_to_base_cost: 52
-group_ops_bls12381_g2_hash_to_base_cost: 52
-group_ops_bls12381_g1_hash_to_cost_per_byte: 2
-group_ops_bls12381_g2_hash_to_cost_per_byte: 2
-group_ops_bls12381_g1_msm_base_cost: 52
-group_ops_bls12381_g2_msm_base_cost: 52
-group_ops_bls12381_g1_msm_base_cost_per_input: 52
-group_ops_bls12381_g2_msm_base_cost_per_input: 52
-group_ops_bls12381_msm_max_len: 32
-group_ops_bls12381_pairing_cost: 52
-hmac_hmac_sha3_256_cost_base: 52
-hmac_hmac_sha3_256_input_cost_per_byte: 2
-hmac_hmac_sha3_256_input_cost_per_block: 2
-check_zklogin_id_cost_base: 200
-check_zklogin_issuer_cost_base: 200
-vdf_verify_vdf_cost: 1500
-vdf_hash_to_input_cost: 100
-scoring_decision_mad_divisor: 2.3
-scoring_decision_cutoff_value: 2.5
-execution_version: 3
-consensus_bad_nodes_stake_threshold: 20
-max_jwk_votes_per_validator_per_epoch: 240
-max_age_of_jwk_in_epochs: 1
-random_beacon_reduction_allowed_delta: 800
-random_beacon_reduction_lower_bound: 1600
-random_beacon_dkg_timeout_round: 3000
-random_beacon_min_round_interval_ms: 200
-random_beacon_dkg_version: 1
-consensus_max_transaction_size_bytes: 262144
-consensus_max_transactions_in_block_bytes: 6291456
-max_deferral_rounds_for_congestion_control: 10
-min_checkpoint_interval_ms: 200
-checkpoint_summary_version_specific_data: 1
-
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
index ffa8e0a9f3fcf..f6772ecad0c7b 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
@@ -6,7 +6,7 @@ ssfn_config_info: ~
validator_config_info: ~
parameters:
chain_start_timestamp_ms: 0
- protocol_version: 52
+ protocol_version: 51
allow_insertion_of_extra_objects: true
epoch_duration_ms: 86400000
stake_subsidy_start_epoch: 0
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
index 8d0bf6fbbfb64..c976dd2ba6910 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
@@ -3,7 +3,7 @@ source: crates/sui-swarm-config/tests/snapshot_tests.rs
expression: genesis.sui_system_object().into_genesis_version_for_tooling()
---
epoch: 0
-protocol_version: 52
+protocol_version: 51
system_state_version: 1
validators:
total_stake: 20000000000000000
@@ -240,13 +240,13 @@ validators:
next_epoch_worker_address: ~
extra_fields:
id:
- id: "0x5ee3815bd22bb164a92d2d9fa8e45c1ece868a4cec17af9f1a4f2b35e7e97612"
+ id: "0x73a2f0fd5f57254ba3d1ae55989e1337b8efc4afa4dc4d442f6a598f2fe57bca"
size: 0
voting_power: 10000
- operation_cap_id: "0x5bb1af2dad062878b913e848b9091ed6f81f064ccd6884fc181706f41f331fec"
+ operation_cap_id: "0x9639b46af4ec7457c69142f33f60f3248f6db1c5233eee24129d22903ddfad52"
gas_price: 1000
staking_pool:
- id: "0x5e20976a9075d0e2c1a0bacb5aa475cb868222c9ff5069da0a6cf862d18a505c"
+ id: "0x440f136b2a867f3fa8085391795545ba288b2fb2b10330527c846fb9f37120b8"
activation_epoch: 0
deactivation_epoch: ~
sui_balance: 20000000000000000
@@ -254,14 +254,14 @@ validators:
value: 0
pool_token_balance: 20000000000000000
exchange_rates:
- id: "0xb452b2f138c9eb4897a0bdb5bf8b49f16f4dfff5a0e32fc281304ab3fd3519b4"
+ id: "0x0f36b5d31fd4076aa06319757646c4338fa9c9a784e4c2481ae669a424100b67"
size: 1
pending_stake: 0
pending_total_sui_withdraw: 0
pending_pool_token_withdraw: 0
extra_fields:
id:
- id: "0xeddc255f7992dc59f21cc4687253baba7d67df4289d7363ad168e0be1176e2aa"
+ id: "0x2d69174a278102cb65246822cc2f0584201c384d69b9d85819607102ffba60b9"
size: 0
commission_rate: 200
next_epoch_stake: 20000000000000000
@@ -269,27 +269,27 @@ validators:
next_epoch_commission_rate: 200
extra_fields:
id:
- id: "0xe3bb275be68081f76e6f243a9e2b66c88ee49870c9a0d7ebb64e597f61e9e141"
+ id: "0x5cd537ed652ac47363d53b2565e7844bfe13f8a2562e0ec085c4eb8bda8bd9ca"
size: 0
pending_active_validators:
contents:
- id: "0xa5ce78594a6f3e8b98a766f93dc5016f80567b7d174305b2f1f5bdf648def400"
+ id: "0x2b210d6f321aaf423f28decbc2515b45a5d06a6aef62a75184f9e53817408a6d"
size: 0
pending_removals: []
staking_pool_mappings:
- id: "0x053838f3d4abadf5674b9b3dd267aa9754f5914edae3c0e260eb0447d4339272"
+ id: "0xb7ec2c6c7fe0281745c066fd6773af278dde2c460b8ddf066c53b7e8b414bd9a"
size: 1
inactive_validators:
- id: "0xb6409731aacdc307c30a616a1ff94aec387ac220d5f3fd48d85812a5d2bf8306"
+ id: "0xe0de5b6cf7a75d182e33f499027f4b659509138026e3d214cedc7c17d4101eb7"
size: 0
validator_candidates:
- id: "0xff35969e6260537114784d8654873c597d3828eb54f295ea978a80a81a512468"
+ id: "0xf1443f5216051e03800c597e26a17392f916b2e69ab2699b96275b4ebebfc1be"
size: 0
at_risk_validators:
contents: []
extra_fields:
id:
- id: "0xbb3eb2d0cc5c03d7733596cc7924f7dfdf38dffffe9cf617057512e0621ff5cd"
+ id: "0x8b7f69f9f052653ff11349cc78006e0154dd05260b1f7cfc3858be2b7ad156e3"
size: 0
storage_fund:
total_object_storage_rebates:
@@ -306,7 +306,7 @@ parameters:
validator_low_stake_grace_period: 7
extra_fields:
id:
- id: "0x94f44132137189cb0e9253c4f3d7b9491ad2de2f7dc4a26188cb9e426334f60b"
+ id: "0x517cf60457b4677c4610531b37443a4ecc8e6b978597092d6b2f7704d0e410a3"
size: 0
reference_gas_price: 1000
validator_report_records:
@@ -320,7 +320,7 @@ stake_subsidy:
stake_subsidy_decrease_rate: 1000
extra_fields:
id:
- id: "0x6acc16d86b4dee5ba8485221215c59a16641467fdb2cbe95c41fe6533d31a130"
+ id: "0xc128be0d158e6f9f9fb2015c39c177b6ad52eafc2823fc9d2d55062f73e21333"
size: 0
safe_mode: false
safe_mode_storage_rewards:
@@ -332,6 +332,6 @@ safe_mode_non_refundable_storage_fee: 0
epoch_start_timestamp_ms: 10
extra_fields:
id:
- id: "0xf72863df91bf14efc27270ef17592ce3f3ecb9302099f8b5bf18303784558fa8"
+ id: "0x6f8bf9baadd7f317000a276ca2ced8ad456b8fc849c66d001baab40980ca2ca0"
size: 0
diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml
index 54ade47cfc5d2..a323ce3e90152 100644
--- a/crates/sui/Cargo.toml
+++ b/crates/sui/Cargo.toml
@@ -24,7 +24,6 @@ clap.workspace = true
bip32.workspace = true
rand.workspace = true
tap.workspace = true
-url.workspace = true
inquire.workspace = true
rusoto_core.workspace = true
rusoto_kms.workspace = true
diff --git a/crates/sui/src/validator_commands.rs b/crates/sui/src/validator_commands.rs
index 58570bcd602a2..e26c8e0fc4d65 100644
--- a/crates/sui/src/validator_commands.rs
+++ b/crates/sui/src/validator_commands.rs
@@ -10,7 +10,6 @@ use std::{
path::PathBuf,
};
use sui_genesis_builder::validator_info::GenesisValidatorInfo;
-use url::{ParseError, Url};
use sui_types::{
base_types::{ObjectID, ObjectRef, SuiAddress},
@@ -510,14 +509,6 @@ impl SuiValidatorCommand {
validator_address,
gas_budget,
} => {
- let parsed_url =
- Url::parse(&bridge_authority_url).map_err(|e: ParseError| anyhow!(e))?;
- if parsed_url.scheme() != "http" && parsed_url.scheme() != "https" {
- anyhow::bail!(
- "URL scheme has to be http or https: {}",
- parsed_url.scheme()
- );
- }
// Read bridge keypair
let ecdsa_keypair = match read_key(&bridge_authority_key_path, true)? {
SuiKeyPair::Secp256k1(key) => key,
@@ -589,14 +580,6 @@ impl SuiValidatorCommand {
validator_address,
gas_budget,
} => {
- let parsed_url =
- Url::parse(&bridge_authority_url).map_err(|e: ParseError| anyhow!(e))?;
- if parsed_url.scheme() != "http" && parsed_url.scheme() != "https" {
- anyhow::bail!(
- "URL scheme has to be http or https: {}",
- parsed_url.scheme()
- );
- }
// Make sure the address is member of the committee
let address = check_address(
context.active_address()?,