Skip to content

Commit f21d3d3

Browse files
authored
Merge pull request #10 from openrelayxyz/merge/bor-v1.0.4
Merge/bor v1.0.4
2 parents 38fdde5 + be87094 commit f21d3d3

File tree

1,470 files changed

+222253
-181515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,470 files changed

+222253
-181515
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 2.1
66
jobs:
77
test:
88
docker:
9-
- image: cimg/go:1.19.4
9+
- image: cimg/go:1.20
1010
steps:
1111
- checkout
1212
- run:
@@ -38,7 +38,7 @@ jobs:
3838
command: go test ./core/rawdb/
3939
build_geth_push:
4040
docker: # run the steps with Docker
41-
- image: cimg/go:1.19.4 # ...with this image as the primary container
41+
- image: cimg/go:1.20.0 # ...with this image as the primary container
4242
# this is where all `steps` will run
4343
steps:
4444
- checkout

.github/workflows/security-sonarqube-ci.yml

-32
This file was deleted.

.golangci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file configures github.com/golangci/golangci-lint.
22

33
run:
4-
go: '1.18'
4+
go: '1.20'
55
timeout: 20m
66
tests: true
77
# default is true. Enables skipping of directories:
@@ -146,7 +146,7 @@ linters-settings:
146146

147147
issues:
148148
exclude-rules:
149-
- path: crypto/blake2b/
149+
- path: crypto/bn256/cloudflare/optate.go
150150
linters:
151151
- deadcode
152152
- path: crypto/bn256/cloudflare

.goreleaser.yml

-5
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,6 @@ nfpms:
103103
scripts:
104104
postinstall: builder/files/bor-post-install.sh
105105

106-
overrides:
107-
rpm:
108-
replacements:
109-
amd64: x86_64
110-
111106
snapshot:
112107
name_template: "{{ .Tag }}.next"
113108

.mailmap

+170-56
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,237 @@
1-
Jeffrey Wilcke <[email protected]>
2-
3-
4-
1+
Aaron Buchwald <[email protected]>
52

6-
Viktor Trón <viktor.tron@gmail.com>
3+
Aaron Kumavis <[email protected].com>
74

8-
Joseph Goulden <[email protected]>
5+
Abel Nieto <[email protected]>
6+
97

10-
Nick Savers <[email protected]>
8+
Afri Schoedon <[email protected]>
9+
1110

12-
Maran Hidskes <maran.hidskes@gmail.com>
11+
Alec Perseghin <aperseghin@gmail.com>
1312

14-
Taylor Gerring <[email protected]>
15-
13+
Aleksey Smyrnov <[email protected]>
14+
15+
Alex Leverington <[email protected]>
16+
17+
18+
Alex Pozhilenkov <[email protected]>
19+
20+
21+
Alexey Akhunov <[email protected]>
22+
23+
Alon Muroch <[email protected]>
24+
25+
Andrey Petrov <[email protected]>
26+
27+
28+
Arkadiy Paronyan <[email protected]>
29+
30+
Armin Braun <[email protected]>
31+
32+
33+
34+
Austin Roberts <[email protected]>
35+
1636

1737
Bas van Kervel <[email protected]>
1838
1939
2040
2141

22-
Sven Ehlert <[email protected]>
42+
Boqin Qin <[email protected]>
43+
2344

24-
Vitalik Buterin <v@buterin.com>
45+
Casey Detrio <cdetrio@gmail.com>
2546

26-
Marian Oancea <[email protected]>
47+
48+
49+
Chris Ziogas <[email protected]>
50+
2751

2852
Christoph Jentzsch <[email protected]>
2953

30-
Heiko Hees <[email protected]>
54+
Diederik Loerakker <[email protected]>
3155

32-
Alex Leverington <[email protected]>
33-
56+
Dimitry Khokhlov <[email protected]>
3457

35-
Zsolt Felföldi <[email protected]>
58+
Domino Valdano <[email protected]>
59+
60+
61+
Edgar Aroutiounian <[email protected]>
62+
63+
Elliot Shepherd <[email protected]>
64+
65+
Enrique Fynn <[email protected]>
66+
67+
Enrique Fynn <[email protected]>
68+
69+
70+
Ernesto del Toro <[email protected]>
71+
72+
73+
Everton Fraga <[email protected]>
74+
75+
Felix Lange <[email protected]>
76+
77+
78+
Frank Wang <[email protected]>
79+
80+
Gary Rong <[email protected]>
3681

3782
Gavin Wood <[email protected]>
3883

39-
Martin Becze <[email protected]>
40-
84+
Gregg Dourgarian <[email protected]>
4185

42-
Dimitry Khokhlov <[email protected]>
86+
Guillaume Ballet <[email protected]>
87+
4388

44-
Roman Mandeleil <roman.mandeleil@gmail.com>
89+
Guillaume Nicolas <guin56@gmail.com>
4590

46-
Alec Perseghin <[email protected]>
91+
Hanjiang Yu <[email protected]>
92+
4793

48-
Alon Muroch <[email protected]>
94+
Heiko Hees <[email protected]>
4995

50-
Arkadiy Paronyan <[email protected]>
96+
Henning Diedrich <[email protected]>
97+
Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
98+
99+
Hwanjo Heo <[email protected]>
100+
101+
Iskander (Alex) Sharipov <[email protected]>
102+
Iskander (Alex) Sharipov <[email protected]> <[email protected]>
51103

52104
53105

54-
Aaron Kumavis <[email protected]>
106+
107+
Janoš Guljaš <[email protected]> Janos Guljas <[email protected]>
55108

56-
Nick Dodson <silentcicero@outlook.com>
109+
Jared Wasinger <j-wasinger@hotmail.com>
57110

58111
Jason Carver <[email protected]>
59112
60113

114+
Javier Peletier <[email protected]>
115+
116+
117+
Jeffrey Wilcke <[email protected]>
118+
119+
120+
121+
122+
Jens Agerberg <[email protected]>
123+
61124
Joseph Chow <[email protected]>
62125
Joseph Chow <[email protected]> ethers <TODO>
63126

64-
Enrique Fynn <[email protected]>
65127

66-
Vincent G <caktux@gmail.com>
128+
Joseph Goulden <joegoulden@gmail.com>
67129

68-
RJ Catalano <[email protected]>
69-
130+
Justin Drake <[email protected]>
70131

71-
Nchinda Nchinda <[email protected]>
132+
Kenso Trabing <[email protected]>
133+
72134

73-
135+
136+
74137

75-
Vlad Gluhovsky <[email protected]>
138+
Louis Holbrook <[email protected]>
139+
76140

77-
Ville Sundell <[email protected]>
141+
Maran Hidskes <[email protected]>
78142

79-
Elliot Shepherd <[email protected]>
143+
Marian Oancea <[email protected]>
80144

81-
Yohann Léon <[email protected]>
145+
Martin Becze <[email protected]>
146+
82147

83-
Gregg Dourgarian <greggd@tempworks.com>
148+
Martin Lundfall <martin.lundfall@protonmail.com>
84149

85-
Casey Detrio <cdetrio@gmail.com>
150+
Matt Garnett <[email protected].com>
86151

87-
Jens Agerberg <[email protected]>
152+
Matthew Halpern <[email protected]>
153+
88154

89-
Nick Johnson <[email protected]>
155+
Michael Riabzev <[email protected]>
90156

91-
Henning Diedrich <[email protected]>
92-
Henning Diedrich <[email protected]> Drake Burroughs <[email protected]>
157+
Nchinda Nchinda <[email protected]>
93158

94-
Felix Lange <[email protected]>
95-
159+
Nick Dodson <[email protected]>
96160

97-
Максим Чусовлянов <[email protected]>
161+
Nick Johnson <[email protected]>
98162

99-
Louis Holbrook <[email protected]>
100-
163+
Nick Savers <[email protected]>
101164

102-
Thomas Bocek <[email protected]>
165+
Nishant Das <[email protected]>
166+
103167

104-
Victor Tran <vu.tran54@gmail.com>
168+
Olivier Hervieu <olivier.hervieu@gmail.com>
105169

106-
Justin Drake <[email protected]>
170+
Pascal Dierich <[email protected]>
171+
107172

108-
Frank Wang <[email protected]>
173+
RJ Catalano <[email protected]>
174+
109175

110-
Gary Rong <garyrong0905@gmail.com>
176+
Ralph Caraveo <deckarep@gmail.com>
111177

112-
Guillaume Nicolas <[email protected]>
178+
Rene Lubov <[email protected]>
179+
180+
Robert Zaremba <[email protected]>
181+
182+
183+
Roman Mandeleil <[email protected]>
113184

114185
Sorin Neacsu <[email protected]>
115186
116187

188+
Sven Ehlert <[email protected]>
189+
190+
Taylor Gerring <[email protected]>
191+
192+
193+
Thomas Bocek <[email protected]>
194+
195+
Tim Cooijmans <[email protected]>
196+
117197
Valentin Wüstholz <[email protected]>
118198
Valentin Wüstholz <[email protected]> <[email protected]>
119199

120-
Armin Braun <[email protected]>
200+
Victor Tran <[email protected]>
121201

122-
Ernesto del Toro <[email protected]>
123-
202+
Viktor Trón <[email protected]>
203+
204+
Ville Sundell <[email protected]>
205+
206+
Vincent G <[email protected]>
207+
208+
Vitalik Buterin <[email protected]>
209+
210+
Vlad Gluhovsky <[email protected]>
211+
212+
213+
Wenshao Zhong <[email protected]>
214+
215+
216+
217+
Will Villanueva <[email protected]>
218+
219+
Xiaobing Jiang <[email protected]>
220+
221+
Xudong Liu <[email protected]>
222+
223+
Yohann Léon <[email protected]>
224+
225+
Zachinquarantine <[email protected]>
226+
227+
228+
Ziyuan Zhong <[email protected]>
229+
230+
Zsolt Felföldi <[email protected]>
231+
232+
meowsbits <[email protected]>
233+
234+
235+
236+
237+
Максим Чусовлянов <[email protected]>

0 commit comments

Comments
 (0)