ssvlabs · GalRogozinski · Jun 9, 2024 · May 14, 2024 · May 14, 2024 · May 14, 2024
diff --git a/qbft/messages.go b/qbft/messages.go
@@ -52,8 +52,8 @@ type Message struct {
 
 	Root                     [32]byte `ssz-size:"32"`
 	DataRound                Round    // The last round that obtained a Prepare quorum
-	RoundChangeJustification [][]byte `ssz-max:"13,65536"` // 2^16
-	PrepareJustification     [][]byte `ssz-max:"13,65536"` // 2^16
+	RoundChangeJustification [][]byte `ssz-max:"13,51852"`
+	PrepareJustification     [][]byte `ssz-max:"13,3700"`
 }
 
 // Creates a Message object from bytes

diff --git a/qbft/messages_encoding.go b/qbft/messages_encoding.go
diff --git a/.../generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create commit.json b/.../generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create commit.json
@@ -39,6 +39,6 @@
 		"RoundChangeJustifications": null,
 		"PrepareJustifications": null,
 		"CreateType": "CreateCommit",
-		"ExpectedRoot": "ce830104bddf6905db857b74df322663359c3c4bb31d8f0554b3ff4a78f96dda",
+		"ExpectedRoot": "5c56f82a51e9392d181cd24718164d2b7548dae479551e4cd7cefaba181c88f8",
 		"ExpectedError": ""
 }
diff --git a/...generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create prepare.json b/...generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create prepare.json
@@ -39,6 +39,6 @@
 		"RoundChangeJustifications": null,
 		"PrepareJustifications": null,
 		"CreateType": "CreatePrepare",
-		"ExpectedRoot": "adf79bdbc15b8954cb75f60f3917410106ae8c36bbc3819f3313b4899a684aab",
+		"ExpectedRoot": "5f8dfc0b340c2fbac1c45d017eed5daeacacaba724a83006bf75029fc23f17c5",
 		"ExpectedError": ""
 }
diff --git a/.../tests_CreateMsgSpecTest/qbft create message create proposal not previously prepared.json b/.../tests_CreateMsgSpecTest/qbft create message create proposal not previously prepared.json
@@ -253,6 +253,6 @@
 		],
 		"PrepareJustifications": null,
 		"CreateType": "createProposal",
-		"ExpectedRoot": "310725e97a6c1566433ca70d4ae3ff4b91f8d32809a753ea2c64125a1bb98db2",
+		"ExpectedRoot": "b6e2b2b60655bed0f127e41d2af790fdb7d44a52282dba4888dcc9057db02353",
 		"ExpectedError": ""
 }
diff --git a/...ison/tests_CreateMsgSpecTest/qbft create message create proposal previously prepared.json b/...ison/tests_CreateMsgSpecTest/qbft create message create proposal previously prepared.json
@@ -467,6 +467,6 @@
 				}
 		],
 		"CreateType": "createProposal",
-		"ExpectedRoot": "e43422be8b818596733c9492e6e3731a6ea1d9809a8cf1192b2ef0fd6b889c0d",
+		"ExpectedRoot": "b3f7492e538454d24f391cf3845c72abfa25206ee37189fea9134332aa3781a0",
 		"ExpectedError": ""
 }
diff --git a/...enerate/state_comparison/tests_CreateMsgSpecTest/qbft create message create proposal.json b/...enerate/state_comparison/tests_CreateMsgSpecTest/qbft create message create proposal.json
@@ -39,6 +39,6 @@
 		"RoundChangeJustifications": null,
 		"PrepareJustifications": null,
 		"CreateType": "createProposal",
-		"ExpectedRoot": "a52caeaa01af9479834aeea962392d6df6ad373565f309700812c4062edb7840",
+		"ExpectedRoot": "6f6ad56759e8e7dc35135b6780f2aa3b0f7e6a7efe34d74dc80fd819c6cfbfe5",
 		"ExpectedError": ""
 }
diff --git a/...ts_CreateMsgSpecTest/qbft create message create round change no justification quorum.json b/...ts_CreateMsgSpecTest/qbft create message create round change no justification quorum.json
@@ -182,6 +182,6 @@
 				}
 		],
 		"CreateType": "CreateRoundChange",
-		"ExpectedRoot": "fd7b5fef9c1cc3a1d769f602a1a6d3d776e615d468cc4e38ddc669bb80a81ff8",
+		"ExpectedRoot": "7a985cc803c25279d8cf3a24f4e8cf7cc6e00df18e127340a8c240dbea47bae7",
 		"ExpectedError": ""
 }
diff --git a/.../tests_CreateMsgSpecTest/qbft create message create round change previously prepared.json b/.../tests_CreateMsgSpecTest/qbft create message create round change previously prepared.json
@@ -253,6 +253,6 @@
 				}
 		],
 		"CreateType": "CreateRoundChange",
-		"ExpectedRoot": "d31ba4f08c790d96b6951cf632c51923ce3e77fbc896336b1def371476b13743",
+		"ExpectedRoot": "78b5a214f4b2c83afe7dc739b317327a6fe8a29e14c27293fbd8a5522543dbf7",
 		"ExpectedError": ""
 }
diff --git a/...ate/state_comparison/tests_CreateMsgSpecTest/qbft create message create round change.json b/...ate/state_comparison/tests_CreateMsgSpecTest/qbft create message create round change.json
@@ -39,6 +39,6 @@
 		"RoundChangeJustifications": null,
 		"PrepareJustifications": null,
 		"CreateType": "CreateRoundChange",
-		"ExpectedRoot": "d31ba4f08c790d96b6951cf632c51923ce3e77fbc896336b1def371476b13743",
+		"ExpectedRoot": "78b5a214f4b2c83afe7dc739b317327a6fe8a29e14c27293fbd8a5522543dbf7",
 		"ExpectedError": ""
 }
diff --git a/...e/state_comparison/tests_MsgSpecTest/qbft message SSZ marshalling of signed messaged.json b/...e/state_comparison/tests_MsgSpecTest/qbft message SSZ marshalling of signed messaged.json
@@ -78,38 +78,38 @@
 		],
 		"ExpectedRoots": [
 				[
-						175,
+						254,
+						141,
+						255,
 						148,
-						200,
-						125,
-						73,
-						48,
-						18,
-						92,
-						10,
-						28,
-						118,
-						101,
-						200,
-						216,
-						124,
-						91,
-						27,
+						17,
+						166,
+						136,
+						98,
+						80,
+						72,
+						142,
+						198,
+						244,
+						251,
+						254,
+						31,
+						38,
+						33,
+						5,
+						29,
+						120,
+						233,
 						221,
-						60,
-						199,
-						96,
-						23,
-						143,
-						187,
-						20,
-						224,
-						23,
-						84,
-						115,
-						90,
-						181,
-						159
+						13,
+						250,
+						32,
+						77,
+						196,
+						186,
+						168,
+						116,
+						138
 				]
 		],
 		"ExpectedError": ""

diff --git a/...st/generate/state_comparison/tests_MsgSpecTest/qbft message commit data nil or len 0.json b/...st/generate/state_comparison/tests_MsgSpecTest/qbft message commit data nil or len 0.json
@@ -78,38 +78,38 @@
 		],
 		"ExpectedRoots": [
 				[
-						144,
-						164,
-						212,
-						249,
-						149,
-						148,
-						180,
-						106,
-						150,
-						155,
-						80,
-						142,
-						228,
-						34,
-						185,
+						253,
+						159,
 						45,
-						95,
-						0,
+						57,
+						170,
+						41,
+						131,
+						129,
+						242,
+						235,
 						237,
-						192,
-						118,
-						248,
-						202,
-						18,
-						28,
-						71,
-						35,
-						45,
+						169,
+						87,
+						219,
+						22,
+						94,
+						106,
+						21,
+						69,
+						7,
+						107,
+						89,
+						46,
+						83,
+						4,
+						113,
 						106,
-						165,
-						73,
-						175
+						54,
+						17,
+						187,
+						167,
+						125
 				]
 		],
 		"ExpectedError": ""

diff --git a/qbft/spectest/generate/state_comparison/tests_MsgSpecTest/qbft message get root.json b/qbft/spectest/generate/state_comparison/tests_MsgSpecTest/qbft message get root.json
@@ -76,38 +76,38 @@
 		"EncodedMessages": null,
 		"ExpectedRoots": [
 				[
-						64,
-						157,
-						154,
-						153,
-						202,
-						201,
-						202,
-						80,
-						76,
-						237,
-						174,
-						9,
-						89,
-						42,
-						40,
-						36,
-						190,
-						169,
-						97,
-						197,
-						172,
-						10,
-						90,
-						65,
-						124,
-						232,
-						127,
-						4,
-						55,
-						251,
-						178,
-						197
+						110,
+						79,
+						43,
+						160,
+						75,
+						234,
+						249,
+						204,
+						198,
+						22,
+						238,
+						51,
+						93,
+						54,
+						87,
+						57,
+						206,
+						233,
+						203,
+						152,
+						2,
+						118,
+						81,
+						136,
+						73,
+						195,
+						11,
+						242,
+						192,
+						231,
+						241,
+						246
 				]
 		],
 		"ExpectedError": ""
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,38 +78,38 @@ @@
     		],
     		"ExpectedRoots": [
     				[
-,
+,
+,
+,
 ,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
+,
 ,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
-,
+,
+,
+,
+,
+,
+,
+,
+,
     				]
     		],
     		"ExpectedError": ""
@@ Expand Down @@