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

RC/Sirius patch 2 #5816

Merged
merged 70 commits into from
Feb 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
cb14bf3
- fixed the log.Warn in esdt.go - getSpecialRoles
iulianpascalau Jan 5, 2024
5251b8e
Merge branch 'master' into non-critical-fixes-sirius-2023.01.05
iulianpascalau Jan 5, 2024
b52d783
- made the dbConfigHandler more robust
iulianpascalau Jan 5, 2024
e799743
- fixes after review
iulianpascalau Jan 5, 2024
4790f86
- fixes after review
iulianpascalau Jan 5, 2024
d1fe13e
- fixed comments
iulianpascalau Jan 8, 2024
3d35226
Merge pull request #5812 from multiversx/fix-prefs-toml-comments
iulianpascalau Jan 8, 2024
f524255
Merge branch 'rc/sirius-patch-2' into non-critical-fixes-sirius-2023.…
iulianpascalau Jan 8, 2024
0c17fc8
Merge pull request #5805 from multiversx/non-critical-fixes-sirius-20…
iulianpascalau Jan 9, 2024
3ffb1df
send invalid signers from leader
sstanculeanu Jan 9, 2024
aaa62e1
redundancy node should not send invalid signers
sstanculeanu Jan 9, 2024
53ad9b3
fixed tests
sstanculeanu Jan 9, 2024
2b34ce7
fix after review
sstanculeanu Jan 9, 2024
034fb59
- fixed assessment tool
iulianpascalau Jan 10, 2024
8d177e1
Merge pull request #5820 from multiversx/fix-assessment-tool
iulianpascalau Jan 10, 2024
cc43302
- fixed the redundancy metric to include the multikey status
iulianpascalau Jan 12, 2024
161452b
Merge branch 'rc/sirius-patch-2' into fix-redundancy-metric
iulianpascalau Jan 12, 2024
a0fcccb
change indexer version
miiu96 Jan 12, 2024
6622473
Merge remote-tracking branch 'origin/master' into update-rc-sirius-pa…
iulianpascalau Jan 12, 2024
29ffc47
Merge pull request #5831 from multiversx/update-rc-sirius-patch-2023.…
iulianpascalau Jan 15, 2024
f037a6f
Merge branch 'rc/sirius-patch-2' into fix-redundancy-metric
iulianpascalau Jan 15, 2024
3121214
fixes after review
sstanculeanu Jan 15, 2024
624cbd5
Merge branch 'rc/sirius-patch-2' into fix_multikey_invalid_signers
sstanculeanu Jan 15, 2024
633c9a6
Merge branch 'rc/sirius-patch-2' into upgrade-indexer-version-sirius
gabi-vuls Jan 15, 2024
96d32fb
verify header hash
AdoAdoAdo Jan 15, 2024
5f981bc
proper tag
miiu96 Jan 16, 2024
7177707
Merge pull request #5829 from multiversx/fix-redundancy-metric
iulianpascalau Jan 16, 2024
fa3adb1
Merge branch 'rc/sirius-patch-2' into verify-hash
iulianpascalau Jan 16, 2024
daa6651
Merge pull request #5836 from multiversx/verify-hash
iulianpascalau Jan 16, 2024
7e3c244
Merge branch 'rc/sirius-patch-2' into upgrade-indexer-version-sirius
iulianpascalau Jan 16, 2024
a7707af
Merge pull request #5830 from multiversx/upgrade-indexer-version-sirius
iulianpascalau Jan 16, 2024
d5d23aa
Merge branch 'rc/sirius-patch-2' into fix_multikey_invalid_signers
sstanculeanu Jan 16, 2024
83a95f0
Merge branch 'master' into update-master-rc-sirius-patch2-2023.01.16
iulianpascalau Jan 16, 2024
0e20091
Merge pull request #5817 from multiversx/fix_multikey_invalid_signers
sstanculeanu Jan 16, 2024
179470f
Merge branch 'rc/sirius-patch-2' into update-master-rc-sirius-patch2-…
iulianpascalau Jan 16, 2024
e8bccc0
- fixed wrong backup machine step-in by correctly resetting counters …
iulianpascalau Jan 16, 2024
7cf5d48
Merge branch 'rc/sirius-patch-2' into fix-wrong-backup-step-in
iulianpascalau Jan 16, 2024
5042328
- fix after merge
iulianpascalau Jan 16, 2024
e9ad64c
- fixes after review: renaming + code optimization
iulianpascalau Jan 17, 2024
9d88539
Merge pull request #5838 from multiversx/update-master-rc-sirius-patc…
iulianpascalau Jan 17, 2024
3de2f82
Merge branch 'master' into update-master-rc-sirius-patch-2-2023.01.17
iulianpascalau Jan 17, 2024
6e6d2cb
- proper releases
iulianpascalau Jan 17, 2024
f69b0fd
remove suffix when migrating from NotSpecified to AutoBalanceEnabled …
BeniaminDrasovean Jan 17, 2024
ef869b7
fix imports
BeniaminDrasovean Jan 17, 2024
8ed7c58
Merge branch 'rc/sirius-patch-2' into fix-wrong-backup-step-in
iulianpascalau Jan 17, 2024
d91ac82
fix tests
BeniaminDrasovean Jan 18, 2024
54775cd
move hostParameters to common
ssd04 Jan 18, 2024
45ba97d
update assessment
ssd04 Jan 18, 2024
639da41
cpu flags checks
ssd04 Jan 18, 2024
2bc1c58
- fix after review
iulianpascalau Jan 18, 2024
0db2dc0
use cpuid implementation for cpu flags check
ssd04 Jan 19, 2024
da2544a
fix typo
ssd04 Jan 19, 2024
c580833
add integration tests
BeniaminDrasovean Jan 19, 2024
f362608
change enable epoch for migrateDataTrie
BeniaminDrasovean Jan 19, 2024
685b847
add cpu flags to config
ssd04 Jan 22, 2024
64ca8a0
use ParseFeature func from cpuid
ssd04 Jan 22, 2024
dbf6d2e
Merge pull request #5842 from multiversx/update-master-rc-sirius-patc…
iulianpascalau Jan 22, 2024
9ee2c79
Merge branch 'rc/sirius-patch-2' into migrate-data-trie-fix
BeniaminDrasovean Jan 22, 2024
a9a630a
linter fix
BeniaminDrasovean Jan 22, 2024
728c22b
Merge branch 'rc/sirius-patch-2' into hardware-requirements-checks
ssd04 Jan 22, 2024
e0566b9
update go mod
BeniaminDrasovean Jan 22, 2024
40d73dd
update enable flags
BeniaminDrasovean Jan 22, 2024
c84a6e6
Merge pull request #5852 from multiversx/hardware-requirements-checks
ssd04 Jan 23, 2024
7cab217
Merge branch 'rc/sirius-patch-2' into fix-wrong-backup-step-in
iulianpascalau Jan 23, 2024
4cea6b5
Merge pull request #5840 from multiversx/fix-wrong-backup-step-in
iulianpascalau Jan 23, 2024
8be2796
Merge branch 'rc/sirius-patch-2' into migrate-data-trie-fix
BeniaminDrasovean Jan 25, 2024
8fb567d
use proper releases in go mod
BeniaminDrasovean Jan 25, 2024
86575d4
Merge pull request #5849 from multiversx/migrate-data-trie-fix
iulianpascalau Jan 25, 2024
591433d
- fixed the multikey backup step-in
iulianpascalau Jan 26, 2024
b3f8514
Merge pull request #5882 from multiversx/fix-multikey-step-in
iulianpascalau Jan 30, 2024
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
send invalid signers from leader
  • Loading branch information
sstanculeanu committed Jan 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 3ffb1df7fbd9543c46e2a3a673caf884312bda70
12 changes: 9 additions & 3 deletions consensus/spos/bls/subroundEndRound.go
Original file line number Diff line number Diff line change
@@ -189,7 +189,7 @@ func (sr *subroundEndRound) receivedInvalidSignersInfo(_ context.Context, cnsDta
return false
}

if sr.IsSelfLeaderInCurrentRound() {
if sr.IsSelfLeaderInCurrentRound() || sr.IsMultiKeyLeaderInCurrentRound() {
return false
}

@@ -589,20 +589,26 @@ func (sr *subroundEndRound) createAndBroadcastHeaderFinalInfo() {
}

func (sr *subroundEndRound) createAndBroadcastInvalidSigners(invalidSigners []byte) {
leader, errGetLeader := sr.GetLeader()
if errGetLeader != nil {
log.Debug("createAndBroadcastInvalidSigners.GetLeader", "error", errGetLeader)
return
}

cnsMsg := consensus.NewConsensusMessage(
sr.GetData(),
nil,
nil,
nil,
[]byte(sr.SelfPubKey()),
[]byte(leader),
nil,
int(MtInvalidSigners),
sr.RoundHandler().Index(),
sr.ChainID(),
nil,
nil,
nil,
sr.CurrentPid(),
sr.GetAssociatedPid([]byte(leader)),
invalidSigners,
)

49 changes: 48 additions & 1 deletion consensus/spos/bls/subroundEndRound_test.go
Original file line number Diff line number Diff line change
@@ -1322,7 +1322,7 @@ func TestSubroundEndRound_ReceivedInvalidSignersInfo(t *testing.T) {
assert.False(t, res)
})

t.Run("received message for self leader", func(t *testing.T) {
t.Run("received message from self leader should return false", func(t *testing.T) {
t.Parallel()

container := mock.InitConsensusCore()
@@ -1339,6 +1339,53 @@ func TestSubroundEndRound_ReceivedInvalidSignersInfo(t *testing.T) {
assert.False(t, res)
})

t.Run("received message from self multikey leader should return false", func(t *testing.T) {
t.Parallel()

container := mock.InitConsensusCore()
keysHandler := &testscommon.KeysHandlerStub{
IsKeyManagedByCurrentNodeCalled: func(pkBytes []byte) bool {
return string(pkBytes) == "A"
},
}
ch := make(chan bool, 1)
consensusState := initConsensusStateWithKeysHandler(keysHandler)
sr, _ := spos.NewSubround(
bls.SrSignature,
bls.SrEndRound,
-1,
int64(85*roundTimeDuration/100),
int64(95*roundTimeDuration/100),
"(END_ROUND)",
consensusState,
ch,
executeStoredMessages,
container,
chainID,
currentPid,
&statusHandler.AppStatusHandlerStub{},
)

srEndRound, _ := bls.NewSubroundEndRound(
sr,
extend,
bls.ProcessingThresholdPercent,
displayStatistics,
&statusHandler.AppStatusHandlerStub{},
&mock.SentSignatureTrackerStub{},
)

srEndRound.SetSelfPubKey("A")

cnsData := consensus.Message{
BlockHeaderHash: []byte("X"),
PubKey: []byte("A"),
}

res := srEndRound.ReceivedInvalidSignersInfo(&cnsData)
assert.False(t, res)
})

t.Run("received hash does not match the hash from current consensus state", func(t *testing.T) {
t.Parallel()