txingestion: remove (ethereum#70)

* txingestion: remove

* workflow: bugfix

* rollup: lint

.github/workflows/integration.yml

@@ -35,7 +35,7 @@ jobs:
           git fetch gh $GITHUB_SHA
           git checkout $GITHUB_SHA
           cd $HOME/optimism-integration
-          ./build.sh
+          ./docker/build.sh
 
       - name: Test
         run: |

cmd/geth/main.go

@@ -149,17 +149,9 @@ var (
 	}
 
 	optimismFlags = []cli.Flag{
-		// TODO: deprecate these flags
-		utils.TxIngestionEnableFlag,
-		utils.TxIngestionDBHostFlag,
-		utils.TxIngestionDBPortFlag,
-		utils.TxIngestionDBNameFlag,
-		utils.TxIngestionDBUserFlag,
-		utils.TxIngestionDBPasswordFlag,
-		utils.TxIngestionPollIntervalFlag,
+		// Flags for the SyncService
 		utils.TxIngestionSignerKeyHexFlag,
 		utils.TxIngestionSignerKeyFileFlag,
-		// Flags for the SyncService
 		utils.Eth1SyncServiceEnable,
 		utils.Eth1AddressResolverAddressFlag,
 		utils.Eth1CanonicalTransactionChainDeployHeightFlag,

cmd/geth/usage.go

@@ -65,13 +65,6 @@ var AppHelpFlagGroups = []flagGroup{
 	{
 		Name: "OPTIMISM",
 		Flags: []cli.Flag{
-			utils.TxIngestionEnableFlag,
-			utils.TxIngestionDBHostFlag,
-			utils.TxIngestionDBPortFlag,
-			utils.TxIngestionDBNameFlag,
-			utils.TxIngestionDBUserFlag,
-			utils.TxIngestionDBPasswordFlag,
-			utils.TxIngestionPollIntervalFlag,
 			utils.TxIngestionSignerKeyHexFlag,
 			utils.TxIngestionSignerKeyFileFlag,
 			utils.Eth1SyncServiceEnable,

cmd/utils/flags.go

@@ -771,42 +771,7 @@ var (
 		Usage: "External EVM configuration (default = built-in interpreter)",
 		Value: "",
 	}
-	// Flags associated with Layer 1 Transaction Ingestion
-	// TODO(mark): deprecate these flags
-	TxIngestionEnableFlag = cli.BoolFlag{
-		Name:  "txingestion.enable",
-		Usage: "Enable L1 Transaction Ingestion",
-	}
-	TxIngestionDBHostFlag = cli.StringFlag{
-		Name:  "txingestion.dbhost",
-		Usage: "HTTP host of SQL database to ingest transactions from",
-		Value: eth.DefaultConfig.Rollup.TxIngestionDBHost,
-	}
-	TxIngestionDBPortFlag = cli.IntFlag{
-		Name:  "txingestion.dbport",
-		Usage: "HTTP port of SQL database to ingest transactions from",
-		Value: int(eth.DefaultConfig.Rollup.TxIngestionDBPort),
-	}
-	TxIngestionDBNameFlag = cli.StringFlag{
-		Name:  "txingestion.dbname",
-		Usage: "Database name to ingest transactions from",
-		Value: eth.DefaultConfig.Rollup.TxIngestionDBName,
-	}
-	TxIngestionDBUserFlag = cli.StringFlag{
-		Name:  "txingestion.dbuser",
-		Usage: "Database username",
-		Value: eth.DefaultConfig.Rollup.TxIngestionDBUser,
-	}
-	TxIngestionDBPasswordFlag = cli.StringFlag{
-		Name:  "txingestion.dbpassword",
-		Usage: "Database password",
-		Value: eth.DefaultConfig.Rollup.TxIngestionDBPassword,
-	}
-	TxIngestionPollIntervalFlag = cli.DurationFlag{
-		Name:  "txingestion.pollinterval",
-		Usage: "Time between polls for tranaction ingestion",
-		Value: eth.DefaultConfig.Rollup.TxIngestionPollInterval,
-	}
+	// The god key
 	TxIngestionSignerKeyHexFlag = cli.StringFlag{
 		Name:   "txingestion.signerkey",
 		Usage:  "Hex private key to authenticate L1 to L2 txs",
@@ -1087,52 +1052,7 @@ func setIPC(ctx *cli.Context, cfg *node.Config) {
 	}
 }
 
-// setTransactionIngestion configures the transaction ingestion process.
-func setTxIngestion(ctx *cli.Context, cfg *rollup.Config) {
-	if ctx.GlobalIsSet(TxIngestionEnableFlag.Name) {
-		cfg.TxIngestionEnable = ctx.GlobalBool(TxIngestionEnableFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionDBHostFlag.Name) {
-		cfg.TxIngestionDBHost = ctx.GlobalString(TxIngestionDBHostFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionDBPortFlag.Name) {
-		cfg.TxIngestionDBPort = ctx.GlobalUint(TxIngestionDBPortFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionDBNameFlag.Name) {
-		cfg.TxIngestionDBName = ctx.GlobalString(TxIngestionDBNameFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionDBUserFlag.Name) {
-		cfg.TxIngestionDBUser = ctx.GlobalString(TxIngestionDBUserFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionDBPasswordFlag.Name) {
-		cfg.TxIngestionDBPassword = ctx.GlobalString(TxIngestionDBPasswordFlag.Name)
-	}
-	if ctx.GlobalIsSet(TxIngestionPollIntervalFlag.Name) {
-		cfg.TxIngestionPollInterval = ctx.GlobalDuration(TxIngestionPollIntervalFlag.Name)
-	}
-
-	var (
-		hex  = ctx.GlobalString(TxIngestionSignerKeyHexFlag.Name)
-		file = ctx.GlobalString(TxIngestionSignerKeyFileFlag.Name)
-		key  *ecdsa.PrivateKey
-		err  error
-	)
-	switch {
-	case file != "" && hex != "":
-		Fatalf("Options %q and %q are mutually exclusive", TxIngestionSignerKeyFileFlag.Name, TxIngestionSignerKeyHexFlag.Name)
-	case file != "":
-		if key, err = crypto.LoadECDSA(file); err != nil {
-			Fatalf("Option %q: %v", NodeKeyFileFlag.Name, err)
-		}
-		cfg.TxIngestionSignerKey = key
-	case hex != "":
-		if key, err = crypto.HexToECDSA(hex); err != nil {
-			Fatalf("Option %q: %v", NodeKeyHexFlag.Name, err)
-		}
-		cfg.TxIngestionSignerKey = key
-	}
-}
-
+// setEth1 configures the sync service
 func setEth1(ctx *cli.Context, cfg *rollup.Config) {
 	if ctx.GlobalIsSet(Eth1CanonicalTransactionChainDeployHeightFlag.Name) {
 		height := ctx.GlobalUint64(Eth1CanonicalTransactionChainDeployHeightFlag.Name)
@@ -1173,6 +1093,27 @@ func setEth1(ctx *cli.Context, cfg *rollup.Config) {
 	if ctx.GlobalIsSet(RollupEnableVerifierFlag.Name) {
 		cfg.IsVerifier = true
 	}
+
+	var (
+		hex  = ctx.GlobalString(TxIngestionSignerKeyHexFlag.Name)
+		file = ctx.GlobalString(TxIngestionSignerKeyFileFlag.Name)
+		key  *ecdsa.PrivateKey
+		err  error
+	)
+	switch {
+	case file != "" && hex != "":
+		Fatalf("Options %q and %q are mutually exclusive", TxIngestionSignerKeyFileFlag.Name, TxIngestionSignerKeyHexFlag.Name)
+	case file != "":
+		if key, err = crypto.LoadECDSA(file); err != nil {
+			Fatalf("Option %q: %v", NodeKeyFileFlag.Name, err)
+		}
+		cfg.TxIngestionSignerKey = key
+	case hex != "":
+		if key, err = crypto.HexToECDSA(hex); err != nil {
+			Fatalf("Option %q: %v", NodeKeyHexFlag.Name, err)
+		}
+		cfg.TxIngestionSignerKey = key
+	}
 }
 
 // setLes configures the les server and ultra light client settings from the command line flags.
@@ -1632,7 +1573,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
 	setMiner(ctx, &cfg.Miner)
 	setWhitelist(ctx, cfg)
 	setLes(ctx, cfg)
-	setTxIngestion(ctx, &cfg.Rollup)
 	setEth1(ctx, &cfg.Rollup)
 
 	if ctx.GlobalIsSet(SyncModeFlag.Name) {

eth/backend.go

@@ -78,9 +78,7 @@ type Ethereum struct {
 	blockchain      *core.BlockChain
 	protocolManager *ProtocolManager
 	lesServer       LesServer
-	// Transaction Ingestion Service
-	txIngestion *rollup.TxIngestion // will be deprecated
-	syncService *rollup.SyncService
+	syncService     *rollup.SyncService
 
 	// DB interfaces
 	chainDb ethdb.Database // Block chain database
@@ -207,7 +205,6 @@ func New(ctx *node.ServiceContext, config *Config) (*Ethereum, error) {
 		config.TxPool.Journal = ctx.ResolvePath(config.TxPool.Journal)
 	}
 	eth.txPool = core.NewTxPool(config.TxPool, chainConfig, eth.blockchain)
-	eth.txIngestion = rollup.NewTxIngestion(config.Rollup, chainConfig, eth.txPool)
 
 	eth.syncService, err = rollup.NewSyncService(context.Background(), config.Rollup, eth.txPool, eth.blockchain, eth.chainDb)
 	if err != nil {

rollup/sync_service.go

@@ -354,6 +354,10 @@ func (s *SyncService) pollHead() {
 			}
 			process := new([]*types.Header)
 			index, err := s.getCommonAncestor(head.Number, process)
+			if err != nil {
+				log.Error("Cannot get common ancestor", "message", err.Error())
+				continue
+			}
 			log.Debug("get common ancestor", "index", index, "count", len(*process))
 			blocks := (*process)[:]
 			for i := len(blocks) - 1; i >= 0; i-- {
@@ -373,6 +377,9 @@ func (s *SyncService) resolveAddresses() error {
 		return errors.New("Must initialize eth rpc client first")
 	}
 	resolver, err := addressmanager.NewLibAddressManager(s.AddressResolverAddress, s.ethrpcclient)
+	if err != nil {
+		return fmt.Errorf("Cannot create new address manager: %w", err)
+	}
 	// TODO(mark): using the correct block height is a consensus critical thing.
 	// Be sure to use the correct height by setting BlockNumber in the context
 	opts := bind.CallOpts{Context: s.ctx}

rollup/sync_service_test.go

@@ -382,7 +382,7 @@ func TestSyncServiceSequencerBatchAppend(t *testing.T) {
 	count := 0
 	for _, transactions := range queued {
 		// This stuff should match ctcTx.tx
-		for _, _ = range transactions {
+		for range transactions {
 			count++
 		}
 	}