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.

Sign up for GitHub

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

Jump to bottom

Rewrite ConflictDAG #2606

Draft
wants to merge 141 commits into
base: develop
Choose a base branch
from
Draft

Rewrite ConflictDAG #2606

wants to merge 141 commits into from

Commits on Mar 10, 2023

  1. Feat: Initial Brainstorm un multi-tiered conflictdag

    @hmoog
    hmoog committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    7c2cb28 View commit details
    Browse the repository at this point in the history

  2. Feat: more brainstorming

    @hmoog
    hmoog committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    10b10a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. Feat: started implementing ordering

    @hmoog
    hmoog committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    37109ba View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Feat: WIP WIP

    @hmoog
    hmoog committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    83d251e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Feat: added unit tests

    @hmoog
    hmoog committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    bb26ad8 View commit details
    Browse the repository at this point in the history

  2. Feat: added more stuff

    @hmoog
    hmoog committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    0021cfd View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Feat: WIP WIP it works

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    3e34f51 View commit details
    Browse the repository at this point in the history

  2. Feat: started finalizing and commenting sub packages

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    71b62f6 View commit details
    Browse the repository at this point in the history

  3. Feat: refactored more code

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    5513fe5 View commit details
    Browse the repository at this point in the history

  4. Feat: more cleanup

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    9d2bc1a View commit details
    Browse the repository at this point in the history

  5. Refactor: removed unnecessary code

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    9094a6e View commit details
    Browse the repository at this point in the history

  6. Refactor: fixed some outputs in the String methods

    @hmoog
    hmoog committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    9bfceea View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Merge branch 'develop' of https://github.com/iotaledger/goshimmer int… 

    …o feat/rewrite-conflictdag-with-voting
    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    8ced0b0 View commit details
    Browse the repository at this point in the history

  2. Fix: updated constructor of AdvancedSet

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    3394cbc View commit details
    Browse the repository at this point in the history

  3. Refactor: removed unused code

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    643d928 View commit details
    Browse the repository at this point in the history

  4. Feat: implemented some preferred instead stuff

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    c933c52 View commit details
    Browse the repository at this point in the history

  5. Feat: Added PreferredInstead functionalitz

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    5740e1c View commit details
    Browse the repository at this point in the history

  6. Refactor: started cleaning up

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    80aeece View commit details
    Browse the repository at this point in the history

  7. Refactor: cleaned up more code

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    e042aef View commit details
    Browse the repository at this point in the history

  8. Refactor: cleaned up code

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    eb04c9c View commit details
    Browse the repository at this point in the history

  9. Refactor: started cleanup SortedSet

    @hmoog
    hmoog committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    6b80c04 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Refactor: cleaned up SortedSet

    @hmoog
    hmoog committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    55496d3 View commit details
    Browse the repository at this point in the history

  2. Feat: hooked PreferredInsteadUpdated

    @hmoog
    hmoog committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    3aad4ed View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Test new Conflicts WIP

    @piotrm50
    piotrm50 committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    bbab455 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Create a worker for updating conflict preference

    @piotrm50
    piotrm50 committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    6b96cf1 View commit details
    Browse the repository at this point in the history

  2. Sorted conflicts somewhat work

    @piotrm50
    piotrm50 committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    222a962 View commit details
    Browse the repository at this point in the history

  3. Test WIP

    @piotrm50
    piotrm50 committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    ba18dd0 View commit details
    Browse the repository at this point in the history

  4. Feat: added shared pendingTasksCounter

    @hmoog
    hmoog committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    fc1aa60 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2023

  1. Feat: fixed bugs?

    @hmoog
    hmoog committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    d7d7813 View commit details
    Browse the repository at this point in the history

  2. Add event log for debugging

    @piotrm50
    piotrm50 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    e82ff02 View commit details
    Browse the repository at this point in the history

  3. Fix: fixed some bugs

    @hmoog
    hmoog committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    c315e24 View commit details
    Browse the repository at this point in the history

  4. Improve unit tests

    @piotrm50
    piotrm50 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    1dcc458 View commit details
    Browse the repository at this point in the history

  5. Improve test assertion

    @piotrm50
    piotrm50 committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    6e3148e View commit details
    Browse the repository at this point in the history

  6. Fix: fixed linter issue

    @hmoog
    hmoog committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    608bb25 View commit details
    Browse the repository at this point in the history

  7. Refactor: refactored code

    @hmoog
    hmoog committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    14445bc View commit details
    Browse the repository at this point in the history

  8. Fix: fixed race condition

    @hmoog
    hmoog committed Mar 22, 2023
    Configuration menu
    Copy the full SHA
    cc6980a View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Add parentsPreferredConflicts property

    @piotrm50
    piotrm50 committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    c66b60c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Feat: started adding likeInstead references

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    8f7fcca View commit details
    Browse the repository at this point in the history

  2. Feat: started adding tests for LikedInstead

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    484a33e View commit details
    Browse the repository at this point in the history

  3. Feat: likedinstead seems to work

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    56a4551 View commit details
    Browse the repository at this point in the history

  4. Refactor: refactored code

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    d5e1181 View commit details
    Browse the repository at this point in the history

  5. Fix: fixed linter errors

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    101870c View commit details
    Browse the repository at this point in the history

  6. Refactor: fixed linter error

    @hmoog
    hmoog committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    6dbff41 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. Refactor: cleaned up code

    @hmoog
    hmoog committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    03b4b7a View commit details
    Browse the repository at this point in the history

  2. Feat: started tying things together in the ConflictDAG

    @hmoog
    hmoog committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    13a3b23 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. Merge branch 'develop' of github.com:iotaledger/goshimmer into feat/r… 

    …ewrite-conflictdag-with-voting
    @hmoog
    hmoog committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    195a7a9 View commit details
    Browse the repository at this point in the history

  2. Feat: started adding conflictdag tests

    @hmoog
    hmoog committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    12437c1 View commit details
    Browse the repository at this point in the history

  3. Feat: extended tests

    @hmoog
    hmoog committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0ef7a4c View commit details
    Browse the repository at this point in the history

  4. Fix: fixed bug

    @hmoog
    hmoog committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    63e66d1 View commit details
    Browse the repository at this point in the history

  5. Fix: fixed bug

    @hmoog
    hmoog committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    20e2aba View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Feat: added more tests

    @hmoog
    hmoog committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    0254d06 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Feat: upgraded hive.go

    @hmoog
    hmoog committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    77785eb View commit details
    Browse the repository at this point in the history

  2. Feat: cleaned up API

    @hmoog
    hmoog committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    1fadcaf View commit details
    Browse the repository at this point in the history

  3. Feat: simplified API

    @hmoog
    hmoog committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    a2dad39 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Feat: cleaned up API

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    21ca0f9 View commit details
    Browse the repository at this point in the history

  2. Feat: simplified api

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f7af16c View commit details
    Browse the repository at this point in the history

  3. Feat: added method to join a conflict to new conflictSets

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    65e5c26 View commit details
    Browse the repository at this point in the history

  4. Feat: uploaded some changes

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    cf5fe5b View commit details
    Browse the repository at this point in the history

  5. Feat: cleaned up types

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    e85c8c8 View commit details
    Browse the repository at this point in the history

  6. Feat: added voting primitives

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    c90601c View commit details
    Browse the repository at this point in the history

  7. Feat: cleaned up code

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    d02da12 View commit details
    Browse the repository at this point in the history

  8. Refactor: cleaned up more code

    @hmoog
    hmoog committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    a107dbb View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. Feat: cleaned up code

    @hmoog
    hmoog committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    1fffdd5 View commit details
    Browse the repository at this point in the history

  2. Feat: merged more funcs

    @hmoog
    hmoog committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    bbee28a View commit details
    Browse the repository at this point in the history

  3. Feat: more cleanup

    @hmoog
    hmoog committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    c6dbe6e View commit details
    Browse the repository at this point in the history

  4. Refactor: started restructuring code

    @hmoog
    hmoog committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    87f34c9 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Refactor: added comments in respect to locking

    @hmoog
    hmoog committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    908cb0b View commit details
    Browse the repository at this point in the history

  2. Refactor: removed unnecessary variable

    @hmoog
    hmoog committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    7496958 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feat/rewrite-conflictdag-with-voting

    @hmoog
    hmoog authored Apr 7, 2023
    Configuration menu
    Copy the full SHA
    e02482a View commit details
    Browse the repository at this point in the history

  4. Feat: go mod tidy

    @hmoog
    hmoog committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    cce86b2 View commit details
    Browse the repository at this point in the history

  5. Fix: fixed data race

    @hmoog
    hmoog committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    f378894 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. Feat: cleaned up code

    @hmoog
    hmoog committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    88b6ad5 View commit details
    Browse the repository at this point in the history

  2. Feat: started adding vote logic

    @hmoog
    hmoog committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    9d82204 View commit details
    Browse the repository at this point in the history

  3. Refactor: refactored walkers and removed utils

    @hmoog
    hmoog committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    bac12e8 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Feat: WIP (almost done)

    @hmoog
    hmoog committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    0d8a269 View commit details
    Browse the repository at this point in the history

  2. Feat: added tests for acceptance

    @hmoog
    hmoog committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    44a821d View commit details
    Browse the repository at this point in the history

  3. Feat: extended tests

    @hmoog
    hmoog committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    dd73c3f View commit details
    Browse the repository at this point in the history

  4. Evaluate results of a test

    @piotrm50
    piotrm50 committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    5e223a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Feat: cleaned up code

    @hmoog
    hmoog committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    e70660d View commit details
    Browse the repository at this point in the history

  2. Clean up stuff

    @piotrm50
    piotrm50 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    8d32368 View commit details
    Browse the repository at this point in the history

  3. Move things from conflict package to conflictdag package and improve … 

    …tests
    @piotrm50
    piotrm50 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    bc8b174 View commit details
    Browse the repository at this point in the history

  4. Fix: reverted accidental change from previous commit

    @hmoog
    hmoog committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    eb5ad7c View commit details
    Browse the repository at this point in the history

  5. Implement Dispose methods for Conflict and SortedConflicts

    @piotrm50
    piotrm50 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    5a1046e View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. Feat: started tracking conflictsets in conflicts

    @hmoog
    hmoog committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    a311ac3 View commit details
    Browse the repository at this point in the history

  2. Implement eviction of the new ConflictDAG

    @piotrm50
    piotrm50 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    b51e5ae View commit details
    Browse the repository at this point in the history

  3. Fix tests after refactoring

    @piotrm50
    piotrm50 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    80eeda0 View commit details
    Browse the repository at this point in the history

  4. Feat: started fixing tests

    @hmoog
    hmoog committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    6b660de View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feat/rewrite-conflictdag-with-voting' of https://github… 

    ….com/iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting
    @hmoog
    hmoog committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    af2d817 View commit details
    Browse the repository at this point in the history

  6. Fix: fixed tests#

    @hmoog
    hmoog committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    b42d725 View commit details
    Browse the repository at this point in the history

  7. Refactor: introduced utility method for getting conflictsets

    @hmoog
    hmoog committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    8e6222e View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Feat: continued work ok eviction

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    750f35b View commit details
    Browse the repository at this point in the history

  2. Fix: fixed bug

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    6c2cc1d View commit details
    Browse the repository at this point in the history

  3. Feat: cleaned up eviction

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    5806b69 View commit details
    Browse the repository at this point in the history

  4. Ledger uses new conflict DAG

    @piotrm50
    piotrm50 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    bb9aa0f View commit details
    Browse the repository at this point in the history

  5. Refactor: added comment

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    1f0ed9b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/rewrite-conflictdag-with-voting' of https://github… 

    ….com/iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting
    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    bd3dd69 View commit details
    Browse the repository at this point in the history

  7. Get rid of VirtualVoting component. Make markerbooker use new Conflic… 

    …tDag
    @piotrm50
    piotrm50 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    b6961e3 View commit details
    Browse the repository at this point in the history

  8. Integrate the new conflictdag with the rest of the components

    @piotrm50
    piotrm50 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    d3c2da5 View commit details
    Browse the repository at this point in the history

  9. Start fixing compile errors

    @piotrm50
    piotrm50 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    1412314 View commit details
    Browse the repository at this point in the history

  10. Refactor: reverted accidental rename

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    e1779ee View commit details
    Browse the repository at this point in the history

  11. Refactor: fix more rename bugs

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    0cf3e83 View commit details
    Browse the repository at this point in the history

  12. Feat: more cleanup

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    e5c8078 View commit details
    Browse the repository at this point in the history

  13. Refactor: minimized changes

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    bf717e9 View commit details
    Browse the repository at this point in the history

  14. Feat: further minimized diff

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    b0d3508 View commit details
    Browse the repository at this point in the history

  15. Fix: fixed some bugs

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    d86df62 View commit details
    Browse the repository at this point in the history

  16. Fix: fixed ReferenceProvider

    @hmoog
    hmoog committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    66ff2d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. Refactor: refactored code

    @hmoog
    hmoog committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    cc057b7 View commit details
    Browse the repository at this point in the history

  2. Refactor: refactored code

    @hmoog
    hmoog committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    53ec43b View commit details
    Browse the repository at this point in the history

  3. Refactor: refactor

    @hmoog
    hmoog committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    fd9b2b0 View commit details
    Browse the repository at this point in the history

  4. Refactor: minimized diff

    @hmoog
    hmoog committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    a2c126a View commit details
    Browse the repository at this point in the history

  5. Refactor: reverted erroneous rename

    @hmoog
    hmoog committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    eb09e99 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Feat: switched ConflictDAG API to use AdvancedSets

    @hmoog
    hmoog committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    d0e8a14 View commit details
    Browse the repository at this point in the history

  2. Feat: optimized code to use AdvancedSet everywhere

    @hmoog
    hmoog committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    9a80012 View commit details
    Browse the repository at this point in the history

  3. Feat: fixed interfaces

    @hmoog
    hmoog committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    2462094 View commit details
    Browse the repository at this point in the history

  4. Continue integrating new conflictdag with the codebase

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    8a34c1d View commit details
    Browse the repository at this point in the history

  5. Fix last problems

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    6307ff4 View commit details
    Browse the repository at this point in the history

  6. Fix tips conflicts tracker

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    8d064cf View commit details
    Browse the repository at this point in the history

  7. Fix some problems with double spend resolution

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    26bdd21 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'debug/race-conditions' into feat/rewrite-conflictdag-wi… 

    …th-voting
    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    d0e9ccd View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/debug/race-conditions' into feat… 

    …/rewrite-conflictdag-with-voting
    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    9537e80 View commit details
    Browse the repository at this point in the history

  10. Continue fixing problems after integrating the new conflictdag

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    162034f View commit details
    Browse the repository at this point in the history

  11. Fix some more problems with double spend and guava spam.

    @piotrm50
    piotrm50 committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    2d8b6a4 View commit details
    Browse the repository at this point in the history

  12. Feat: added some missing comments

    @hmoog
    hmoog committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    ed31879 View commit details
    Browse the repository at this point in the history

  13. Fix: fixed tests

    @hmoog
    hmoog committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    3c9f913 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Feat: Created ConflictDAG interface package 

    - introduced dedicated ConflictDAG interface package
- moved implementation to v1 package
- removed old ConflictDAG package
- started adding generic test framework
    @hmoog
    hmoog committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    9920479 View commit details
    Browse the repository at this point in the history

  2. Only remove strong parents when adding a new tip to tip pool

    @piotrm50
    piotrm50 committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    fa1d97a View commit details
    Browse the repository at this point in the history

  3. Fix casting votes when propagating conflict after fork.

    @piotrm50
    piotrm50 committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    1cbee1c View commit details
    Browse the repository at this point in the history

  4. Revert accidental change

    @piotrm50
    piotrm50 committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    6ecdf48 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Feat: implemented generic test framework for conflictdag

    @hmoog
    hmoog committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    2503e80 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Merge remote-tracking branch 'origin/develop' into feat/rewrite-confl… 

    …ictdag-with-voting
    @piotrm50
    piotrm50 committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    27312ab View commit details
    Browse the repository at this point in the history

  2. Fix post merge errors

    @piotrm50
    piotrm50 committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    d026284 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/develop' into feat/rewrite-confl… 

    …ictdag-with-voting
    @piotrm50
    piotrm50 committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    aed80c5 View commit details
    Browse the repository at this point in the history

  4. Remove some unused metrics that caused problems

    @piotrm50
    piotrm50 committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    d745f0a View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Fix nil pointer in the metrics plugin

    @piotrm50
    piotrm50 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    9846cee View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. Always create conflictsets

    @piotrm50
    piotrm50 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    db1714c View commit details
    Browse the repository at this point in the history

  2. Get rid of implicit self-like

    @piotrm50
    piotrm50 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    c7866a2 View commit details
    Browse the repository at this point in the history

  3. Add a parent block back to the tip pool after removing old one.

    @piotrm50
    piotrm50 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    151a66e View commit details
    Browse the repository at this point in the history

  4. Remove printlns for subjectively invalid blocks

    @piotrm50
    piotrm50 committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    7258ae8 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Fix imports

    @piotrm50
    piotrm50 committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    4e167db View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Add non-conflicting conflict to ConflictDAG test suite

    @karimodm
    karimodm committed May 11, 2023
    Configuration menu
    Copy the full SHA
    8574b8e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/rewrite-conflictdag-with-voting' of github.com:iot… 

    …aledger/goshimmer into feat/rewrite-conflictdag-with-voting
    @karimodm
    karimodm committed May 11, 2023
    Configuration menu
    Copy the full SHA
    749aa3e View commit details
    Browse the repository at this point in the history