From 5739ecc7ac32802b8acc095005e6daab282f2500 Mon Sep 17 00:00:00 2001 From: Nico Schlumprecht <7006025+Nic0S@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:50:16 -0400 Subject: [PATCH 1/2] Fix log broadcaster force flag (#6311) "force" was used in one spot, and "force-broadcast" in another preventing the flag from being propagated. Fix it. (cherry picked from commit 0cafb6a6ba4fbdad1f484b3ff16a71614183e529) --- core/chains/evm/log/broadcaster.go | 2 +- core/cmd/remote_client.go | 5 ++--- core/web/replay_controller.go | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/chains/evm/log/broadcaster.go b/core/chains/evm/log/broadcaster.go index 262181c8563..81103684102 100644 --- a/core/chains/evm/log/broadcaster.go +++ b/core/chains/evm/log/broadcaster.go @@ -188,7 +188,7 @@ func (b *broadcaster) Start(context.Context) error { // ReplayFromBlock implements the Broadcaster interface. func (b *broadcaster) ReplayFromBlock(number int64, forceBroadcast bool) { - b.logger.Infof("Replay requested from block number: %v", number) + b.logger.Infow("Replay requested", "block number", number, "force", forceBroadcast) select { case b.replayChannel <- replayRequest{ fromBlock: number, diff --git a/core/cmd/remote_client.go b/core/cmd/remote_client.go index e61b3e5d9bc..b7236a0d51a 100644 --- a/core/cmd/remote_client.go +++ b/core/cmd/remote_client.go @@ -127,18 +127,17 @@ func (cli *Client) getPage(requestURI string, page int, model interface{}) (err // ReplayFromBlock replays chain data from the given block number until the most recent func (cli *Client) ReplayFromBlock(c *clipkg.Context) (err error) { - blockNumber := c.Int64("block-number") if blockNumber <= 0 { return cli.errorOut(errors.New("Must pass a positive value in '--block-number' parameter")) } - forceBroadcast := c.Bool("force-broadcast") + forceBroadcast := c.Bool("force") buf := bytes.NewBufferString("{}") resp, err := cli.HTTP.Post( fmt.Sprintf( - "/v2/replay_from_block/%v?force_broadcast=%s", + "/v2/replay_from_block/%v?force=%s", blockNumber, strconv.FormatBool(forceBroadcast), ), buf) diff --git a/core/web/replay_controller.go b/core/web/replay_controller.go index fcd7f6b47e0..73d71404234 100644 --- a/core/web/replay_controller.go +++ b/core/web/replay_controller.go @@ -25,10 +25,10 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) { } // check if force_broadcast query string parameter provided - var forceBroadcast bool + var force bool var err error - if fb := c.Query("force_broadcast"); fb != "" { - forceBroadcast, err = strconv.ParseBool(fb) + if fb := c.Query("force"); fb != "" { + force, err = strconv.ParseBool(fb) if err != nil { jsonAPIError(c, http.StatusUnprocessableEntity, errors.Wrap(err, "boolean value required for 'force_broadcast' query string param")) return @@ -58,7 +58,7 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) { } chainID := chain.ID() - if err := bdc.App.ReplayFromBlock(chainID, uint64(blockNumber), forceBroadcast); err != nil { + if err := bdc.App.ReplayFromBlock(chainID, uint64(blockNumber), force); err != nil { jsonAPIError(c, http.StatusInternalServerError, err) return } From 3476558249071f267de9c16e07ded13d1501b96d Mon Sep 17 00:00:00 2001 From: Nico Schlumprecht <7006025+Nic0S@users.noreply.github.com> Date: Wed, 6 Apr 2022 18:52:19 -0400 Subject: [PATCH 2/2] Fix error message for force mode (#6399) (cherry picked from commit 4aadcea5901bc5fb4b78bbe7d01faa2ca21b93c1) --- core/web/replay_controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/web/replay_controller.go b/core/web/replay_controller.go index 73d71404234..955e06b29c9 100644 --- a/core/web/replay_controller.go +++ b/core/web/replay_controller.go @@ -24,13 +24,13 @@ func (bdc *ReplayController) ReplayFromBlock(c *gin.Context) { return } - // check if force_broadcast query string parameter provided + // check if "force" query string parameter provided var force bool var err error if fb := c.Query("force"); fb != "" { force, err = strconv.ParseBool(fb) if err != nil { - jsonAPIError(c, http.StatusUnprocessableEntity, errors.Wrap(err, "boolean value required for 'force_broadcast' query string param")) + jsonAPIError(c, http.StatusUnprocessableEntity, errors.Wrap(err, "boolean value required for 'force' query string param")) return } }