Merge release/1.7.0 into develop #7206
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
(cherry picked from commit 98c68a7)
- "msg" has special meaning and overrides the main log message, we intended to log it as structured data instead.
….7.0 Fix logging of msg in ethereum requests
Updated tests for addLog and added some new ones
Update log/pool.go & log/pool_test.go for besu (#7106)
(cherry picked from commit b887a24)
…index_not_null Convert NULL tx_index values in log_broadcaster to -1
Gotta scope max nonce lookup to a single key!.
…7828-highest-confirmed-nonce Release 1.7.0/bugfix/47828 highest confirmed nonce
This reverts commit 4944ded.
This reverts commit 0189506.
Revert besu workaround
…hangelog-1.7.0 Finalize date on changelog for 1.7.0
…licts-develop-2 Fix merge conflicts with develop
HenryNguyen5
requested review from
samsondav,
jmank88,
connorwstein,
makramkd,
jkongie,
PiotrTrzpil and
spooktheducks
as code owners
HenryNguyen5
commented
Aug 9, 2022
| @@ -745,6 +745,73 @@ func TestEthConfirmer_CheckForReceipts_confirmed_missing_receipt_scoped_to_key(t | |||
| mustTxBeInState(t, borm, etx2_9, txmgr.EthTxConfirmed) | |||
| } | |||
|
|
|||
| func TestEthConfirmer_CheckForReceipts_confirmed_missing_receipt_scoped_to_key(t *testing.T) { | |||
There was a problem hiding this comment.
@samsondav This already exists, the auto conflict resolution by git duplicated this block. The rest of the diffs should be double checked for invalid merges.
samsondav
force-pushed
the
resolve-conflicts-1.7.0
branch
from
a445e6a
to
07c7c10
Compare
samsondav
force-pushed
the
resolve-conflicts-1.7.0
branch
from
bdaa7be
to
e5fb7df
Compare
samsondav
approved these changes
Aug 9, 2022
jmank88
approved these changes
Aug 9, 2022
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.
Summary
An intermediary branch was created to resolve merge conflicts between release/1.7.0 and develop without merging develop back into release/1.7.0. This was done to keep history as clean and accurate as possible.
Once merged, #7189 should automatically close due to no diff.
Sanity Check
Below are a set of commands used to check that this current branch mirrors the same set of commits to be merged from
release/1.7.0intodevelop, with the exception of the merge commit added in this branch to resolve conflicts.a445e6ae3is the one merge commit to resolve conflicts:a445e6a(#7206)Commit list