Skip to content

Commit

Permalink
Deprecate --init-sync-no-verify, make it the default (prysmaticlabs#4179
Browse files Browse the repository at this point in the history
)

* deprecated --init-sync-no-verify, make it the default
* Merge branch 'master' into deprecate-init-sync-verify-flag
* add more flag info
* Merge branch 'deprecate-init-sync-verify-flag' of github.com:prysmaticlabs/prysm into deprecate-init-sync-verify-flag
* gofmt
* Merge refs/heads/master into deprecate-init-sync-verify-flag
* Merge refs/heads/master into deprecate-init-sync-verify-flag
  • Loading branch information
prestonvanloon authored and prylabs-bulldozer[bot] committed Dec 3, 2019
1 parent 28c4f28 commit 32245a9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
6 changes: 4 additions & 2 deletions shared/featureconfig/config.go
Expand Up @@ -86,8 +86,10 @@ func ConfigureBeaconChain(ctx *cli.Context) {
log.Warn("Enabled unsafe eth1 data vote cache")
cfg.EnableEth1DataVoteCache = true
}
if ctx.GlobalBool(InitSyncNoVerifyFlag.Name) {
log.Warn("Initial syncing without verifying block's contents")
if ctx.GlobalBool(initSyncVerifyEverythingFlag.Name) {
log.Warn("Initial syncing with verifying all block's content signatures.")
cfg.InitSyncNoVerify = false
} else {
cfg.InitSyncNoVerify = true
}
if ctx.GlobalBool(NewCacheFlag.Name) {
Expand Down
19 changes: 13 additions & 6 deletions shared/featureconfig/flags.go
Expand Up @@ -45,11 +45,6 @@ var (
Name: "enable-active-count-cache",
Usage: "Enable unsafe cache mechanism. See https://github.com/prysmaticlabs/prysm/issues/3106",
}
// InitSyncNoVerifyFlag enables the initial sync no verify configuration.
InitSyncNoVerifyFlag = cli.BoolFlag{
Name: "init-sync-no-verify",
Usage: "Initial sync to finalized check point w/o verifying block's signature, RANDAO and attestation's aggregated signatures",
}
// NewCacheFlag enables the node to use the new caching scheme.
NewCacheFlag = cli.BoolFlag{
Name: "new-cache",
Expand Down Expand Up @@ -81,6 +76,12 @@ var (
Name: "prune-states",
Usage: "Prune epoch boundary states before last finalized check point",
}
initSyncVerifyEverythingFlag = cli.BoolFlag{
Name: "initial-sync-verify-all-signatures",
Usage: "Initial sync to finalized checkpoint with verifying block's signature, RANDAO " +
"and attestation's aggregated signatures. Without this flag, only the proposer " +
"signature is verified until the node reaches the end of the finalized chain.",
}
)

// Deprecated flags list.
Expand Down Expand Up @@ -112,6 +113,11 @@ var (
Usage: deprecatedUsage,
Hidden: true,
}
deprecatedInitSyncNoVerifyFlag = cli.BoolFlag{
Name: "init-sync-no-verify",
Usage: deprecatedUsage,
Hidden: true,
}
)

var deprecatedFlags = []cli.Flag{
Expand All @@ -120,6 +126,7 @@ var deprecatedFlags = []cli.Flag{
deprecatedScatterFlag,
deprecatedPruneFinalizedStatesFlag,
deprecatedOptimizeProcessEpoch,
deprecatedInitSyncNoVerifyFlag,
}

// ValidatorFlags contains a list of all the feature flags that apply to the validator client.
Expand All @@ -134,7 +141,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
writeSSZStateTransitionsFlag,
EnableAttestationCacheFlag,
EnableEth1DataVoteCacheFlag,
InitSyncNoVerifyFlag,
initSyncVerifyEverythingFlag,
NewCacheFlag,
SkipBLSVerifyFlag,
enableBackupWebhookFlag,
Expand Down

0 comments on commit 32245a9

Please sign in to comment.