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 master (2e4e6bd) into libevm (2) #812

Merged
merged 72 commits into from
Feb 20, 2025

Conversation

darioush
Copy link
Collaborator

Step 2. merge master 2e4e6bd
Step 3. Make coreth & avalanchego mutually depend on each other via replace...
Step 4. Push one of them (eg, coreth)
Step 5. now go get coreth in avalanchego
Step 5. now go get avalanchego in coreth & set versions.sh.

darioush and others added 30 commits October 15, 2024 20:22
* Remove the bls dependency
---------
Co-authored-by: Darioush Jalali <[email protected]>
* Release notes and avalanchego update

* restore avago version

* bump avago to master

* ammend notes

* go mod tidy

* bump version

* update notes
* new atomic pkg

* bump avago

* bump versions

* change newimport clk to time

* move utils

* bump avago

* go mod tidy

* use address methods from avago

* bump avago

* bump e2e avago version
* new atomic pkg

* bump avago

* bump versions

* move attomic gossip

* lint

* change newimport clk to time

* move utils

* bump avago

* go mod tidy

* update releases md

* use address methods from avago

* bump avago

* bump e2e avago version

* Update plugin/evm/atomic/gossip_test.go

Co-authored-by: Quentin McGaw <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>

* Update plugin/evm/atomic/mempool.go

Co-authored-by: Quentin McGaw <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>

* Update plugin/evm/config/config.go

Co-authored-by: Quentin McGaw <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>

* Update plugin/evm/atomic/tx_heap.go

Co-authored-by: Quentin McGaw <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>

* Update plugin/evm/config/config.go

Co-authored-by: Quentin McGaw <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>

* fix reviews

---------

Signed-off-by: Ceyhun Onur <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>
Co-authored-by: Quentin McGaw <[email protected]>
* header.yml is missing so removing ineffective go-license

* Remove unneeded source constants

* Remove unneeded source versions

* Use go generate commands to generate mocks

* Remove the need to install mockgen in the script

* Add mock-up-to-date step to test CI workflow

* Remove all mocks before generating them in CI

* Add generate command for non-tracked mock
(Note using source mode was compulsory due to CGO)

* Use bash shell for mock check step

* Remove script mock.gen.sh

* docs(contributing): add mocks section

* mockgen version used is the one defined in go.mod
- requires a `tools.go` blank importing golang.org/x/tools/imports in order to have the `golang.org/x/tools` dependency satisfied for mockgen v0.4
- less future deltas when upgrading mockgen

* ci: use more precise go generate regex

* Add `git add --intent-to-add --all` to detect untracked files

* Add copyright notices
* small changes

* relevant warp changes

* use wrapped db package

* nit

* equivalent to subnet-evm 843e3f7

* add multiatch docker build to support arm (#1417)

* remove build_docker_image.sh

---------

Co-authored-by: Ceyhun Onur <[email protected]>
…blocks (#719)

- default behavior for pruning mode to reject blocks before the 32 blocks preceding the last accepted block
- default behavior for archive mode to reject blocks before ~24h worth of blocks preceding the last accepted block
- archive mode new option `historical-proof-query-window` to customize the blocks window, or set it to 0 to accept any block number
Co-authored-by: maskpp <[email protected]>
Co-authored-by: Aaron Chen <[email protected]>
Co-authored-by: Shiming Zhang <[email protected]>
Co-authored-by: Felix Lange <[email protected]>
Co-authored-by: Nathan <[email protected]>
Co-authored-by: Eric <[email protected]>
Co-authored-by: Darioush Jalali <[email protected]>
Co-authored-by: Quentin McGaw <[email protected]>
qdm12
qdm12 previously approved these changes Feb 19, 2025
@qdm12 qdm12 changed the title merge master 2e4e6bd85132e7c655775e1b62a6397e0270cdb5 Merge master into libevm Feb 19, 2025
@qdm12 qdm12 changed the title Merge master into libevm Merge master (2e4e6bd) into libevm (2) Feb 19, 2025
ARR4N
ARR4N previously approved these changes Feb 20, 2025
Copy link
Contributor

@ARR4N ARR4N left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Performed a cursory review of the additional commits beyond 2e4e6bd. Primarily a rubber stamp after discussion with @qdm12.

Base automatically changed from darioush/qdm12/libevm-phase-2.5 to libevm February 20, 2025 11:19
@qdm12 qdm12 dismissed stale reviews from ARR4N and themself February 20, 2025 11:19

The base branch was changed.

@qdm12 qdm12 marked this pull request as ready for review February 20, 2025 11:41
@qdm12 qdm12 requested review from ceyonur and a team as code owners February 20, 2025 11:41
@qdm12 qdm12 enabled auto-merge (squash) February 20, 2025 11:44
Copy link
Contributor

@ARR4N ARR4N left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:stamp:

@qdm12 qdm12 merged commit 65f999e into libevm Feb 20, 2025
6 checks passed
@qdm12 qdm12 deleted the darioush/qdm12/libevm-phase-2.5-merge-master branch February 20, 2025 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants