[AVAX] Merge Cortina 15 (v1.10.15) #315
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
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: Dan Laine <[email protected]>
Signed-off-by: Dan Laine <[email protected]> Co-authored-by: Dan Laine <[email protected]>
) Signed-off-by: Dan Laine <[email protected]>
Signed-off-by: Dhruba Basu <[email protected]>
Signed-off-by: Dhruba Basu <[email protected]>
Signed-off-by: marun <[email protected]> Co-authored-by: marun <[email protected]>
Signed-off-by: Joshua Kim <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: Joshua Kim <[email protected]>
Signed-off-by: Dan Laine <[email protected]>
Signed-off-by: Dhruba Basu <[email protected]>
Signed-off-by: Dan Laine <[email protected]> Co-authored-by: Dhruba Basu <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]>
Signed-off-by: Cesar <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]> Co-authored-by: Dan Laine <[email protected]>
# Conflicts: # RELEASES.md # codec/reflectcodec/struct_fielder.go # codec/reflectcodec/type_codec.go # genesis/config.go # go.sum # version/constants.go # vms/platformvm/txs/visitor.go
evlekht
changed the title
evlekht
force-pushed
the
evlekht/cortina/15
branch
3 times, most recently
from
d05e7ce to
a3544ce
Compare
knikos
requested changes
Mar 8, 2024
evlekht
force-pushed
the
evlekht/cortina/15
branch
from
a3544ce to
03bc2b0
Compare
knikos
approved these changes
Mar 8, 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-14 and cortina-15.
https://github.com/ava-labs/avalanchego/releases/tag/v1.10.15
Conflicts
Post-merge fixes
Avalanche added execution logic for pvm baseTx.
Cause we already added this kind of logic before go-live, we need to keep our tx. This PR removes some of our code that duplicates newly introduced and utilizes avax baseTx code with necessary diff.
Codec typeID remained the same, cause we could already have baseTxs on existing networks.
How this was tested
With already existing unit-tests and e2e tests.