feat: add param to skip system config signer check

Author: yiweichi

cmd/geth/main.go

@@ -182,6 +182,7 @@ var (
 		utils.GossipSequencerHTTPFlag,
 		utils.GossipBroadcastToAllEnabledFlag,
 		utils.GossipBroadcastToAllCapFlag,
+		utils.SkipSignerCheckFlag,
 		utils.DASyncEnabledFlag,
 		utils.DAMissingHeaderFieldsBaseURLFlag,
 		utils.DABlockNativeAPIEndpointFlag,

cmd/geth/usage.go

@@ -255,6 +255,7 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.GossipSequencerHTTPFlag,
 			utils.GossipBroadcastToAllEnabledFlag,
 			utils.GossipBroadcastToAllCapFlag,
+			utils.SkipSignerCheckFlag,
 		},
 	},
 	{

cmd/utils/flags.go

@@ -919,6 +919,11 @@ var (
 		Value: 30,
 	}
 
+	SkipSignerCheckFlag = cli.BoolFlag{
+		Name:  "skipsignercheck",
+		Usage: "Skip signer check for the SystemContract engine",
+	}
+
 	// DA syncing settings
 	DASyncEnabledFlag = cli.BoolFlag{
 		Name:  "da.sync",
@@ -1847,6 +1852,10 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 		cfg.GossipBroadcastToAllCap = ctx.GlobalInt(GossipBroadcastToAllCapFlag.Name)
 		log.Info("Gossip broadcast to all enabled", "enabled", cfg.GossipBroadcastToAllEnabled, "cap", cfg.GossipBroadcastToAllCap)
 	}
+	if ctx.GlobalIsSet(SkipSignerCheckFlag.Name) {
+		cfg.SkipSignerCheck = ctx.GlobalBool(SkipSignerCheckFlag.Name)
+		log.Info("Skip signer check for the SystemContract engine", "skipped", cfg.SkipSignerCheck)
+	}
 	// Only configure sequencer http flag if we're running in verifier mode i.e. --mine is disabled.
 	if ctx.IsSet(GossipSequencerHTTPFlag.Name) && !ctx.IsSet(MiningEnabledFlag.Name) {
 		cfg.GossipSequencerHTTP = ctx.String(GossipSequencerHTTPFlag.Name)

consensus/system_contract/consensus.go

@@ -135,7 +135,7 @@ func (s *SystemContract) verifyHeader(chain consensus.ChainHeaderReader, header
 		return errInvalidNonce
 	}
 	// Check that the BlockSignature contains signature if block is not requested
-	if header.Number.Cmp(big.NewInt(0)) != 0 && len(header.BlockSignature) != extraSeal {
+	if !s.skipSignerCheck && header.Number.Cmp(big.NewInt(0)) != 0 && len(header.BlockSignature) != extraSeal {
 		return errMissingSignature
 	}
 	// Ensure that the mix digest is zero
@@ -202,6 +202,10 @@ func (s *SystemContract) verifyCascadingFields(chain consensus.ChainHeaderReader
 		return err
 	}
 
+	if s.skipSignerCheck {
+		return nil
+	}
+
 	signer, err := ecrecover(header)
 	if err != nil {
 		return err

consensus/system_contract/system_contract.go

@@ -33,11 +33,13 @@ type SystemContract struct {
 
 	ctx    context.Context
 	cancel context.CancelFunc
+
+	skipSignerCheck bool
 }
 
 // New creates a SystemContract consensus engine with the initial
 // authorized signer fetched from L1 (if available).
-func New(ctx context.Context, config *params.SystemContractConfig, client sync_service.EthClient) *SystemContract {
+func New(ctx context.Context, config *params.SystemContractConfig, client sync_service.EthClient, skipSignerCheck bool) *SystemContract {
 	log.Info("Initializing system_contract consensus engine", "config", config)
 
 	ctx, cancel := context.WithCancel(ctx)

consensus/system_contract/system_contract_test.go

@@ -36,7 +36,7 @@ func TestSystemContract_FetchSigner(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	sys := New(ctx, config, fakeClient)
+	sys := New(ctx, config, fakeClient, false)
 	defer sys.Close()
 
 	require.NoError(t, sys.fetchAddressFromL1())
@@ -62,7 +62,7 @@ func TestSystemContract_AuthorizeCheck(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	sys := New(ctx, config, fakeClient)
+	sys := New(ctx, config, fakeClient, false)
 	defer sys.Close()
 
 	require.NoError(t, sys.fetchAddressFromL1())
@@ -117,7 +117,7 @@ func TestSystemContract_SignsAfterUpdate(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	defer cancel()
 
-	sys := New(ctx, config, fakeClient)
+	sys := New(ctx, config, fakeClient, false)
 	defer sys.Close()
 
 	require.NoError(t, sys.fetchAddressFromL1())

eth/backend.go

@@ -120,7 +120,7 @@ type Ethereum struct {
 
 // New creates a new Ethereum object (including the
 // initialisation of the common Ethereum object)
-func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ethereum, error) {
+func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client, ) (*Ethereum, error) {
 	// Ensure configuration values are compatible and sane
 	if config.SyncMode == downloader.LightSync {
 		return nil, errors.New("can't run eth.Ethereum in light sync mode, use les.LightEthereum")
@@ -166,7 +166,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client l1.Client) (*Ether
 		chainDb:           chainDb,
 		eventMux:          stack.EventMux(),
 		accountManager:    stack.AccountManager(),
-		engine:            ethconfig.CreateConsensusEngine(stack, chainConfig, &ethashConfig, config.Miner.Notify, config.Miner.Noverify, chainDb, l1Client),
+		engine:            ethconfig.CreateConsensusEngine(stack, chainConfig, &ethashConfig, config.Miner.Notify, config.Miner.Noverify, chainDb, l1Client, config.SkipSignerCheck),
 		closeBloomHandler: make(chan struct{}),
 		networkID:         config.NetworkId,
 		gasPrice:          config.Miner.GasPrice,

eth/ethconfig/config.go

@@ -236,14 +236,17 @@ type Config struct {
 	GossipSequencerHTTP         string
 	GossipBroadcastToAllEnabled bool
 	GossipBroadcastToAllCap     int
+
+	// Skip signer check for the SystemContract engine
+	SkipSignerCheck bool
 }
 
 // CreateConsensusEngine creates a consensus engine for the given chain configuration.
-func CreateConsensusEngine(stack *node.Node, chainConfig *params.ChainConfig, config *ethash.Config, notify []string, noverify bool, db ethdb.Database, l1Client sync_service.EthClient) consensus.Engine {
+func CreateConsensusEngine(stack *node.Node, chainConfig *params.ChainConfig, config *ethash.Config, notify []string, noverify bool, db ethdb.Database, l1Client sync_service.EthClient, skipSignerCheck bool) consensus.Engine {
 	// Case 1: Both SystemContract and Clique are defined: create an upgradable engine.
 	if chainConfig.SystemContract != nil && chainConfig.Clique != nil {
 		cliqueEngine := clique.New(chainConfig.Clique, db)
-		sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, l1Client)
+		sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, l1Client, skipSignerCheck)
 		sysEngine.Start()
 		return wrapper.NewUpgradableEngine(chainConfig.IsEuclidV2, cliqueEngine, sysEngine)
 	}
@@ -255,7 +258,7 @@ func CreateConsensusEngine(stack *node.Node, chainConfig *params.ChainConfig, co
 
 	// Case 3: Only the SystemContract engine is defined.
 	if chainConfig.SystemContract != nil {
-		sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, l1Client)
+		sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, l1Client, skipSignerCheck)
 		sysEngine.Start()
 		return sysEngine
 	}

les/client.go

@@ -110,7 +110,7 @@ func New(stack *node.Node, config *ethconfig.Config, l1Client sync_service.EthCl
 		eventMux:       stack.EventMux(),
 		reqDist:        newRequestDistributor(peers, &mclock.System{}),
 		accountManager: stack.AccountManager(),
-		engine:         ethconfig.CreateConsensusEngine(stack, chainConfig, &config.Ethash, nil, false, chainDb, l1Client),
+		engine:         ethconfig.CreateConsensusEngine(stack, chainConfig, &config.Ethash, nil, false, chainDb, l1Client, config.SkipSignerCheck),
 		bloomRequests:  make(chan chan *bloombits.Retrieval),
 		bloomIndexer:   core.NewBloomIndexer(chainDb, params.BloomBitsBlocksClient, params.HelperTrieConfirmations),
 		p2pServer:      stack.Server(),

miner/scroll_worker_test.go

@@ -1411,7 +1411,7 @@ func TestEuclidV2TransitionVerification(t *testing.T) {
 	// init worker
 	db := rawdb.NewMemoryDatabase()
 	cliqueEngine := clique.New(chainConfig.Clique, db)
-	sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, &system_contract.FakeEthClient{Value: testBankAddress})
+	sysEngine := system_contract.New(context.Background(), chainConfig.SystemContract, &system_contract.FakeEthClient{Value: testBankAddress}, false)
 	engine := wrapper.NewUpgradableEngine(chainConfig.IsEuclidV2, cliqueEngine, sysEngine)
 	w, b := newTestWorkerWithEmptyBlock(t, chainConfig, engine, db, 0)
 	defer w.close()