Merge main rc v1.6.0 2023.12.21 #164
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
Guarded transactions
…ta-for-signing Added todo comment for getting data for signing from core
…-cli Freeze account feat example cli
updated elrond-go + elrond-go-core to latest commit
MX-13883: native auth server use api for fetching the block
MX-13884: native auth support legacy signable messages
update dependencies for guardians
Update mx chain go
…server Cache block timestamp in authserver
# Conflicts: # aggregator/notifees/interface.go # aggregator/notifees/mxNotifee.go # blockchain/interface.go # blockchain/proxy.go # blockchain/proxy_test.go # builders/txBuilder.go # builders/txBuilder_test.go # data/transaction.go # examples/examplesTransaction/main.go # go.mod # go.sum # interactors/interface.go # interactors/transaction_test.go # testsCommon/proxyStub.go # testsCommon/signerStub.go # testsCommon/txBuilderStub.go # workflows/interface.go # workflows/moveBalanceHandler.go
Merge main to guardians 2023.05.26
Merge main freeze account
added RoundsPerEpoch to NetworkConfig
# Conflicts: # .github/workflows/golangci-lint.yml # blockchain/endpointProviders/baseEndpointProvider.go # blockchain/endpointProviders/baseEndpointProvider_test.go # blockchain/proxy.go # blockchain/proxy_test.go # disabled/enableEpochsHandler.go # go.mod # go.sum # testsCommon/proxyStub.go # testsCommon/txBuilderStub.go # workflows/interface.go
Merge master freeze acc
Feat/freeze account
# Conflicts: # blockchain/endpointProviders/baseEndpointProvider.go # blockchain/proxy.go # blockchain/proxy_test.go # go.mod # go.sum
- updated golang version in go.mod - activated workflows for `rc/*` branches - fixed linter issues
andreibancioiu
approved these changes
Dec 21, 2023
sstanculeanu
approved these changes
Dec 22, 2023
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.
rc/*branches