Fix off-by-one in data poster nonce check #2326
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
cla-bot
bot
added
the
s
Tristan-Wilson
requested changes
May 22, 2024
| return nil | ||
| } | ||
| } else { | ||
| log.Info("DataPoster will send previously unsent batch tx", "nonce", newTx.FullTx.Nonce(), "prevType", precedingTx.FullTx.Type(), "type", newTx.FullTx.Type(), "prevSent", precedingTx.Sent, "latestBlockNumber", latestBlockNumber, "prevBlockNumber", prevBlockNumber, "reorgResistantNonce", reorgResistantNonce) | ||
| } |
There was a problem hiding this comment.
I think it needs to be at the inner level here since precedingTx can be nil, and also I put it at that level because didn't want to spam too many of these logs when the tx was previously sent.
There was a problem hiding this comment.
Did you mean to put it in the else? Most of the fields are only populated in the if case which is why I was confused
There was a problem hiding this comment.
In the current level of nesting I believe precedingTx is always non-nil, and I changed it to a debug log (instead of info) to make it a bit quieter
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.
The "reorg resistant nonce" is really a reorg resistant tx count, which is one higher than the tx nonce that won't be reorged. In other words, if the previous tx is equal to the reorg resistant tx count, then the previous tx can still be reorged (only the one before it is safe). This PR fixes that by comparing it to the new tx nonce. If the new tx nonce is greater than the reorg resistant tx count, then that means that there's a gap between the last safe tx and the new tx we're posting. This would be equivalent to changing the
>to a>=, but I thought this way was clearer. I also cleaned up some logging which was logging the variables in the wrong place (they aren't populated in the second log statement).