diff --git a/config/config.go b/config/config.go index 89865d1ae2..0ab143b89b 100644 --- a/config/config.go +++ b/config/config.go @@ -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 @@ -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) diff --git a/config/local_defaults.go b/config/local_defaults.go index c5b26f65c9..725409e738 100644 --- a/config/local_defaults.go +++ b/config/local_defaults.go @@ -20,7 +20,7 @@ package config var defaultLocal = Local{ - Version: 17, + Version: 16, AccountUpdatesStatsInterval: 5000000000, AccountsRebuildSynchronousMode: 1, AnnounceParticipationKey: true, diff --git a/installer/config.json.example b/installer/config.json.example index a455ad2ec0..42b6361bd7 100644 --- a/installer/config.json.example +++ b/installer/config.json.example @@ -1,5 +1,5 @@ { - "Version": 17, + "Version": 16, "AccountUpdatesStatsInterval": 5000000000, "AccountsRebuildSynchronousMode": 1, "AnnounceParticipationKey": true, diff --git a/test/testdata/configs/config-v16.json b/test/testdata/configs/config-v16.json index e7201905da..42b6361bd7 100644 --- a/test/testdata/configs/config-v16.json +++ b/test/testdata/configs/config-v16.json @@ -1,5 +1,6 @@ { "Version": 16, + "AccountUpdatesStatsInterval": 5000000000, "AccountsRebuildSynchronousMode": 1, "AnnounceParticipationKey": true, "Archival": false, @@ -11,6 +12,7 @@ "CatchpointInterval": 10000, "CatchpointTracking": 0, "CatchupBlockDownloadRetryAttempts": 1000, + "CatchupBlockValidateMode": 0, "CatchupFailurePeerRefreshRate": 10, "CatchupGossipBlockFetchTimeoutSec": 4, "CatchupHTTPBlockFetchTimeoutSec": 4, @@ -22,7 +24,9 @@ "DNSSecurityFlags": 1, "DeadlockDetection": 0, "DisableLocalhostConnectionRateLimit": true, + "DisableNetworking": false, "DisableOutgoingConnectionThrottling": false, + "EnableAccountUpdatesStats": false, "EnableAgreementReporting": false, "EnableAgreementTimeMetrics": false, "EnableAssembleStats": false, @@ -63,6 +67,7 @@ "OptimizeAccountsDatabaseOnStartup": false, "OutgoingMessageFilterBucketCount": 3, "OutgoingMessageFilterBucketSize": 128, + "ParticipationKeysRefreshInterval": 60000000000, "PeerConnectionsUpdateInterval": 3600, "PeerPingPeriodSeconds": 0, "PriorityPeers": {}, diff --git a/test/testdata/configs/config-v17.json b/test/testdata/configs/config-v17.json deleted file mode 100644 index a455ad2ec0..0000000000 --- a/test/testdata/configs/config-v17.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "Version": 17, - "AccountUpdatesStatsInterval": 5000000000, - "AccountsRebuildSynchronousMode": 1, - "AnnounceParticipationKey": true, - "Archival": false, - "BaseLoggerDebugLevel": 4, - "BlockServiceCustomFallbackEndpoints": "", - "BroadcastConnectionsLimit": -1, - "CadaverSizeTarget": 1073741824, - "CatchpointFileHistoryLength": 365, - "CatchpointInterval": 10000, - "CatchpointTracking": 0, - "CatchupBlockDownloadRetryAttempts": 1000, - "CatchupBlockValidateMode": 0, - "CatchupFailurePeerRefreshRate": 10, - "CatchupGossipBlockFetchTimeoutSec": 4, - "CatchupHTTPBlockFetchTimeoutSec": 4, - "CatchupLedgerDownloadRetryAttempts": 50, - "CatchupParallelBlocks": 16, - "ConnectionsRateLimitingCount": 60, - "ConnectionsRateLimitingWindowSeconds": 1, - "DNSBootstrapID": ".algorand.network", - "DNSSecurityFlags": 1, - "DeadlockDetection": 0, - "DisableLocalhostConnectionRateLimit": true, - "DisableNetworking": false, - "DisableOutgoingConnectionThrottling": false, - "EnableAccountUpdatesStats": false, - "EnableAgreementReporting": false, - "EnableAgreementTimeMetrics": false, - "EnableAssembleStats": false, - "EnableBlockService": false, - "EnableBlockServiceFallbackToArchiver": true, - "EnableCatchupFromArchiveServers": false, - "EnableDeveloperAPI": false, - "EnableGossipBlockService": true, - "EnableIncomingMessageFilter": false, - "EnableLedgerService": false, - "EnableMetricReporting": false, - "EnableOutgoingNetworkMessageFiltering": true, - "EnablePingHandler": true, - "EnableProcessBlockStats": false, - "EnableProfiler": false, - "EnableRequestLogger": false, - "EnableTopAccountsReporting": false, - "EndpointAddress": "127.0.0.1:0", - "FallbackDNSResolverAddress": "", - "ForceRelayMessages": false, - "GossipFanout": 4, - "IncomingConnectionsLimit": 10000, - "IncomingMessageFilterBucketCount": 5, - "IncomingMessageFilterBucketSize": 512, - "IsIndexerActive": false, - "LedgerSynchronousMode": 2, - "LogArchiveMaxAge": "", - "LogArchiveName": "node.archive.log", - "LogSizeLimit": 1073741824, - "MaxCatchpointDownloadDuration": 7200000000000, - "MaxConnectionsPerIP": 30, - "MinCatchpointFileDownloadBytesPerSecond": 20480, - "NetAddress": "", - "NetworkMessageTraceServer": "", - "NetworkProtocolVersion": "", - "NodeExporterListenAddress": ":9100", - "NodeExporterPath": "./node_exporter", - "OptimizeAccountsDatabaseOnStartup": false, - "OutgoingMessageFilterBucketCount": 3, - "OutgoingMessageFilterBucketSize": 128, - "ParticipationKeysRefreshInterval": 60000000000, - "PeerConnectionsUpdateInterval": 3600, - "PeerPingPeriodSeconds": 0, - "PriorityPeers": {}, - "PublicAddress": "", - "ReconnectTime": 60000000000, - "ReservedFDs": 256, - "RestReadTimeoutSeconds": 15, - "RestWriteTimeoutSeconds": 120, - "RunHosted": false, - "SuggestedFeeBlockHistory": 3, - "SuggestedFeeSlidingWindowSize": 50, - "TLSCertFile": "", - "TLSKeyFile": "", - "TelemetryToLog": true, - "TxPoolExponentialIncreaseFactor": 2, - "TxPoolSize": 15000, - "TxSyncIntervalSeconds": 60, - "TxSyncServeResponseSize": 1000000, - "TxSyncTimeoutSeconds": 30, - "UseXForwardedForAddressField": "", - "VerifiedTranscationsCacheSize": 30000 -}