Merge upstream - 18-09-2024 #65
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Primarily for some Polygon GasStation updates, which will support troubleshooting of the GasStation API and will also enforce a floor on the Polygon PoS priority fee in the event that the GasStation times out.
…-protocol#1823) The relayer handover logic incorrectly assumes that BOT_IDENTIFIER is not undefined. This was identified by the Lisk team when they updated their relayer.
This reverts commit 30f6894.
…pstream-18-09-2024
matjazv
approved these changes
Sep 18, 2024
…protocol#1827) The Dataworker complains that 8 bundles is insufficient to cover the 6 hour fillDeadlineBuffer with a 1 hour challenge window, so bump it to 10.
…pstream-18-09-2024
Incede
approved these changes
Sep 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What was the problem?
This PR resolves #LISK-1107
How was it solved?
get fetch upstream && git merge -S upstream/masterHow was it tested?
Locally, with and without setting the BOT_IDENTIFIER and with/without running a local redis server instance