Skip to content

Commit

Permalink
Addressed Lazar's comment - removed consensus_timestamp from `Platf…
Browse files Browse the repository at this point in the history
…ormState` and put it back to `ConsensusSnapshot`

Signed-off-by: Ivan Malygin <ivan@swirldslabs.com>
  • Loading branch information
imalygin committed Jun 20, 2024
1 parent e00fa8a commit 111bad5
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions platform/state/platform_state.proto
Original file line number Diff line number Diff line change
Expand Up @@ -44,34 +44,27 @@ import "timestamp.proto";
* restart and reconnect.
*/
message PlatformState {
/**
* A consensus timestamp for this state.
* <p>
* This SHALL be the consensus timestamp of the first transaction in
* the current round.
*/
proto.Timestamp consensus_timestamp = 1;

/**
* A version describing the current version of application software.
* <p>
* This SHALL be the software version that created this state.
*/
proto.SemanticVersion creation_software_version = 2;
proto.SemanticVersion creation_software_version = 1;

/**
* A number of non-ancient rounds.
* <p>
* This SHALL be the count of rounds considered non-ancient.
*/
uint32 rounds_non_ancient = 3;
uint32 rounds_non_ancient = 2;

/**
* A snapshot of the consensus state at the end of the round.
* <p>
* This SHALL be used for restart/reconnect.
*/
ConsensusSnapshot consensus_snapshot = 4;
ConsensusSnapshot consensus_snapshot = 3;

/**
* A timestamp for the next scheduled time when a freeze will start.
Expand All @@ -80,13 +73,13 @@ message PlatformState {
* If a freeze is currently scheduled, this MUST be set, and MUST
* match the timestamp requested for that freeze.
*/
proto.Timestamp freeze_time = 5;
proto.Timestamp freeze_time = 4;

/**
* A timestamp for the last time a freeze was performed.<br/>
* If not set, there has never been a freeze.
*/
proto.Timestamp last_frozen_time = 6;
proto.Timestamp last_frozen_time = 5;

/**
* A consensus node semantic version.<br/>
Expand All @@ -96,7 +89,7 @@ message PlatformState {
* If birth round migration is complete, this SHALL be the _first_ software
* version that enabled birth round mode.
*/
proto.SemanticVersion first_version_in_birth_round_mode = 7;
proto.SemanticVersion first_version_in_birth_round_mode = 6;

// Fields below are to be deprecated in the foreseeable future.

Expand Down Expand Up @@ -162,6 +155,16 @@ message ConsensusSnapshot {
*/
uint64 next_consensus_number = 4;

/**
* A "consensus" timestamp.<br/>
* The consensus timestamp of this snapshot.
* <p>
* This SHALL be a consensus value and MAY NOT correspond to an actual
* "wall clock" timestamp.<br/>
* Consensus Timestamps SHALL always increase.
*/
proto.Timestamp consensus_timestamp = 5;

}

/**
Expand Down

0 comments on commit 111bad5

Please sign in to comment.