Code

Rewrite ConflictDAG#2606

Code

Draft

hmoog wants to merge 141 commits intodevelopiotaledger/goshimmer:developfrom feat/rewrite-conflictdag-with-votingiotaledger/goshimmer:feat/rewrite-conflictdag-with-votingCopy head branch name to clipboard

+4,600-2,438

Commits

Commits on Mar 10, 2023

• Feat: Initial Brainstorm un multi-tiered conflictdag

  hmoog

  committed
  7c2cb28

  Copy full SHA for 7c2cb28

• Feat: more brainstorming

  hmoog

  committed
  10b10a0

  Copy full SHA for 10b10a0

Commits on Mar 11, 2023

• Feat: started implementing ordering

  hmoog

  committed
  37109ba

  Copy full SHA for 37109ba

Commits on Mar 14, 2023

• Feat: WIP WIP

  hmoog

  committed
  83d251e

  Copy full SHA for 83d251e

Commits on Mar 15, 2023

• Feat: added unit tests

  hmoog

  committed
  bb26ad8

  Copy full SHA for bb26ad8

• Feat: added more stuff

  hmoog

  committed
  0021cfd

  Copy full SHA for 0021cfd

Commits on Mar 16, 2023

• Feat: WIP WIP it works

  hmoog

  committed
  3e34f51

  Copy full SHA for 3e34f51

• Feat: started finalizing and commenting sub packages

  hmoog

  committed
  71b62f6

  Copy full SHA for 71b62f6

• Feat: refactored more code

  hmoog

  committed
  5513fe5

  Copy full SHA for 5513fe5

• Feat: more cleanup

  hmoog

  committed
  9d2bc1a

  Copy full SHA for 9d2bc1a

• Refactor: removed unnecessary code

  hmoog

  committed
  9094a6e

  Copy full SHA for 9094a6e

• Refactor: fixed some outputs in the String methods

  hmoog

  committed
  9bfceea

  Copy full SHA for 9bfceea

Commits on Mar 17, 2023

• Merge branch 'develop' of https://github.com/iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting

  hmoog

  committed
  8ced0b0

  Copy full SHA for 8ced0b0

• Fix: updated constructor of AdvancedSet

  hmoog

  committed
  3394cbc

  Copy full SHA for 3394cbc

• Refactor: removed unused code

  hmoog

  committed
  643d928

  Copy full SHA for 643d928

• Feat: implemented some preferred instead stuff

  hmoog

  committed
  c933c52

  Copy full SHA for c933c52

• Feat: Added PreferredInstead functionalitz

  hmoog

  committed
  5740e1c

  Copy full SHA for 5740e1c

• Refactor: started cleaning up

  hmoog

  committed
  80aeece

  Copy full SHA for 80aeece

• Refactor: cleaned up more code

  hmoog

  committed
  e042aef

  Copy full SHA for e042aef

• Refactor: cleaned up code

  hmoog

  committed
  eb04c9c

  Copy full SHA for eb04c9c

• Refactor: started cleanup SortedSet

  hmoog

  committed
  6b80c04

  Copy full SHA for 6b80c04

Commits on Mar 18, 2023

• Refactor: cleaned up SortedSet

  hmoog

  committed
  55496d3

  Copy full SHA for 55496d3

• Feat: hooked PreferredInsteadUpdated

  hmoog

  committed
  3aad4ed

  Copy full SHA for 3aad4ed

Commits on Mar 20, 2023

• Test new Conflicts WIP

  piotrm50

  committed
  bbab455

  Copy full SHA for bbab455

Commits on Mar 21, 2023

• Create a worker for updating conflict preference

  piotrm50

  committed
  6b96cf1

  Copy full SHA for 6b96cf1

• Sorted conflicts somewhat work

  piotrm50

  committed
  222a962

  Copy full SHA for 222a962

• Test WIP

  piotrm50

  committed
  ba18dd0

  Copy full SHA for ba18dd0

• Feat: added shared pendingTasksCounter

  hmoog

  committed
  fc1aa60

  Copy full SHA for fc1aa60

Commits on Mar 22, 2023

• Feat: fixed bugs?

  hmoog

  committed
  d7d7813

  Copy full SHA for d7d7813

• Add event log for debugging

  piotrm50

  committed
  e82ff02

  Copy full SHA for e82ff02

• Fix: fixed some bugs

  hmoog

  committed
  c315e24

  Copy full SHA for c315e24

• Improve unit tests

  piotrm50

  committed
  1dcc458

  Copy full SHA for 1dcc458

• Improve test assertion

  piotrm50

  committed
  6e3148e

  Copy full SHA for 6e3148e

• Fix: fixed linter issue

  hmoog

  committed
  608bb25

  Copy full SHA for 608bb25

• Refactor: refactored code

  hmoog

  committed
  14445bc

  Copy full SHA for 14445bc

• Fix: fixed race condition

  hmoog

  committed
  cc6980a

  Copy full SHA for cc6980a

Commits on Mar 23, 2023

• Add parentsPreferredConflicts property

  piotrm50

  committed
  c66b60c

  Copy full SHA for c66b60c

Commits on Mar 24, 2023

• Feat: started adding likeInstead references

  hmoog

  committed
  8f7fcca

  Copy full SHA for 8f7fcca

• Feat: started adding tests for LikedInstead

  hmoog

  committed
  484a33e

  Copy full SHA for 484a33e

• Feat: likedinstead seems to work

  hmoog

  committed
  56a4551

  Copy full SHA for 56a4551

• Refactor: refactored code

  hmoog

  committed
  d5e1181

  Copy full SHA for d5e1181

• Fix: fixed linter errors

  hmoog

  committed
  101870c

  Copy full SHA for 101870c

• Refactor: fixed linter error

  hmoog

  committed
  6dbff41

  Copy full SHA for 6dbff41

Commits on Mar 25, 2023

• Refactor: cleaned up code

  hmoog

  committed
  03b4b7a

  Copy full SHA for 03b4b7a

• Feat: started tying things together in the ConflictDAG

  hmoog

  committed
  13a3b23

  Copy full SHA for 13a3b23

Commits on Mar 29, 2023

• Merge branch 'develop' of github.com:iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting

  hmoog

  committed
  195a7a9

  Copy full SHA for 195a7a9

• Feat: started adding conflictdag tests

  hmoog

  committed
  12437c1

  Copy full SHA for 12437c1

• Feat: extended tests

  hmoog

  committed
  0ef7a4c

  Copy full SHA for 0ef7a4c

• Fix: fixed bug

  hmoog

  committed
  63e66d1

  Copy full SHA for 63e66d1

• Fix: fixed bug

  hmoog

  committed
  20e2aba

  Copy full SHA for 20e2aba

Commits on Mar 30, 2023

• Feat: added more tests

  hmoog

  committed
  0254d06

  Copy full SHA for 0254d06

Commits on Apr 4, 2023

• Feat: upgraded hive.go

  hmoog

  committed
  77785eb

  Copy full SHA for 77785eb

• Feat: cleaned up API

  hmoog

  committed
  1fadcaf

  Copy full SHA for 1fadcaf

• Feat: simplified API

  hmoog

  committed
  a2dad39

  Copy full SHA for a2dad39

Commits on Apr 5, 2023

• Feat: cleaned up API

  hmoog

  committed
  21ca0f9

  Copy full SHA for 21ca0f9

• Feat: simplified api

  hmoog

  committed
  f7af16c

  Copy full SHA for f7af16c

• Feat: added method to join a conflict to new conflictSets

  hmoog

  committed
  65e5c26

  Copy full SHA for 65e5c26

• Feat: uploaded some changes

  hmoog

  committed
  cf5fe5b

  Copy full SHA for cf5fe5b

• Feat: cleaned up types

  hmoog

  committed
  e85c8c8

  Copy full SHA for e85c8c8

• Feat: added voting primitives

  hmoog

  committed
  c90601c

  Copy full SHA for c90601c

• Feat: cleaned up code

  hmoog

  committed
  d02da12

  Copy full SHA for d02da12

• Refactor: cleaned up more code

  hmoog

  committed
  a107dbb

  Copy full SHA for a107dbb

Commits on Apr 6, 2023

• Feat: cleaned up code

  hmoog

  committed
  1fffdd5

  Copy full SHA for 1fffdd5

• Feat: merged more funcs

  hmoog

  committed
  bbee28a

  Copy full SHA for bbee28a

• Feat: more cleanup

  hmoog

  committed
  c6dbe6e

  Copy full SHA for c6dbe6e

• Refactor: started restructuring code

  hmoog

  committed
  87f34c9

  Copy full SHA for 87f34c9

Commits on Apr 7, 2023

• Refactor: added comments in respect to locking

  hmoog

  committed
  908cb0b

  Copy full SHA for 908cb0b

• Refactor: removed unnecessary variable

  hmoog

  committed
  7496958

  Copy full SHA for 7496958

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

  hmoog

  authored
  e02482a

  Copy full SHA for e02482a

• Feat: go mod tidy

  hmoog

  committed
  cce86b2

  Copy full SHA for cce86b2

• Fix: fixed data race

  hmoog

  committed
  f378894

  Copy full SHA for f378894

Commits on Apr 10, 2023

• Feat: cleaned up code

  hmoog

  committed
  88b6ad5

  Copy full SHA for 88b6ad5

• Feat: started adding vote logic

  hmoog

  committed
  9d82204

  Copy full SHA for 9d82204

• Refactor: refactored walkers and removed utils

  hmoog

  committed
  bac12e8

  Copy full SHA for bac12e8

Commits on Apr 11, 2023

• Feat: WIP (almost done)

  hmoog

  committed
  0d8a269

  Copy full SHA for 0d8a269

• Feat: added tests for acceptance

  hmoog

  committed
  44a821d

  Copy full SHA for 44a821d

• Feat: extended tests

  hmoog

  committed
  dd73c3f

  Copy full SHA for dd73c3f

• Evaluate results of a test

  piotrm50

  committed
  5e223a1

  Copy full SHA for 5e223a1

Commits on Apr 12, 2023

• Feat: cleaned up code

  hmoog

  committed
  e70660d

  Copy full SHA for e70660d

• Clean up stuff

  piotrm50

  committed
  8d32368

  Copy full SHA for 8d32368

• Move things from conflict package to conflictdag package and improve tests

  piotrm50

  committed
  bc8b174

  Copy full SHA for bc8b174

• Fix: reverted accidental change from previous commit

  hmoog

  committed
  eb5ad7c

  Copy full SHA for eb5ad7c

• Implement Dispose methods for Conflict and SortedConflicts

  piotrm50

  committed
  5a1046e

  Copy full SHA for 5a1046e

Commits on Apr 13, 2023

• Feat: started tracking conflictsets in conflicts

  hmoog

  committed
  a311ac3

  Copy full SHA for a311ac3

• Implement eviction of the new ConflictDAG

  piotrm50

  committed
  b51e5ae

  Copy full SHA for b51e5ae

• Fix tests after refactoring

  piotrm50

  committed
  80eeda0

  Copy full SHA for 80eeda0

• Feat: started fixing tests

  hmoog

  committed
  6b660de

  Copy full SHA for 6b660de

• Merge branch 'feat/rewrite-conflictdag-with-voting' of https://github.com/iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting

  hmoog

  committed
  af2d817

  Copy full SHA for af2d817

• Fix: fixed tests#

  hmoog

  committed
  b42d725

  Copy full SHA for b42d725

• Refactor: introduced utility method for getting conflictsets

  hmoog

  committed
  8e6222e

  Copy full SHA for 8e6222e

Commits on Apr 14, 2023

• Feat: continued work ok eviction

  hmoog

  committed
  750f35b

  Copy full SHA for 750f35b

• Fix: fixed bug

  hmoog

  committed
  6c2cc1d

  Copy full SHA for 6c2cc1d

• Feat: cleaned up eviction

  hmoog

  committed
  5806b69

  Copy full SHA for 5806b69

• Ledger uses new conflict DAG

  piotrm50

  committed
  bb9aa0f

  Copy full SHA for bb9aa0f

• Refactor: added comment

  hmoog

  committed
  1f0ed9b

  Copy full SHA for 1f0ed9b

• Merge branch 'feat/rewrite-conflictdag-with-voting' of https://github.com/iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting

  hmoog

  committed
  bd3dd69

  Copy full SHA for bd3dd69

• Get rid of VirtualVoting component. Make markerbooker use new ConflictDag

  piotrm50

  committed
  b6961e3

  Copy full SHA for b6961e3

• Integrate the new conflictdag with the rest of the components

  piotrm50

  committed
  d3c2da5

  Copy full SHA for d3c2da5

• Start fixing compile errors

  piotrm50

  committed
  1412314

  Copy full SHA for 1412314

• Refactor: reverted accidental rename

  hmoog

  committed
  e1779ee

  Copy full SHA for e1779ee

• Refactor: fix more rename bugs

  hmoog

  committed
  0cf3e83

  Copy full SHA for 0cf3e83

• Feat: more cleanup

  hmoog

  committed
  e5c8078

  Copy full SHA for e5c8078

• Refactor: minimized changes

  hmoog

  committed
  bf717e9

  Copy full SHA for bf717e9

• Feat: further minimized diff

  hmoog

  committed
  b0d3508

  Copy full SHA for b0d3508

• Fix: fixed some bugs

  hmoog

  committed
  d86df62

  Copy full SHA for d86df62

• Fix: fixed ReferenceProvider

  hmoog

  committed
  66ff2d4

  Copy full SHA for 66ff2d4

Commits on Apr 15, 2023

• Refactor: refactored code

  hmoog

  committed
  cc057b7

  Copy full SHA for cc057b7

• Refactor: refactored code

  hmoog

  committed
  53ec43b

  Copy full SHA for 53ec43b

• Refactor: refactor

  hmoog

  committed
  fd9b2b0

  Copy full SHA for fd9b2b0

• Refactor: minimized diff

  hmoog

  committed
  a2c126a

  Copy full SHA for a2c126a

• Refactor: reverted erroneous rename

  hmoog

  committed
  eb09e99

  Copy full SHA for eb09e99

Commits on Apr 17, 2023

• Feat: switched ConflictDAG API to use AdvancedSets

  hmoog

  committed
  d0e8a14

  Copy full SHA for d0e8a14

• Feat: optimized code to use AdvancedSet everywhere

  hmoog

  committed
  9a80012

  Copy full SHA for 9a80012

• Feat: fixed interfaces

  hmoog

  committed
  2462094

  Copy full SHA for 2462094

• Continue integrating new conflictdag with the codebase

  piotrm50

  committed
  8a34c1d

  Copy full SHA for 8a34c1d

• Fix last problems

  piotrm50

  committed
  6307ff4

  Copy full SHA for 6307ff4

• Fix tips conflicts tracker

  piotrm50

  committed
  8d064cf

  Copy full SHA for 8d064cf

• Fix some problems with double spend resolution

  piotrm50

  committed
  26bdd21

  Copy full SHA for 26bdd21

• Merge branch 'debug/race-conditions' into feat/rewrite-conflictdag-with-voting

  piotrm50

  committed
  d0e9ccd

  Copy full SHA for d0e9ccd

• Merge remote-tracking branch 'origin/debug/race-conditions' into feat/rewrite-conflictdag-with-voting

  piotrm50

  committed
  9537e80

  Copy full SHA for 9537e80

• Continue fixing problems after integrating the new conflictdag

  piotrm50

  committed
  162034f

  Copy full SHA for 162034f

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

  piotrm50

  committed
  2d8b6a4

  Copy full SHA for 2d8b6a4

• Feat: added some missing comments

  hmoog

  committed
  ed31879

  Copy full SHA for ed31879

• Fix: fixed tests

  hmoog

  committed
  3c9f913

  Copy full SHA for 3c9f913

Commits on Apr 18, 2023

• Feat: Created ConflictDAG interface package

  Show description for 9920479
  hmoog

  committed
  9920479

  Copy full SHA for 9920479

• Only remove strong parents when adding a new tip to tip pool

  piotrm50

  committed
  fa1d97a

  Copy full SHA for fa1d97a

• Fix casting votes when propagating conflict after fork.

  piotrm50

  committed
  1cbee1c

  Copy full SHA for 1cbee1c

• Revert accidental change

  piotrm50

  committed
  6ecdf48

  Copy full SHA for 6ecdf48

Commits on Apr 19, 2023

• Feat: implemented generic test framework for conflictdag

  hmoog

  committed
  2503e80

  Copy full SHA for 2503e80

Commits on Apr 20, 2023

• Merge remote-tracking branch 'origin/develop' into feat/rewrite-conflictdag-with-voting

  piotrm50

  committed
  27312ab

  Copy full SHA for 27312ab

• Fix post merge errors

  piotrm50

  committed
  d026284

  Copy full SHA for d026284

• Merge remote-tracking branch 'origin/develop' into feat/rewrite-conflictdag-with-voting

  piotrm50

  committed
  aed80c5

  Copy full SHA for aed80c5

• Remove some unused metrics that caused problems

  piotrm50

  committed
  d745f0a

  Copy full SHA for d745f0a

Commits on Apr 26, 2023

• Fix nil pointer in the metrics plugin

  piotrm50

  committed
  9846cee

  Copy full SHA for 9846cee

Commits on Apr 27, 2023

• Always create conflictsets

  piotrm50

  committed
  db1714c

  Copy full SHA for db1714c

• Get rid of implicit self-like

  piotrm50

  committed
  c7866a2

  Copy full SHA for c7866a2

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

  piotrm50

  committed
  151a66e

  Copy full SHA for 151a66e

• Remove printlns for subjectively invalid blocks

  piotrm50

  committed
  7258ae8

  Copy full SHA for 7258ae8

Commits on Apr 28, 2023

• Fix imports

  piotrm50

  committed
  4e167db

  Copy full SHA for 4e167db

Commits on May 11, 2023

• Add non-conflicting conflict to ConflictDAG test suite

  karimodm

  committed
  8574b8e

  Copy full SHA for 8574b8e

• Merge branch 'feat/rewrite-conflictdag-with-voting' of github.com:iotaledger/goshimmer into feat/rewrite-conflictdag-with-voting

  karimodm

  committed
  749aa3e

  Copy full SHA for 749aa3e