Merge branch 'develop' of https://github.com/epociask/optimism into indexer.l1height-param

7eb17ec9 · Ethen Pociask · 40140a6f · 07a461c3 · 7eb17ec9 · 7eb17ec9
Commit 7eb17ec9 authored Aug 19, 2023 by Ethen Pociask
14 changed files
--- a/.changeset/tame-doors-invite.md
+++ b/.changeset/tame-doors-invite.md
+---
+'@eth-optimism/common-ts': patch
+---
+Updated npm dependencies of common-ts
--- a/op-challenger/fault/cannon/provider.go
+++ b/op-challenger/fault/cannon/provider.go
@@ -50,17 +50,17 @@ type CannonTraceProvider struct {
 	lastProof *proofData
 }
-func NewTraceProvider(ctx context.Context, logger log.Logger, cfg *config.Config, l1Client bind.ContractCaller) (*CannonTraceProvider, error) {
+func NewTraceProvider(ctx context.Context, logger log.Logger, cfg *config.Config, l1Client bind.ContractCaller, gameAddr common.Address) (*CannonTraceProvider, error) {
 	l2Client, err := ethclient.DialContext(ctx, cfg.CannonL2)
 	if err != nil {
 		return nil, fmt.Errorf("dial l2 client %v: %w", cfg.CannonL2, err)
 	}
 	defer l2Client.Close() // Not needed after fetching the inputs
-	gameCaller, err := bindings.NewFaultDisputeGameCaller(cfg.GameAddress, l1Client)
+	gameCaller, err := bindings.NewFaultDisputeGameCaller(gameAddr, l1Client)
 	if err != nil {
-		return nil, fmt.Errorf("create caller for game %v: %w", cfg.GameAddress, err)
+		return nil, fmt.Errorf("create caller for game %v: %w", gameAddr, err)
 	}
-	localInputs, err := fetchLocalInputs(ctx, cfg.GameAddress, gameCaller, l2Client)
+	localInputs, err := fetchLocalInputs(ctx, gameAddr, gameCaller, l2Client)
 	if err != nil {
 		return nil, fmt.Errorf("fetch local game inputs: %w", err)
 	}

--- a/op-challenger/fault/factory.go
+++ b/op-challenger/fault/factory.go
@@ -31,11 +31,6 @@ type FaultDisputeGame struct {
 	Proxy     common.Address
 }
-// GameLoader is a minimal interface for fetching on chain dispute games.
-type GameLoader interface {
-	FetchAllGamesAtBlock(ctx context.Context) ([]FaultDisputeGame, error)
-}
 type gameLoader struct {
 	caller MinimalDisputeGameFactoryCaller
 }

--- a/op-challenger/fault/game.go
+++ b/op-challenger/fault/game.go
+package fault
+import (
+	"context"
+	"fmt"
+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-challenger/config"
+	"github.com/ethereum-optimism/optimism/op-challenger/fault/alphabet"
+	"github.com/ethereum-optimism/optimism/op-challenger/fault/cannon"
+	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-service/txmgr"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+)
+type Actor interface {
+	Act(ctx context.Context) error
+}
+type GameInfo interface {
+	GetGameStatus(context.Context) (types.GameStatus, error)
+	LogGameInfo(ctx context.Context)
+}
+type GamePlayer struct {
+	agent                   Actor
+	agreeWithProposedOutput bool
+	caller                  GameInfo
+	logger                  log.Logger
+}
+func NewGamePlayer(
+	ctx context.Context,
+	logger log.Logger,
+	cfg *config.Config,
+	addr common.Address,
+	txMgr txmgr.TxManager,
+	client *ethclient.Client,
+) (*GamePlayer, error) {
+	logger = logger.New("game", addr)
+	contract, err := bindings.NewFaultDisputeGameCaller(addr, client)
+	if err != nil {
+		return nil, fmt.Errorf("failed to bind the fault dispute game contract: %w", err)
+	}
+	loader := NewLoader(contract)
+	gameDepth, err := loader.FetchGameDepth(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch the game depth: %w", err)
+	}
+	var provider types.TraceProvider
+	var updater types.OracleUpdater
+	switch cfg.TraceType {
+	case config.TraceTypeCannon:
+		provider, err = cannon.NewTraceProvider(ctx, logger, cfg, client, addr)
+		if err != nil {
+			return nil, fmt.Errorf("create cannon trace provider: %w", err)
+		}
+		updater, err = cannon.NewOracleUpdater(ctx, logger, txMgr, addr, client)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create the cannon updater: %w", err)
+		}
+	case config.TraceTypeAlphabet:
+		provider = alphabet.NewTraceProvider(cfg.AlphabetTrace, gameDepth)
+		updater = alphabet.NewOracleUpdater(logger)
+	default:
+		return nil, fmt.Errorf("unsupported trace type: %v", cfg.TraceType)
+	}
+	if err := ValidateAbsolutePrestate(ctx, provider, loader); err != nil {
+		return nil, fmt.Errorf("failed to validate absolute prestate: %w", err)
+	}
+	responder, err := NewFaultResponder(logger, txMgr, addr)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create the responder: %w", err)
+	}
+	caller, err := NewFaultCallerFromBindings(addr, client, logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to bind the fault contract: %w", err)
+	}
+	return &GamePlayer{
+		agent:                   NewAgent(loader, int(gameDepth), provider, responder, updater, cfg.AgreeWithProposedOutput, logger),
+		agreeWithProposedOutput: cfg.AgreeWithProposedOutput,
+		caller:                  caller,
+		logger:                  logger,
+	}, nil
+}
+func (g *GamePlayer) ProgressGame(ctx context.Context) bool {
+	g.logger.Trace("Checking if actions are required")
+	if err := g.agent.Act(ctx); err != nil {
+		g.logger.Error("Error when acting on game", "err", err)
+	}
+	if status, err := g.caller.GetGameStatus(ctx); err != nil {
+		g.logger.Warn("Unable to retrieve game status", "err", err)
+	} else if status != 0 {
+		var expectedStatus types.GameStatus
+		if g.agreeWithProposedOutput {
+			expectedStatus = types.GameStatusChallengerWon
+		} else {
+			expectedStatus = types.GameStatusDefenderWon
+		}
+		if expectedStatus == status {
+			g.logger.Info("Game won", "status", status)
+		} else {
+			g.logger.Error("Game lost", "status", status)
+		}
+		return true
+	} else {
+		g.caller.LogGameInfo(ctx)
+	}
+	return false
+}
--- a/op-challenger/fault/game_test.go
+++ b/op-challenger/fault/game_test.go
+package fault
+import (
+	"context"
+	"errors"
+	"testing"
+	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
+	"github.com/ethereum-optimism/optimism/op-node/testlog"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/stretchr/testify/require"
+)
+func TestProgressGameAndLogState(t *testing.T) {
+	_, game, actor, gameInfo := setupProgressGameTest(t, true)
+	done := game.ProgressGame(context.Background())
+	require.False(t, done, "should not be done")
+	require.Equal(t, 1, actor.callCount, "should perform next actions")
+	require.Equal(t, 1, gameInfo.logCount, "should log latest game state")
+}
+func TestProgressGame_LogErrorFromAct(t *testing.T) {
+	handler, game, actor, gameInfo := setupProgressGameTest(t, true)
+	actor.err = errors.New("boom")
+	done := game.ProgressGame(context.Background())
+	require.False(t, done, "should not be done")
+	require.Equal(t, 1, actor.callCount, "should perform next actions")
+	require.Equal(t, 1, gameInfo.logCount, "should log latest game state")
+	errLog := handler.FindLog(log.LvlError, "Error when acting on game")
+	require.NotNil(t, errLog, "should log error")
+	require.Equal(t, actor.err, errLog.GetContextValue("err"))
+}
+func TestProgressGame_LogErrorWhenGameLost(t *testing.T) {
+	tests := []struct {
+		name            string
+		status          types.GameStatus
+		agreeWithOutput bool
+		logLevel        log.Lvl
+		logMsg          string
+	}{
+		{
+			name:            "GameLostAsDefender",
+			status:          types.GameStatusChallengerWon,
+			agreeWithOutput: false,
+			logLevel:        log.LvlError,
+			logMsg:          "Game lost",
+		},
+		{
+			name:            "GameLostAsChallenger",
+			status:          types.GameStatusDefenderWon,
+			agreeWithOutput: true,
+			logLevel:        log.LvlError,
+			logMsg:          "Game lost",
+		},
+		{
+			name:            "GameWonAsDefender",
+			status:          types.GameStatusDefenderWon,
+			agreeWithOutput: false,
+			logLevel:        log.LvlInfo,
+			logMsg:          "Game won",
+		},
+		{
+			name:            "GameWonAsChallenger",
+			status:          types.GameStatusChallengerWon,
+			agreeWithOutput: true,
+			logLevel:        log.LvlInfo,
+			logMsg:          "Game won",
+		},
+	}
+	for _, test := range tests {
+		test := test
+		t.Run(test.name, func(t *testing.T) {
+			handler, game, _, gameInfo := setupProgressGameTest(t, test.agreeWithOutput)
+			gameInfo.status = test.status
+			done := game.ProgressGame(context.Background())
+			require.True(t, done, "should be done")
+			require.Equal(t, 0, gameInfo.logCount, "should not log latest game state")
+			errLog := handler.FindLog(test.logLevel, test.logMsg)
+			require.NotNil(t, errLog, "should log game result")
+			require.Equal(t, test.status, errLog.GetContextValue("status"))
+		})
+	}
+}
+func setupProgressGameTest(t *testing.T, agreeWithProposedRoot bool) (*testlog.CapturingHandler, *GamePlayer, *stubActor, *stubGameInfo) {
+	logger := testlog.Logger(t, log.LvlDebug)
+	handler := &testlog.CapturingHandler{
+		Delegate: logger.GetHandler(),
+	}
+	logger.SetHandler(handler)
+	actor := &stubActor{}
+	gameInfo := &stubGameInfo{}
+	game := &GamePlayer{
+		agent:                   actor,
+		agreeWithProposedOutput: agreeWithProposedRoot,
+		caller:                  gameInfo,
+		logger:                  logger,
+	}
+	return handler, game, actor, gameInfo
+}
+type stubActor struct {
+	callCount int
+	err       error
+}
+func (a *stubActor) Act(ctx context.Context) error {
+	a.callCount++
+	return a.err
+}
+type stubGameInfo struct {
+	status   types.GameStatus
+	err      error
+	logCount int
+}
+func (s *stubGameInfo) GetGameStatus(ctx context.Context) (types.GameStatus, error) {
+	return s.status, s.err
+}
+func (s *stubGameInfo) LogGameInfo(ctx context.Context) {
+	s.logCount++
+}
--- a/op-challenger/fault/monitor.go
+++ b/op-challenger/fault/monitor.go
@@ -2,63 +2,95 @@ package fault
 import (
 	"context"
+	"fmt"
+	"math/big"
 	"time"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
 )
-type GameInfo interface {
+type gamePlayer interface {
-	GetGameStatus(context.Context) (types.GameStatus, error)
+	ProgressGame(ctx context.Context) bool
-	LogGameInfo(ctx context.Context)
 }
-type Actor interface {
+type playerCreator func(address common.Address) (gamePlayer, error)
-	Act(ctx context.Context) error
+type blockNumberFetcher func(ctx context.Context) (uint64, error)
+// gameSource loads information about the games available to play
+type gameSource interface {
+	FetchAllGamesAtBlock(ctx context.Context, blockNumber *big.Int) ([]FaultDisputeGame, error)
 }
-func MonitorGame(ctx context.Context, logger log.Logger, agreeWithProposedOutput bool, actor Actor, caller GameInfo) error {
+type gameMonitor struct {
-	logger.Info("Monitoring fault dispute game", "agreeWithOutput", agreeWithProposedOutput)
+	logger           log.Logger
+	source           gameSource
+	createPlayer     playerCreator
+	fetchBlockNumber blockNumberFetcher
+	allowedGame      common.Address
+	players          map[common.Address]gamePlayer
+}
-	for {
+func newGameMonitor(logger log.Logger, fetchBlockNumber blockNumberFetcher, allowedGame common.Address, source gameSource, createGame playerCreator) *gameMonitor {
-		done := progressGame(ctx, logger, agreeWithProposedOutput, actor, caller)
+	return &gameMonitor{
-		if done {
+		logger:           logger,
-			return nil
+		source:           source,
+		createPlayer:     createGame,
+		fetchBlockNumber: fetchBlockNumber,
+		allowedGame:      allowedGame,
+		players:          make(map[common.Address]gamePlayer),
+	}
+}
+func (m *gameMonitor) progressGames(ctx context.Context) error {
+	blockNum, err := m.fetchBlockNumber(ctx)
+	if err != nil {
+		return fmt.Errorf("failed to load current block number: %w", err)
+	}
+	games, err := m.source.FetchAllGamesAtBlock(ctx, new(big.Int).SetUint64(blockNum))
+	if err != nil {
+		return fmt.Errorf("failed to load games: %w", err)
+	}
+	for _, game := range games {
+		if m.allowedGame != (common.Address{}) && m.allowedGame != game.Proxy {
+			m.logger.Debug("Skipping game not on allow list", "game", game.Proxy)
+			continue
 		}
-		select {
+		player, err := m.fetchOrCreateGamePlayer(game)
-		case <-time.After(300 * time.Millisecond):
+		if err != nil {
-		// Continue
+			m.logger.Error("Error while progressing game", "game", game.Proxy, "err", err)
-		case <-ctx.Done():
+			continue
-			return ctx.Err()
 		}
+		player.ProgressGame(ctx)
 	}
+	return nil
 }
-// progressGame checks the current state of the game, and attempts to progress it by performing moves, steps or resolving
+func (m *gameMonitor) fetchOrCreateGamePlayer(gameData FaultDisputeGame) (gamePlayer, error) {
-// Returns true if the game is complete or false if it needs to be monitored further
+	if player, ok := m.players[gameData.Proxy]; ok {
-func progressGame(ctx context.Context, logger log.Logger, agreeWithProposedOutput bool, actor Actor, caller GameInfo) bool {
+		return player, nil
-	logger.Trace("Checking if actions are required")
+	}
-	if err := actor.Act(ctx); err != nil {
+	player, err := m.createPlayer(gameData.Proxy)
-		logger.Error("Error when acting on game", "err", err)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create game player %v: %w", gameData.Proxy, err)
 	}
-	if status, err := caller.GetGameStatus(ctx); err != nil {
+	m.players[gameData.Proxy] = player
-		logger.Warn("Unable to retrieve game status", "err", err)
+	return player, nil
-	} else if status != 0 {
+}
-		var expectedStatus types.GameStatus
-		if agreeWithProposedOutput {
+func (m *gameMonitor) MonitorGames(ctx context.Context) error {
-			expectedStatus = types.GameStatusChallengerWon
+	m.logger.Info("Monitoring fault dispute games")
-		} else {
-			expectedStatus = types.GameStatusDefenderWon
+	for {
+		err := m.progressGames(ctx)
+		if err != nil {
+			m.logger.Error("Failed to progress games", "err", err)
 		}
-		if expectedStatus == status {
+		select {
-			logger.Info("Game won", "status", status)
+		case <-time.After(300 * time.Millisecond):
-		} else {
+		// Continue
-			logger.Error("Game lost", "status", status)
+		case <-ctx.Done():
+			return ctx.Err()
 		}
-		return true
-	} else {
-		caller.LogGameInfo(ctx)
 	}
-	return false
 }
--- a/op-challenger/fault/monitor_test.go
+++ b/op-challenger/fault/monitor_test.go
@@ -2,130 +2,123 @@ package fault
 import (
 	"context"
-	"errors"
+	"math/big"
 	"testing"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
 	"github.com/ethereum-optimism/optimism/op-node/testlog"
 )
 func TestMonitorExitsWhenContextDone(t *testing.T) {
-	logger := testlog.Logger(t, log.LvlDebug)
+	monitor, _, _ := setupMonitorTest(t, common.Address{})
-	actor := &stubActor{}
-	gameInfo := &stubGameInfo{}
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel()
-	err := MonitorGame(ctx, logger, true, actor, gameInfo)
+	err := monitor.MonitorGames(ctx)
 	require.ErrorIs(t, err, context.Canceled)
 }
-func TestProgressGameAndLogState(t *testing.T) {
+func TestMonitorCreateAndProgressGameAgents(t *testing.T) {
-	logger, _, actor, gameInfo := setupProgressGameTest(t)
+	monitor, source, games := setupMonitorTest(t, common.Address{})
-	done := progressGame(context.Background(), logger, true, actor, gameInfo)
-	require.False(t, done, "should not be done")
-	require.Equal(t, 1, actor.callCount, "should perform next actions")
-	require.Equal(t, 1, gameInfo.logCount, "should log latest game state")
-}
-func TestProgressGame_LogErrorFromAct(t *testing.T) {
+	addr1 := common.Address{0xaa}
-	logger, handler, actor, gameInfo := setupProgressGameTest(t)
+	addr2 := common.Address{0xbb}
-	actor.err = errors.New("Boom")
+	source.games = []FaultDisputeGame{
-	done := progressGame(context.Background(), logger, true, actor, gameInfo)
-	require.False(t, done, "should not be done")
-	require.Equal(t, 1, actor.callCount, "should perform next actions")
-	require.Equal(t, 1, gameInfo.logCount, "should log latest game state")
-	errLog := handler.FindLog(log.LvlError, "Error when acting on game")
-	require.NotNil(t, errLog, "should log error")
-	require.Equal(t, actor.err, errLog.GetContextValue("err"))
-}
-func TestProgressGame_LogErrorWhenGameLost(t *testing.T) {
-	tests := []struct {
-		name            string
-		status          types.GameStatus
-		agreeWithOutput bool
-		logLevel        log.Lvl
-		logMsg          string
-	}{
 		{
-			name:            "GameLostAsDefender",
+			Proxy:     addr1,
-			status:          types.GameStatusChallengerWon,
+			Timestamp: 9999,
-			agreeWithOutput: false,
-			logLevel:        log.LvlError,
-			logMsg:          "Game lost",
 		},
 		{
-			name:            "GameLostAsChallenger",
+			Proxy:     addr2,
-			status:          types.GameStatusDefenderWon,
+			Timestamp: 9999,
-			agreeWithOutput: true,
-			logLevel:        log.LvlError,
-			logMsg:          "Game lost",
 		},
+	}
+	err := monitor.progressGames(context.Background())
+	require.NoError(t, err)
+	require.Len(t, games.created, 2, "should create game agents")
+	require.Contains(t, games.created, addr1)
+	require.Contains(t, games.created, addr2)
+	require.Equal(t, 1, games.created[addr1].progressCount)
+	require.Equal(t, 1, games.created[addr2].progressCount)
+	// The stub will fail the test if a game is created with the same address multiple times
+	require.NoError(t, monitor.progressGames(context.Background()), "should only create games once")
+	require.Equal(t, 2, games.created[addr1].progressCount)
+	require.Equal(t, 2, games.created[addr2].progressCount)
+}
+func TestMonitorOnlyCreateSpecifiedGame(t *testing.T) {
+	addr1 := common.Address{0xaa}
+	addr2 := common.Address{0xbb}
+	monitor, source, games := setupMonitorTest(t, addr2)
+	source.games = []FaultDisputeGame{
 		{
-			name:            "GameWonAsDefender",
+			Proxy:     addr1,
-			status:          types.GameStatusDefenderWon,
+			Timestamp: 9999,
-			agreeWithOutput: false,
-			logLevel:        log.LvlInfo,
-			logMsg:          "Game won",
 		},
 		{
-			name:            "GameWonAsChallenger",
+			Proxy:     addr2,
-			status:          types.GameStatusChallengerWon,
+			Timestamp: 9999,
-			agreeWithOutput: true,
-			logLevel:        log.LvlInfo,
-			logMsg:          "Game won",
 		},
 	}
-	for _, test := range tests {
-		test := test
+	err := monitor.progressGames(context.Background())
-		t.Run(test.name, func(t *testing.T) {
+	require.NoError(t, err)
-			logger, handler, actor, gameInfo := setupProgressGameTest(t)
-			gameInfo.status = test.status
+	require.Len(t, games.created, 1, "should only create allowed game")
+	require.Contains(t, games.created, addr2)
-			done := progressGame(context.Background(), logger, test.agreeWithOutput, actor, gameInfo)
+	require.NotContains(t, games.created, addr1)
-			require.True(t, done, "should be done")
+	require.Equal(t, 1, games.created[addr2].progressCount)
-			require.Equal(t, 0, gameInfo.logCount, "should not log latest game state")
-			errLog := handler.FindLog(test.logLevel, test.logMsg)
-			require.NotNil(t, errLog, "should log game result")
-			require.Equal(t, test.status, errLog.GetContextValue("status"))
-		})
-	}
 }
-func setupProgressGameTest(t *testing.T) (log.Logger, *testlog.CapturingHandler, *stubActor, *stubGameInfo) {
+func setupMonitorTest(t *testing.T, allowedGame common.Address) (*gameMonitor, *stubGameSource, *createdGames) {
 	logger := testlog.Logger(t, log.LvlDebug)
-	handler := &testlog.CapturingHandler{
+	source := &stubGameSource{}
-		Delegate: logger.GetHandler(),
+	games := &createdGames{
+		t:       t,
+		created: make(map[common.Address]*stubGame),
 	}
-	logger.SetHandler(handler)
+	fetchBlockNum := func(ctx context.Context) (uint64, error) {
-	actor := &stubActor{}
+		return 1234, nil
-	gameInfo := &stubGameInfo{}
+	}
-	return logger, handler, actor, gameInfo
+	monitor := newGameMonitor(logger, fetchBlockNum, allowedGame, source, games.CreateGame)
+	return monitor, source, games
+}
+type stubGameSource struct {
+	games []FaultDisputeGame
 }
-type stubActor struct {
+func (s *stubGameSource) FetchAllGamesAtBlock(ctx context.Context, blockNumber *big.Int) ([]FaultDisputeGame, error) {
-	callCount int
+	return s.games, nil
-	err       error
 }
-func (a *stubActor) Act(ctx context.Context) error {
+type stubGame struct {
-	a.callCount++
+	addr          common.Address
-	return a.err
+	progressCount int
+	done          bool
 }
-type stubGameInfo struct {
+func (g *stubGame) ProgressGame(ctx context.Context) bool {
-	status   types.GameStatus
+	g.progressCount++
-	err      error
+	return g.done
-	logCount int
 }
-func (s *stubGameInfo) GetGameStatus(ctx context.Context) (types.GameStatus, error) {
+type createdGames struct {
-	return s.status, s.err
+	t       *testing.T
+	created map[common.Address]*stubGame
 }
-func (s *stubGameInfo) LogGameInfo(ctx context.Context) {
+func (c *createdGames) CreateGame(addr common.Address) (gamePlayer, error) {
-	s.logCount++
+	if _, exists := c.created[addr]; exists {
+		c.t.Fatalf("game %v already exists", addr)
+	}
+	game := &stubGame{addr: addr}
+	c.created[addr] = game
+	return game, nil
 }
--- a/op-challenger/fault/service.go
+++ b/op-challenger/fault/service.go
@@ -7,14 +7,12 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
 	"github.com/ethereum-optimism/optimism/op-challenger/config"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/alphabet"
-	"github.com/ethereum-optimism/optimism/op-challenger/fault/cannon"
 	"github.com/ethereum-optimism/optimism/op-challenger/fault/types"
 	"github.com/ethereum-optimism/optimism/op-service/client"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr"
 	"github.com/ethereum-optimism/optimism/op-service/txmgr/metrics"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 )
@@ -26,10 +24,8 @@ type Service interface {
 }
 type service struct {
-	agent                   *Agent
+	logger  log.Logger
-	agreeWithProposedOutput bool
+	monitor *gameMonitor
-	caller                  *FaultCaller
-	logger                  log.Logger
 }
 // NewService creates a new Service.
@@ -44,63 +40,18 @@ func NewService(ctx context.Context, logger log.Logger, cfg *config.Config) (*se
 		return nil, fmt.Errorf("failed to dial L1: %w", err)
 	}
-	contract, err := bindings.NewFaultDisputeGameCaller(cfg.GameAddress, client)
+	factory, err := bindings.NewDisputeGameFactory(cfg.GameFactoryAddress, client)
 	if err != nil {
-		return nil, fmt.Errorf("failed to bind the fault dispute game contract: %w", err)
+		return nil, fmt.Errorf("failed to bind the fault dispute game factory contract: %w", err)
-	}
-	loader := NewLoader(contract)
-	gameDepth, err := loader.FetchGameDepth(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to fetch the game depth: %w", err)
-	}
-	gameDepth = uint64(gameDepth)
-	var trace types.TraceProvider
-	var updater types.OracleUpdater
-	switch cfg.TraceType {
-	case config.TraceTypeCannon:
-		trace, err = cannon.NewTraceProvider(ctx, logger, cfg, client)
-		if err != nil {
-			return nil, fmt.Errorf("create cannon trace provider: %w", err)
-		}
-		updater, err = cannon.NewOracleUpdater(ctx, logger, txMgr, cfg.GameAddress, client)
-		if err != nil {
-			return nil, fmt.Errorf("failed to create the cannon updater: %w", err)
-		}
-	case config.TraceTypeAlphabet:
-		trace = alphabet.NewTraceProvider(cfg.AlphabetTrace, gameDepth)
-		updater = alphabet.NewOracleUpdater(logger)
-	default:
-		return nil, fmt.Errorf("unsupported trace type: %v", cfg.TraceType)
-	}
-	return newTypedService(ctx, logger, cfg, loader, gameDepth, client, trace, updater, txMgr)
-}
-// newTypedService creates a new Service from a provided trace provider.
-func newTypedService(ctx context.Context, logger log.Logger, cfg *config.Config, loader Loader, gameDepth uint64, client *ethclient.Client, provider types.TraceProvider, updater types.OracleUpdater, txMgr txmgr.TxManager) (*service, error) {
-	if err := ValidateAbsolutePrestate(ctx, provider, loader); err != nil {
-		return nil, fmt.Errorf("failed to validate absolute prestate: %w", err)
-	}
-	gameLogger := logger.New("game", cfg.GameAddress)
-	responder, err := NewFaultResponder(gameLogger, txMgr, cfg.GameAddress)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create the responder: %w", err)
-	}
-	caller, err := NewFaultCallerFromBindings(cfg.GameAddress, client, gameLogger)
-	if err != nil {
-		return nil, fmt.Errorf("failed to bind the fault contract: %w", err)
 	}
+	loader := NewGameLoader(factory)
+	monitor := newGameMonitor(logger, client.BlockNumber, cfg.GameAddress, loader, func(addr common.Address) (gamePlayer, error) {
+		return NewGamePlayer(ctx, logger, cfg, addr, txMgr, client)
+	})
 	return &service{
-		agent:                   NewAgent(loader, int(gameDepth), provider, responder, updater, cfg.AgreeWithProposedOutput, gameLogger),
+		monitor: monitor,
-		agreeWithProposedOutput: cfg.AgreeWithProposedOutput,
+		logger:  logger,
-		caller:                  caller,
-		logger:                  gameLogger,
 	}, nil
 }
@@ -123,5 +74,5 @@ func ValidateAbsolutePrestate(ctx context.Context, trace types.TraceProvider, lo
 // MonitorGame monitors the fault dispute game and attempts to progress it.
 func (s *service) MonitorGame(ctx context.Context) error {
-	return MonitorGame(ctx, s.logger, s.agreeWithProposedOutput, s.agent, s.caller)
+	return s.monitor.MonitorGames(ctx)
 }
--- a/op-e2e/e2eutils/disputegame/cannon_helper.go
+++ b/op-e2e/e2eutils/disputegame/cannon_helper.go
@@ -38,7 +38,7 @@ func (g *CannonGameHelper) CreateHonestActor(ctx context.Context, rollupCfg *rol
 	}
 	opts = append(opts, options...)
 	cfg := challenger.NewChallengerConfig(g.t, l1Endpoint, opts...)
-	provider, err := cannon.NewTraceProvider(ctx, testlog.Logger(g.t, log.LvlInfo).New("role", "CorrectTrace"), cfg, l1Client)
+	provider, err := cannon.NewTraceProvider(ctx, testlog.Logger(g.t, log.LvlInfo).New("role", "CorrectTrace"), cfg, l1Client, g.addr)
 	g.require.NoError(err, "create cannon trace provider")
 	return &HonestHelper{

--- a/op-e2e/faultproof_test.go
+++ b/op-e2e/faultproof_test.go
@@ -12,8 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
-func TestCannonMultipleGames(t *testing.T) {
+func TestMultipleAlphabetGames(t *testing.T) {
-	t.Skip("Challenger doesn't yet support multiple games")
 	InitParallel(t)
 	ctx := context.Background()
@@ -41,6 +40,13 @@ func TestCannonMultipleGames(t *testing.T) {
 	game2.WaitForClaimCount(ctx, 4)
 	game1.Defend(ctx, 1, common.Hash{0xaa})
 	game1.WaitForClaimCount(ctx, 4)
+	gameDuration := game1.GameDuration(ctx)
+	sys.TimeTravelClock.AdvanceTime(gameDuration)
+	require.NoError(t, wait.ForNextBlock(ctx, l1Client))
+	game1.WaitForGameStatus(ctx, disputegame.StatusChallengerWins)
+	game2.WaitForGameStatus(ctx, disputegame.StatusChallengerWins)
 }
 func TestMultipleCannonGames(t *testing.T) {

--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
    "mocha": "^10.2.0",
    "nx": "16.7.1",
    "nyc": "^15.1.0",
-    "patch-package": "^6.4.7",
+    "patch-package": "^8.0.0",
    "prettier": "^2.8.0",
    "prettier-plugin-solidity": "^1.0.0-beta.13",
    "rimraf": "^5.0.1",

--- a/packages/common-ts/package.json
+++ b/packages/common-ts/package.json
@@ -34,31 +34,31 @@
    "url": "https://github.com/ethereum-optimism/optimism.git"
  },
  "dependencies": {
-    "@eth-optimism/core-utils": "0.12.3",
+    "@eth-optimism/core-utils": "workspace:*",
-    "@sentry/node": "^6.3.1",
+    "@sentry/node": "^7.64.0",
-    "bcfg": "^0.1.7",
+    "bcfg": "^0.2.1",
-    "body-parser": "^1.20.0",
+    "body-parser": "^1.20.2",
-    "commander": "^9.0.0",
+    "commander": "^11.0.0",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.3.1",
-    "envalid": "^7.2.2",
+    "envalid": "^7.3.1",
-    "ethers": "^5.7.0",
+    "ethers": "^5.7.2",
-    "express": "^4.17.1",
+    "express": "^4.18.2",
-    "express-prom-bundle": "^6.4.1",
+    "express-prom-bundle": "^6.6.0",
    "lodash": "^4.17.21",
    "morgan": "^1.10.0",
    "pino": "^8.15.0",
-    "pino-multi-stream": "^5.3.0",
+    "pino-multi-stream": "^6.0.0",
    "pino-sentry": "^0.14.0",
-    "prom-client": "^13.1.0"
+    "prom-client": "^14.2.0"
  },
  "devDependencies": {
    "@ethersproject/abstract-provider": "^5.7.0",
    "@ethersproject/abstract-signer": "^5.7.0",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.17",
-    "@types/morgan": "^1.9.3",
+    "@types/morgan": "^1.9.4",
-    "@types/pino": "^6.3.6",
+    "@types/pino": "^7.0.5",
-    "@types/pino-multi-stream": "^5.1.1",
+    "@types/pino-multi-stream": "^5.1.3",
-    "chai": "^4.3.4",
+    "chai": "^4.3.7",
-    "supertest": "^6.1.4"
+    "supertest": "^6.3.3"
  }
 }
--- a/packages/common-ts/tsconfig.json
+++ b/packages/common-ts/tsconfig.json
 {
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "rootDir": "./src",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "skipLibCheck": true
  },
  "include": [

--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -115,8 +115,8 @@ importers:
        specifier: ^15.1.0
        version: 15.1.0
      patch-package:
-        specifier: ^6.4.7
+        specifier: ^8.0.0
-        version: 6.4.7
+        version: 8.0.0
      prettier:
        specifier: ^2.8.0
        version: 2.8.8
@@ -192,35 +192,35 @@ importers:
  packages/common-ts:
    dependencies:
      '@eth-optimism/core-utils':
-        specifier: 0.12.3
+        specifier: workspace:*
        version: link:../core-utils
      '@sentry/node':
-        specifier: ^6.3.1
+        specifier: ^7.64.0
-        version: 6.11.0
+        version: 7.64.0
      bcfg:
-        specifier: ^0.1.7
+        specifier: ^0.2.1
-        version: 0.1.7
+        version: 0.2.1
      body-parser:
-        specifier: ^1.20.0
+        specifier: ^1.20.2
-        version: 1.20.0
+        version: 1.20.2
      commander:
-        specifier: ^9.0.0
+        specifier: ^11.0.0
-        version: 9.0.0
+        version: 11.0.0
      dotenv:
-        specifier: ^16.0.0
+        specifier: ^16.3.1
-        version: 16.0.0
+        version: 16.3.1
      envalid:
-        specifier: ^7.2.2
+        specifier: ^7.3.1
-        version: 7.2.2
+        version: 7.3.1
      ethers:
-        specifier: ^5.7.0
+        specifier: ^5.7.2
-        version: 5.7.1
+        version: 5.7.2
      express:
-        specifier: ^4.17.1
+        specifier: ^4.18.2
-        version: 4.17.1
+        version: 4.18.2
      express-prom-bundle:
-        specifier: ^6.4.1
+        specifier: ^6.6.0
-        version: 6.4.1(prom-client@13.2.0)
+        version: 6.6.0(prom-client@14.2.0)
      lodash:
        specifier: ^4.17.21
        version: 4.17.21
@@ -231,14 +231,14 @@ importers:
        specifier: ^8.15.0
        version: 8.15.0
      pino-multi-stream:
-        specifier: ^5.3.0
+        specifier: ^6.0.0
-        version: 5.3.0
+        version: 6.0.0
      pino-sentry:
        specifier: ^0.14.0
        version: 0.14.0
      prom-client:
-        specifier: ^13.1.0
+        specifier: ^14.2.0
-        version: 13.2.0
+        version: 14.2.0
    devDependencies:
      '@ethersproject/abstract-provider':
        specifier: ^5.7.0
@@ -247,23 +247,23 @@ importers:
        specifier: ^5.7.0
        version: 5.7.0
      '@types/express':
-        specifier: ^4.17.13
+        specifier: ^4.17.17
-        version: 4.17.13
+        version: 4.17.17
      '@types/morgan':
-        specifier: ^1.9.3
+        specifier: ^1.9.4
-        version: 1.9.3
+        version: 1.9.4
      '@types/pino':
-        specifier: ^6.3.6
+        specifier: ^7.0.5
-        version: 6.3.11
+        version: 7.0.5
      '@types/pino-multi-stream':
-        specifier: ^5.1.1
+        specifier: ^5.1.3
-        version: 5.1.2
+        version: 5.1.3
      chai:
-        specifier: ^4.3.4
+        specifier: ^4.3.7
-        version: 4.3.4
+        version: 4.3.7
      supertest:
-        specifier: ^6.1.4
+        specifier: ^6.3.3
-        version: 6.1.6
+        version: 6.3.3
  packages/contracts-bedrock:
    devDependencies:
@@ -2167,34 +2167,6 @@ packages:
    dependencies:
      '@ethersproject/logger': 5.7.0
-  /@ethersproject/providers@5.7.1:
-    resolution: {integrity: sha512-vZveG/DLyo+wk4Ga1yx6jSEHrLPgmTt+dFv0dv8URpVCRf0jVhalps1jq/emN/oXnMRsC7cQgAF32DcXLL7BPQ==}
-    dependencies:
-      '@ethersproject/abstract-provider': 5.7.0
-      '@ethersproject/abstract-signer': 5.7.0
-      '@ethersproject/address': 5.7.0
-      '@ethersproject/base64': 5.7.0
-      '@ethersproject/basex': 5.7.0
-      '@ethersproject/bignumber': 5.7.0
-      '@ethersproject/bytes': 5.7.0
-      '@ethersproject/constants': 5.7.0
-      '@ethersproject/hash': 5.7.0
-      '@ethersproject/logger': 5.7.0
-      '@ethersproject/networks': 5.7.1
-      '@ethersproject/properties': 5.7.0
-      '@ethersproject/random': 5.7.0
-      '@ethersproject/rlp': 5.7.0
-      '@ethersproject/sha2': 5.7.0
-      '@ethersproject/strings': 5.7.0
-      '@ethersproject/transactions': 5.7.0
-      '@ethersproject/web': 5.7.1
-      bech32: 1.1.4
-      ws: 7.4.6
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: false
  /@ethersproject/providers@5.7.2:
    resolution: {integrity: sha512-g34EWZ1WWAVgr4aptGlVBF8mhl3VWjv+8hoAnzStu8Ah22VHBsuGzP17eb6xDVRzw895G4W7vvx60lFFur/1Rg==}
    dependencies:
@@ -3279,6 +3251,16 @@ packages:
      '@noble/hashes': 1.3.1
      '@scure/base': 1.1.1
+  /@sentry-internal/tracing@7.64.0:
+    resolution: {integrity: sha512-1XE8W6ki7hHyBvX9hfirnGkKDBKNq3bDJyXS86E0bYVDl94nvbRM9BD9DHsCFetqYkVm1yDGEK+6aUVs4CztoQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      '@sentry/core': 7.64.0
+      '@sentry/types': 7.64.0
+      '@sentry/utils': 7.64.0
+      tslib: 2.6.0
+    dev: false
  /@sentry/core@5.30.0:
    resolution: {integrity: sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==}
    engines: {node: '>=6'}
@@ -3290,15 +3272,13 @@ packages:
      tslib: 1.14.1
    dev: true
-  /@sentry/core@6.11.0:
+  /@sentry/core@7.64.0:
-    resolution: {integrity: sha512-09TB+f3pqEq8LFahFWHO6I/4DxHo+NcS52OkbWMDqEi6oNZRD7PhPn3i14LfjsYVv3u3AESU8oxSEGbFrr2UjQ==}
+    resolution: {integrity: sha512-IzmEyl5sNG7NyEFiyFHEHC+sizsZp9MEw1+RJRLX6U5RITvcsEgcajSkHQFafaBPzRrcxZMdm47Cwhl212LXcw==}
-    engines: {node: '>=6'}
+    engines: {node: '>=8'}
    dependencies:
-      '@sentry/hub': 6.11.0
+      '@sentry/types': 7.64.0
-      '@sentry/minimal': 6.11.0
+      '@sentry/utils': 7.64.0
-      '@sentry/types': 6.11.0
+      tslib: 2.6.0
-      '@sentry/utils': 6.11.0
-      tslib: 1.14.1
    dev: false
  /@sentry/hub@5.30.0:
@@ -3310,15 +3290,6 @@ packages:
      tslib: 1.14.1
    dev: true
-  /@sentry/hub@6.11.0:
-    resolution: {integrity: sha512-pT9hf+ZJfVFpoZopoC+yJmFNclr4NPqPcl2cgguqCHb69DklD1NxgBNWK8D6X05qjnNFDF991U6t1mxP9HrGuw==}
-    engines: {node: '>=6'}
-    dependencies:
-      '@sentry/types': 6.11.0
-      '@sentry/utils': 6.11.0
-      tslib: 1.14.1
-    dev: false
  /@sentry/minimal@5.30.0:
    resolution: {integrity: sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==}
    engines: {node: '>=6'}
@@ -3328,15 +3299,6 @@ packages:
      tslib: 1.14.1
    dev: true
-  /@sentry/minimal@6.11.0:
-    resolution: {integrity: sha512-XkZ7qrdlGp4IM/gjGxf1Q575yIbl5RvPbg+WFeekpo16Ufvzx37Mr8c2xsZaWosISVyE6eyFpooORjUlzy8EDw==}
-    engines: {node: '>=6'}
-    dependencies:
-      '@sentry/hub': 6.11.0
-      '@sentry/types': 6.11.0
-      tslib: 1.14.1
-    dev: false
  /@sentry/node@5.30.0:
    resolution: {integrity: sha512-Br5oyVBF0fZo6ZS9bxbJZG4ApAjRqAnqFFurMVJJdunNb80brh7a5Qva2kjhm+U6r9NJAB5OmDyPkA1Qnt+QVg==}
    engines: {node: '>=6'}
@@ -3354,19 +3316,18 @@ packages:
      - supports-color
    dev: true
-  /@sentry/node@6.11.0:
+  /@sentry/node@7.64.0:
-    resolution: {integrity: sha512-vbk+V/n7ZIFD8rHPYy03t/gIG5V7LGdjU4qJxVDgNZzticfWPnd2sLgle/r+l60XF6SKW/epG4rnxnBcgPdWaw==}
+    resolution: {integrity: sha512-wRi0uTnp1WSa83X2yLD49tV9QPzGh5e42IKdIDBiQ7lV9JhLILlyb34BZY1pq6p4dp35yDasDrP3C7ubn7wo6A==}
-    engines: {node: '>=6'}
+    engines: {node: '>=8'}
    dependencies:
-      '@sentry/core': 6.11.0
+      '@sentry-internal/tracing': 7.64.0
-      '@sentry/hub': 6.11.0
+      '@sentry/core': 7.64.0
-      '@sentry/tracing': 6.11.0
+      '@sentry/types': 7.64.0
-      '@sentry/types': 6.11.0
+      '@sentry/utils': 7.64.0
-      '@sentry/utils': 6.11.0
      cookie: 0.4.1
-      https-proxy-agent: 5.0.0
+      https-proxy-agent: 5.0.1
      lru_map: 0.3.3
-      tslib: 1.14.1
+      tslib: 2.6.0
    transitivePeerDependencies:
      - supports-color
    dev: false
@@ -3382,25 +3343,14 @@ packages:
      tslib: 1.14.1
    dev: true
-  /@sentry/tracing@6.11.0:
-    resolution: {integrity: sha512-9VA1/SY++WeoMQI4K6n/sYgIdRtCu9NLWqmGqu/5kbOtESYFgAt1DqSyqGCr00ZjQiC2s7tkDkTNZb38K6KytQ==}
-    engines: {node: '>=6'}
-    dependencies:
-      '@sentry/hub': 6.11.0
-      '@sentry/minimal': 6.11.0
-      '@sentry/types': 6.11.0
-      '@sentry/utils': 6.11.0
-      tslib: 1.14.1
-    dev: false
  /@sentry/types@5.30.0:
    resolution: {integrity: sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==}
    engines: {node: '>=6'}
    dev: true
-  /@sentry/types@6.11.0:
+  /@sentry/types@7.64.0:
-    resolution: {integrity: sha512-gm5H9eZhL6bsIy/h3T+/Fzzz2vINhHhqd92CjHle3w7uXdTdFV98i2pDpErBGNTSNzbntqOMifYEB5ENtZAvcg==}
+    resolution: {integrity: sha512-LqjQprWXjUFRmzIlUjyA+KL+38elgIYmAeoDrdyNVh8MK5IC1W2Lh1Q87b4yOiZeMiIhIVNBd7Ecoh2rodGrGA==}
-    engines: {node: '>=6'}
+    engines: {node: '>=8'}
    dev: false
  /@sentry/utils@5.30.0:
@@ -3411,12 +3361,12 @@ packages:
      tslib: 1.14.1
    dev: true
-  /@sentry/utils@6.11.0:
+  /@sentry/utils@7.64.0:
-    resolution: {integrity: sha512-IOvyFHcnbRQxa++jO+ZUzRvFHEJ1cZjrBIQaNVc0IYF0twUOB5PTP6joTcix38ldaLeapaPZ9LGfudbvYvxkdg==}
+    resolution: {integrity: sha512-HRlM1INzK66Gt+F4vCItiwGKAng4gqzCR4C5marsL3qv6SrKH98dQnCGYgXluSWaaa56h97FRQu7TxCk6jkSvQ==}
-    engines: {node: '>=6'}
+    engines: {node: '>=8'}
    dependencies:
-      '@sentry/types': 6.11.0
+      '@sentry/types': 7.64.0
-      tslib: 1.14.1
+      tslib: 2.6.0
    dev: false
  /@sigstore/protobuf-specs@0.1.0:
@@ -3982,19 +3932,20 @@ packages:
    dependencies:
      '@types/ms': 0.7.31
-  /@types/express-serve-static-core@4.17.24:
+  /@types/express-serve-static-core@4.17.35:
-    resolution: {integrity: sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==}
+    resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==}
    dependencies:
      '@types/node': 20.5.0
      '@types/qs': 6.9.7
      '@types/range-parser': 1.2.4
+      '@types/send': 0.17.1
    dev: true
-  /@types/express@4.17.13:
+  /@types/express@4.17.17:
-    resolution: {integrity: sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==}
+    resolution: {integrity: sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==}
    dependencies:
      '@types/body-parser': 1.19.1
-      '@types/express-serve-static-core': 4.17.24
+      '@types/express-serve-static-core': 4.17.35
      '@types/qs': 6.9.7
      '@types/serve-static': 1.13.10
    dev: true
@@ -4095,8 +4046,8 @@ packages:
    resolution: {integrity: sha512-/fvYntiO1GeICvqbQ3doGDIP97vWmvFt83GKguJ6prmQM2iXZfFcq6YE8KteFyRtX2/h5Hf91BYvPodJKFYv5Q==}
    dev: true
-  /@types/morgan@1.9.3:
+  /@types/morgan@1.9.4:
-    resolution: {integrity: sha512-BiLcfVqGBZCyNCnCH3F4o2GmDLrpy0HeBVnNlyZG4fo88ZiE9SoiBe3C+2ezuwbjlEyT+PDZ17//TAlRxAn75Q==}
+    resolution: {integrity: sha512-cXoc4k+6+YAllH3ZHmx4hf7La1dzUk6keTR4bF4b4Sc0mZxU/zK4wO7l+ZzezXm/jkYj/qC+uYGZrarZdIVvyQ==}
    dependencies:
      '@types/node': 20.5.0
    dev: true
@@ -4138,8 +4089,8 @@ packages:
      '@types/node': 20.5.0
    dev: true
-  /@types/pino-multi-stream@5.1.2:
+  /@types/pino-multi-stream@5.1.3:
-    resolution: {integrity: sha512-z52gOj8uq+W/wCPpsUeMzHDt2VRFF9WMtTvk/wnx4q+/4DuIG1qU3TNdac1dlWYBuqdwXriTWGjcVcaSG5WsIA==}
+    resolution: {integrity: sha512-OxIkhBpfXw1q1BkOIkTSrq0YAkOmlSBaZbM5EXjgjTvgNLZLBwC7/+HGVWw7wW5/ofRyNPDg8Ykd/cx4bq69PQ==}
    dependencies:
      '@types/pino': 6.3.11
    dev: true
@@ -4147,7 +4098,7 @@ packages:
  /@types/pino-pretty@4.7.1:
    resolution: {integrity: sha512-l1ntNXdpVWsnPYUk5HyO5Lxfr38zLCgxVfEn/9Zhhm+nGF04/BiIou/m8XPwvoVZLV+livUo79VdHXMJPfUYxA==}
    dependencies:
-      '@types/pino': 6.3.11
+      '@types/pino': 7.0.5
    dev: true
  /@types/pino-std-serializers@2.4.1:
@@ -4162,7 +4113,14 @@ packages:
      '@types/node': 20.5.0
      '@types/pino-pretty': 4.7.1
      '@types/pino-std-serializers': 2.4.1
-      sonic-boom: 2.1.0
+      sonic-boom: 2.8.0
+    dev: true
+  /@types/pino@7.0.5:
+    resolution: {integrity: sha512-wKoab31pknvILkxAF8ss+v9iNyhw5Iu/0jLtRkUD74cNfOOLJNnqfFKAv0r7wVaTQxRZtWrMpGfShwwBjOcgcg==}
+    deprecated: This is a stub types definition. pino provides its own type definitions, so you do not need this installed.
+    dependencies:
+      pino: 8.15.0
    dev: true
  /@types/prettier@2.3.2:
@@ -4221,6 +4179,13 @@ packages:
    resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
    dev: true
+  /@types/send@0.17.1:
+    resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
+    dependencies:
+      '@types/mime': 1.3.2
+      '@types/node': 20.5.0
+    dev: true
  /@types/serve-static@1.13.10:
    resolution: {integrity: sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==}
    dependencies:
@@ -5605,12 +5570,12 @@ packages:
      queue-microtask: 1.2.3
    dev: true
-  /accepts@1.3.7:
+  /accepts@1.3.8:
-    resolution: {integrity: sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==}
+    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
    engines: {node: '>= 0.6'}
    dependencies:
      mime-types: 2.1.35
-      negotiator: 0.6.2
+      negotiator: 0.6.3
    dev: false
  /acorn-jsx@5.3.2(acorn@8.10.0):
@@ -5925,7 +5890,6 @@ packages:
  /asap@2.0.6:
    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-    dev: false
  /asn1@0.2.4:
    resolution: {integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==}
@@ -5968,6 +5932,11 @@ packages:
  /asynckit@0.4.0:
    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+  /at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+    dev: true
  /atomic-sleep@1.0.0:
    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
    engines: {node: '>=8.0.0'}
@@ -6031,8 +6000,8 @@ packages:
      safe-buffer: 5.1.2
    dev: false
-  /bcfg@0.1.7:
+  /bcfg@0.2.1:
-    resolution: {integrity: sha512-+4beq5bXwfmxdcEoHYQsaXawh1qFzjLcRvPe5k5ww/NEWzZTm56Jk8LuPmfeGB7X584jZ8xGq6UgMaZnNDa5Ww==}
+    resolution: {integrity: sha512-Q69DG2V9QJexdXvYoiXM4xfQ5m65tIOAzJCcW4USQdvbWEJJqBQ9MEDdyJb2ei5fadAJPVp8rUpLbFnkC37FZA==}
    engines: {node: '>=8.0.0'}
    dependencies:
      bsert: 0.0.10
@@ -6125,38 +6094,40 @@ packages:
  /bn.js@5.2.1:
    resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
-  /body-parser@1.19.0:
+  /body-parser@1.20.1:
-    resolution: {integrity: sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==}
+    resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==}
-    engines: {node: '>= 0.8'}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
    dependencies:
-      bytes: 3.1.0
+      bytes: 3.1.2
      content-type: 1.0.4
      debug: 2.6.9
-      depd: 1.1.2
+      depd: 2.0.0
-      http-errors: 1.7.2
+      destroy: 1.2.0
+      http-errors: 2.0.0
      iconv-lite: 0.4.24
-      on-finished: 2.3.0
+      on-finished: 2.4.1
-      qs: 6.7.0
+      qs: 6.11.0
-      raw-body: 2.4.0
+      raw-body: 2.5.1
      type-is: 1.6.18
+      unpipe: 1.0.0
    transitivePeerDependencies:
      - supports-color
    dev: false
-  /body-parser@1.20.0:
+  /body-parser@1.20.2:
-    resolution: {integrity: sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==}
+    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
    dependencies:
      bytes: 3.1.2
-      content-type: 1.0.4
+      content-type: 1.0.5
      debug: 2.6.9
      depd: 2.0.0
      destroy: 1.2.0
      http-errors: 2.0.0
      iconv-lite: 0.4.24
      on-finished: 2.4.1
-      qs: 6.10.3
+      qs: 6.11.0
-      raw-body: 2.5.1
+      raw-body: 2.5.2
      type-is: 1.6.18
      unpipe: 1.0.0
    transitivePeerDependencies:
@@ -6343,11 +6314,6 @@ packages:
    engines: {node: '>=12.17'}
    dev: true
-  /bytes@3.1.0:
-    resolution: {integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==}
-    engines: {node: '>= 0.8'}
-    dev: false
  /bytes@3.1.2:
    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
    engines: {node: '>= 0.8'}
@@ -6782,6 +6748,11 @@ packages:
      typical: 5.2.0
    dev: true
+  /commander@11.0.0:
+    resolution: {integrity: sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==}
+    engines: {node: '>=16'}
+    dev: false
  /commander@2.20.3:
    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
@@ -6804,11 +6775,6 @@ packages:
    engines: {node: '>= 12'}
    dev: true
-  /commander@9.0.0:
-    resolution: {integrity: sha512-JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw==}
-    engines: {node: ^12.20.0 || >=14}
-    dev: false
  /comment-parser@1.1.6-beta.0:
    resolution: {integrity: sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==}
    engines: {node: '>= 10.0.0'}
@@ -6854,11 +6820,11 @@ packages:
      upper-case: 2.0.2
    dev: true
-  /content-disposition@0.5.3:
+  /content-disposition@0.5.4:
-    resolution: {integrity: sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==}
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
    engines: {node: '>= 0.6'}
    dependencies:
-      safe-buffer: 5.1.2
+      safe-buffer: 5.2.1
    dev: false
  /content-type@1.0.4:
@@ -6866,6 +6832,11 @@ packages:
    engines: {node: '>= 0.6'}
    dev: false
+  /content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+    dev: false
  /conventional-changelog-angular@6.0.0:
    resolution: {integrity: sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg==}
    engines: {node: '>=14'}
@@ -6956,15 +6927,15 @@ packages:
    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
    dev: false
-  /cookie@0.4.0:
-    resolution: {integrity: sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==}
-    engines: {node: '>= 0.6'}
-    dev: false
  /cookie@0.4.1:
    resolution: {integrity: sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==}
    engines: {node: '>= 0.6'}
+  /cookie@0.5.0:
+    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
+    engines: {node: '>= 0.6'}
+    dev: false
  /cookiejar@2.1.4:
    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
    requiresBuild: true
@@ -7076,6 +7047,7 @@ packages:
      semver: 5.7.2
      shebang-command: 1.2.0
      which: 1.3.1
+    dev: false
  /cross-spawn@7.0.3:
    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
@@ -7359,11 +7331,6 @@ packages:
      - supports-color
    dev: true
-  /depd@1.1.2:
-    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
-    engines: {node: '>= 0.6'}
-    dev: false
  /depd@2.0.0:
    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
    engines: {node: '>= 0.8'}
@@ -7381,10 +7348,6 @@ packages:
    engines: {node: '>=6'}
    dev: true
-  /destroy@1.0.4:
-    resolution: {integrity: sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==}
-    dev: false
  /destroy@1.2.0:
    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
@@ -7410,6 +7373,13 @@ packages:
      execa: 5.1.1
    dev: true
+  /dezalgo@1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+    dependencies:
+      asap: 2.0.6
+      wrappy: 1.0.2
+    dev: true
  /diff-sequences@29.4.3:
    resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==}
    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -7527,11 +7497,6 @@ packages:
    engines: {node: '>=10'}
    dev: true
-  /dotenv@16.0.0:
-    resolution: {integrity: sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==}
-    engines: {node: '>=12'}
-    dev: false
  /dotenv@16.3.1:
    resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
    engines: {node: '>=12'}
@@ -7680,8 +7645,8 @@ packages:
    engines: {node: '>=6'}
    dev: true
-  /envalid@7.2.2:
+  /envalid@7.3.1:
-    resolution: {integrity: sha512-bl/3VF5PhoF26HlDWiE0NRRHUbKT/+UDP/+0JtOFmhUwK3cUPS7JgWYGbE8ArvA61T+SyNquxscLCS6y4Wnpdw==}
+    resolution: {integrity: sha512-KL1YRwn8WcoF/Ty7t+yLLtZol01xr9ZJMTjzoGRM8NaSU+nQQjSWOQKKJhJP2P57bpdakJ9jbxqQX4fGTOicZg==}
    engines: {node: '>=8.12'}
    dependencies:
      tslib: 2.3.1
@@ -8600,44 +8565,6 @@ packages:
      rlp: 2.2.7
    dev: true
-  /ethers@5.7.1:
-    resolution: {integrity: sha512-5krze4dRLITX7FpU8J4WscXqADiKmyeNlylmmDLbS95DaZpBhDe2YSwRQwKXWNyXcox7a3gBgm/MkGXV1O1S/Q==}
-    dependencies:
-      '@ethersproject/abi': 5.7.0
-      '@ethersproject/abstract-provider': 5.7.0
-      '@ethersproject/abstract-signer': 5.7.0
-      '@ethersproject/address': 5.7.0
-      '@ethersproject/base64': 5.7.0
-      '@ethersproject/basex': 5.7.0
-      '@ethersproject/bignumber': 5.7.0
-      '@ethersproject/bytes': 5.7.0
-      '@ethersproject/constants': 5.7.0
-      '@ethersproject/contracts': 5.7.0
-      '@ethersproject/hash': 5.7.0
-      '@ethersproject/hdnode': 5.7.0
-      '@ethersproject/json-wallets': 5.7.0
-      '@ethersproject/keccak256': 5.7.0
-      '@ethersproject/logger': 5.7.0
-      '@ethersproject/networks': 5.7.1
-      '@ethersproject/pbkdf2': 5.7.0
-      '@ethersproject/properties': 5.7.0
-      '@ethersproject/providers': 5.7.1
-      '@ethersproject/random': 5.7.0
-      '@ethersproject/rlp': 5.7.0
-      '@ethersproject/sha2': 5.7.0
-      '@ethersproject/signing-key': 5.7.0
-      '@ethersproject/solidity': 5.7.0
-      '@ethersproject/strings': 5.7.0
-      '@ethersproject/transactions': 5.7.0
-      '@ethersproject/units': 5.7.0
-      '@ethersproject/wallet': 5.7.0
-      '@ethersproject/web': 5.7.1
-      '@ethersproject/wordlists': 5.7.0
-    transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: false
  /ethers@5.7.2:
    resolution: {integrity: sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==}
    dependencies:
@@ -8782,48 +8709,49 @@ packages:
    resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
    dev: true
-  /express-prom-bundle@6.4.1(prom-client@13.2.0):
+  /express-prom-bundle@6.6.0(prom-client@14.2.0):
-    resolution: {integrity: sha512-Sg0svLQe/SS5z1tHDTVfZVjNumobiDlXM0jmemt5Dm9K6BX8z9yCwEr93zbko6fNMR4zKav77iPfxUWi6gAjNA==}
+    resolution: {integrity: sha512-tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ==}
    engines: {node: '>=10'}
    peerDependencies:
      prom-client: '>=12.0.0'
    dependencies:
      on-finished: 2.4.1
-      prom-client: 13.2.0
+      prom-client: 14.2.0
      url-value-parser: 2.0.3
    dev: false
-  /express@4.17.1:
+  /express@4.18.2:
-    resolution: {integrity: sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==}
+    resolution: {integrity: sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==}
    engines: {node: '>= 0.10.0'}
    dependencies:
-      accepts: 1.3.7
+      accepts: 1.3.8
      array-flatten: 1.1.1
-      body-parser: 1.19.0
+      body-parser: 1.20.1
-      content-disposition: 0.5.3
+      content-disposition: 0.5.4
      content-type: 1.0.4
-      cookie: 0.4.0
+      cookie: 0.5.0
      cookie-signature: 1.0.6
      debug: 2.6.9
-      depd: 1.1.2
+      depd: 2.0.0
      encodeurl: 1.0.2
      escape-html: 1.0.3
      etag: 1.8.1
-      finalhandler: 1.1.2
+      finalhandler: 1.2.0
      fresh: 0.5.2
+      http-errors: 2.0.0
      merge-descriptors: 1.0.1
      methods: 1.1.2
-      on-finished: 2.3.0
+      on-finished: 2.4.1
      parseurl: 1.3.3
      path-to-regexp: 0.1.7
      proxy-addr: 2.0.7
-      qs: 6.7.0
+      qs: 6.11.0
      range-parser: 1.2.1
-      safe-buffer: 5.1.2
+      safe-buffer: 5.2.1
-      send: 0.17.1
+      send: 0.18.0
-      serve-static: 1.14.1
+      serve-static: 1.15.0
-      setprototypeof: 1.1.1
+      setprototypeof: 1.2.0
-      statuses: 1.5.0
+      statuses: 2.0.1
      type-is: 1.6.18
      utils-merge: 1.0.1
      vary: 1.1.2
@@ -8897,21 +8825,12 @@ packages:
    resolution: {integrity: sha512-zaTadChr+NekyzallAMXATXLOR8MNx3zqpZ0MUF2aGf4EathnG0f32VLODNlY8IuGY3HoRO2L6/6fSzNsLaHIw==}
    engines: {node: '>=6'}
-  /fast-safe-stringify@2.0.8:
-    resolution: {integrity: sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==}
-    dev: false
  /fast-safe-stringify@2.1.1:
    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
  /fast-stable-stringify@1.0.0:
    resolution: {integrity: sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag==}
-  /fastify-warning@0.2.0:
-    resolution: {integrity: sha512-s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw==}
-    deprecated: This module renamed to process-warning
-    dev: false
  /fastq@1.15.0:
    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
    dependencies:
@@ -8964,16 +8883,16 @@ packages:
    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
    engines: {node: '>=0.10.0'}
-  /finalhandler@1.1.2:
+  /finalhandler@1.2.0:
-    resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==}
+    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
    engines: {node: '>= 0.8'}
    dependencies:
      debug: 2.6.9
      encodeurl: 1.0.2
      escape-html: 1.0.3
-      on-finished: 2.3.0
+      on-finished: 2.4.1
      parseurl: 1.3.3
-      statuses: 1.5.0
+      statuses: 2.0.1
      unpipe: 1.0.0
    transitivePeerDependencies:
      - supports-color
@@ -9058,10 +8977,6 @@ packages:
    hasBin: true
    dev: true
-  /flatstr@1.0.12:
-    resolution: {integrity: sha512-4zPxDyhCyiN2wIAtSLI6gc82/EjqZc1onI4Mz/l0pWrAlsSfYH/2ZIcU+e3oA2wDwbzIWNKwa23F8rh6+DRWkw==}
-    dev: false
  /flatted@3.2.2:
    resolution: {integrity: sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==}
    dev: true
@@ -9145,9 +9060,13 @@ packages:
      fetch-blob: 3.2.0
    dev: true
-  /formidable@1.2.2:
+  /formidable@2.1.2:
-    resolution: {integrity: sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==}
+    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
-    deprecated: 'Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau'
+    dependencies:
+      dezalgo: 1.0.4
+      hexoid: 1.0.0
+      once: 1.4.0
+      qs: 6.11.2
    dev: true
  /forwarded@0.2.0:
@@ -9221,6 +9140,16 @@ packages:
      universalify: 0.1.2
    dev: false
+  /fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+    dependencies:
+      at-least-node: 1.0.0
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+    dev: true
  /fs-minipass@2.1.0:
    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
    engines: {node: '>= 8'}
@@ -9812,6 +9741,11 @@ packages:
      tslib: 2.6.0
    dev: true
+  /hexoid@1.0.0:
+    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
+    engines: {node: '>=8'}
+    dev: true
  /hey-listen@1.0.8:
    resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==}
@@ -9870,28 +9804,6 @@ packages:
    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
    dev: true
-  /http-errors@1.7.2:
-    resolution: {integrity: sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      depd: 1.1.2
-      inherits: 2.0.3
-      setprototypeof: 1.1.1
-      statuses: 1.5.0
-      toidentifier: 1.0.0
-    dev: false
-  /http-errors@1.7.3:
-    resolution: {integrity: sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==}
-    engines: {node: '>= 0.6'}
-    dependencies:
-      depd: 1.1.2
-      inherits: 2.0.4
-      setprototypeof: 1.1.1
-      statuses: 1.5.0
-      toidentifier: 1.0.0
-    dev: false
  /http-errors@2.0.0:
    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
    engines: {node: '>= 0.8'}
@@ -9921,16 +9833,6 @@ packages:
      jsprim: 1.4.1
      sshpk: 1.16.1
-  /https-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==}
-    engines: {node: '>= 6'}
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
  /https-proxy-agent@5.0.1:
    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
    engines: {node: '>= 6'}
@@ -9939,7 +9841,6 @@ packages:
      debug: 4.3.4(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color
-    dev: true
  /human-id@1.0.2:
    resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==}
@@ -10055,10 +9956,6 @@ packages:
      once: 1.4.0
      wrappy: 1.0.2
-  /inherits@2.0.3:
-    resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==}
-    dev: false
  /inherits@2.0.4:
    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@@ -10197,13 +10094,6 @@ packages:
    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
    engines: {node: '>= 0.4'}
-  /is-ci@2.0.0:
-    resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
-    hasBin: true
-    dependencies:
-      ci-info: 2.0.0
-    dev: true
  /is-ci@3.0.1:
    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
    hasBin: true
@@ -10871,6 +10761,12 @@ packages:
    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
    dev: true
+  /json-stable-stringify@1.0.2:
+    resolution: {integrity: sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==}
+    dependencies:
+      jsonify: 0.0.1
+    dev: true
  /json-stringify-safe@5.0.1:
    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
@@ -10910,6 +10806,10 @@ packages:
      graceful-fs: 4.2.11
    dev: true
+  /jsonify@0.0.1:
+    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
+    dev: true
  /jsonparse@1.3.1:
    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
    engines: {'0': node >= 0.2.0}
@@ -12275,10 +12175,6 @@ packages:
  /ms@2.0.0:
    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-  /ms@2.1.1:
-    resolution: {integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==}
-    dev: false
  /ms@2.1.2:
    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
@@ -12354,15 +12250,9 @@ packages:
    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
    dev: true
-  /negotiator@0.6.2:
-    resolution: {integrity: sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==}
-    engines: {node: '>= 0.6'}
-    dev: false
  /negotiator@0.6.3:
    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
    engines: {node: '>= 0.6'}
-    dev: true
  /neo-async@2.6.2:
    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
@@ -12370,6 +12260,7 @@ packages:
  /nice-try@1.0.5:
    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
+    dev: false
  /no-case@3.0.4:
    resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
@@ -12878,7 +12769,6 @@ packages:
  /on-exit-leak-free@2.1.0:
    resolution: {integrity: sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w==}
-    dev: false
  /on-finished@2.3.0:
    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
@@ -13237,24 +13127,26 @@ packages:
      tslib: 2.6.0
    dev: true
-  /patch-package@6.4.7:
+  /patch-package@8.0.0:
-    resolution: {integrity: sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==}
+    resolution: {integrity: sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==}
-    engines: {npm: '>5'}
+    engines: {node: '>=14', npm: '>5'}
    hasBin: true
    dependencies:
      '@yarnpkg/lockfile': 1.1.0
-      chalk: 2.4.2
+      chalk: 4.1.2
-      cross-spawn: 6.0.5
+      ci-info: 3.8.0
+      cross-spawn: 7.0.3
      find-yarn-workspace-root: 2.0.0
-      fs-extra: 7.0.1
+      fs-extra: 9.1.0
-      is-ci: 2.0.0
+      json-stable-stringify: 1.0.2
      klaw-sync: 6.0.0
-      minimist: 1.2.6
+      minimist: 1.2.8
      open: 7.4.2
      rimraf: 2.7.1
-      semver: 5.7.1
+      semver: 7.5.4
      slash: 2.0.0
      tmp: 0.0.33
+      yaml: 2.3.1
    dev: true
  /path-browserify@1.0.1:
@@ -13296,6 +13188,7 @@ packages:
  /path-key@2.0.1:
    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
    engines: {node: '>=4'}
+    dev: false
  /path-key@3.1.1:
    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
@@ -13411,13 +13304,12 @@ packages:
    dependencies:
      readable-stream: 4.4.2
      split2: 4.2.0
-    dev: false
-  /pino-multi-stream@5.3.0:
+  /pino-multi-stream@6.0.0:
-    resolution: {integrity: sha512-4fAGCRll18I+JmoAbxDvU9zc5sera/3c+VgTtUdoNMOZ/VSHB+HMAYtixKpeRmZTDHDDdE2rtwjVkuwWB8mYQA==}
+    resolution: {integrity: sha512-oCuTtaDSUB5xK1S45r9oWE0Dj8RWdHVvaGTft5pO/rmzgIqQRkilf5Ooilz3uRm0IYj8sPRho3lVx48LCmXjvQ==}
    deprecated: No longer supported. Use the multi-stream support in the latest core Pino
    dependencies:
-      pino: 6.13.1
+      pino: 7.11.0
    dev: false
  /pino-sentry@0.14.0:
@@ -13425,7 +13317,7 @@ packages:
    engines: {node: '>=10'}
    hasBin: true
    dependencies:
-      '@sentry/node': 6.11.0
+      '@sentry/node': 7.64.0
      commander: 2.20.3
      pumpify: 2.0.1
      split2: 3.2.2
@@ -13434,29 +13326,11 @@ packages:
      - supports-color
    dev: false
-  /pino-std-serializers@3.2.0:
-    resolution: {integrity: sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg==}
-    dev: false
  /pino-std-serializers@4.0.0:
    resolution: {integrity: sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==}
  /pino-std-serializers@6.2.2:
    resolution: {integrity: sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA==}
-    dev: false
-  /pino@6.13.1:
-    resolution: {integrity: sha512-QQf67BU+cANnc/2U+wzUV20UjO5oBryWpnNyKshdLfT9BdeiXlh9wxLGmOjAuBWMYITdMs+BtJSQQNlGRNbWpA==}
-    hasBin: true
-    dependencies:
-      fast-redact: 3.2.0
-      fast-safe-stringify: 2.0.8
-      fastify-warning: 0.2.0
-      flatstr: 1.0.12
-      pino-std-serializers: 3.2.0
-      quick-format-unescaped: 4.0.4
-      sonic-boom: 1.4.1
-    dev: false
  /pino@7.11.0:
    resolution: {integrity: sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==}
@@ -13489,7 +13363,6 @@ packages:
      safe-stable-stringify: 2.4.3
      sonic-boom: 3.3.0
      thread-stream: 2.4.0
-    dev: false
  /pirates@4.0.6:
    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
@@ -13634,15 +13507,13 @@ packages:
  /process-warning@2.2.0:
    resolution: {integrity: sha512-/1WZ8+VQjR6avWOgHeEPd7SDQmFQ1B5mC1eRXsCm5TarlNmx/wCsa5GEaxGm05BORRtyG/Ex/3xq3TuRvq57qg==}
-    dev: false
  /process@0.11.10:
    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
    engines: {node: '>= 0.6.0'}
-    dev: false
-  /prom-client@13.2.0:
+  /prom-client@14.2.0:
-    resolution: {integrity: sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==}
+    resolution: {integrity: sha512-sF308EhTenb/pDRPakm+WgiN+VdM/T1RaHj1x+MvAuT8UiQP8JmOEbxVqtkbfR4LrvOg5n7ic01kRBDGXjYikA==}
    engines: {node: '>=10'}
    dependencies:
      tdigest: 0.1.1
@@ -13754,19 +13625,11 @@ packages:
      pngjs: 5.0.0
      yargs: 15.4.1
-  /qs@6.10.3:
-    resolution: {integrity: sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.0.4
-    dev: false
  /qs@6.11.0:
    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
    engines: {node: '>=0.6'}
    dependencies:
      side-channel: 1.0.4
-    dev: true
  /qs@6.11.2:
    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
@@ -13778,11 +13641,6 @@ packages:
    resolution: {integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==}
    engines: {node: '>=0.6'}
-  /qs@6.7.0:
-    resolution: {integrity: sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==}
-    engines: {node: '>=0.6'}
-    dev: false
  /query-ast@1.0.4:
    resolution: {integrity: sha512-KFJFSvODCBjIH5HbHvITj9EEZKYUU6VX0T5CuB1ayvjUoUaZkKMi6eeby5Tf8DMukyZHlJQOE1+f3vevKUe6eg==}
    dependencies:
@@ -13832,16 +13690,6 @@ packages:
    engines: {node: '>= 0.6'}
    dev: false
-  /raw-body@2.4.0:
-    resolution: {integrity: sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      bytes: 3.1.0
-      http-errors: 1.7.2
-      iconv-lite: 0.4.24
-      unpipe: 1.0.0
-    dev: false
  /raw-body@2.5.1:
    resolution: {integrity: sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==}
    engines: {node: '>= 0.8'}
@@ -13860,7 +13708,6 @@ packages:
      http-errors: 2.0.0
      iconv-lite: 0.4.24
      unpipe: 1.0.0
-    dev: true
  /react-dom@18.2.0(react@18.2.0):
    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
@@ -14046,7 +13893,6 @@ packages:
      events: 3.3.0
      process: 0.11.10
      string_decoder: 1.3.0
-    dev: false
  /readdirp@3.6.0:
    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
@@ -14062,7 +13908,6 @@ packages:
  /real-require@0.2.0:
    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
    engines: {node: '>= 12.13.0'}
-    dev: false
  /redent@3.0.0:
    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
@@ -14502,6 +14347,7 @@ packages:
  /semver@5.7.1:
    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
    hasBin: true
+    dev: false
  /semver@5.7.2:
    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
@@ -14532,23 +14378,23 @@ packages:
    dependencies:
      lru-cache: 6.0.0
-  /send@0.17.1:
+  /send@0.18.0:
-    resolution: {integrity: sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==}
+    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
    engines: {node: '>= 0.8.0'}
    dependencies:
      debug: 2.6.9
-      depd: 1.1.2
+      depd: 2.0.0
-      destroy: 1.0.4
+      destroy: 1.2.0
      encodeurl: 1.0.2
      escape-html: 1.0.3
      etag: 1.8.1
      fresh: 0.5.2
-      http-errors: 1.7.3
+      http-errors: 2.0.0
      mime: 1.6.0
-      ms: 2.1.1
+      ms: 2.1.3
-      on-finished: 2.3.0
+      on-finished: 2.4.1
      range-parser: 1.2.1
-      statuses: 1.5.0
+      statuses: 2.0.1
    transitivePeerDependencies:
      - supports-color
    dev: false
@@ -14567,14 +14413,14 @@ packages:
      randombytes: 2.1.0
    dev: true
-  /serve-static@1.14.1:
+  /serve-static@1.15.0:
-    resolution: {integrity: sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==}
+    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
    engines: {node: '>= 0.8.0'}
    dependencies:
      encodeurl: 1.0.2
      escape-html: 1.0.3
      parseurl: 1.3.3
-      send: 0.17.1
+      send: 0.18.0
    transitivePeerDependencies:
      - supports-color
    dev: false
@@ -14585,10 +14431,6 @@ packages:
  /setimmediate@1.0.5:
    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-  /setprototypeof@1.1.1:
-    resolution: {integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==}
-    dev: false
  /setprototypeof@1.2.0:
    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
@@ -14611,6 +14453,7 @@ packages:
    engines: {node: '>=0.10.0'}
    dependencies:
      shebang-regex: 1.0.0
+    dev: false
  /shebang-command@2.0.0:
    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
@@ -14622,6 +14465,7 @@ packages:
  /shebang-regex@1.0.0:
    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
    engines: {node: '>=0.10.0'}
+    dev: false
  /shebang-regex@3.0.0:
    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
@@ -14794,19 +14638,6 @@ packages:
    resolution: {integrity: sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw==}
    dev: true
-  /sonic-boom@1.4.1:
-    resolution: {integrity: sha512-LRHh/A8tpW7ru89lrlkU4AszXt1dbwSjVWguGrmlxE7tawVmDBlI1PILMkXAxJTwqhgsEeTHzj36D5CmHgQmNg==}
-    dependencies:
-      atomic-sleep: 1.0.0
-      flatstr: 1.0.12
-    dev: false
-  /sonic-boom@2.1.0:
-    resolution: {integrity: sha512-x2j9LXx27EDlyZEC32gBM+scNVMdPutU7FIKV2BOTKCnPrp7bY5BsplCMQ4shYYR3IhDSIrEXoqb6GlS+z7KyQ==}
-    dependencies:
-      atomic-sleep: 1.0.0
-    dev: true
  /sonic-boom@2.8.0:
    resolution: {integrity: sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==}
    dependencies:
@@ -14816,7 +14647,6 @@ packages:
    resolution: {integrity: sha512-LYxp34KlZ1a2Jb8ZQgFCK3niIHzibdwtwNUWKg0qQRzsDoJ3Gfgkf8KdBTFU3SkejDEIlWwnSnpVdOZIhFMl/g==}
    dependencies:
      atomic-sleep: 1.0.0
-    dev: false
  /sort-keys@2.0.0:
    resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==}
@@ -14958,11 +14788,6 @@ packages:
      type-fest: 0.7.1
    dev: true
-  /statuses@1.5.0:
-    resolution: {integrity: sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==}
-    engines: {node: '>= 0.6'}
-    dev: false
  /statuses@2.0.1:
    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
    engines: {node: '>= 0.8'}
@@ -15206,21 +15031,19 @@ packages:
      ts-interface-checker: 0.1.13
    dev: true
-  /superagent@6.1.0:
+  /superagent@8.1.2:
-    resolution: {integrity: sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==}
+    resolution: {integrity: sha512-6WTxW1EB6yCxV5VFOIPQruWGHqc3yI7hEmZK6h+pyk69Lk/Ut7rLUY6W/ONF2MjBuGjvmMiIpsrVJ2vjrHlslA==}
-    engines: {node: '>= 7.0.0'}
+    engines: {node: '>=6.4.0 <13 || >=14'}
-    deprecated: Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.
    dependencies:
      component-emitter: 1.3.0
      cookiejar: 2.1.4
      debug: 4.3.4(supports-color@8.1.1)
      fast-safe-stringify: 2.1.1
-      form-data: 3.0.1
+      form-data: 4.0.0
-      formidable: 1.2.2
+      formidable: 2.1.2
      methods: 1.1.2
      mime: 2.6.0
      qs: 6.11.2
-      readable-stream: 3.6.2
      semver: 7.5.4
    transitivePeerDependencies:
      - supports-color
@@ -15233,12 +15056,12 @@ packages:
    resolution: {integrity: sha512-8iTn3oSS8nRGn+C2pgXSKPI3jmpm6FExNazNpjvqS6ZUJQCej3PUXEKM8NjHBOs54ExM+LPW/FBRhymrdcCiSg==}
    engines: {node: '>=14.0.0'}
-  /supertest@6.1.6:
+  /supertest@6.3.3:
-    resolution: {integrity: sha512-0hACYGNJ8OHRg8CRITeZOdbjur7NLuNs0mBjVhdpxi7hP6t3QIbOzLON5RTUmZcy2I9riuII3+Pr2C7yztrIIg==}
+    resolution: {integrity: sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA==}
-    engines: {node: '>=6.0.0'}
+    engines: {node: '>=6.4.0'}
    dependencies:
      methods: 1.1.2
-      superagent: 6.1.0
+      superagent: 8.1.2
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -15374,7 +15197,6 @@ packages:
    resolution: {integrity: sha512-xZYtOtmnA63zj04Q+F9bdEay5r47bvpo1CaNqsKi7TpoJHcotUez8Fkfo2RJWpW91lnnaApdpRbVwCWsy+ifcw==}
    dependencies:
      real-require: 0.2.0
-    dev: false
  /through2@2.0.5:
    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
@@ -15439,11 +15261,6 @@ packages:
  /toggle-selection@1.0.6:
    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
-  /toidentifier@1.0.0:
-    resolution: {integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==}
-    engines: {node: '>=0.6'}
-    dev: false
  /toidentifier@1.0.1:
    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
    engines: {node: '>=0.6'}
@@ -17162,6 +16979,7 @@ packages:
    hasBin: true
    dependencies:
      isexe: 2.0.0
+    dev: false
  /which@2.0.2:
    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}