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

[AVAX] Merge Cortina 17 (v1.10.17) #358

Draft
wants to merge 97 commits into
base: evlekht/new-dev-c19
Choose a base branch
from

Conversation

evlekht
Copy link
Member

@evlekht evlekht commented Jul 24, 2024

Why this should be merged

This PR contains changes from ava-labs/avalanchego between cortina-16 and cortina-17.
https://github.com/ava-labs/avalanchego/releases/tag/v1.10.17

Conflicts

  • .github/workflows/test.e2e.existing.yml
  • .github/workflows/test.e2e.yml
  • .github/workflows/test.upgrade.yml
  • README.md
  • RELEASES.md
  • genesis/bootstrappers.json
  • go.sum
  • node/node.go
  • scripts/build_tmpnetctl.sh
  • scripts/mocks.mockgen.txt
  • scripts/tests.e2e.persistent.sh
  • scripts/tests.e2e.sh
  • tests/e2e/README.md
  • tests/fixture/tmpnet/local/config.go
  • version/compatibility.json
  • version/constants.go
  • vms/platformvm/state/diff.go
  • vms/platformvm/state/mock_chain.go
  • vms/platformvm/state/mock_diff.go
  • vms/platformvm/state/mock_state.go
  • vms/platformvm/state/state.go

Post-merge fixes

How this was tested

With already existing unit-tests and e2e tests.

Additional references

Original PR
#317

StephenButtolph and others added 30 commits November 2, 2023 20:20
Signed-off-by: David Boehm <[email protected]>
Signed-off-by: Dan Laine <[email protected]>
Co-authored-by: Darioush Jalali <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: felipemadero <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
Signed-off-by: David Boehm <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
felipemadero and others added 26 commits November 27, 2023 11:43
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
# Conflicts:
#	RELEASES.md
#	api/admin/client.go
#	api/admin/service.go
#	go.mod
#	go.sum
#	node/node.go
#	version/compatibility.json
#	version/constants.go
#	vms/platformvm/api/static_service.go
#	vms/platformvm/service.go
#	vms/platformvm/vm.go
# Conflicts:
#	.github/workflows/test.e2e.existing.yml
#	.github/workflows/test.e2e.yml
#	.github/workflows/test.upgrade.yml
#	README.md
#	RELEASES.md
#	genesis/bootstrappers.json
#	go.sum
#	node/node.go
#	scripts/build_tmpnetctl.sh
#	scripts/mocks.mockgen.txt
#	scripts/tests.e2e.persistent.sh
#	scripts/tests.e2e.sh
#	tests/e2e/README.md
#	tests/fixture/tmpnet/local/config.go
#	version/compatibility.json
#	version/constants.go
#	vms/platformvm/state/diff.go
#	vms/platformvm/state/mock_chain.go
#	vms/platformvm/state/mock_diff.go
#	vms/platformvm/state/mock_state.go
#	vms/platformvm/state/state.go
@evlekht evlekht force-pushed the evlekht/cortina-17 branch from c2b5e8f to e0b8016 Compare July 24, 2024 14:56
@evlekht evlekht force-pushed the evlekht/cortina-17 branch from e0b8016 to 77ad800 Compare July 24, 2024 16:03
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.