Merge conflicts demo refactor #5894
Closed
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
Add resource limiter config
…vereign-logs Mx 14670 collect outgoing sovereign logs
…-signature-outgoing-tx-data # Conflicts: # consensus/spos/bls/blsSubroundsFactory.go
…14758-sovereign-header-sig-verifier
overridable configs fix
# Conflicts: # go.mod
Fix out of gas save key value
# Conflicts: # go.mod # go.sum
…r-with-confirmed-bridgeOps Mock grpc server
Start sovereign nodes with certificates
…rtificate-logviewer
…e-logviewer Load tls config into logviewer
Fix metric count consensus
…figs Merge notifier config into sovereign config
Fix import db resource leak
…ng-operations-16-jan-2023 # Conflicts: # cmd/sovereignnode/incomingHeader/errors.go # cmd/sovereignnode/incomingHeader/incomingHeaderProcessor_test.go # cmd/sovereignnode/incomingHeader/incomingSCRProcessor.go
switch to current block randomness for ordering transactions
…going-operations-16-jan-2023 Merge sovereign into feat/sov outgoing operations 16 jan 2023
feat/ Sovereign outgoing bridge operations
…18-jan-2024 Merge rc 1 7 into sovereign 18 jan 2024
…ts-outgoing-ops FIX: Add back subscribed events for outgoing operations
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?