[AVAX] Merge Cortina 19 (v1.10.19) #320
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tate` (ava-labs#2489) Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: Stephen Buttolph <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]> Co-authored-by: Dhruba Basu <[email protected]>
Signed-off-by: Joshua Kim <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Darioush Jalali <[email protected]>
# Conflicts: # .github/workflows/ci.yml # .github/workflows/scripts/cleanup-net-outage-sim.sh # .github/workflows/scripts/run-net-outage-sim.sh # RELEASES.md # api/admin/client.go # api/admin/service.go # go.sum # node/node.go # scripts/lint.sh # scripts/tests.e2e.existing.sh # scripts/tests.e2e.sh # version/compatibility.json # version/constants.go # vms/platformvm/txs/executor/state_changes.go # vms/platformvm/txs/executor/tx_mempool_verifier.go
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
knikos
reviewed
Apr 2, 2024
mo-c4t
previously approved these changes
Apr 2, 2024
evlekht
force-pushed
the
evlekht/cortina/19
branch
from
acd19cc to
e3d54c1
Compare
knikos
approved these changes
Apr 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why this should be merged
This PR contains changes from ava-labs/avalanchego between cortina-18 and cortina-19.
https://github.com/ava-labs/avalanchego/releases/tag/v1.10.19
Conflicts
Post-merge fixes
vms/platformvm/block/executor/options.go
Make
CaminoRewardValidatorTxalways prefer commit, since it onCommit and onAbort state are the same forCaminoRewardValidatorTx.vms/platformvm/camino_service.go
If
LockModeBondDepositis false, thenGetValidatorsAtwill call original avax service.How this was tested
With already existing unit-tests and e2e tests.
Co-authors
@knikos