Skip to content
New issue

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

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

Already on GitHub? # to your account

Cortina 18: Ava-labs/core-eth v0.12.10-rc5 (avalanchego 1.10.18) #94

Merged
merged 34 commits into from
Mar 19, 2024

Conversation

knikos
Copy link
Member

@knikos knikos commented Mar 14, 2024

Why this should be merged

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

Notable changes

Diff with previous tag v1.1.17-rc0 (coreth v0.12.9-rc.9) ava-labs/coreth@v0.12.9-rc.9...v0.12.10-rc.5

How this works

Conflicts

  • .github/workflows/ci.yml
  • core/txpool/txpool.go (due to renaming D -> Durango)
  • core/vm/interpreter.go (removed AllowUnfinalizedQueries)
  • eth/backend.go (new allowUnfinalizedQueries in EthAPIBackend - we have split struct field initalization due to AdminController. Therefore, new field is added here)
  • go.mod
  • go.sum
  • params/config.go
  • plugin/evm/codec.go (linear codec now accepts durangoTime as parameter + var renamings)
  • plugin/evm/vm.go (due to renaming D -> Durango directly below KopernikusChain config)
  • scripts/lint.sh
  • scripts/versions.sh

Fixes

How this was tested

Automated unit tests

StephenButtolph and others added 30 commits December 6, 2023 13:39
* Add support for warp offchain messages

* Address comments
* Atomic trie repair script

* clearer vdb commit

* update comment

* improve UT

* update comment

* review comments

* return int from repairAtomicTrie

* add comment

* fix bug

* move block parsing to init

* clarify the UT

* add err check

* pr comment

* comment

* pr comments

* add comment
* initial height map repair

* add vdb commit

* Atomic trie repair script

* clearer vdb commit

* update comment

* improve UT

* update comment

* review comments

* return int from repairAtomicTrie

* pr comments

* start the migration on VM initialize

* add comment

* fix bug

* fix bug, improve UT

* reduce logs

* pr comments

* test names

* remove nil check

* batch the sleeping

* move block parsing to init

* clarify the UT

* add err check

* pr comment

* comment

* pr comment

* remove delay as argument

* change log time
* add gossip marshallers

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

* nit

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

* nit

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

* fix build

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>

* use int64 timestamp

* update avalanchego dep

* update avalanchego dep

---------

Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
Co-authored-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
* remove no-op handler

* add crosschain apprequest func

---------

Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
* verify single predicate

* simplify returned error

* track indexes for predicates

* don't short cirtcuit predicate err

* Update predicate_check.go



* nits for single-predicate-verify (#1012)

* Update x/warp/predicate_test.go




* Update x/warp/predicate_test.go




* review fixes

* use bitset constructor

* change return type to err in verifypredicate

---------

Signed-off-by: Ceyhun Onur <ceyhun.onur@avalabs.org>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>
Co-authored-by: marun <maru.newby@avalabs.org>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
* initial height map repair

* add vdb commit

* Atomic trie repair script

* clearer vdb commit

* update comment

* improve UT

* update comment

* review comments

* return int from repairAtomicTrie

* pr comments

* start the migration on VM initialize

* add comment

* fix bug

* fix bug, improve UT

* reduce logs

* pr comments

* test names

* remove nil check

* batch the sleeping

* move block parsing to init

* clarify the UT

* add err check

* pr comment

* comment

* pr comment

* remove delay as argument

* Remove completed migration

* fix merge

* fix merge
* verify single predicate (#960)

* verify single predicate

* simplify returned error

* track indexes for predicates

* don't short cirtcuit predicate err

* Update predicate_check.go

Signed-off-by: Ceyhun Onur <ceyhun.onur@avalabs.org>

* nits for single-predicate-verify (#1012)

* Update x/warp/predicate_test.go

Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>

* Update x/warp/predicate_test.go

Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>

* review fixes

* use bitset constructor

* change return type to err in verifypredicate

---------

Signed-off-by: Ceyhun Onur <ceyhun.onur@avalabs.org>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>
Co-authored-by: marun <maru.newby@avalabs.org>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>

* sync with subnet-evm v0.5.11-rc.0

* add interfaces to mockgen

* Update core/vm/instructions.go

Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>

* move warp params to warp package

---------

Signed-off-by: Ceyhun Onur <ceyhun.onur@avalabs.org>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>
Co-authored-by: marun <maru.newby@avalabs.org>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
* rename DUpgrade to Durango

* Apply suggestions from code review

Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>

---------

Signed-off-by: Ceyhun Onur <ceyhunonur54@gmail.com>
Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org>
* refactor: move AllowUnfinalizedQueries out of vm.Config

* fix comment

* review naming suggestion

* Revert "fix comment"

This reverts commit 323f1cf.
maru-ava and others added 3 commits January 9, 2024 07:41
* Add check for compatible version of golangci-lint

* fixup: Avoid requiring patch version
* update const name

* lower min target items

* fix lint

* add churn multiplier

* latest ago

* nits

* fix e2e

* update GetFilter

* use correct avalanche version

* update AvalancheGo@v1.10.18-rc.17

* update scripts version
# Conflicts:
#	.github/workflows/ci.yml
#	core/txpool/txpool.go
#	core/vm/interpreter.go
#	eth/backend.go
#	go.mod
#	go.sum
#	params/config.go
#	plugin/evm/codec.go
#	plugin/evm/vm.go
#	scripts/lint.sh
#	scripts/versions.sh
@knikos knikos requested a review from evlekht March 14, 2024 15:26
@knikos knikos force-pushed the nikos/cortina/18 branch from aef51f4 to aa6a37e Compare March 15, 2024 08:14
@knikos knikos marked this pull request as ready for review March 15, 2024 08:17
evlekht
evlekht previously approved these changes Mar 15, 2024
@knikos knikos merged commit 0e69822 into dev Mar 19, 2024
7 checks passed
@knikos knikos deleted the nikos/cortina/18 branch March 19, 2024 15:13
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants