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

Cortina 19: Ava-labs/core-eth v0.12.11-rc.2 (avalanchego 1.10.19) #96

Merged
merged 19 commits into from
Mar 28, 2024

Conversation

knikos
Copy link
Member

@knikos knikos commented Mar 28, 2024

Why this should be merged

This PR contains changes from ava-labs/core-eth between cortina-18 and cortina-19. Its required for upcoming merge of cortina-19 changes to caminogo.

Notable changes

Diff with previous tag v1.1.18-rc0 (coreth v0.12.10-rc.5) ava-labs/coreth@v0.12.10-rc.5...v0.12.11-rc.2

How this works

Conflicts

  • .github/workflows/ci.yml (new step to apply linter to shell scripts see ci: Add shellcheck step to lint job ava-labs/coreth#464)
  • RELEASES.md
  • core/genesis.go (import conflict)
  • go.sum
  • params/config.go (avax made some minor refactorings - conflict due to Sunrise Timestamp)
  • plugin/evm/version.go
  • scripts/build_test.sh (avax wrapped all passed arguments with quotes $@ -> "$@" probably due to linter introduction)
  • scripts/versions.sh

Fixes

  • plugin/evm/camino_vm_test.go (NewBlock constructor was replaced by NewBlockWithExtData)
  • accounts/abi/bind/bind_test.go (updated caminogo tag reference)

Minor sh scripts changes due to newly introduced linter

namely adding quotes due to warnings or restructuring slightly to satisfy linter

  • SC2086 (info): Double quote to prevent globbing and word splitting.
  • SC2206 (warning): Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a.
  • SC2046 (warning): Quote this to prevent word splitting.

How this was tested

ci

ceyonur and others added 18 commits January 11, 2024 13:40
* remove ethdb

* fix codebase

* merge fixes

* missed this file
* add UT for eth tx pool subscribe

* fix eth tx pool subscribtion

* remove extra registry param

* don't use journal

* simplify test

* increase timeout
Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
* Fix stat emitted for eth txs gossip received error

* fix name

* Add back atomic error stat
* align types/block.go with addative upstream

* align with subnet-evm for now

* add copyright header

* rename to WithExtData
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
# Conflicts:
#  .github/workflows/ci.yml
#   RELEASES.md
#	core/genesis.go
#	go.sum
#   params/config.go
#   plugin/evm/version.go
#   scripts/build_test.sh
#	scripts/versions.sh
@knikos knikos requested a review from evlekht March 28, 2024 11:25
@knikos knikos force-pushed the nikos/cortina/19 branch 2 times, most recently from d0d08c8 to 6faed94 Compare March 28, 2024 11:43
@knikos knikos marked this pull request as ready for review March 28, 2024 11:55
@knikos knikos merged commit eaa273e into dev Mar 28, 2024
6 checks passed
@knikos knikos deleted the nikos/cortina/19 branch March 28, 2024 12:53
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.

7 participants