Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace GoF with confirmation state #2313

Merged
merged 335 commits into from
Jul 7, 2022
Merged

Conversation

jonastheis
Copy link
Contributor

@jonastheis jonastheis commented Jul 5, 2022

This PR replaces the Grade of Finality and inclusion state with confirmation state throughout the whole code base.

Other changes:

  • improve conflict dashboard page to show all conflicts sorted from newest to oldest and attach to ConflictAccepted and ConflictRejected events to always show conflicts as resolved

karimodm and others added 30 commits June 8, 2022 13:39
# Conflicts:
#	packages/notarization/commitments.go
 Conflicts:
	go.mod
	go.sum
	packages/ledger/testframework.go
	packages/tangle/message.go
	packages/tangle/message_test.go
	packages/tangle/messagefactory.go
	packages/tangle/tangle.go
	packages/tangle/tangle_test.go
	packages/tangle/testutils.go
	plugins/core.go
	tools/integration-tests/tester/framework/parameters.go
# Conflicts:
#	packages/notarization/commitments.go
# Conflicts:
#	packages/epoch/types.go
#	packages/mana/accessbasevector.go
#	packages/mana/consensusbasevector.go
#	packages/notarization/commitments.go
#	packages/notarization/manager.go
#	packages/notarization/manager_test.go
#	packages/notarization/storage.go
…tion

 Conflicts:
	packages/epoch/types.go
	packages/ledger/snapshot.go
Co-authored-by: Andrea V <1577639+karimodm@users.noreply.github.com>
Copy link
Contributor

@hmoog hmoog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O_O

documentation/docs/apis/ledgerstate.md Outdated Show resolved Hide resolved
packages/conflictdag/conflictdag.go Outdated Show resolved Hide resolved
packages/ledger/events.go Outdated Show resolved Hide resolved
packages/ledger/models.go Outdated Show resolved Hide resolved
packages/ledger/models.go Outdated Show resolved Hide resolved
plugins/messagelayer/mana_plugin.go Outdated Show resolved Hide resolved
plugins/messagelayer/mana_plugin.go Outdated Show resolved Hide resolved
plugins/messagelayer/mana_plugin.go Outdated Show resolved Hide resolved
plugins/webapi/ledgerstate/plugin.go Outdated Show resolved Hide resolved
tools/integration-tests/tester/tests/testutil.go Outdated Show resolved Hide resolved
Copy link
Contributor

@hmoog hmoog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

O_O

@jonastheis jonastheis merged commit 0578e2d into develop Jul 7, 2022
@jonastheis jonastheis deleted the feat/confirmation-state branch July 7, 2022 09:01
This was referenced Jul 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants