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

devel:devel+classic #94

Draft
wants to merge 475 commits into
base: devel
Choose a base branch
from
Draft

devel:devel+classic #94

wants to merge 475 commits into from

Conversation

meowsbits
Copy link

@meowsbits meowsbits commented Sep 7, 2023

This PR is intended to present the diff for visibility and review.

The base branch devel is upstream's main branch.
The target branch is our patch branch that establishes support for ETC.

This PR should not be merged!

meowsbits added 30 commits May 4, 2023 00:18
meowsbits and others added 19 commits October 10, 2023 06:17
These were lost when erigon dropped
the external erigon-lib dep, copy-pasting
it to a package under this project root.

Date: 2023-10-09 15:32:11-06:00
Signed-off-by: meows <b5c6@protonmail.com>
Date: 2023-10-10 07:28:48-06:00
Signed-off-by: meows <b5c6@protonmail.com>
Historically we had several times when:
- erigon downloaded new version of .seg file
- or didn't finish download and start indexing

this was a "quick-fix protection" against this cases
but now we have other protections for this cases
let's try to remove this one - because it's not compatible with "copy
datadir" and "restore datadir from backup" scenarios
 Conflicts:
	erigon-lib/chain/chain_config.go
	erigon-lib/chain/networkname/network_name_classic.go
	go.sum
Date: 2023-10-25 05:57:03-06:00
Signed-off-by: meows <b5c6@protonmail.com>
…on/common/hexutil

Date: 2023-10-25 05:58:30-06:00
Signed-off-by: meows <b5c6@protonmail.com>
erigontech#8580)

PR erigontech#8202 might cause Issue erigontech#8550, so reverting it until Alexey's return.

This reverts commit 2ce98f8.
…h#8499)

Bor consensus: this calc is heavy and has cache
Newly introduced `t.logGaps` was being set to `nil` and still accessed
within `clearFailedLogs`. This PR changes the ordering, moving the nil
setting to `CaptureTxEnd`.
* call getEnode before NodeStarted to make sure it is ready for RPC
calls
* fix connection error detection on macOS
* use a non-default p2p port to avoid conflicts
* disable bor milestones on local heimdall
* generate node keys for static peers config
```
 error: conflicting types for ‘mdbx_get_datacmp’ due to enum/integer mismatch; have ‘int (*(unsigned int))(const MDBX_val *, const MDBX_val *)’ {aka ‘int (*(unsigned int))(const struct iovec *, const struct iovec *)’} [-Werror=enum-int-mismatch]
26609 | __cold MDBX_cmp_func *mdbx_get_datacmp(unsigned flags) {
      |                       ^~~~~~~~~~~~~~~~
mdbx.h:4932:1: note: previous declaration of ‘mdbx_get_datacmp’ with type ‘int (*(MDBX_db_flags_t))(const MDBX_val *, const MDBX_val *)’ {aka ‘int (*(MDBX_db_flags_t))(const struct iovec *, const struct iovec *)’}
```
can't upgrade mdbx version for now
Copy link

github-actions bot commented Dec 7, 2023

This PR is stale because it has been open for 40 days with no activity.

@github-actions github-actions bot added the Stale label Dec 7, 2023
@meowsbits meowsbits removed the Stale label Dec 7, 2023
Copy link

This PR is stale because it has been open for 40 days with no activity.

@github-actions github-actions bot added the Stale label Jan 17, 2024
@meowsbits meowsbits removed the Stale label Jan 17, 2024
Copy link

This PR is stale because it has been open for 40 days with no activity.

@github-actions github-actions bot added the Stale label Feb 27, 2024
@meowsbits meowsbits removed the Stale label Feb 28, 2024
Copy link

github-actions bot commented Apr 9, 2024

This PR is stale because it has been open for 40 days with no activity.

@github-actions github-actions bot added the Stale label Apr 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants