Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge/testing #4248

Merged
merged 46 commits into from
Jul 17, 2022
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
ef3f14d
block optimization fixes
avalonche Jun 8, 2022
0c50c19
add tests
avalonche Jun 8, 2022
dde327c
add tests
avalonche Jun 9, 2022
90e8dc3
remove code already in #4136
avalonche Jun 27, 2022
4affe14
move set blocks to chain helper
avalonche Jun 28, 2022
718b05e
hive test fixes
avalonche Jun 29, 2022
0b7f578
block optimization fixes
avalonche Jun 8, 2022
3775bd6
add tests
avalonche Jun 9, 2022
39822a2
move set blocks to chain helper
avalonche Jun 28, 2022
4ba5f57
Add fix to pivot destination number
avalonche Jun 9, 2022
e4dc714
remove redundant code
avalonche Jun 16, 2022
69f2eb8
fix to is beacon headers sync finished
avalonche Jun 30, 2022
f32b030
change "FastSyncCatchUpHeightDelta": "9223372036854775807" for merge …
MarekM25 Jun 30, 2022
e57e52a
fix tests
MarekM25 Jun 30, 2022
45886f6
ACCEPTED -> SYNCING
MarekM25 Jun 30, 2022
616c17a
add tests for reorg
avalonche Jun 30, 2022
ea65f8f
add more logs, working on fastSyncTransition fix
MarekM25 Jul 1, 2022
d1e16a3
Merge branch 'master' into merge/syncing_fixes
MarekM25 Jul 1, 2022
98004b6
change BestKnownNumber for test
MarekM25 Jul 1, 2022
4cfecce
remove metadata
MarekM25 Jul 4, 2022
711f4c8
revert logging
MarekM25 Jul 4, 2022
5d2f4a9
cleanup
MarekM25 Jul 4, 2022
33c9395
Merge remote-tracking branch 'remotes/origin/pivot-destination-number…
MarekM25 Jul 4, 2022
2695bf6
small fix
MarekM25 Jul 4, 2022
7ebd4d7
Merge branch 'master' into merge/testing
MarekM25 Jul 4, 2022
4a5e4f3
fix build
MarekM25 Jul 5, 2022
b70ebb8
Merge branch 'master' into merge/testing
MarekM25 Jul 6, 2022
578c6b5
fix
MarekM25 Jul 6, 2022
2bd93f8
Merge remote-tracking branch 'origin/master' into merge/testing
marcindsobczak Jul 6, 2022
7447afc
Increase refresh timeout
asdacap Jul 7, 2022
2dcde17
Merge remote-tracking branch 'origin/increase-refresh-timeout' into m…
marcindsobczak Jul 7, 2022
37b6817
Merge remote-tracking branch 'origin/master' into merge/testing
marcindsobczak Jul 7, 2022
9cb8bd3
fix MergeBlockDownloader?
MarekM25 Jul 8, 2022
e2c2eb5
add logs in NewPayloadV1Handler
MarekM25 Jul 8, 2022
f0e2089
Merge branch 'master' into merge/testing
MarekM25 Jul 8, 2022
33064b6
small change in logs
MarekM25 Jul 8, 2022
5e2fa14
improved logs & add comment
MarekM25 Jul 8, 2022
d049a06
UpdateOrCreateLevel changing pointers?
MarekM25 Jul 8, 2022
c677613
unknown payload
MarekM25 Jul 8, 2022
1ce6df2
reverted UpdateOrCreateLevel changes
MarekM25 Jul 11, 2022
0c3a276
Merge branch 'master' into merge/testing
MarekM25 Jul 11, 2022
f749b3b
Merge branch 'master' into merge/testing
MarekM25 Jul 14, 2022
ac32845
cosmetic
MarekM25 Jul 14, 2022
a0f7446
Merge branch 'master' into merge/testing
MarekM25 Jul 14, 2022
794cf38
submodule fix
MarekM25 Jul 14, 2022
65df7f2
update eth tests
MarekM25 Jul 14, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into merge/testing
# Conflicts:
#	src/Nethermind/Nethermind.Synchronization/Timeouts.cs
MarekM25 committed Jul 8, 2022
commit f0e20892825718f545c0aa48627b02a1a151b88a

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.