Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge besu main #6393

Closed
wants to merge 125 commits into from
Closed

Merge besu main #6393

Changes from 1 commit
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
f35dc50
Bootstrap Linea configuration + transaction max calldata size validation
fab-10 Mar 31, 2023
76b9903
Merge pull request #1 from ConsenSys/tx-calldata-limit
fab-10 Apr 3, 2023
b559b37
add block limit (#2)
pinges Apr 5, 2023
4defe8d
Validate calldata limits when importing a block (#3)
fab-10 Apr 11, 2023
20f567c
Test tx calldata limit (#5)
fab-10 Apr 13, 2023
402d2db
Set Linea chain id and gas limit (#6)
fab-10 Apr 13, 2023
5fcd7a8
Fix zero base fee market
fab-10 Apr 14, 2023
ca122f7
Remove allocations from Linea genesis
fab-10 Apr 14, 2023
80bbc10
Merge remote-tracking branch 'upstream/main'
fab-10 Apr 18, 2023
9ac0783
Update Linea network smoke test
fab-10 Apr 18, 2023
bd088e5
Fix Linea parameters at startup
fab-10 Apr 18, 2023
7427275
Merge remote-tracking branch 'upstream/main'
fab-10 May 2, 2023
e93e493
Update Linea genesis file
fab-10 May 2, 2023
be37c24
Merge remote-tracking branch 'upstream/main'
fab-10 May 2, 2023
6cea6bd
Merge remote-tracking branch 'upstream/main'
fab-10 May 3, 2023
57171e2
Fix clique genesis conf for Linea
fab-10 May 3, 2023
5ab0d55
Update default calldata limits
fab-10 May 3, 2023
8e068d9
Cleanup Linea hard forks
fab-10 May 4, 2023
c6f897c
Merge remote-tracking branch 'upstream/main'
fab-10 May 4, 2023
2f54fc8
Merge remote-tracking branch 'upstream/main'
fab-10 May 8, 2023
ba7e33b
Update genesis file
fab-10 May 8, 2023
4621d81
Linea must fork from London not Paris
fab-10 May 8, 2023
fcc9cca
Merge remote-tracking branch 'upstream/main'
fab-10 May 10, 2023
3730f29
javadoc comments required for publish tasks (#10)
garyschulte May 10, 2023
db92814
Opcode changes (#7)
Gabriel-Trintinalia May 11, 2023
301ec65
Merge remote-tracking branch 'upstream/main'
fab-10 May 16, 2023
f8c5db0
Merge remote-tracking branch 'upstream/main'
fab-10 Jun 14, 2023
46ffd07
Merge remote-tracking branch 'upstream/main'
fab-10 Jul 25, 2023
6ad3036
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 1, 2023
87fe822
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 1, 2023
88b878c
Use linea plugin names for cli options
fab-10 Aug 2, 2023
1c69815
Rework Linea transaction validator
fab-10 Aug 2, 2023
ea777ee
Linea is not using zero base fee market
fab-10 Aug 2, 2023
32120e7
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 2, 2023
2fe03c2
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 17, 2023
c262b05
Fix merge
fab-10 Aug 17, 2023
0dafa19
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 23, 2023
1de00db
Leave only base CI workflow
fab-10 Aug 23, 2023
61739d0
Add SPDX headers
fab-10 Aug 23, 2023
037fb51
Make checkSpdxHeader task cross platform
fab-10 Aug 23, 2023
d6173ef
Update docker dist properties
fab-10 Aug 23, 2023
77cd946
Add new Github actions workflow
fab-10 Aug 23, 2023
40367a2
Add buildArm64 step to CI workflow
fab-10 Aug 23, 2023
5113e7e
CI: fix publish manifest
fab-10 Aug 23, 2023
b9698b0
Remove ARM build for the moment, and build after tests
fab-10 Aug 23, 2023
dc01217
Merge all CI in one job to avoid long copies of the workspace
fab-10 Aug 23, 2023
df05568
Simplify CI
fab-10 Aug 23, 2023
fc01039
Fix unit tests
fab-10 Aug 23, 2023
c5f648a
Parallelize Gradle execution
fab-10 Aug 23, 2023
26474b6
Disable block calldata tests until we have the plugin
fab-10 Aug 24, 2023
d763c8d
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 24, 2023
a02e320
Fix test failing on WSL due to different ways of getting the hostname
fab-10 Aug 24, 2023
0a1b973
Increase CI gradle memory, update actions and use no-daemon option
fab-10 Aug 24, 2023
295f7c8
Setup CI (#12)
fab-10 Aug 25, 2023
21e623a
Merge remote-tracking branch 'upstream/main'
fab-10 Aug 25, 2023
b030e57
Set the architecture for the docker image
fab-10 Aug 25, 2023
1c005dd
Use larger runner
fab-10 Sep 11, 2023
72223d5
Add world context to transaction tracing API
delehef Sep 1, 2023
11689d1
Update changelog with PR ID
delehef Sep 1, 2023
60859ed
Add the Transaction to traceEndTransaction
delehef Sep 5, 2023
be3ba36
Rebase on main
delehef Sep 12, 2023
e3fba04
Layered txpool by default and txpool options hoverhaul (#5772)
fab-10 Sep 11, 2023
c80f66c
Fix issue 5824 - Duplicate key errors in EthScheduler-Transactions (#…
ahamlat Sep 11, 2023
f61e570
Merge branch 'main' into fabio
fab-10 Sep 12, 2023
05c0f6e
Run CI on zkbesu branch and PR against it
fab-10 Sep 12, 2023
bbf2f47
Merge sequence work done so far
fab-10 Sep 12, 2023
ee0e188
Merge branch 'main' into zkbesu
fab-10 Sep 14, 2023
97ac88c
Set gradle max workers
fab-10 Sep 14, 2023
8718a5f
Merge branch 'main' into zkbesu
fab-10 Sep 25, 2023
908a6c6
Publish java artifacts to Cloudsmith (#14)
fab-10 Oct 4, 2023
ba8e2ed
Merge branch 'main' into zkbesu
fab-10 Oct 4, 2023
571ac56
Merge branch 'zkbesu' of github.com:ConsenSys/linea-besu into zkbesu
fab-10 Oct 4, 2023
0096356
Fix unit test after merge
fab-10 Oct 4, 2023
5ff9889
Rename artifacts group it to linea-besu and remove uneeded stuff
fab-10 Oct 4, 2023
c1d89e8
Fix build
fab-10 Oct 4, 2023
4aa2e47
Fix artifacts groupId
fab-10 Oct 5, 2023
90bdd3c
Upload distributions to Cloudsmith (#15)
fab-10 Oct 5, 2023
8676e0f
Merge branch 'main' into zkbesu
fab-10 Oct 11, 2023
fc6367c
Fix switch
fab-10 Oct 11, 2023
29c4a9a
Linea EVM executor
fab-10 Oct 11, 2023
ae2651a
Merge branch 'hyperledger:main' into zkbesu
pinges Oct 13, 2023
30df8c2
Merge branch 'main' into zkbesu
fab-10 Oct 17, 2023
7de0a6a
adds linea mainnet as network option, renames the existing one to lin…
daniellehrner Oct 26, 2023
456ea00
add read account into trielog (#21)
matkt Oct 26, 2023
3313946
Merge branch 'main' into zkbesu
fab-10 Oct 27, 2023
a5fa4b3
Merge branch 'zkbesu' of github.com:ConsenSys/linea-besu into zkbesu
fab-10 Oct 27, 2023
0fa2896
Merge branch 'main' into zkbesu
daniellehrner Oct 27, 2023
5681aa2
Merge branch 'main' into zkbesu
fab-10 Nov 6, 2023
9343870
Merge remote-tracking branch 'upstream/main' into HEAD
pinges Nov 7, 2023
b134b5b
Making this method public allows to use it in reference tests
daniellehrner Nov 7, 2023
3ecd3f7
add test support files to besu-core
daniellehrner Nov 7, 2023
40d8617
Move calldata limit validation in the Linea plugin (#23)
fab-10 Nov 9, 2023
43120fe
Merge branch 'main' into zkbesu
fab-10 Nov 9, 2023
dca46ad
Remove leftover from #23
fab-10 Nov 9, 2023
f205c0a
Split workflow so that publishing only happens when PR is merged (#25)
Gabriel-Trintinalia Nov 9, 2023
c8a65ce
Merge branch 'main' into zkbesu
fab-10 Nov 20, 2023
07f3f24
Merge remote-tracking branch 'upstream/main' into zkbesu
fab-10 Nov 21, 2023
915381a
Merge branch 'main' into zkbesu
fab-10 Nov 21, 2023
58447ae
Fix clash of Besu and EVM Tool Docker image names
fab-10 Nov 21, 2023
afb4147
Fix clash of Besu and EVM Tool Docker image names
fab-10 Nov 21, 2023
d9159bb
Do not create evmtool Docker image
fab-10 Nov 21, 2023
2d6feca
Merge branch 'main' into zkbesu
fab-10 Nov 22, 2023
1c18e7d
Acceptance test for Clique when configured to not create empty blocks
fab-10 Nov 21, 2023
98037f1
Test Clique mines a block only when txs are present, if create empty …
fab-10 Nov 22, 2023
16d3461
Merge remote-tracking branch 'fab10/clique-no-empty-blocks-at' into z…
fab-10 Nov 22, 2023
d13d8db
Test Clique mines a block only when txs are present, if create empty …
fab-10 Nov 22, 2023
aceaec1
Merge remote-tracking branch 'fab10/clique-no-empty-blocks-at' into z…
fab-10 Nov 22, 2023
fb19439
Test Clique mines a block only when txs are present, if create empty …
fab-10 Nov 22, 2023
f5e44be
Merge remote-tracking branch 'fab10/clique-no-empty-blocks-at' into z…
fab-10 Nov 22, 2023
f79d71d
Merge branch 'main' into zkbesu
fab-10 Nov 23, 2023
cbfea3e
Merge branch 'main' into zkbesu
fab-10 Nov 30, 2023
2513088
fix: double calls to trace{Start,End}Transaction (#6247)
delehef Dec 6, 2023
a0edac5
Merge branch 'main' into zkbesu
fab-10 Dec 6, 2023
62107e5
Fix to avoid an infinite loop when processing imported blocks in the …
fab-10 Dec 6, 2023
5fb77a5
Merge branch 'main' into zkbesu
fab-10 Dec 7, 2023
af045e3
Merge remote-tracking branch 'upstream/main' into zkbesu for release 8
garyschulte Dec 7, 2023
81452ac
Merge remote-tracking branch 'upstream/main' into zkbesu
garyschulte Dec 7, 2023
1d4b979
Merge branch 'main' into zkbesu
fab-10 Dec 21, 2023
0f2e43c
Merge main into zkbesu (#27)
garyschulte Jan 3, 2024
df2d89a
use hyperledger main behavior for accumulator get account (#28)
garyschulte Jan 3, 2024
99b9ab3
Merge Besu main (#32)
fab-10 Jan 8, 2024
c029a9f
Introduce TransactionSelectionContext to pass data between selectors …
fab-10 Jan 10, 2024
6a1f12e
Make BesuNode::getMiningParameters public
fab-10 Jan 10, 2024
dcb6f27
Make transaction pool configurable in acceptance tests (#33)
fab-10 Jan 10, 2024
c7bafe2
Merge remote-tracking branch 'upstream/main' into zkbesu
jframe Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into zkbesu 
Signed-off-by: garyschulte <garyschulte@gmail.com>
  • Loading branch information
@garyschulte
garyschulte committed Dec 7, 2023
commit 81452acd53b63c31dc35d6ffd598cec7c0cb56da

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.