Merge rc17next1 into feat/relayedv3 2024.05.15 #6171
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
…ion which can be called by anyone.
# Conflicts: # common/enablers/enableEpochsHandler.go # common/enablers/epochFlags.go # common/interface.go # go.mod # go.sum # sharding/mock/enableEpochsHandlerMock.go # testscommon/enableEpochsHandlerMock/enableEpochsHandlerStub.go
…torage-opt # Conflicts: # cmd/node/config/enableEpochs.toml # common/constants.go # common/enablers/enableEpochsHandler.go # config/epochConfig.go # config/tomlConfig_test.go # go.mod # go.sum # sharding/mock/enableEpochsHandlerMock.go
ESDT v2 implementations on SystemSC - dynamic tokens and tokenType
…in-feat/esdt-improvements-30jan # Conflicts: # common/constants.go # common/enablers/enableEpochsHandler.go # config/epochConfig.go # config/tomlConfig_test.go # vm/systemSmartContracts/esdt.go
…-improvements-30jan Merge rc/v1.7.0 in feat/esdt improvements 30jan
…t-improvements-integration # Conflicts: # common/constants.go # go.mod # go.sum
esdt improvements integration
# Conflicts: # integrationTests/chainSimulator/staking/delegation_test.go
…into rc/v1.7.next1 # Conflicts: # go.mod # go.sum
Integrate vm improve 1.5.5
…n-go into merge_rc170_into_rc17next1_2024.05.08 # Conflicts: # go.mod # go.sum
…024.05.08 Merge rc170 into rc17next1 2024.05.08
# Conflicts: # node/chainSimulator/chainSimulator_test.go
…sovereign Chain simulator updates for sovereign
v1.7.10 dev config
…to merge_master_into_rc17next1_2024.05.14
Adjust workflow runners (MacOS)
…2024.05.14 Merge master into rc17next1 2024.05.14
…n-go into feat/relayedv3 # Conflicts: # common/constants.go # common/enablers/enableEpochsHandler.go # common/enablers/enableEpochsHandler_test.go # config/epochConfig.go # config/tomlConfig_test.go # go.mod # go.sum # integrationTests/multiShard/relayedTx/relayedTxV2_test.go # integrationTests/multiShard/relayedTx/relayedTx_test.go # integrationTests/vm/txsFee/moveBalance_test.go # integrationTests/vm/txsFee/relayedBuiltInFunctions_test.go # integrationTests/vm/txsFee/relayedScCalls_test.go # process/errors.go
sstanculeanu
added
the
ignore-for-release-notes
andreibancioiu
approved these changes
May 15, 2024
raduchis
approved these changes
May 15, 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.
Reasoning behind the pull request
Proposed changes
Testing procedure
Pre-requisites
Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:
featbranch created?featbranch merging, do all satellite projects have a proper tag insidego.mod?