Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rollback config v17 into v16 #2140

Merged
merged 1 commit into from
May 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ type Local struct {
// Version tracks the current version of the defaults so we can migrate old -> new
// This is specifically important whenever we decide to change the default value
// for an existing parameter. This field tag must be updated any time we add a new version.
Version uint32 `version[0]:"0" version[1]:"1" version[2]:"2" version[3]:"3" version[4]:"4" version[5]:"5" version[6]:"6" version[7]:"7" version[8]:"8" version[9]:"9" version[10]:"10" version[11]:"11" version[12]:"12" version[13]:"13" version[14]:"14" version[15]:"15" version[16]:"16" version[17]:"17"`
Version uint32 `version[0]:"0" version[1]:"1" version[2]:"2" version[3]:"3" version[4]:"4" version[5]:"5" version[6]:"6" version[7]:"7" version[8]:"8" version[9]:"9" version[10]:"10" version[11]:"11" version[12]:"12" version[13]:"13" version[14]:"14" version[15]:"15" version[16]:"16"`

// environmental (may be overridden)
// When enabled, stores blocks indefinitally, otherwise, only the most recents blocks
Expand Down Expand Up @@ -401,23 +401,23 @@ type Local struct {
// 3 : speed up catchup by skipping necessary validations
// 12 : perform all validation methods (normal and additional). These extra tests helps to verify the integrity of the compiled executable against
// previously used executabled, and would not provide any additional security guarantees.
CatchupBlockValidateMode int `version[17]:"0"`
CatchupBlockValidateMode int `version[16]:"0"`

// Generate AccountUpdates telemetry event
EnableAccountUpdatesStats bool `version[17]:"false"`
EnableAccountUpdatesStats bool `version[16]:"false"`

// Time interval in nanoseconds for generating accountUpdates telemetry event
AccountUpdatesStatsInterval time.Duration `version[17]:"5000000000"`
AccountUpdatesStatsInterval time.Duration `version[16]:"5000000000"`

// ParticipationKeysRefreshInterval is the duration between two consecutive checks to see if new participation
// keys have been placed on the genesis directory.
ParticipationKeysRefreshInterval time.Duration `version[17]:"60000000000"`
ParticipationKeysRefreshInterval time.Duration `version[16]:"60000000000"`

// DisableNetworking disables all the incoming and outgoing communication a node would perform. This is useful
// when we have a single-node private network, where there is no other nodes that need to be communicated with.
// features like catchpoint catchup would be rendered completly non-operational, and many of the node inner
// working would be completly dis-functional.
DisableNetworking bool `version[17]:"false"`
DisableNetworking bool `version[16]:"false"`
}

// Filenames of config files within the configdir (e.g. ~/.algorand)
Expand Down
2 changes: 1 addition & 1 deletion config/local_defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package config

var defaultLocal = Local{
Version: 17,
Version: 16,
AccountUpdatesStatsInterval: 5000000000,
AccountsRebuildSynchronousMode: 1,
AnnounceParticipationKey: true,
Expand Down
2 changes: 1 addition & 1 deletion installer/config.json.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Version": 17,
"Version": 16,
"AccountUpdatesStatsInterval": 5000000000,
"AccountsRebuildSynchronousMode": 1,
"AnnounceParticipationKey": true,
Expand Down
5 changes: 5 additions & 0 deletions test/testdata/configs/config-v16.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"Version": 16,
"AccountUpdatesStatsInterval": 5000000000,
"AccountsRebuildSynchronousMode": 1,
"AnnounceParticipationKey": true,
"Archival": false,
Expand All @@ -11,6 +12,7 @@
"CatchpointInterval": 10000,
"CatchpointTracking": 0,
"CatchupBlockDownloadRetryAttempts": 1000,
"CatchupBlockValidateMode": 0,
"CatchupFailurePeerRefreshRate": 10,
"CatchupGossipBlockFetchTimeoutSec": 4,
"CatchupHTTPBlockFetchTimeoutSec": 4,
Expand All @@ -22,7 +24,9 @@
"DNSSecurityFlags": 1,
"DeadlockDetection": 0,
"DisableLocalhostConnectionRateLimit": true,
"DisableNetworking": false,
"DisableOutgoingConnectionThrottling": false,
"EnableAccountUpdatesStats": false,
"EnableAgreementReporting": false,
"EnableAgreementTimeMetrics": false,
"EnableAssembleStats": false,
Expand Down Expand Up @@ -63,6 +67,7 @@
"OptimizeAccountsDatabaseOnStartup": false,
"OutgoingMessageFilterBucketCount": 3,
"OutgoingMessageFilterBucketSize": 128,
"ParticipationKeysRefreshInterval": 60000000000,
"PeerConnectionsUpdateInterval": 3600,
"PeerPingPeriodSeconds": 0,
"PriorityPeers": {},
Expand Down
92 changes: 0 additions & 92 deletions test/testdata/configs/config-v17.json

This file was deleted.