@@ -283,13 +283,6 @@ var (
283283 EnvVars : prefixEnvVars ("RESPONSE_DELAY_AFTER" ),
284284 Value : config .DefaultResponseDelayAfter ,
285285 }
286- L1BeaconSkipBlobVerificationFlag = & cli.BoolFlag {
287- Name : "l1-beacon-skip-blob-verification" ,
288- Usage : "Skip verification of the KZG proof for each blob returned by the Beacon node. Not recommended unless the provided beacon endpoints are trusted." ,
289- EnvVars : prefixEnvVars ("L1_BEACON_SKIP_BLOB_VERIFICATION" ),
290- Value : false ,
291- Hidden : true ,
292- }
293286)
294287
295288// requiredFlags are checked by [CheckRequired]
@@ -337,7 +330,6 @@ var optionalFlags = []cli.Flag{
337330 ResponseDelayFlag ,
338331 ResponseDelayAfterFlag ,
339332 L1GenesisFlag ,
340- L1BeaconSkipBlobVerificationFlag ,
341333}
342334
343335func init () {
@@ -703,109 +695,103 @@ func NewConfigFromCLI(ctx *cli.Context, logger log.Logger) (*config.Config, erro
703695 networks := ctx .StringSlice (flags .NetworkFlagName )
704696 l1EthRpc := ctx .String (L1EthRpcFlag .Name )
705697 l1Beacon := ctx .String (L1BeaconFlag .Name )
706- l1BeaconSkipBlobVerification := ctx .Bool (L1BeaconSkipBlobVerificationFlag .Name )
707698 l2Rpcs := ctx .StringSlice (L2EthRpcFlag .Name )
708699 l2Experimental := ctx .String (L2ExperimentalEthRpcFlag .Name )
709700 return & config.Config {
710701 // Required Flags
711- L1EthRpc : l1EthRpc ,
712- L1Beacon : l1Beacon ,
713- L1BeaconSkipBlobVerification : l1BeaconSkipBlobVerification ,
714- TraceTypes : traceTypes ,
715- GameFactoryAddress : gameFactoryAddress ,
716- GameAllowlist : allowedGames ,
717- GameWindow : ctx .Duration (GameWindowFlag .Name ),
718- MaxConcurrency : maxConcurrency ,
719- L2Rpcs : l2Rpcs ,
720- MaxPendingTx : ctx .Uint64 (MaxPendingTransactionsFlag .Name ),
721- PollInterval : ctx .Duration (HTTPPollInterval .Name ),
722- MinUpdateInterval : ctx .Duration (MinUpdateInterval .Name ),
723- AdditionalBondClaimants : claimants ,
724- RollupRpc : ctx .String (RollupRpcFlag .Name ),
725- SupervisorRPC : ctx .String (SupervisorRpcFlag .Name ),
702+ L1EthRpc : l1EthRpc ,
703+ L1Beacon : l1Beacon ,
704+ TraceTypes : traceTypes ,
705+ GameFactoryAddress : gameFactoryAddress ,
706+ GameAllowlist : allowedGames ,
707+ GameWindow : ctx .Duration (GameWindowFlag .Name ),
708+ MaxConcurrency : maxConcurrency ,
709+ L2Rpcs : l2Rpcs ,
710+ MaxPendingTx : ctx .Uint64 (MaxPendingTransactionsFlag .Name ),
711+ PollInterval : ctx .Duration (HTTPPollInterval .Name ),
712+ MinUpdateInterval : ctx .Duration (MinUpdateInterval .Name ),
713+ AdditionalBondClaimants : claimants ,
714+ RollupRpc : ctx .String (RollupRpcFlag .Name ),
715+ SupervisorRPC : ctx .String (SupervisorRpcFlag .Name ),
726716 Cannon : vm.Config {
727- L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
728- VmType : types .TraceTypeCannon ,
729- L1 : l1EthRpc ,
730- L1Beacon : l1Beacon ,
731- L1BeaconSkipBlobVerification : l1BeaconSkipBlobVerification ,
732- L2s : l2Rpcs ,
733- L2Experimental : l2Experimental ,
734- VmBin : ctx .String (CannonBinFlag .Name ),
735- Server : ctx .String (CannonServerFlag .Name ),
736- Networks : networks ,
737- L2Custom : ctx .Bool (CannonL2CustomFlag .Name ),
738- RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeCannon ),
739- L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeCannon ),
740- DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeCannon ),
741- SnapshotFreq : ctx .Uint (CannonSnapshotFreqFlag .Name ),
742- InfoFreq : ctx .Uint (CannonInfoFreqFlag .Name ),
743- DebugInfo : true ,
744- BinarySnapshots : true ,
717+ L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
718+ VmType : types .TraceTypeCannon ,
719+ L1 : l1EthRpc ,
720+ L1Beacon : l1Beacon ,
721+ L2s : l2Rpcs ,
722+ L2Experimental : l2Experimental ,
723+ VmBin : ctx .String (CannonBinFlag .Name ),
724+ Server : ctx .String (CannonServerFlag .Name ),
725+ Networks : networks ,
726+ L2Custom : ctx .Bool (CannonL2CustomFlag .Name ),
727+ RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeCannon ),
728+ L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeCannon ),
729+ DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeCannon ),
730+ SnapshotFreq : ctx .Uint (CannonSnapshotFreqFlag .Name ),
731+ InfoFreq : ctx .Uint (CannonInfoFreqFlag .Name ),
732+ DebugInfo : true ,
733+ BinarySnapshots : true ,
745734 },
746735 CannonAbsolutePreState : ctx .String (CannonPreStateFlag .Name ),
747736 CannonAbsolutePreStateBaseURL : cannonPreStatesURL ,
748737 CannonKona : vm.Config {
749- L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
750- VmType : types .TraceTypeCannonKona ,
751- L1 : l1EthRpc ,
752- L1Beacon : l1Beacon ,
753- L1BeaconSkipBlobVerification : l1BeaconSkipBlobVerification ,
754- L2s : l2Rpcs ,
755- L2Experimental : l2Experimental ,
756- VmBin : ctx .String (CannonBinFlag .Name ),
757- Server : ctx .String (CannonKonaServerFlag .Name ),
758- Networks : networks ,
759- L2Custom : ctx .Bool (CannonKonaL2CustomFlag .Name ),
760- RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeCannonKona ),
761- L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeCannonKona ),
762- DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeCannonKona ),
763- SnapshotFreq : ctx .Uint (CannonSnapshotFreqFlag .Name ),
764- InfoFreq : ctx .Uint (CannonInfoFreqFlag .Name ),
765- DebugInfo : true ,
766- BinarySnapshots : true ,
738+ L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
739+ VmType : types .TraceTypeCannonKona ,
740+ L1 : l1EthRpc ,
741+ L1Beacon : l1Beacon ,
742+ L2s : l2Rpcs ,
743+ L2Experimental : l2Experimental ,
744+ VmBin : ctx .String (CannonBinFlag .Name ),
745+ Server : ctx .String (CannonKonaServerFlag .Name ),
746+ Networks : networks ,
747+ L2Custom : ctx .Bool (CannonKonaL2CustomFlag .Name ),
748+ RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeCannonKona ),
749+ L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeCannonKona ),
750+ DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeCannonKona ),
751+ SnapshotFreq : ctx .Uint (CannonSnapshotFreqFlag .Name ),
752+ InfoFreq : ctx .Uint (CannonInfoFreqFlag .Name ),
753+ DebugInfo : true ,
754+ BinarySnapshots : true ,
767755 },
768756 CannonKonaAbsolutePreState : ctx .String (CannonKonaPreStateFlag .Name ),
769757 CannonKonaAbsolutePreStateBaseURL : cannonKonaPreStatesURL ,
770758 Datadir : ctx .String (DatadirFlag .Name ),
771759 Asterisc : vm.Config {
772- L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
773- VmType : types .TraceTypeAsterisc ,
774- L1 : l1EthRpc ,
775- L1Beacon : l1Beacon ,
776- L1BeaconSkipBlobVerification : l1BeaconSkipBlobVerification ,
777- L2s : l2Rpcs ,
778- L2Experimental : l2Experimental ,
779- VmBin : ctx .String (AsteriscBinFlag .Name ),
780- Server : ctx .String (AsteriscServerFlag .Name ),
781- Networks : networks ,
782- RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeAsterisc ),
783- L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeAsterisc ),
784- DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeAsterisc ),
785- SnapshotFreq : ctx .Uint (AsteriscSnapshotFreqFlag .Name ),
786- InfoFreq : ctx .Uint (AsteriscInfoFreqFlag .Name ),
787- BinarySnapshots : true ,
760+ L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
761+ VmType : types .TraceTypeAsterisc ,
762+ L1 : l1EthRpc ,
763+ L1Beacon : l1Beacon ,
764+ L2s : l2Rpcs ,
765+ L2Experimental : l2Experimental ,
766+ VmBin : ctx .String (AsteriscBinFlag .Name ),
767+ Server : ctx .String (AsteriscServerFlag .Name ),
768+ Networks : networks ,
769+ RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeAsterisc ),
770+ L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeAsterisc ),
771+ DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeAsterisc ),
772+ SnapshotFreq : ctx .Uint (AsteriscSnapshotFreqFlag .Name ),
773+ InfoFreq : ctx .Uint (AsteriscInfoFreqFlag .Name ),
774+ BinarySnapshots : true ,
788775 },
789776 AsteriscAbsolutePreState : ctx .String (AsteriscPreStateFlag .Name ),
790777 AsteriscAbsolutePreStateBaseURL : asteriscPreStatesURL ,
791778 AsteriscKona : vm.Config {
792- L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
793- VmType : types .TraceTypeAsteriscKona ,
794- L1 : l1EthRpc ,
795- L1Beacon : l1Beacon ,
796- L1BeaconSkipBlobVerification : l1BeaconSkipBlobVerification ,
797- L2s : l2Rpcs ,
798- L2Experimental : l2Experimental ,
799- VmBin : ctx .String (AsteriscBinFlag .Name ),
800- Server : ctx .String (AsteriscKonaServerFlag .Name ),
801- Networks : networks ,
802- L2Custom : ctx .Bool (AsteriscKonaL2CustomFlag .Name ),
803- RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeAsteriscKona ),
804- L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeAsteriscKona ),
805- DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeAsteriscKona ),
806- SnapshotFreq : ctx .Uint (AsteriscSnapshotFreqFlag .Name ),
807- InfoFreq : ctx .Uint (AsteriscInfoFreqFlag .Name ),
808- BinarySnapshots : true ,
779+ L1GenesisPath : ctx .String (L1GenesisFlag .Name ),
780+ VmType : types .TraceTypeAsteriscKona ,
781+ L1 : l1EthRpc ,
782+ L1Beacon : l1Beacon ,
783+ L2s : l2Rpcs ,
784+ L2Experimental : l2Experimental ,
785+ VmBin : ctx .String (AsteriscBinFlag .Name ),
786+ Server : ctx .String (AsteriscKonaServerFlag .Name ),
787+ Networks : networks ,
788+ L2Custom : ctx .Bool (AsteriscKonaL2CustomFlag .Name ),
789+ RollupConfigPaths : RollupConfigFlag .StringSlice (ctx , types .TraceTypeAsteriscKona ),
790+ L2GenesisPaths : L2GenesisFlag .StringSlice (ctx , types .TraceTypeAsteriscKona ),
791+ DepsetConfigPath : DepsetConfigFlag .String (ctx , types .TraceTypeAsteriscKona ),
792+ SnapshotFreq : ctx .Uint (AsteriscSnapshotFreqFlag .Name ),
793+ InfoFreq : ctx .Uint (AsteriscInfoFreqFlag .Name ),
794+ BinarySnapshots : true ,
809795 },
810796 AsteriscKonaAbsolutePreState : ctx .String (AsteriscKonaPreStateFlag .Name ),
811797 AsteriscKonaAbsolutePreStateBaseURL : asteriscKonaPreStatesURL ,
0 commit comments