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

Feat: Reactive protocol rework #293

Merged
merged 422 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
422 commits
Select commit Hold shift + click to select a range
31873ba
Fix: linter happy now?
hmoog Oct 6, 2023
c671b8d
Fix: meh :/
hmoog Oct 6, 2023
8594ba8
Fix: fixed data race
hmoog Oct 6, 2023
2952932
Fix: fixed bug in test framework
hmoog Oct 6, 2023
7512c22
Feat: moved EngineManager to protocol
hmoog Oct 6, 2023
b9a3034
Refactor: cleaned up more code
hmoog Oct 6, 2023
8ae6de1
Refactor: restructured more code
hmoog Oct 6, 2023
0dc53df
Refactor: started moving protocol methods to protocol
hmoog Oct 6, 2023
173e7b2
Feat: started moving method to protocol
hmoog Oct 6, 2023
7707e8b
Refactor: started introducing cleaner sub-components
hmoog Oct 6, 2023
1deb2d6
Feat: made network_manager no module
hmoog Oct 6, 2023
be117a1
Feat: addressed linter errors
hmoog Oct 7, 2023
a53bf45
Feat: added HookedStopped
hmoog Oct 7, 2023
666dafe
Refactor: removed ambiguitiy
hmoog Oct 7, 2023
5607410
Feat: addressed more linter warnings
hmoog Oct 7, 2023
021eb8f
Refactor: moved more code
hmoog Oct 7, 2023
055add7
Refactor: refactored more code
hmoog Oct 7, 2023
4454d17
Refactor: removed unnecessary log
hmoog Oct 7, 2023
e14db7a
Feat: broke out AttestationsRequester
hmoog Oct 7, 2023
9c77277
Refactor: moar refactor
hmoog Oct 7, 2023
6cd1622
Feat: moved all methods to sub protocols
hmoog Oct 7, 2023
9bdc2e1
Refactor: refactored file structuure
hmoog Oct 8, 2023
7bd12d4
Refactor: addressed linter warning
hmoog Oct 8, 2023
9fc0104
Fix: fixed bug
hmoog Oct 8, 2023
d8a1fd0
Refactor: reduced change surface
hmoog Oct 8, 2023
460829c
Refactor: reverted changes
hmoog Oct 8, 2023
e91ed60
Refactor: reverted changes
hmoog Oct 8, 2023
b5cc8f5
Refactor: reverted more changes
hmoog Oct 8, 2023
b88389e
Feat: added support for ChainSwitchingThreshold
hmoog Oct 8, 2023
3c17e45
Feat: added variables to track down nil pointer exception
hmoog Oct 8, 2023
3121333
Feat: more checks
hmoog Oct 8, 2023
aa25235
Feat: added check to ApiForVersion
hmoog Oct 8, 2023
1b00b72
Refactor: re-enabled disabled test
hmoog Oct 8, 2023
ca06d5f
Feat: cleaned up EngineManager
hmoog Oct 9, 2023
a10b0d4
Feat: improved logging to find reason for failing test
hmoog Oct 9, 2023
d25d4a6
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Oct 9, 2023
7a3a289
Refactor: reverted changes
hmoog Oct 9, 2023
84628ee
Feat: used reactivemodule
hmoog Oct 9, 2023
d39b555
Refactor: removed MainEngineInstance
hmoog Oct 9, 2023
1ed9de3
Feat: added shutdown logic to engine manager
hmoog Oct 10, 2023
34f5e4b
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Oct 11, 2023
fc79876
Feat: WIP WARPSYNC CHANGES
hmoog Oct 17, 2023
fd9bcc8
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Oct 20, 2023
496cc81
Feat: added debug output
hmoog Oct 20, 2023
a7e3642
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Oct 20, 2023
1a994fa
Fix some bugs when integrating cached reset branch (#474)
hmoog Oct 30, 2023
77cb8cc
Refactor: cleaned more code
hmoog Oct 30, 2023
647d023
Feat: started experimenting with definitions framework
hmoog Oct 30, 2023
0b3ba89
Fix: fixed bug with erroneous transition rule
hmoog Oct 31, 2023
a98681a
Feat: refactored code
hmoog Oct 31, 2023
03605c0
Feat: cleaned more code
hmoog Oct 31, 2023
070b946
Refactor: wip wip wip
hmoog Nov 1, 2023
5d59b3f
Refactor: add more outputs to detect failure in CI
hmoog Nov 1, 2023
62a9f14
Feat: more logs
hmoog Nov 1, 2023
aac4389
Feat: add more logging
hmoog Nov 1, 2023
281d2f1
Fix: fixed some logic
hmoog Nov 2, 2023
69b9d88
Refactor: codegasm
hmoog Nov 2, 2023
a0bde5c
Refactor: unembedded Engines
hmoog Nov 2, 2023
0c33362
Refactor: played with hive.go framework structure
hmoog Nov 2, 2023
16ce5ce
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 2, 2023
e9b7a2b
Fix: addressed linter warnings
hmoog Nov 2, 2023
3c2ad4e
Refactor: cleaned up more code
hmoog Nov 2, 2023
69f0b58
Feat: cleaned up chain inheritance
hmoog Nov 3, 2023
0bfc546
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
karimodm Nov 3, 2023
e54b283
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 3, 2023
69745c2
Feat: increased waiting time for test to pass
hmoog Nov 3, 2023
63834ce
Fix: fixed chain inheritance
hmoog Nov 3, 2023
5f233f0
Feat: add logs to failing test
hmoog Nov 3, 2023
017da90
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 4, 2023
a7a30a5
Feat: fixed chain inheritance
hmoog Nov 5, 2023
6f8210e
Refactor: removed comments + looping test
hmoog Nov 5, 2023
dd70408
Refactor: adjust comments
hmoog Nov 6, 2023
c98bcda
Refactor: remove go.work
hmoog Nov 6, 2023
38a0ac5
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
5b9763e
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
726331f
Refactor: removed timeout
hmoog Nov 7, 2023
a7c8225
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
9e529a4
Feat: cleaned options
hmoog Nov 7, 2023
df283fb
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
551007a
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
3126a41
Feat: cleaned up code
hmoog Nov 7, 2023
dadeb8c
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 7, 2023
57a9e90
Feat: missing file
hmoog Nov 7, 2023
9b5feac
Fix: fixed merge conflicts
hmoog Nov 7, 2023
8740c32
Feat: reordered logs
hmoog Nov 8, 2023
f072485
Feat: upgraded to hive
hmoog Nov 8, 2023
d79116f
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 8, 2023
60a65e9
Fix: fixed some pending merge errors
hmoog Nov 9, 2023
70582dc
Refactor: fixed refactor bug
hmoog Nov 9, 2023
9e3290e
Refactor: go mod tidy
hmoog Nov 9, 2023
2860af4
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 9, 2023
c5dfffe
Feat: update iota.go
hmoog Nov 9, 2023
5e94d84
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 9, 2023
b2d7862
Refactor: addressed linter remarks
hmoog Nov 9, 2023
10b123a
Refactor: addressed more linter remarks
hmoog Nov 9, 2023
6224ffa
Refactor: addressed more linter warnings
hmoog Nov 9, 2023
337ca36
Refactor: still more
hmoog Nov 9, 2023
522c971
Refactor: and even more
hmoog Nov 9, 2023
672d080
Refactor: fixed bug in chain inheritance after merge
hmoog Nov 9, 2023
9786bc2
Feat: started refactoring chains
hmoog Nov 9, 2023
d09d430
Refactor: renamed chains properties
hmoog Nov 9, 2023
cf7289f
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 9, 2023
7a40424
Refactor: cleaning up chains
hmoog Nov 9, 2023
3bcf9d0
Feat: started using latest hive.go features
hmoog Nov 9, 2023
4353b80
Feat: fixed nil pointer exception
hmoog Nov 9, 2023
6bdbd73
Feat: moved evictionstate to procotol
hmoog Nov 9, 2023
fe7cea0
Refactor: introduced subcomponent tracking commitments
hmoog Nov 9, 2023
38700a3
Refactor: removed CommitmentCreated event
hmoog Nov 9, 2023
39da887
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 9, 2023
577aa2d
Feat: go mod tidy
hmoog Nov 9, 2023
2a81f39
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 10, 2023
c509f88
Feat: introduced blocktowarpsync
hmoog Nov 10, 2023
cb3aff9
Refactor: refactor chains
hmoog Nov 10, 2023
74f70a2
Refactor: started cleaning up chain
hmoog Nov 10, 2023
09eeddb
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 10, 2023
1777616
Feat: merge
hmoog Nov 10, 2023
ae6b0c8
Refactor: more cleanup
hmoog Nov 10, 2023
fda739f
Refactor: refactored some code
hmoog Nov 10, 2023
95eb78c
Merge branch 'feat/cache-reset' of github.com:iotaledger/iota-core in…
hmoog Nov 10, 2023
884d415
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
karimodm Nov 15, 2023
a29b142
Fix RootCommitment load below genesis slot
karimodm Nov 15, 2023
837e70f
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
karimodm Nov 16, 2023
00bdb31
Docker 5 genesisSlot
karimodm Nov 16, 2023
490361a
Increase log levels
karimodm Nov 16, 2023
84a997f
trace log doesn't exist
karimodm Nov 16, 2023
329990c
trace loglevel does not exist
karimodm Nov 17, 2023
a92a3fa
Feat: added Commitments.Root
hmoog Nov 20, 2023
77098bb
Merge branch 'feat/reactive-chainmanager' of github.com:iotaledger/io…
hmoog Nov 21, 2023
25c2584
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 21, 2023
cecb64b
Fix: fix merge conflicts
hmoog Nov 21, 2023
fc6991e
Feat: add logging
hmoog Nov 21, 2023
f77aa25
Feat: started refactoring / cleaning up code
hmoog Nov 22, 2023
b905bd5
Feat: more cleanup
hmoog Nov 22, 2023
ab607ee
Refactor: moved private method to end
hmoog Nov 22, 2023
a43a72a
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 22, 2023
02b8c1e
Feat: fixed race condition in hive
hmoog Nov 22, 2023
56b35b7
Feat: finished commenting chain
hmoog Nov 22, 2023
21d93d7
Feat: started cleaning up chains.go
hmoog Nov 22, 2023
65dc972
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 22, 2023
9ad22fe
Feat: continued to cleanup
hmoog Nov 23, 2023
6976153
Refactor: removed unused code
hmoog Nov 23, 2023
f141e0e
Refactor: more cleanup
hmoog Nov 23, 2023
367ea73
Refactor: chains almost done
hmoog Nov 23, 2023
415a555
Feat: chain is close to optimal code structure
hmoog Nov 23, 2023
86a829b
Feat: finished cleaning up chain.go and chains.go
hmoog Nov 24, 2023
f6a5978
Refactor: started chaning commitment to new style
hmoog Nov 24, 2023
9b9af77
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 24, 2023
f71fde5
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 24, 2023
ff6cf4b
Feat: started cleaning up commitments
hmoog Nov 25, 2023
ce4e08f
Refactor: refactor commitments prior to commenting
hmoog Nov 26, 2023
91f08e9
Refactor: refactored commitments
hmoog Nov 26, 2023
381fefe
Feat: finished cleaning up commitment.go and commitments.go
hmoog Nov 27, 2023
a108d77
Refactor: extended comments
hmoog Nov 27, 2023
22a5fca
Feat: cleaned up protocol.go, options.go, events.go, errors.go
hmoog Nov 27, 2023
ec1b453
Feat: DONE?
hmoog Nov 27, 2023
0d02a01
Fix: fix naming issues
hmoog Nov 27, 2023
ba0da46
Feat: enable engine logging
hmoog Nov 27, 2023
893deae
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 27, 2023
b6878f4
Fix: Fix WarpSync
hmoog Nov 27, 2023
0539f34
Feat: added more logic
hmoog Nov 27, 2023
e82a4be
Fix: fixed more code
hmoog Nov 27, 2023
ab3fdec
Trigger Commitment's IsCommittable at - MCA + 1
karimodm Nov 27, 2023
66807e0
Deadlock fix
karimodm Nov 27, 2023
d77b7cb
Fix race in notarization vs attestations
karimodm Nov 28, 2023
18ab2ef
Merge branch 'feat/reactive-chainmanager' into fix/warpSync
karimodm Nov 28, 2023
e23b164
Fix: MainEngine no longer registers as candidate
hmoog Nov 28, 2023
000355b
Force accept and commit with MCA delay
karimodm Nov 28, 2023
f7aca11
Refactor: disable engine logging
hmoog Nov 28, 2023
58a9972
Add rootblocks only before force-accepting them
karimodm Nov 28, 2023
d86db88
Merge pull request #573 from iotaledger/fix/reactive-candidates
karimodm Nov 28, 2023
d1cfa46
Merge remote-tracking branch 'origin/feat/reactive-chainmanager' into…
karimodm Nov 28, 2023
9e9697c
Reset the Engine when WarpSyncMode turns true
karimodm Nov 28, 2023
2604e3c
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 28, 2023
4338642
Merge branch 'feat/reactive-chainmanager' of github.com:iotaledger/io…
hmoog Nov 28, 2023
51431c7
Fix: TestLossOfAcceptanceFromGenesis test fixed
hmoog Nov 28, 2023
c5e8d76
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 28, 2023
407c833
Refactor: enable engine logging
hmoog Nov 28, 2023
ef9927b
Merge branch 'feat/reactive-chainmanager' of github.com:iotaledger/io…
hmoog Nov 29, 2023
b4d6346
Feat: increased timeout
hmoog Nov 29, 2023
e1bfcdf
Feat: extend waiting time?
hmoog Nov 29, 2023
1e4b2f2
Feat: Added PR for bundled changes while debugging
hmoog Nov 29, 2023
a467a26
Feat: added more logs
hmoog Nov 29, 2023
ed38887
Feat: added log output
hmoog Nov 29, 2023
0db2bf0
Feat: changed some code
hmoog Nov 30, 2023
13cd73a
Feat: added log
hmoog Nov 30, 2023
8f60e3d
Feat: add logging
hmoog Nov 30, 2023
a524987
Feat: added logging
hmoog Nov 30, 2023
ff87a2e
Feat: added solidity stuff to the logging - let's see
hmoog Nov 30, 2023
8b97187
Feat: add logging
hmoog Nov 30, 2023
146feba
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Nov 30, 2023
7b8abd6
Merge branch 'feat/reactive-chainmanager' of github.com:iotaledger/io…
hmoog Nov 30, 2023
aa6642e
Change warp sync to wait for WeightPropagated instead of Booked of bl…
jonastheis Dec 1, 2023
bb338af
Adjust TestProtocol_EngineSwitching_CommitteeRotation to wait for the…
jonastheis Dec 1, 2023
aeb9258
Fix calculation of WarpSyncThreshold
jonastheis Dec 1, 2023
62a9cb4
WarpSyncMode should be enabled if latestProducedCommitment == nil
jonastheis Dec 1, 2023
7243706
Feat: fixed some stuff
hmoog Dec 1, 2023
66e843a
Merge branch 'fix/warpSync' of github.com:iotaledger/iota-core into d…
hmoog Dec 1, 2023
32ebf8b
Fix: fixed tests
hmoog Dec 1, 2023
b3049b5
Refactor: reverted changes
hmoog Dec 1, 2023
9c845ec
Refactor: reverted more changes
hmoog Dec 1, 2023
1e8e9dd
Refactor: reverted more changes
hmoog Dec 1, 2023
52694be
Fix: fixed bugs and refactored code
hmoog Dec 1, 2023
8ad929b
Refactor: refactored warpsync to be able to handle loss of acceptance
hmoog Dec 3, 2023
89f0213
Refactor: fixed typo + race condition
hmoog Dec 3, 2023
af324c3
Fix bugs in WarpSync logic (#577)
hmoog Dec 3, 2023
6eae1b4
Refactor: started reverting unnecessary changes
hmoog Dec 3, 2023
14f7108
Merge branch 'fix/warpSync' of github.com:iotaledger/iota-core into d…
hmoog Dec 3, 2023
7675908
Refactor: reverted changes
hmoog Dec 3, 2023
8a2a19e
Refactor: reverted rename
hmoog Dec 3, 2023
aa420c9
Refactor: addressed linter issues
hmoog Dec 3, 2023
dd8771a
Refactor: reduced changes
hmoog Dec 3, 2023
044b797
Refactor: reverted unnecessary changes
hmoog Dec 3, 2023
010e103
Refactor: reverted more changes
hmoog Dec 3, 2023
a3a5c72
Refactor: minimizing more changes
hmoog Dec 3, 2023
0ce46e7
Refactor: reverted more code
hmoog Dec 3, 2023
b6b430f
Refactor: revert
hmoog Dec 3, 2023
5beda14
Refactor: revert
hmoog Dec 3, 2023
2b819f9
Refactor: reverted more
hmoog Dec 3, 2023
75240f0
Refactor: revert
hmoog Dec 3, 2023
e83a78e
Fix: fix possible nil pointer exception
hmoog Dec 3, 2023
90c1fd3
Refactor: renamed flags
hmoog Dec 4, 2023
8b5b5dc
Refactor: finished rename
hmoog Dec 4, 2023
5241622
Refactor: refactored warpsync protocol
hmoog Dec 4, 2023
c6a7242
Feat: updated comments
hmoog Dec 4, 2023
5fb3535
Refactor: updated comments
hmoog Dec 4, 2023
d8f5208
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
jonastheis Dec 4, 2023
bfe40ba
Merge remote-tracking branch 'origin/feat/reactive-chainmanager' into…
jonastheis Dec 4, 2023
2cac971
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
karimodm Dec 4, 2023
6044a6d
Merge branch 'feat/reactive-chainmanager' into fix/warpSync
karimodm Dec 4, 2023
9576fd6
Do not mark blocks as root blocks when warp syncing as that is done a…
jonastheis Dec 4, 2023
d8d6430
Address review comments
jonastheis Dec 4, 2023
1419993
Merge branch 'fix/warpSync' of github.com:iotaledger/iota-core into f…
jonastheis Dec 4, 2023
610eb3d
Delete evil spammer as they are moved to evil tools repo
jonastheis Dec 4, 2023
ac6a993
Fix deadlock
jonastheis Dec 4, 2023
edf541f
Merge pull request #568 from iotaledger/fix/warpSync
karimodm Dec 4, 2023
a97b114
Update pkg/protocol/chains.go
hmoog Dec 4, 2023
9c9d51e
Update pkg/protocol/chains.go
hmoog Dec 4, 2023
cc008bc
Update pkg/protocol/chains.go
hmoog Dec 4, 2023
5131ad4
Feat: addresse some remarks
hmoog Dec 4, 2023
c6e0c54
Merge branch 'feat/reactive-chainmanager' of github.com:iotaledger/io…
hmoog Dec 4, 2023
20574a5
Refactor: removed EarliestRootCommitment
hmoog Dec 5, 2023
3b422af
Feat: addressed more remarks
hmoog Dec 5, 2023
fe3a9d5
Feat: added chain switching condition to engine spawning
hmoog Dec 5, 2023
a5a57ba
Merge branch 'develop' of github.com:iotaledger/iota-core into feat/r…
hmoog Dec 5, 2023
f3d8ad0
Add options for attestation and warp sync requester
jonastheis Dec 5, 2023
1609a37
Merge remote-tracking branch 'origin/develop' into feat/reactive-chai…
jonastheis Dec 5, 2023
48b1db2
Remove log and potentially fix race condition for nil block #556
jonastheis Dec 5, 2023
5baf82d
Add comment to commitment_verifier
jonastheis Dec 5, 2023
8b9d1f8
Add version check for received commitments
jonastheis Dec 5, 2023
8829fea
Add shutdown to storage tests
jonastheis Dec 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactor: reverted more changes
  • Loading branch information
hmoog committed Dec 1, 2023
commit 1e8e9ddac14752b5882a73722e0d31efbaba4089
10 changes: 10 additions & 0 deletions pkg/protocol/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@
func (c *Chain) Commitment(slot iotago.SlotIndex) (commitment *Commitment, exists bool) {
for currentChain := c; currentChain != nil; {
switch forkingPoint := currentChain.ForkingPoint.Get(); {
case forkingPoint == nil:
return nil, false
case forkingPoint.Slot() == slot:
return forkingPoint, true
case slot > forkingPoint.Slot():
Expand Down Expand Up @@ -335,6 +337,14 @@
}, latestSeenSlot))
}

func warpSyncThreshold(latestSeenSlot iotago.SlotIndex, minCommittableAge iotago.SlotIndex) iotago.SlotIndex {

Check failure on line 340 in pkg/protocol/chain.go

View workflow job for this annotation

GitHub Actions / GolangCI-Lint

func `warpSyncThreshold` is unused (unused)
if minCommittableAge < latestSeenSlot {
return latestSeenSlot - minCommittableAge + 1
}

return 0
}

// addCommitment adds the given commitment to this chain.
func (c *Chain) addCommitment(newCommitment *Commitment) (shutdown func()) {
c.commitments.Set(newCommitment.Slot(), newCommitment)
Expand Down
2 changes: 1 addition & 1 deletion pkg/protocol/commitment.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func (c *Commitment) initDerivedProperties() (shutdown func()) {
return lo.Batch(
// mark commitments that are marked as root as verified
c.IsCommitted.InheritFrom(c.IsRoot),
c.IsAboveLatestVerifiedCommitment.InheritFrom(c.IsRoot),
c.ReplayDroppedBlocks.InheritFrom(c.IsRoot),

// mark commitments that are marked as verified as attested, fully booked and committable
c.IsAttested.InheritFrom(c.IsCommitted),
Expand Down
16 changes: 8 additions & 8 deletions pkg/testsuite/mock/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,19 +392,19 @@ func (n *Node) attachEngineLogsWithName(failOnBlockFiltered bool, instance *engi
})

events.SpendDAG.SpenderCreated.Hook(func(conflictID iotago.TransactionID) {
instance.LogTrace("ConflictDAG.SpendCreated", "conflictID", conflictID)
instance.LogTrace("SpendDAG.SpenderCreated", "conflictID", conflictID)
})

events.SpendDAG.SpenderEvicted.Hook(func(conflictID iotago.TransactionID) {
instance.LogTrace("ConflictDAG.SpendEvicted", "conflictID", conflictID)
instance.LogTrace("SpendDAG.SpenderEvicted", "conflictID", conflictID)
})

events.SpendDAG.SpenderRejected.Hook(func(conflictID iotago.TransactionID) {
instance.LogTrace("ConflictDAG.SpendRejected", "conflictID", conflictID)
instance.LogTrace("SpendDAG.SpenderRejected", "conflictID", conflictID)
})

events.SpendDAG.SpenderAccepted.Hook(func(conflictID iotago.TransactionID) {
instance.LogTrace("ConflictDAG.SpendAccepted", "conflictID", conflictID)
instance.LogTrace("SpendDAG.SpenderAccepted", "conflictID", conflictID)
})

instance.Ledger.MemPool().OnSignedTransactionAttached(
Expand Down Expand Up @@ -525,10 +525,6 @@ func (n *Node) FilteredBlocks() []*postsolidfilter.BlockFilteredEvent {
return n.filteredBlockEvents
}

func (n *Node) MainEngineSwitchedCount() int {
return int(n.mainEngineSwitchedCount.Load())
}

func (n *Node) TransactionFailure(txID iotago.SignedTransactionID) (InvalidSignedTransactionEvent, bool) {
n.mutex.RLock()
defer n.mutex.RUnlock()
Expand All @@ -537,6 +533,10 @@ func (n *Node) TransactionFailure(txID iotago.SignedTransactionID) (InvalidSigne
return event, exists
}

func (n *Node) MainEngineSwitchedCount() int {
return int(n.mainEngineSwitchedCount.Load())
}

func (n *Node) AttachedBlocks() []*blocks.Block {
n.mutex.RLock()
defer n.mutex.RUnlock()
Expand Down
15 changes: 13 additions & 2 deletions pkg/testsuite/storage_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,15 @@ func (t *TestSuite) AssertCommitmentSlotIndexExists(slot iotago.SlotIndex, nodes
return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: commitment at index %v not found", node.Name, slot)
}

// Make sure the main chain exists
mainChain := node.Protocol.Chains.Main.Get()
if mainChain == nil {
return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: main chain not found when checking for commitment at index %v", node.Name, slot)
}

// Make sure the commitment is also available in the ChainManager.
if node.Protocol.Chains.Main.Get().LatestCommitment.Get().ID().Slot() < slot {
latestCommitment := mainChain.LatestCommitment.Get()
if latestCommitment == nil || latestCommitment.ID().Slot() < slot {
return ierrors.Errorf("AssertCommitmentSlotIndexExists: %s: commitment at index %v not found in ChainManager", node.Name, slot)
}

Expand Down Expand Up @@ -126,8 +133,12 @@ func (t *TestSuite) AssertChainID(expectedChainID iotago.CommitmentID, nodes ...

for _, node := range nodes {
t.Eventually(func() error {
actualChainID := node.Protocol.Chains.Main.Get().ForkingPoint.Get().ID()
mainChain := node.Protocol.Chains.Main.Get()
if mainChain == nil {
return ierrors.Errorf("AssertChainID: %s: main chain not found", node.Name)
}

actualChainID := mainChain.ForkingPoint.Get().ID()
if expectedChainID != actualChainID {
fmt.Println(expectedChainID, actualChainID)
hmoog marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
Loading