Allow pruning to multiple targets, including without snapshots

cmd/geth/snapshot.go

@@ -179,15 +179,16 @@ func pruneState(ctx *cli.Context) error {
 		log.Error("Too many arguments given")
 		return errors.New("too many arguments")
 	}
-	var targetRoot common.Hash
+	var targetRoots []common.Hash
 	if ctx.NArg() == 1 {
-		targetRoot, err = parseRoot(ctx.Args().First())
+		root, err := parseRoot(ctx.Args().First())
 		if err != nil {
 			log.Error("Failed to resolve state root", "err", err)
 			return err
 		}
+		targetRoots = append(targetRoots, root)
 	}
-	if err = pruner.Prune(targetRoot); err != nil {
+	if err = pruner.Prune(targetRoots); err != nil {
 		log.Error("Failed to prune state", "err", err)
 		return err
 	}

core/blockchain.go

@@ -647,6 +647,13 @@ func (bc *BlockChain) setHeadBeyondRoot(head uint64, root common.Hash, repair bo
 							// if the historical chain pruning is enabled. In that case the logic
 							// needs to be improved here.
 							if !bc.HasState(bc.genesisBlock.Root()) {
+								// Arbitrum: we have a later block with state; use that instead.
+								if lastFullBlock != 0 {
+									blockNumber = lastFullBlock
+									newHeadBlock = bc.GetBlock(lastFullBlockHash, lastFullBlock)
+									log.Debug("Rewound to block with state but not snapshot", "number", newHeadBlock.NumberU64(), "hash", newHeadBlock.Hash())
+									break
+								}
 								if err := CommitGenesisState(bc.db, bc.genesisBlock.Hash()); err != nil {
 									log.Crit("Failed to commit genesis state", "err", err)
 								}