diff --git a/qbft/controller.go b/qbft/controller.go index 2b5bd6b0d..d6a057d5d 100644 --- a/qbft/controller.go +++ b/qbft/controller.go @@ -120,10 +120,6 @@ func (c *Controller) UponExistingInstanceMsg(msg *ProcessingMessage) (*types.Sig return nil, nil } - if err := c.broadcastDecided(decidedMsg); err != nil { - // no need to fail processing instance deciding if failed to save/ broadcast - fmt.Printf("%s\n", err.Error()) - } return decidedMsg, nil } @@ -169,15 +165,6 @@ func (c *Controller) forceStopAllInstanceExceptCurrent() { } } -func (c *Controller) broadcastDecided(aggregatedCommit *types.SignedSSVMessage) error { - - if err := c.GetConfig().GetNetwork().Broadcast(aggregatedCommit.SSVMessage.GetID(), aggregatedCommit); err != nil { - // We do not return error here, just Log broadcasting error. - return errors.Wrap(err, "could not broadcast decided") - } - return nil -} - func (c *Controller) GetConfig() IConfig { return c.config } diff --git a/qbft/messages_encoding.go b/qbft/messages_encoding.go index b1a004191..79a3dfec9 100644 --- a/qbft/messages_encoding.go +++ b/qbft/messages_encoding.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 6732475e30a3885e05ad0c04dfd8b3ca58aae4ebd22fa32781bb39c9d2f307c2 +// Hash: 578300ed5a3dbea99256e5e83e87b91e991213f4bd974c40387c8843a8cdd3d8 // Version: 0.1.3 package qbft diff --git a/qbft/spectest/all_tests.go b/qbft/spectest/all_tests.go index ee7437864..41d2eea67 100644 --- a/qbft/spectest/all_tests.go +++ b/qbft/spectest/all_tests.go @@ -195,7 +195,6 @@ var AllTests = []tests.TestF{ commit.NoCommitQuorum, commit.ForceStop, commit.PostCutoff, - commit.SortedDecided, roundchange.HappyFlow, roundchange.WrongHeight, diff --git a/qbft/spectest/generate/state_comparison/tests_ControllerSpecTest/qbft controller sorted decided.json b/qbft/spectest/generate/state_comparison/tests_ControllerSpecTest/qbft controller sorted decided.json deleted file mode 100644 index 54212a8df..000000000 --- a/qbft/spectest/generate/state_comparison/tests_ControllerSpecTest/qbft controller sorted decided.json +++ /dev/null @@ -1,1095 +0,0 @@ -[ - { - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Height": 0, - "StoredInstances": [ - { - "State": { - "CommitteeMember": { - "OperatorID": 1, - "CommitteeID": [ - 207, - 151, - 173, - 238, - 219, - 89, - 224, - 91, - 253, - 115, - 162, - 180, - 194, - 168, - 136, - 87, - 8, - 196, - 244, - 247, - 12, - 132, - 198, - 75, - 39, - 18, - 14, - 114, - 171, - 115, - 59, - 114 - ], - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBeU16MmIrS1pKSXpCelJad3RwYnkKTHYvZzdZNFBGTDhGVGI0Y0Y0cVhzRVh4Smh1MGxHSmhUMFlZWUN4WUNhdk1aZjUwTlFETzRRQ2RlM2xzb0VZQgphdzBlZnRrWE5pMkxYL3h3aWozY044NTZkMkdvMGhZZjJCRVYySkUzb3pkU1NyNWNoaS9hVHYxM2w4YU1ZY2pXCjA4bHlBemxBVXozWGd2UmlkVktteHhoakFQRVRmM1BtcHV3aGFvM1luL3dMOFJSNk9BakNFUjRLN1JjLzV2bksKanZCaDU3bFNRZjdZRk9kV2ZnbEhjTWNYZndVNStldmFFbVJhaW9vYXpTQnkwMUtvMlJEQnBGL3VFNzdzZGYxQwo2NVRRSnZvS3kyRjBKUWJ2ME9RVFNqVzBDUHcwaFMydk96Qk5VK3ZBRUVYNHdxQmp6M1grUER1OUxid0E1NFdtClVRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K", - "FaultyNodes": 1, - "Committee": [ - { - "OperatorID": 1, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBeU16MmIrS1pKSXpCelJad3RwYnkKTHYvZzdZNFBGTDhGVGI0Y0Y0cVhzRVh4Smh1MGxHSmhUMFlZWUN4WUNhdk1aZjUwTlFETzRRQ2RlM2xzb0VZQgphdzBlZnRrWE5pMkxYL3h3aWozY044NTZkMkdvMGhZZjJCRVYySkUzb3pkU1NyNWNoaS9hVHYxM2w4YU1ZY2pXCjA4bHlBemxBVXozWGd2UmlkVktteHhoakFQRVRmM1BtcHV3aGFvM1luL3dMOFJSNk9BakNFUjRLN1JjLzV2bksKanZCaDU3bFNRZjdZRk9kV2ZnbEhjTWNYZndVNStldmFFbVJhaW9vYXpTQnkwMUtvMlJEQnBGL3VFNzdzZGYxQwo2NVRRSnZvS3kyRjBKUWJ2ME9RVFNqVzBDUHcwaFMydk96Qk5VK3ZBRUVYNHdxQmp6M1grUER1OUxid0E1NFdtClVRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 2, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBbVlaUDJHRzRxM1ZSUmFpZG1nbWEKT0N3eno4OEdUTDIvdHM0c3gyZk1hSkJ3dDJtY1JwR1NKTHVNQWgrUUpFSWhFUGNXYVNicllVYTdOZUg2VHZSdwp1TUlRdldzT3hzRUNmTzZndmZiTGhNeERyaGZrRmc2R3pNZ0pZQm1VUXVxRUlwYklXZitRVzJoQ0ViQjN1R3Y4CnFpMDdpSTBTTzB6OEtjZnhCVUJXNmtxNkRJdHozbEo2Z1ZOTjdTNFRBblZkS2o2NjBuR2JuSENlOVJQMzRma3IKVEtuUTBHb0NEOHh2RTE3U1dsWThHcmFzRGxJbDUxcWJSRGx2RXJJS3QvRHFBbllkZk4rL1BLekxJMkxlUGNjSApRdVdKalA5UXZZTWhrci9VVmdyMGM4Ums3bmt2YXprYmtrS2JreGVUMkp3OC9WN2gveWE0aDhZb1B6MkJLd05RCmNRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 3, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdG9pRlRVcUpwTDg0eHZoTUZTQU8KWUFxYkVZaXpEQlBsL2xNMmMxOEtzRzlJQVNEU3piTmZ4R25jMnBDMzdqanI3aDNibFN4RU5ZU0tPWVZIVzJOMgpxOGJ6TEJ1MDZrSzBnenNWRERKTU5jOGpwVnFOK0VJclBsSWpOWUwybXA1Wk5uYXp5YVdBYVZWa05ZeU1hYWpJCkF6VHlyWis2d3VvUVJvaXV6U2dsdTBSNmV1V1FaZThDY2lFVDFaRHJDMFJpaG4rYklCbzNlN3YwekZBZXczUXcKVTNJbEZvanp0SjVyaitKZmx5UWFVaS96VEN5OXFUUG5XV0ZBenRHWjZGZS8wM3VoVk4wczhXWnd0MnkxVjFiaQpIWUFQWXo2MmZpdENWNDRZcmt6RU9tSVNnUm4zVW9qT3prOHZORlltY0NSNDFMMncvbzE3UjBEM0xnOG54QzZNCkpRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 4, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBcVFYenEvNlh0VkVmSlRaL3YxUHcKa3pTa05SWGJwQy80MWE5TFNRdnNra0lDZEcyZEd3K1FhZ2tOVllwdktRc1Izd0F4QmZEb1FxZE1vRXY4R2g5eApCYVphZjZrTFdrbmFWWVlOSmVXbjZiRWlEbVhqVllETXE1ZGhsOW9kOVVoSzRFWVQ4cklmNWFsZnlFYTkrV3M5Cm9lQUxTMjFjVlBwUlBvYlFIeHNYOHhvOXVRQ3JMeE9xYzRFVzgyODVLajV2blFsZnBHRzIxV0ZCZmJIR1I0WGEKK2FtT2ZUS1BsUkxsZVZVTXp3WCs3cGVHSi81SDNqcExGbCtvRmFyMkMvWURIL0VKejArTnE2R0ptNzFpSjdNYwoxK2MwUDZGT2F5NlpxWitaRGo5ZHBKZC9tYnFZenkzcks2YlBvOE52TkVZSFNKZk9SRDRLak5NSXM0UzF5cHhaCkl3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - } - ], - "DomainType": [ - 0, - 0, - 3, - 1 - ] - }, - "ID": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Round": 1, - "Height": 0, - "LastPreparedRound": 1, - "LastPreparedValue": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ", - "ProposalAcceptedForCurrentRound": { - "SignedMessage": { - "Signatures": [ - "CzU9/GbbgfT1J/6fnAe07EDzLIirezU9AfNDzGNfautfsVAs4CKX/dQNXon/teMl7QeoZGEswQ2LqT7KuKvtaaX8QYXoO2+aTzpnI996omxXcYMf1UW3+kEfG+PeTqLzJgOR/y1iK4Fwry+znYDBJqbW2MhLFdSlqIIGB1FRQyM9HR+2fVncaLJdNAh6DPrjqXlgBHpvtiqFHLYPfPVER1+Yd18nufjUoUhamPlkaDzTsQq1TmPgYZf5+GCRmhS5zs+UwDf+fNwSnCfAjtvHHkmpLOtGDTrvWVoIj5XJmR3Nm3E8bXu2DY7Cpjj2LUS2swDLPQDl+LbzQdMfpj6yrQ==" - ], - "OperatorIDs": [ - 1 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ" - }, - "QBFTMessage": { - "MsgType": 0, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - }, - "Decided": true, - "DecidedValue": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ", - "ProposeContainer": { - "Msgs": { - "1": [ - { - "SignedMessage": { - "Signatures": [ - "CzU9/GbbgfT1J/6fnAe07EDzLIirezU9AfNDzGNfautfsVAs4CKX/dQNXon/teMl7QeoZGEswQ2LqT7KuKvtaaX8QYXoO2+aTzpnI996omxXcYMf1UW3+kEfG+PeTqLzJgOR/y1iK4Fwry+znYDBJqbW2MhLFdSlqIIGB1FRQyM9HR+2fVncaLJdNAh6DPrjqXlgBHpvtiqFHLYPfPVER1+Yd18nufjUoUhamPlkaDzTsQq1TmPgYZf5+GCRmhS5zs+UwDf+fNwSnCfAjtvHHkmpLOtGDTrvWVoIj5XJmR3Nm3E8bXu2DY7Cpjj2LUS2swDLPQDl+LbzQdMfpj6yrQ==" - ], - "OperatorIDs": [ - 1 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ" - }, - "QBFTMessage": { - "MsgType": 0, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - } - ] - } - }, - "PrepareContainer": { - "Msgs": { - "1": [ - { - "SignedMessage": { - "Signatures": [ - "g0BBLoygeLOHqaIj4pmkzrTfJc+5ChUS5DzxiV4EFVyRkQp7w1x4hGsS++AwQqcUC6Z+j7i/icSFuQnSMdS5W/SUYiyWgzY75xd+fa/IBRFqAZkJICUdtIcBBo4U7DgenowmoSfArGNm/swIP+zlZ8akA9VWWGgh9EoBpEYyumGPSnsbVSbLvD/iSIuv2myboKPuEI8NqQzjUezRQC+ahB/ml1m6S341ymfTjsdGbhVlPBZsWXUlJUHFpn3rl8hDUiSz4yROPgSC4xXH++0CesXLWeUgEisx5e0NRFs8OGLnnH6vBSgdWYYnQy5nfWCEZSQgZdWhlOUwoX/zjoqVzg==" - ], - "OperatorIDs": [ - 1 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 1, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - }, - { - "SignedMessage": { - "Signatures": [ - "dfmNuoBlZZxe8CWQO/iBCeSWtOt+xijMhsyx6xsxR1kpOjXdjZ5GQbYEeClVjRw/tywFtAFAyw1HB2DHmpPeCHsIn+BsLhkT4r8eZYldPXWLjuKlMw8OrqUiBQ11YgngEvLLJpLsk5mZf3ccU6KyM1/xj7Z8Yl6WsotukYMSGB8t3OJyxbD/go0IUtafOqI3Hgkb0A9m3uDybjRfBWICreNrcHgnjKxIowiigIwpNx2pmdCi+j3MLKVcTqfhOIqcMHVDMM5LVMNQi9MXp0ymsqXf3TGT133kcnjvLPj6/2WdAYwuWs9BrrKqQ1dDC627n4Lbje8mnNKcxDTCCi+8TA==" - ], - "OperatorIDs": [ - 2 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 1, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - }, - { - "SignedMessage": { - "Signatures": [ - "CK+6dEz+S2R4iGi6DHHTa1BSXt6DqMp6maTtXMe2HyX7Y7+xU6J1z49rKH61VMzLhBJI3itygLd734iO6Lae7n9dC2AMEaS4NsajETlzGZGrAvNEU5+W/ORzOkt0zuAh1vqMJV9wkps1CwCuV5m4Tt2Uw6kpZfc5/W24Jmjux1sF0v1colJ2ehmGGmVONA2w38mMZZvnQSd7J4ENR/PqPD6j3qkP/OQk4gWJJKY/W82IXNLadHdcvJN7JDdstPzx9FzM1b6zmuP0qwRzjpjIdPAzWh1l4q/yw+WgqS0kMKJPVpDJFt1OdX4ygQ1dEtJx2l7YaOpf0C6KAZv83ricrg==" - ], - "OperatorIDs": [ - 3 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 1, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - } - ] - } - }, - "CommitContainer": { - "Msgs": { - "1": [ - { - "SignedMessage": { - "Signatures": [ - "QP3Rd93H73AyuvCmfsENVK9NBmcx+f1E33UtE9dYqUOIIu289CLlnO9BiRKPXMNY141jeNr8JsqbivEpzelbMulkmxUXbGdp0uwRxcRenU3oc6LEGw+EjUYASMyT1rXrfCCBwE5vzGybTJAUxvGqEuJL42wz6POVtmK9/wYp2KpX0H9ehUsFvHUipm5dmGkg4gzJW9VuOTwgCtHtr+ZL090EPgaw2WDKNYeE1sScZoh3UWn+DhDmLchDhOxfstYxcbfDrd0NWnkVXJDzE7DlCvBRO2QrEov30ea27hh5dKb493m8XhyO0A1bFURPQUhE8S2rMVDkKDZ9orojrM8TgQ==" - ], - "OperatorIDs": [ - 4 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 2, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - }, - { - "SignedMessage": { - "Signatures": [ - "VOEYr49ORL61wVkIif9Jv0Z85Mdl/T0za/v8dblspGhfvr7V1a/CbBQkiKCs7h8IeDJZrJ2v0aDnc9j49LUC0buORfskygfjvg9U0AuwMJ1ohRKWJ79WG8PdcH0r4h9JyspSqM4YjQrO2TCDthutLAsFbdklo28Hl6koVWPqqRlh7FJjJYYBMbkPh8slLvVdl8Mz2aWY8jSaVF5oZE8pmP4uZcPws03NA3r0s7zdQ80usxgj225ahSvMOwiXtKOlaENuU1pRJXFiQV3ptIOZH86UeJWp/e04pLiFyQVrz4Rk43tmN1Vf4RkwM9chx/ZXomLT8J1Ri1zu5N42cCGWtg==" - ], - "OperatorIDs": [ - 2 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 2, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - }, - { - "SignedMessage": { - "Signatures": [ - "DyAKAM84BaQy3UZy+sJO2tgfutZ73863DIw3S0nxD2jbj8EYJ2K9Cv1W7zF1uLJ/q14A478XYtj62zHqVpN15R65X8mZs6PIscY040nUlsuM46we81Q6uCxRtQxBkASl9ubwihhsPXTRfkhL4MfpDpk9J7uGZ9mQhT7dnGXjZ/9dRyJQv3t0mDKQpcc3UmECvDtYvjFtLZGKguBmhAC6mtwgcC/5reKoQoBi8M5aoAC7ycNZW9kn7DwgQj//qvWB9EwoRQpObNiEWyHiiuDSOW4uFh7ott4fk92bD2qleCNMfEURT+1uwW4OdhjIzOgj4aZJM3iTc4T/3uwjYAXPMg==" - ], - "OperatorIDs": [ - 3 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - "QBFTMessage": { - "MsgType": 2, - "Height": 0, - "Round": 1, - "Identifier": "AQIDBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", - "Root": [ - 190, - 149, - 111, - 183, - 223, - 78, - 243, - 117, - 49, - 104, - 45, - 88, - 131, - 32, - 8, - 79, - 201, - 20, - 195, - 240, - 254, - 211, - 53, - 38, - 62, - 91, - 68, - 6, - 46, - 108, - 41, - 180 - ], - "DataRound": 0, - "RoundChangeJustification": [], - "PrepareJustification": [] - } - } - ] - } - }, - "RoundChangeContainer": { - "Msgs": {} - } - }, - "StartValue": "AQIDBA==" - } - ], - "CommitteeMember": { - "OperatorID": 1, - "CommitteeID": [ - 207, - 151, - 173, - 238, - 219, - 89, - 224, - 91, - 253, - 115, - 162, - 180, - 194, - 168, - 136, - 87, - 8, - 196, - 244, - 247, - 12, - 132, - 198, - 75, - 39, - 18, - 14, - 114, - 171, - 115, - 59, - 114 - ], - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBeU16MmIrS1pKSXpCelJad3RwYnkKTHYvZzdZNFBGTDhGVGI0Y0Y0cVhzRVh4Smh1MGxHSmhUMFlZWUN4WUNhdk1aZjUwTlFETzRRQ2RlM2xzb0VZQgphdzBlZnRrWE5pMkxYL3h3aWozY044NTZkMkdvMGhZZjJCRVYySkUzb3pkU1NyNWNoaS9hVHYxM2w4YU1ZY2pXCjA4bHlBemxBVXozWGd2UmlkVktteHhoakFQRVRmM1BtcHV3aGFvM1luL3dMOFJSNk9BakNFUjRLN1JjLzV2bksKanZCaDU3bFNRZjdZRk9kV2ZnbEhjTWNYZndVNStldmFFbVJhaW9vYXpTQnkwMUtvMlJEQnBGL3VFNzdzZGYxQwo2NVRRSnZvS3kyRjBKUWJ2ME9RVFNqVzBDUHcwaFMydk96Qk5VK3ZBRUVYNHdxQmp6M1grUER1OUxid0E1NFdtClVRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K", - "FaultyNodes": 1, - "Committee": [ - { - "OperatorID": 1, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBeU16MmIrS1pKSXpCelJad3RwYnkKTHYvZzdZNFBGTDhGVGI0Y0Y0cVhzRVh4Smh1MGxHSmhUMFlZWUN4WUNhdk1aZjUwTlFETzRRQ2RlM2xzb0VZQgphdzBlZnRrWE5pMkxYL3h3aWozY044NTZkMkdvMGhZZjJCRVYySkUzb3pkU1NyNWNoaS9hVHYxM2w4YU1ZY2pXCjA4bHlBemxBVXozWGd2UmlkVktteHhoakFQRVRmM1BtcHV3aGFvM1luL3dMOFJSNk9BakNFUjRLN1JjLzV2bksKanZCaDU3bFNRZjdZRk9kV2ZnbEhjTWNYZndVNStldmFFbVJhaW9vYXpTQnkwMUtvMlJEQnBGL3VFNzdzZGYxQwo2NVRRSnZvS3kyRjBKUWJ2ME9RVFNqVzBDUHcwaFMydk96Qk5VK3ZBRUVYNHdxQmp6M1grUER1OUxid0E1NFdtClVRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 2, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBbVlaUDJHRzRxM1ZSUmFpZG1nbWEKT0N3eno4OEdUTDIvdHM0c3gyZk1hSkJ3dDJtY1JwR1NKTHVNQWgrUUpFSWhFUGNXYVNicllVYTdOZUg2VHZSdwp1TUlRdldzT3hzRUNmTzZndmZiTGhNeERyaGZrRmc2R3pNZ0pZQm1VUXVxRUlwYklXZitRVzJoQ0ViQjN1R3Y4CnFpMDdpSTBTTzB6OEtjZnhCVUJXNmtxNkRJdHozbEo2Z1ZOTjdTNFRBblZkS2o2NjBuR2JuSENlOVJQMzRma3IKVEtuUTBHb0NEOHh2RTE3U1dsWThHcmFzRGxJbDUxcWJSRGx2RXJJS3QvRHFBbllkZk4rL1BLekxJMkxlUGNjSApRdVdKalA5UXZZTWhrci9VVmdyMGM4Ums3bmt2YXprYmtrS2JreGVUMkp3OC9WN2gveWE0aDhZb1B6MkJLd05RCmNRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 3, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdG9pRlRVcUpwTDg0eHZoTUZTQU8KWUFxYkVZaXpEQlBsL2xNMmMxOEtzRzlJQVNEU3piTmZ4R25jMnBDMzdqanI3aDNibFN4RU5ZU0tPWVZIVzJOMgpxOGJ6TEJ1MDZrSzBnenNWRERKTU5jOGpwVnFOK0VJclBsSWpOWUwybXA1Wk5uYXp5YVdBYVZWa05ZeU1hYWpJCkF6VHlyWis2d3VvUVJvaXV6U2dsdTBSNmV1V1FaZThDY2lFVDFaRHJDMFJpaG4rYklCbzNlN3YwekZBZXczUXcKVTNJbEZvanp0SjVyaitKZmx5UWFVaS96VEN5OXFUUG5XV0ZBenRHWjZGZS8wM3VoVk4wczhXWnd0MnkxVjFiaQpIWUFQWXo2MmZpdENWNDRZcmt6RU9tSVNnUm4zVW9qT3prOHZORlltY0NSNDFMMncvbzE3UjBEM0xnOG54QzZNCkpRSURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - }, - { - "OperatorID": 4, - "SSVOperatorPubKey": "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBcVFYenEvNlh0VkVmSlRaL3YxUHcKa3pTa05SWGJwQy80MWE5TFNRdnNra0lDZEcyZEd3K1FhZ2tOVllwdktRc1Izd0F4QmZEb1FxZE1vRXY4R2g5eApCYVphZjZrTFdrbmFWWVlOSmVXbjZiRWlEbVhqVllETXE1ZGhsOW9kOVVoSzRFWVQ4cklmNWFsZnlFYTkrV3M5Cm9lQUxTMjFjVlBwUlBvYlFIeHNYOHhvOXVRQ3JMeE9xYzRFVzgyODVLajV2blFsZnBHRzIxV0ZCZmJIR1I0WGEKK2FtT2ZUS1BsUkxsZVZVTXp3WCs3cGVHSi81SDNqcExGbCtvRmFyMkMvWURIL0VKejArTnE2R0ptNzFpSjdNYwoxK2MwUDZGT2F5NlpxWitaRGo5ZHBKZC9tYnFZenkzcks2YlBvOE52TkVZSFNKZk9SRDRLak5NSXM0UzF5cHhaCkl3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K" - } - ], - "DomainType": [ - 0, - 0, - 3, - 1 - ] - } - } -] \ No newline at end of file diff --git a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_sorted_decided.json b/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_sorted_decided.json deleted file mode 100644 index edb359c5b..000000000 --- a/qbft/spectest/generate/tests/tests.ControllerSpecTest_qbft_controller_sorted_decided.json +++ /dev/null @@ -1,592 +0,0 @@ -{ - "Name": "sorted decided", - "RunInstanceData": [ - { - "InputValue": "AQIDBA==", - "InputMessages": [ - { - "Signatures": [ - "CzU9/GbbgfT1J/6fnAe07EDzLIirezU9AfNDzGNfautfsVAs4CKX/dQNXon/teMl7QeoZGEswQ2LqT7KuKvtaaX8QYXoO2+aTzpnI996omxXcYMf1UW3+kEfG+PeTqLzJgOR/y1iK4Fwry+znYDBJqbW2MhLFdSlqIIGB1FRQyM9HR+2fVncaLJdNAh6DPrjqXlgBHpvtiqFHLYPfPVER1+Yd18nufjUoUhamPlkaDzTsQq1TmPgYZf5+GCRmhS5zs+UwDf+fNwSnCfAjtvHHkmpLOtGDTrvWVoIj5XJmR3Nm3E8bXu2DY7Cpjj2LUS2swDLPQDl+LbzQdMfpj6yrQ==" - ], - "OperatorIDs": [ - 1 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ" - }, - { - "Signatures": [ - "g0BBLoygeLOHqaIj4pmkzrTfJc+5ChUS5DzxiV4EFVyRkQp7w1x4hGsS++AwQqcUC6Z+j7i/icSFuQnSMdS5W/SUYiyWgzY75xd+fa/IBRFqAZkJICUdtIcBBo4U7DgenowmoSfArGNm/swIP+zlZ8akA9VWWGgh9EoBpEYyumGPSnsbVSbLvD/iSIuv2myboKPuEI8NqQzjUezRQC+ahB/ml1m6S341ymfTjsdGbhVlPBZsWXUlJUHFpn3rl8hDUiSz4yROPgSC4xXH++0CesXLWeUgEisx5e0NRFs8OGLnnH6vBSgdWYYnQy5nfWCEZSQgZdWhlOUwoX/zjoqVzg==" - ], - "OperatorIDs": [ - 1 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - { - "Signatures": [ - "dfmNuoBlZZxe8CWQO/iBCeSWtOt+xijMhsyx6xsxR1kpOjXdjZ5GQbYEeClVjRw/tywFtAFAyw1HB2DHmpPeCHsIn+BsLhkT4r8eZYldPXWLjuKlMw8OrqUiBQ11YgngEvLLJpLsk5mZf3ccU6KyM1/xj7Z8Yl6WsotukYMSGB8t3OJyxbD/go0IUtafOqI3Hgkb0A9m3uDybjRfBWICreNrcHgnjKxIowiigIwpNx2pmdCi+j3MLKVcTqfhOIqcMHVDMM5LVMNQi9MXp0ymsqXf3TGT133kcnjvLPj6/2WdAYwuWs9BrrKqQ1dDC627n4Lbje8mnNKcxDTCCi+8TA==" - ], - "OperatorIDs": [ - 2 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - { - "Signatures": [ - "CK+6dEz+S2R4iGi6DHHTa1BSXt6DqMp6maTtXMe2HyX7Y7+xU6J1z49rKH61VMzLhBJI3itygLd734iO6Lae7n9dC2AMEaS4NsajETlzGZGrAvNEU5+W/ORzOkt0zuAh1vqMJV9wkps1CwCuV5m4Tt2Uw6kpZfc5/W24Jmjux1sF0v1colJ2ehmGGmVONA2w38mMZZvnQSd7J4ENR/PqPD6j3qkP/OQk4gWJJKY/W82IXNLadHdcvJN7JDdstPzx9FzM1b6zmuP0qwRzjpjIdPAzWh1l4q/yw+WgqS0kMKJPVpDJFt1OdX4ygQ1dEtJx2l7YaOpf0C6KAZv83ricrg==" - ], - "OperatorIDs": [ - 3 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - { - "Signatures": [ - "QP3Rd93H73AyuvCmfsENVK9NBmcx+f1E33UtE9dYqUOIIu289CLlnO9BiRKPXMNY141jeNr8JsqbivEpzelbMulkmxUXbGdp0uwRxcRenU3oc6LEGw+EjUYASMyT1rXrfCCBwE5vzGybTJAUxvGqEuJL42wz6POVtmK9/wYp2KpX0H9ehUsFvHUipm5dmGkg4gzJW9VuOTwgCtHtr+ZL090EPgaw2WDKNYeE1sScZoh3UWn+DhDmLchDhOxfstYxcbfDrd0NWnkVXJDzE7DlCvBRO2QrEov30ea27hh5dKb493m8XhyO0A1bFURPQUhE8S2rMVDkKDZ9orojrM8TgQ==" - ], - "OperatorIDs": [ - 4 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - { - "Signatures": [ - "VOEYr49ORL61wVkIif9Jv0Z85Mdl/T0za/v8dblspGhfvr7V1a/CbBQkiKCs7h8IeDJZrJ2v0aDnc9j49LUC0buORfskygfjvg9U0AuwMJ1ohRKWJ79WG8PdcH0r4h9JyspSqM4YjQrO2TCDthutLAsFbdklo28Hl6koVWPqqRlh7FJjJYYBMbkPh8slLvVdl8Mz2aWY8jSaVF5oZE8pmP4uZcPws03NA3r0s7zdQ80usxgj225ahSvMOwiXtKOlaENuU1pRJXFiQV3ptIOZH86UeJWp/e04pLiFyQVrz4Rk43tmN1Vf4RkwM9chx/ZXomLT8J1Ri1zu5N42cCGWtg==" - ], - "OperatorIDs": [ - 2 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - }, - { - "Signatures": [ - "DyAKAM84BaQy3UZy+sJO2tgfutZ73863DIw3S0nxD2jbj8EYJ2K9Cv1W7zF1uLJ/q14A478XYtj62zHqVpN15R65X8mZs6PIscY040nUlsuM46we81Q6uCxRtQxBkASl9ubwihhsPXTRfkhL4MfpDpk9J7uGZ9mQhT7dnGXjZ/9dRyJQv3t0mDKQpcc3UmECvDtYvjFtLZGKguBmhAC6mtwgcC/5reKoQoBi8M5aoAC7ycNZW9kn7DwgQj//qvWB9EwoRQpObNiEWyHiiuDSOW4uFh7ott4fk92bD2qleCNMfEURT+1uwW4OdhjIzOgj4aZJM3iTc4T/3uwjYAXPMg==" - ], - "OperatorIDs": [ - 3 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": null - } - ], - "ControllerPostRoot": "", - "ExpectedTimerState": null, - "ExpectedDecidedState": { - "DecidedVal": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ", - "DecidedCnt": 1, - "BroadcastedDecided": { - "Signatures": [ - "VOEYr49ORL61wVkIif9Jv0Z85Mdl/T0za/v8dblspGhfvr7V1a/CbBQkiKCs7h8IeDJZrJ2v0aDnc9j49LUC0buORfskygfjvg9U0AuwMJ1ohRKWJ79WG8PdcH0r4h9JyspSqM4YjQrO2TCDthutLAsFbdklo28Hl6koVWPqqRlh7FJjJYYBMbkPh8slLvVdl8Mz2aWY8jSaVF5oZE8pmP4uZcPws03NA3r0s7zdQ80usxgj225ahSvMOwiXtKOlaENuU1pRJXFiQV3ptIOZH86UeJWp/e04pLiFyQVrz4Rk43tmN1Vf4RkwM9chx/ZXomLT8J1Ri1zu5N42cCGWtg==", - "DyAKAM84BaQy3UZy+sJO2tgfutZ73863DIw3S0nxD2jbj8EYJ2K9Cv1W7zF1uLJ/q14A478XYtj62zHqVpN15R65X8mZs6PIscY040nUlsuM46we81Q6uCxRtQxBkASl9ubwihhsPXTRfkhL4MfpDpk9J7uGZ9mQhT7dnGXjZ/9dRyJQv3t0mDKQpcc3UmECvDtYvjFtLZGKguBmhAC6mtwgcC/5reKoQoBi8M5aoAC7ycNZW9kn7DwgQj//qvWB9EwoRQpObNiEWyHiiuDSOW4uFh7ott4fk92bD2qleCNMfEURT+1uwW4OdhjIzOgj4aZJM3iTc4T/3uwjYAXPMg==", - "QP3Rd93H73AyuvCmfsENVK9NBmcx+f1E33UtE9dYqUOIIu289CLlnO9BiRKPXMNY141jeNr8JsqbivEpzelbMulkmxUXbGdp0uwRxcRenU3oc6LEGw+EjUYASMyT1rXrfCCBwE5vzGybTJAUxvGqEuJL42wz6POVtmK9/wYp2KpX0H9ehUsFvHUipm5dmGkg4gzJW9VuOTwgCtHtr+ZL090EPgaw2WDKNYeE1sScZoh3UWn+DhDmLchDhOxfstYxcbfDrd0NWnkVXJDzE7DlCvBRO2QrEov30ea27hh5dKb493m8XhyO0A1bFURPQUhE8S2rMVDkKDZ9orojrM8TgQ==" - ], - "OperatorIDs": [ - 2, - 3, - 4 - ], - "SSVMessage": { - "MsgType": 0, - "MsgID": [ - 1, - 2, - 3, - 4, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "Data": "AgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAATAAAAL6Vb7ffTvN1MWgtWIMgCE/JFMPw/tM1Jj5bRAYubCm0AAAAAAAAAACEAAAAhAAAAAECAwQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" - }, - "FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ" - } - }, - "omitempty": null - } - ], - "OutputMessages": null, - "ExpectedError": "", - "omitempty": null -} \ No newline at end of file diff --git a/qbft/spectest/tests/commit/sorted_decided.go b/qbft/spectest/tests/commit/sorted_decided.go deleted file mode 100644 index f0e70c7a7..000000000 --- a/qbft/spectest/tests/commit/sorted_decided.go +++ /dev/null @@ -1,38 +0,0 @@ -package commit - -import ( - "crypto/rsa" - - "github.com/ssvlabs/ssv-spec/qbft/spectest/tests" - "github.com/ssvlabs/ssv-spec/types" - "github.com/ssvlabs/ssv-spec/types/testingutils" -) - -// SortedDecided tests the creation of the decided message that should have sorted signers -func SortedDecided() tests.SpecTest { - ks := testingutils.Testing4SharesSet() - return &tests.ControllerSpecTest{ - Name: "sorted decided", - RunInstanceData: []*tests.RunInstanceData{ - { - InputValue: []byte{1, 2, 3, 4}, - InputMessages: []*types.SignedSSVMessage{ - testingutils.TestingProposalMessage(ks.OperatorKeys[1], 1), - testingutils.TestingPrepareMessage(ks.OperatorKeys[1], 1), - testingutils.TestingPrepareMessage(ks.OperatorKeys[2], 2), - testingutils.TestingPrepareMessage(ks.OperatorKeys[3], 3), - testingutils.TestingCommitMessage(ks.OperatorKeys[4], 4), - testingutils.TestingCommitMessage(ks.OperatorKeys[2], 2), - testingutils.TestingCommitMessage(ks.OperatorKeys[3], 3), - }, - ExpectedDecidedState: tests.DecidedState{ - DecidedVal: testingutils.TestingQBFTFullData, - DecidedCnt: 1, - BroadcastedDecided: testingutils.TestingCommitMultiSignerMessage( - []*rsa.PrivateKey{ks.OperatorKeys[2], ks.OperatorKeys[3], ks.OperatorKeys[4]}, - []types.OperatorID{2, 3, 4}), - }, - }, - }, - } -} diff --git a/qbft/spectest/tests/controller_spectest.go b/qbft/spectest/tests/controller_spectest.go index ae426bff0..4d11f73c6 100644 --- a/qbft/spectest/tests/controller_spectest.go +++ b/qbft/spectest/tests/controller_spectest.go @@ -1,7 +1,6 @@ package tests import ( - "bytes" "encoding/hex" "encoding/json" "fmt" @@ -124,46 +123,6 @@ func (test *ControllerSpecTest) testProcessMsg( return lastErr } -func (test *ControllerSpecTest) testBroadcastedDecided( - t *testing.T, - config qbft.IConfig, - identifier []byte, - runData *RunInstanceData, - committee []*types.Operator, -) { - if runData.ExpectedDecidedState.BroadcastedDecided != nil { - // test broadcasted - broadcastedSignedMsgs := config.GetNetwork().(*testingutils.TestingNetwork).BroadcastedMsgs - require.Greater(t, len(broadcastedSignedMsgs), 0) - require.NoError(t, testingutils.VerifyListOfSignedSSVMessages(broadcastedSignedMsgs, committee)) - found := false - for _, msg := range broadcastedSignedMsgs { - - // a hack for testing non standard messageID identifiers since we copy them into a MessageID this fixes it - msgID := types.MessageID{} - copy(msgID[:], identifier) - - if !bytes.Equal(msgID[:], msg.SSVMessage.MsgID[:]) { - continue - } - - r1, err := msg.GetRoot() - require.NoError(t, err) - - r2, err := runData.ExpectedDecidedState.BroadcastedDecided.GetRoot() - require.NoError(t, err) - - if r1 == r2 && - reflect.DeepEqual(runData.ExpectedDecidedState.BroadcastedDecided.OperatorIDs, msg.OperatorIDs) && - reflect.DeepEqual(runData.ExpectedDecidedState.BroadcastedDecided.Signatures, msg.Signatures) { - require.False(t, found) - found = true - } - } - require.True(t, found) - } -} - func (test *ControllerSpecTest) runInstanceWithData( t *testing.T, height qbft.Height, @@ -182,8 +141,6 @@ func (test *ControllerSpecTest) runInstanceWithData( lastErr = err } - test.testBroadcastedDecided(t, contr.GetConfig(), contr.Identifier, runData, contr.CommitteeMember.Committee) - // test root r, err := contr.GetRoot() require.NoError(t, err) diff --git a/types/beacon_types_encoding.go b/types/beacon_types_encoding.go index 5d9522e32..ac1ffed19 100644 --- a/types/beacon_types_encoding.go +++ b/types/beacon_types_encoding.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: e8d4da029627f61fc9e6f7ec2d837905e84d31d318f66dc7795dbf951c9cdb3a +// Hash: 5f9ee936d2c6bc57f624b677a7220e230c02501eba5cd8319ceac46ec4182761 // Version: 0.1.3 package types diff --git a/types/signer.go b/types/signer.go index c92ad73bb..202842a66 100644 --- a/types/signer.go +++ b/types/signer.go @@ -2,6 +2,7 @@ package types import ( "bytes" + spec "github.com/attestantio/go-eth2-client/spec/phase0" ssz "github.com/ferranbt/fastssz" ) diff --git a/types/testingutils/beacon_node_committee_duty.go b/types/testingutils/beacon_node_committee_duty.go index 08bff5bb2..e883c97b8 100644 --- a/types/testingutils/beacon_node_committee_duty.go +++ b/types/testingutils/beacon_node_committee_duty.go @@ -223,7 +223,6 @@ var TestingSignedCommitteeBeaconObjectSSZRoot = func(duty *types.CommitteeDuty, switch validatorDuty.Type { case types.BNRoleAttester: - attResponse := TestingAttestationResponseBeaconObjectForDuty(ks, version, validatorDuty) ret = append(ret, GetSSZRootNoError(attResponse)) case types.BNRoleSyncCommittee: