Skip to content

Commit

Permalink
chore: reorder protocol version 17, 18 (MystenLabs#12839)
Browse files Browse the repository at this point in the history
## Description 

to match with MystenLabs#12837,
execution_version will go out with v18 (in 1.5.0) whereas the multisig
feature flag will be released with 1.4.2 in v17.

## Test Plan 

How did you test the new or updated feature?

---
If your changes are not user-facing and not a breaking change, you can
skip the following section. Otherwise, please indicate what changed, and
then add to the Release Notes section as highlighted during the release
process.

### Type of Change (Check all that apply)

- [ ] protocol change
- [ ] user-visible impact
- [ ] breaking change for a client SDKs
- [ ] breaking change for FNs (FN binary must upgrade)
- [ ] breaking change for validators or node operators (must upgrade
binaries)
- [ ] breaking change for on-chain data layout
- [ ] necessitate either a data wipe or data migration

### Release notes
  • Loading branch information
joyqvq authored Jul 5, 2023
1 parent 4c68bb5 commit e290747
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
11 changes: 5 additions & 6 deletions crates/sui-protocol-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1287,9 +1287,13 @@ impl ProtocolConfig {
cfg
}
17 => {
let mut cfg = Self::get_for_version_impl(version - 1, chain);
cfg.feature_flags.upgraded_multisig_supported = true;
cfg
}
18 => {
let mut cfg = Self::get_for_version_impl(version - 1, chain);
cfg.execution_version = Some(1);

// Following flags are implied by this execution version. Once support for earlier
// protocol versions is dropped, these flags can be removed:
// cfg.feature_flags.package_upgrades = true;
Expand All @@ -1298,11 +1302,6 @@ impl ProtocolConfig {
// cfg.feature_flags.loaded_child_objects_fixed = true;
// cfg.feature_flags.ban_entry_init = true;
// cfg.feature_flags.pack_digest_hash_modules = true;
cfg
}
18 => {
let mut cfg = Self::get_for_version_impl(version - 1, chain);
cfg.feature_flags.upgraded_multisig_supported = true;
cfg.feature_flags.txn_base_cost_as_multiplier = true;
// this is a multiplier of the gas price
cfg.base_tx_cost_fixed = Some(1_000);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ feature_flags:
narwhal_versioned_metadata: true
consensus_transaction_ordering: ByGasPrice
simplified_unwrap_then_delete: true
upgraded_multisig_supported: true
max_tx_size_bytes: 131072
max_input_objects: 2048
max_size_written_objects: 5000000
Expand Down Expand Up @@ -181,5 +182,4 @@ hmac_hmac_sha3_256_input_cost_per_byte: 2
hmac_hmac_sha3_256_input_cost_per_block: 2
scoring_decision_mad_divisor: 2.3
scoring_decision_cutoff_value: 2.5
execution_version: 1

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ feature_flags:
narwhal_versioned_metadata: true
consensus_transaction_ordering: ByGasPrice
simplified_unwrap_then_delete: true
upgraded_multisig_supported: true
max_tx_size_bytes: 131072
max_input_objects: 2048
max_size_written_objects: 5000000
Expand Down Expand Up @@ -182,5 +183,4 @@ hmac_hmac_sha3_256_input_cost_per_byte: 2
hmac_hmac_sha3_256_input_cost_per_block: 2
scoring_decision_mad_divisor: 2.3
scoring_decision_cutoff_value: 2.5
execution_version: 1

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ feature_flags:
zklogin_auth: true
consensus_transaction_ordering: ByGasPrice
simplified_unwrap_then_delete: true
upgraded_multisig_supported: true
max_tx_size_bytes: 131072
max_input_objects: 2048
max_size_written_objects: 5000000
Expand Down Expand Up @@ -183,5 +184,4 @@ hmac_hmac_sha3_256_input_cost_per_byte: 2
hmac_hmac_sha3_256_input_cost_per_block: 2
scoring_decision_mad_divisor: 2.3
scoring_decision_cutoff_value: 2.5
execution_version: 1

0 comments on commit e290747

Please sign in to comment.