Skip to content

Commit

Permalink
Spec - Revert changes in HashTreeRoot and SSZ encoding for backwards-…
Browse files Browse the repository at this point in the history 
…compatibility (#362)

* Revert "Deneb Support (#324)"

This reverts commit f2d5899.

* Add jsons (#357)

* create jsons

* compare with jsons

* generate jsons for qbft signed message

* compare qbft signed message with json state

* fix lint error

* generate jsons for create msg test

* generate jsons for create msg test

* use correct test type

* use correct test name

* Return deneb with old encoding (#360)

* Revert "Revert "Deneb Support (#324)""

This reverts commit 0a559e2.

* use custom old encodings

* generate-jsons

* Add phase0 version

* Bellatrix -> Capella on a single test

* Generate jsons

* Revert Capella -> Deneb on a single test

---------

Co-authored-by: MatheusFranco99 <[email protected]>

---------

Co-authored-by: MatheusFranco99 <[email protected]>
  • Loading branch information
@GalRogozinski @MatheusFranco99
GalRogozinski and MatheusFranco99 authored Feb 1, 2024
1 parent d111858 commit 3879a9e
Show file tree
Hide file tree
Showing 410 changed files with 49,397 additions and 41,257 deletions.
4 changes: 2 additions & 2 deletions qbft/generate.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package qbft

//go:generate rm -f ./messages_encoding.go
//go:generate go run github.com/ferranbt/fastssz/sszgen --path messages.go --include ./types.go,../types/signer.go,../types/operator.go --exclude-objs OperatorID
// rm -f ./messages_encoding.go
// go run github.com/ferranbt/fastssz/sszgen --path messages.go --include ./types.go,../types/signer.go,../types/operator.go --exclude-objs OperatorID
4 changes: 2 additions & 2 deletions qbft/messages_encoding.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions .../generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create commit.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"Name": "create commit",
"Value": [
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
],
"StateValue": null,
"Round": 10,
"RoundChangeJustifications": null,
"PrepareJustifications": null,
"CreateType": "CreateCommit",
"ExpectedRoot": "0834b51f3c87d4aba362d7e2eeb4172d22e0ef18d4dfadd37e8c9ceb62c7719d",
"ExpectedError": ""
}
44 changes: 44 additions & 0 deletions ...generate/state_comparison/tests_CreateMsgSpecTest/qbft create message create prepare.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"Name": "create prepare",
"Value": [
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
],
"StateValue": null,
"Round": 10,
"RoundChangeJustifications": null,
"PrepareJustifications": null,
"CreateType": "CreatePrepare",
"ExpectedRoot": "2eba5b18818e0ec94f5c02ff7abc8ca932ed5d1f32a115197fbaa14247a39cb2",
"ExpectedError": ""
}
195 changes: 195 additions & 0 deletions .../tests_CreateMsgSpecTest/qbft create message create proposal not previously prepared.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
{
"Name": "create proposal not previously prepared",
"Value": [
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
],
"StateValue": null,
"Round": 0,
"RoundChangeJustifications": [
{
"Signature": "gztz02gJCBBld01h2Pb/7pG5BvLmymJYG+fOGi8fCq81dVcUcoNMZmCvloEyiT+OD5Cl1b+v6OaSbkM80leaeENvDl8G377UXnKTI4wY/74ve7a7iZgSLRf/x7fNM7fB",
"Signers": [
1
],
"Message": {
"MsgType": 0,
"Height": 0,
"Round": 2,
"Identifier": "AQIDBA==",
"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": null,
"PrepareJustification": null
},
"FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ"
},
{
"Signature": "jLHzMp8Y+D46RWGLJEOr49k05Q+UkqPjWgknRsFgFHRJgHGOi0u6wt10PLief4fVCUJOEXE1fbENSqUgtf03KVpQ3EaEN94xbfkY5AFfbfF7yk12EpEOP/0C49uBovdQ",
"Signers": [
2
],
"Message": {
"MsgType": 0,
"Height": 0,
"Round": 2,
"Identifier": "AQIDBA==",
"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": null,
"PrepareJustification": null
},
"FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ"
},
{
"Signature": "ts0KRie2NM79t+H+9ZajE3y5g3oTw3ak/YMsEEZzWWE2G4EtrJCJevuhAwxFhnwgFbcMf8xHfxryZP5dTcRS2zA30tVz/n6XsPmHJT5dzwtVdY9QpJ8hQsE56sJSEsOz",
"Signers": [
3
],
"Message": {
"MsgType": 0,
"Height": 0,
"Round": 2,
"Identifier": "AQIDBA==",
"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": null,
"PrepareJustification": null
},
"FullData": "AQIDBAUGBwgJAQIDBAUGBwgJAQIDBAUGBwgJ"
}
],
"PrepareJustifications": null,
"CreateType": "createProposal",
"ExpectedRoot": "45f15e2dc3a0c1bd13aa977ead44abfabab094864db4a77dcd0cd9a30e87c3bb",
"ExpectedError": ""
}
Loading

0 comments on commit 3879a9e

Please sign in to comment.