Skip to content

Commit

Permalink
[StateAccumulator] Remove v2 disable functionality from node config (M…
Browse files Browse the repository at this point in the history
…ystenLabs#18786)

## Description 

Before removing v1, we need to ensure that no one has v2 force disabled,
as it would otherwise lead to a fork during upgrade due to forcing v2 to
be enabled mid-epoch.

## 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:
- [ ] REST API:
  • Loading branch information
williampsmith authored Jul 24, 2024
1 parent edac0d9 commit c7de614
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 2 additions & 0 deletions crates/sui-config/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ pub struct NodeConfig {
#[serde(default)]
pub execution_cache: ExecutionCacheConfig,

// step 1 in removing the old state accumulator
#[serde(skip)]
#[serde(default = "bool_true")]
pub state_accumulator_v2: bool,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -276,7 +275,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -414,7 +412,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -552,7 +549,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -690,7 +686,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -828,7 +823,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
- protocol-key-pair:
Expand Down Expand Up @@ -966,7 +960,6 @@ validator_configs:
max-transaction-manager-queue-length: 100000
max-transaction-manager-per-object-queue-length: 100
execution-cache: passthrough-cache
state-accumulator-v2: true
enable-soft-bundle: true
enable-validator-tx-finalizer: true
account_keys:
Expand All @@ -976,3 +969,4 @@ account_keys:
- mfPjCoE6SX0Sl84MnmNS/LS+tfPpkn7I8tziuk2g0WM=
- 5RWlYF22jS9i76zLl8jP2D3D8GC5ht+IP1dWUBGZxi8=
genesis: "[fake genesis]"

0 comments on commit c7de614

Please sign in to comment.