Skip to content

Commit cbbbcce

Browse files
committed
fix(iota-core), chore(iota-execution): fix order of gas price feedback feature flag; downgrade toml_edit version (#7501)
- `iota-core`: Place the new feature flag `congested_objects_gas_price_feedback_mechanism` at the bottom. - `iota-execution`: Downgrade `toml_edit` to `0.22`. It seems it was unnecessary bumped to `0.22.27` on the feature branch. See first three comments in #7456. - [x] Basic tests (linting, compilation, formatting, unit/integration tests) - [ ] Patch-specific tests (correctness, functionality coverage) - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have checked that new and existing unit tests pass locally with my changes - [x] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] REST API:
1 parent f170dac commit cbbbcce

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

crates/iota-protocol-config/src/lib.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,6 @@ struct FeatureFlags {
276276
#[serde(skip_serializing_if = "is_false")]
277277
consensus_zstd_compression: bool,
278278

279-
// To enable/disable the gas price feedback mechanism used for transactions
280-
// cancelled due to shared object congestion
281-
#[serde(skip_serializing_if = "is_false")]
282-
congested_objects_gas_price_feedback_mechanism: bool,
283-
284279
// Use the minimum free execution slot to schedule execution of a transaction in the shared
285280
// object congestion tracker.
286281
#[serde(skip_serializing_if = "is_false")]
@@ -293,6 +288,11 @@ struct FeatureFlags {
293288
// If true, enabled batched block sync in consensus.
294289
#[serde(skip_serializing_if = "is_false")]
295290
consensus_batched_block_sync: bool,
291+
292+
// To enable/disable the gas price feedback mechanism used for transactions
293+
// cancelled due to shared object congestion
294+
#[serde(skip_serializing_if = "is_false")]
295+
congested_objects_gas_price_feedback_mechanism: bool,
296296
}
297297

298298
fn is_true(b: &bool) -> bool {
@@ -1257,13 +1257,6 @@ impl ProtocolConfig {
12571257
self.feature_flags.consensus_zstd_compression
12581258
}
12591259

1260-
/// Check if the gas price feedback mechanism (which is used for
1261-
/// transactions cancelled due to shared object congestion) is enabled
1262-
pub fn congested_objects_gas_price_feedback_mechanism(&self) -> bool {
1263-
self.feature_flags
1264-
.congested_objects_gas_price_feedback_mechanism
1265-
}
1266-
12671260
pub fn congestion_control_min_free_execution_slot(&self) -> bool {
12681261
self.feature_flags
12691262
.congestion_control_min_free_execution_slot
@@ -1276,6 +1269,13 @@ impl ProtocolConfig {
12761269
pub fn consensus_batched_block_sync(&self) -> bool {
12771270
self.feature_flags.consensus_batched_block_sync
12781271
}
1272+
1273+
/// Check if the gas price feedback mechanism (which is used for
1274+
/// transactions cancelled due to shared object congestion) is enabled
1275+
pub fn congested_objects_gas_price_feedback_mechanism(&self) -> bool {
1276+
self.feature_flags
1277+
.congested_objects_gas_price_feedback_mechanism
1278+
}
12791279
}
12801280

12811281
#[cfg(not(msim))]

iota-execution/cut/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ anyhow.workspace = true
1111
clap.workspace = true
1212
thiserror.workspace = true
1313
toml.workspace = true
14-
toml_edit = "0.22.27"
14+
toml_edit = "0.22"
1515

1616
[dev-dependencies]
1717
expect-test.workspace = true

0 commit comments

Comments
 (0)