From ac7c5293f6518a047e45aec652e5b6afa5f8c99c Mon Sep 17 00:00:00 2001 From: Moreti Georgiev Date: Thu, 31 Oct 2024 14:11:14 +0200 Subject: [PATCH] feat: default zkevm.witness flag to false --- README.md | 2 +- cmd/utils/flags.go | 11 ++++++----- zk/tests/nightly-l1-recovery/network5-config.yaml | 1 - .../nightly-l1-recovery/network5-sync-config.yaml | 1 - zk/tests/nightly-l1-recovery/network8-config.yaml | 1 - .../nightly-l1-recovery/network8-sync-config.yaml | 1 - zk/tests/unwinds/config/dynamic-integration8.yaml | 1 - 7 files changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 55b567116ab..62971a97b03 100644 --- a/README.md +++ b/README.md @@ -203,7 +203,7 @@ For a full explanation of the config options, see below: Sequencer specific config: - `zkevm.executor-urls`: A csv list of the executor URLs. These will be used in a round robbin fashion by the sequencer - `zkevm.executor-strict`: Defaulted to true, but can be set to false when running the sequencer without verifications (use with extreme caution) -- `zkevm.witness-full`: Defaulted to true. Controls whether the full or partial witness is used with the executor. +- `zkevm.witness-full`: Defaulted to false. Controls whether the full or partial witness is used with the executor. - `zkevm.reject-smart-contract-deployments`: Defaulted to false. Controls whether smart contract deployments are rejected by the TxPool. Resource Utilisation config: diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 7a9f2818e0c..fd6626ec7b7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -651,7 +651,7 @@ var ( WitnessFullFlag = cli.BoolFlag{ Name: "zkevm.witness-full", Usage: "Enable/Diable witness full", - Value: true, + Value: false, } SyncLimit = cli.UintFlag{ Name: "zkevm.sync-limit", @@ -1168,6 +1168,7 @@ func setNodeUserIdent(ctx *cli.Context, cfg *nodecfg.Config) { cfg.UserIdent = identity } } + func setNodeUserIdentCobra(f *pflag.FlagSet, cfg *nodecfg.Config) { if identity := f.String(IdentityFlag.Name, IdentityFlag.Value, IdentityFlag.Usage); identity != nil && len(*identity) > 0 { cfg.UserIdent = *identity @@ -1485,7 +1486,7 @@ func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config, nodeName, datadir string) { if ctx.String(ChainFlag.Name) == networkname.DevChainName { // --dev mode can't use p2p networking. - //cfg.MaxPeers = 0 // It can have peers otherwise local sync is not possible + // cfg.MaxPeers = 0 // It can have peers otherwise local sync is not possible if !ctx.IsSet(ListenPortFlag.Name) { cfg.ListenAddr = ":0" } @@ -1506,7 +1507,7 @@ func SetNodeConfig(ctx *cli.Context, cfg *nodecfg.Config) { func SetNodeConfigCobra(cmd *cobra.Command, cfg *nodecfg.Config) { flags := cmd.Flags() - //SetP2PConfig(ctx, &cfg.P2P) + // SetP2PConfig(ctx, &cfg.P2P) setNodeUserIdentCobra(flags, cfg) setDataDirCobra(flags, cfg) } @@ -1536,7 +1537,7 @@ func setDataDir(ctx *cli.Context, cfg *nodecfg.Config) { } func isPowerOfTwo(n uint64) bool { - if n == 0 { //corner case: if n is zero it will also consider as power 2 + if n == 0 { // corner case: if n is zero it will also consider as power 2 return true } return n&(n-1) == 0 @@ -1835,7 +1836,7 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C cfg.SentinelPort = ctx.Uint64(SentinelPortFlag.Name) cfg.Sync.UseSnapshots = ethconfig.UseSnapshotsByChainName(ctx.String(ChainFlag.Name)) - if ctx.IsSet(SnapshotFlag.Name) { //force override default by cli + if ctx.IsSet(SnapshotFlag.Name) { // force override default by cli cfg.Sync.UseSnapshots = ctx.Bool(SnapshotFlag.Name) } diff --git a/zk/tests/nightly-l1-recovery/network5-config.yaml b/zk/tests/nightly-l1-recovery/network5-config.yaml index 82cf74f727e..515deb56717 100644 --- a/zk/tests/nightly-l1-recovery/network5-config.yaml +++ b/zk/tests/nightly-l1-recovery/network5-config.yaml @@ -24,7 +24,6 @@ zkevm.datastream-version: 2 zkevm.data-stream-host: "127.0.0.1" zkevm.executor-strict: false # zkevm.executor-urls: "zkevm2-stateless-executor:50071" -zkevm.witness-full: false zkevm.sequencer-block-seal-time: "5s" zkevm.sequencer-batch-seal-time: "15m" zkevm.allow-pre-eip155-transactions: true diff --git a/zk/tests/nightly-l1-recovery/network5-sync-config.yaml b/zk/tests/nightly-l1-recovery/network5-sync-config.yaml index 648303c2b50..0e68e9d917a 100644 --- a/zk/tests/nightly-l1-recovery/network5-sync-config.yaml +++ b/zk/tests/nightly-l1-recovery/network5-sync-config.yaml @@ -20,7 +20,6 @@ zkevm.l1-first-block: 6032365 zkevm.rpc-ratelimit: 250 zkevm.executor-strict: false # zkevm.executor-urls: "zkevm2-stateless-executor:50071" -zkevm.witness-full: false zkevm.sequencer-block-seal-time: "5s" zkevm.sequencer-batch-seal-time: "15m" zkevm.allow-pre-eip155-transactions: true diff --git a/zk/tests/nightly-l1-recovery/network8-config.yaml b/zk/tests/nightly-l1-recovery/network8-config.yaml index b38c7a3b45f..e1d5f922f41 100644 --- a/zk/tests/nightly-l1-recovery/network8-config.yaml +++ b/zk/tests/nightly-l1-recovery/network8-config.yaml @@ -23,7 +23,6 @@ zkevm.datastream-version: 2 zkevm.data-stream-host: "127.0.0.1" # zkevm.sequencer-initial-fork-id: 9 zkevm.executor-strict: false -zkevm.witness-full: false zkevm.sequencer-block-seal-time: "5s" zkevm.sequencer-batch-seal-time: "15m" zkevm.allow-pre-eip155-transactions: true diff --git a/zk/tests/nightly-l1-recovery/network8-sync-config.yaml b/zk/tests/nightly-l1-recovery/network8-sync-config.yaml index 98a80e3747d..0127b381a9d 100644 --- a/zk/tests/nightly-l1-recovery/network8-sync-config.yaml +++ b/zk/tests/nightly-l1-recovery/network8-sync-config.yaml @@ -23,7 +23,6 @@ zkevm.datastream-version: 2 #zkevm.data-stream-host: "127.0.0.1" # zkevm.sequencer-initial-fork-id: 9 zkevm.executor-strict: false -zkevm.witness-full: false zkevm.sequencer-block-seal-time: "5s" zkevm.sequencer-batch-seal-time: "15m" zkevm.allow-pre-eip155-transactions: true diff --git a/zk/tests/unwinds/config/dynamic-integration8.yaml b/zk/tests/unwinds/config/dynamic-integration8.yaml index afba2cd46a8..1174fea5db8 100644 --- a/zk/tests/unwinds/config/dynamic-integration8.yaml +++ b/zk/tests/unwinds/config/dynamic-integration8.yaml @@ -22,7 +22,6 @@ zkevm.rpc-ratelimit: 250 zkevm.datastream-version: 2 # zkevm.data-stream-host: "127.0.0.1" zkevm.executor-strict: false -zkevm.witness-full: false zkevm.sequencer-block-seal-time: "5s" zkevm.sequencer-batch-seal-time: "15m" zkevm.allow-pre-eip155-transactions: true