File tree
7 files changed
+120
-53
lines changed- ethereum/statetransition/src
- main/java/tech/pegasys/teku/statetransition
- forkchoice
- util
- noop
- test/java/tech/pegasys/teku/statetransition
- forkchoice
- util
- networking/eth2/src
- main/java/tech/pegasys/teku/networking/eth2/gossip/topics/topichandlers
- test/java/tech/pegasys/teku/networking/eth2/gossip/topics
7 files changed
+120
-53
lines changedethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoice.java
Lines changed: 6 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
760 | 760 |
| |
761 | 761 |
| |
762 | 762 |
| |
763 |
| - | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
764 | 769 |
| |
765 | 770 |
| |
766 | 771 |
| |
|
Lines changed: 47 additions & 25 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
63 |
| - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
64 | 67 |
| |
65 | 68 |
| |
66 | 69 |
| |
| |||
70 | 73 |
| |
71 | 74 |
| |
72 | 75 |
| |
73 |
| - | |
74 |
| - | |
75 |
| - | |
76 |
| - | |
77 |
| - | |
78 |
| - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
79 | 82 |
| |
80 | 83 |
| |
81 | 84 |
| |
82 |
| - | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
83 | 89 |
| |
84 | 90 |
| |
85 | 91 |
| |
86 | 92 |
| |
87 | 93 |
| |
88 | 94 |
| |
89 | 95 |
| |
90 |
| - | |
91 |
| - | |
92 |
| - | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
93 | 104 |
| |
94 | 105 |
| |
95 | 106 |
| |
96 |
| - | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
97 | 112 |
| |
98 | 113 |
| |
99 | 114 |
| |
100 | 115 |
| |
101 |
| - | |
102 |
| - | |
103 |
| - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
104 | 126 |
| |
105 | 127 |
| |
106 | 128 |
| |
107 |
| - | |
108 |
| - | |
109 |
| - | |
110 |
| - | |
111 |
| - | |
| 129 | + | |
| 130 | + | |
112 | 131 |
| |
113 | 132 |
| |
114 | 133 |
| |
115 |
| - | |
116 | 134 |
| |
117 | 135 |
| |
118 | 136 |
| |
119 |
| - | |
| 137 | + | |
120 | 138 |
| |
121 |
| - | |
| 139 | + | |
122 | 140 |
| |
123 | 141 |
| |
| 142 | + | |
124 | 143 |
| |
| 144 | + | |
125 | 145 |
| |
126 | 146 |
| |
127 |
| - | |
| 147 | + | |
128 | 148 |
| |
129 | 149 |
| |
130 | 150 |
| |
131 | 151 |
| |
132 |
| - | |
133 | 152 |
| |
134 | 153 |
| |
135 | 154 |
| |
| 155 | + | |
136 | 156 |
| |
137 | 157 |
| |
138 | 158 |
| |
139 | 159 |
| |
| 160 | + | |
140 | 161 |
| |
| 162 | + | |
141 | 163 |
| |
142 | 164 |
| |
143 | 165 |
| |
|
Lines changed: 13 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
32 | 35 |
| |
33 | 36 |
| |
34 | 37 |
| |
35 |
| - | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
36 | 42 |
| |
37 | 43 |
| |
38 | 44 |
| |
39 |
| - | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
40 | 50 |
|
Lines changed: 18 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
307 | 307 |
| |
308 | 308 |
| |
309 | 309 |
| |
| 310 | + | |
310 | 311 |
| |
311 |
| - | |
| 312 | + | |
312 | 313 |
| |
313 | 314 |
| |
314 | 315 |
| |
315 | 316 |
| |
316 | 317 |
| |
317 | 318 |
| |
318 | 319 |
| |
319 |
| - | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
320 | 323 |
| |
321 | 324 |
| |
322 | 325 |
| |
| |||
347 | 350 |
| |
348 | 351 |
| |
349 | 352 |
| |
350 |
| - | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
351 | 356 |
| |
352 | 357 |
| |
353 | 358 |
| |
| |||
747 | 752 |
| |
748 | 753 |
| |
749 | 754 |
| |
750 |
| - | |
| 755 | + | |
| 756 | + | |
| 757 | + | |
| 758 | + | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
751 | 762 |
| |
752 | 763 |
| |
753 | 764 |
| |
| |||
788 | 799 |
| |
789 | 800 |
| |
790 | 801 |
| |
791 |
| - | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
792 | 805 |
| |
793 | 806 |
| |
794 | 807 |
| |
|
Lines changed: 28 additions & 12 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
47 | 47 |
| |
48 | 48 |
| |
49 | 49 |
| |
50 |
| - | |
| 50 | + | |
| 51 | + | |
51 | 52 |
| |
52 | 53 |
| |
53 | 54 |
| |
| |||
65 | 66 |
| |
66 | 67 |
| |
67 | 68 |
| |
68 |
| - | |
| 69 | + | |
| 70 | + | |
69 | 71 |
| |
70 | 72 |
| |
71 | 73 |
| |
| |||
84 | 86 |
| |
85 | 87 |
| |
86 | 88 |
| |
87 |
| - | |
| 89 | + | |
| 90 | + | |
88 | 91 |
| |
89 | 92 |
| |
90 | 93 |
| |
| |||
102 | 105 |
| |
103 | 106 |
| |
104 | 107 |
| |
105 |
| - | |
| 108 | + | |
| 109 | + | |
106 | 110 |
| |
107 | 111 |
| |
108 | 112 |
| |
| |||
119 | 123 |
| |
120 | 124 |
| |
121 | 125 |
| |
122 |
| - | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
123 | 132 |
| |
124 | 133 |
| |
125 | 134 |
| |
| |||
131 | 140 |
| |
132 | 141 |
| |
133 | 142 |
| |
134 |
| - | |
| 143 | + | |
| 144 | + | |
135 | 145 |
| |
136 | 146 |
| |
137 | 147 |
| |
| |||
144 | 154 |
| |
145 | 155 |
| |
146 | 156 |
| |
147 |
| - | |
148 |
| - | |
149 |
| - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
150 | 163 |
| |
151 | 164 |
| |
152 | 165 |
| |
| |||
157 | 170 |
| |
158 | 171 |
| |
159 | 172 |
| |
160 |
| - | |
161 |
| - | |
162 |
| - | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
163 | 179 |
| |
164 | 180 |
| |
165 | 181 |
| |
|
Lines changed: 3 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
141 |
| - | |
| 141 | + | |
| 142 | + | |
142 | 143 |
| |
143 | 144 |
| |
144 | 145 |
| |
| |||
172 | 173 |
| |
173 | 174 |
| |
174 | 175 |
| |
175 |
| - | |
| 176 | + | |
176 | 177 |
| |
177 | 178 |
| |
178 | 179 |
| |
|
Lines changed: 5 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
92 | 92 |
| |
93 | 93 |
| |
94 | 94 |
| |
95 |
| - | |
| 95 | + | |
96 | 96 |
| |
97 | 97 |
| |
98 | 98 |
| |
| |||
125 | 125 |
| |
126 | 126 |
| |
127 | 127 |
| |
128 |
| - | |
| 128 | + | |
129 | 129 |
| |
130 | 130 |
| |
131 | 131 |
| |
| |||
148 | 148 |
| |
149 | 149 |
| |
150 | 150 |
| |
151 |
| - | |
| 151 | + | |
152 | 152 |
| |
153 | 153 |
| |
154 | 154 |
| |
| |||
171 | 171 |
| |
172 | 172 |
| |
173 | 173 |
| |
174 |
| - | |
| 174 | + | |
175 | 175 |
| |
176 | 176 |
| |
177 | 177 |
| |
| |||
194 | 194 |
| |
195 | 195 |
| |
196 | 196 |
| |
197 |
| - | |
| 197 | + | |
198 | 198 |
| |
199 | 199 |
| |
200 | 200 |
| |
|
0 commit comments