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

Jump to bottom

Merge sequencer work done so far #13

Merged
merged 61 commits into from
Sep 12, 2023
Merged

Merge sequencer work done so far #13

merged 61 commits into from
Sep 12, 2023

Conversation

fab-10
Copy link
Collaborator

@fab-10 fab-10 commented Sep 12, 2023

PR description

Fixed Issue(s)

fab-10 and others added 30 commits March 31, 2023 19:23
@fab-10
Bootstrap Linea configuration + transaction max calldata size validation
f35dc50 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge pull request #1 from ConsenSys/tx-calldata-limit
76b9903 
Bootstrap Linea configuration + transaction max calldata size validation
@pinges @fab-10
add block limit (#2)
b559b37 
* add block limit

Signed-off-by: Stefan <[email protected]>

* Replace lineaParameters with blockMaxCalldataSize

Signed-off-by: Fabio Di Fabio <[email protected]>

* Fix description of --Xblock-max-calldata-size option

Signed-off-by: Fabio Di Fabio <[email protected]>

---------

Signed-off-by: Stefan <[email protected]>
Signed-off-by: Fabio Di Fabio <[email protected]>
Co-authored-by: Fabio Di Fabio <[email protected]>
@fab-10
Validate calldata limits when importing a block (#3)
4defe8d 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Test tx calldata limit (#5)
20f567c 
* Test tx calldata limit
* Test block calldata limit

Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Set Linea chain id and gas limit (#6)
402d2db 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Fix zero base fee market
5fcd7a8 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Remove allocations from Linea genesis
ca122f7 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
80bbc10 
# Conflicts:
#	besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
#	besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
#	besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
#	consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/difficulty/fixed/FixedDifficultyProtocolSchedule.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSchedule.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilder.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultTimestampScheduleTest.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilderTest.java
#	ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
#	ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
@fab-10
Update Linea network smoke test
9ac0783 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Fix Linea parameters at startup
bd088e5 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
7427275 
# Conflicts:
#	besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
#	besu/src/main/java/org/hyperledger/besu/cli/config/NetworkName.java
#	besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
#	besu/src/test/java/org/hyperledger/besu/ForkIdsNetworkConfigTest.java
#	consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeProtocolSchedule.java
#	consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/AbstractProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilder.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionInvalidReason.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/DefaultTimestampScheduleTest.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/TimestampScheduleBuilderTest.java
#	ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/MainnetGenesisFileModule.java
#	ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java
@fab-10
Update Linea genesis file
e93e493 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
be37c24
@fab-10
Merge remote-tracking branch 'upstream/main'
6cea6bd
@fab-10
Fix clique genesis conf for Linea
57171e2 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Update default calldata limits
5ab0d55 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Cleanup Linea hard forks
8e068d9 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
c6f897c
@fab-10
Merge remote-tracking branch 'upstream/main'
2f54fc8
@fab-10
Update genesis file
ba7e33b 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Linea must fork from London not Paris
4621d81 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
fcc9cca 
# Conflicts:
#	.gitignore
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
@garyschulte
javadoc comments required for publish tasks (#10)
3730f29 
Signed-off-by: garyschulte <[email protected]>
@Gabriel-Trintinalia
Opcode changes (#7)
db92814 
* Override evm operations with Linea behaviours
@fab-10
Merge remote-tracking branch 'upstream/main'
301ec65
@fab-10
Merge remote-tracking branch 'upstream/main'
f8c5db0 
# Conflicts:
#	.circleci/config.yml
#	besu/src/main/java/org/hyperledger/besu/controller/BesuController.java
#	besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java
#	ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java
#	ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/BlockTransactionSelector.java
#	ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockTransactionSelectorTest.java
@fab-10
Merge remote-tracking branch 'upstream/main'
46ffd07 
# Conflicts:
#	besu/src/main/java/org/hyperledger/besu/RunnerBuilder.java
#	ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcErrorConverter.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/response/JsonRpcError.java
#	ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/JsonRpcMethodsFactory.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/AbstractJsonRpcHttpServiceTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceHostAllowlistTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceLoginTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceRpcApisTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTestBase.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsClientAuthTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsMisconfigurationTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpServiceTlsTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
#	ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketServiceLoginTest.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpecBuilder.java
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionValidatorTest.java
#	ethereum/retesteth/src/main/java/org/hyperledger/besu/ethereum/retesteth/NoRewardProtocolScheduleWrapper.java
#	evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java
@fab-10
Merge remote-tracking branch 'upstream/main'
6ad3036 
# Conflicts:
#	ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/PermissionTransactionValidatorTest.java
@fab-10
Merge remote-tracking branch 'upstream/main'
87fe822 
# Conflicts:
#	ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/TransactionValidatorFactory.java
fab-10 and others added 27 commits August 17, 2023 12:35
@fab-10
Merge remote-tracking branch 'upstream/main'
2fe03c2
@fab-10
Fix merge
c262b05 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
0dafa19
@fab-10
Leave only base CI workflow
1de00db 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Add SPDX headers
61739d0 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Make checkSpdxHeader task cross platform
037fb51 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Update docker dist properties
d6173ef 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Add new Github actions workflow
77cd946 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Add buildArm64 step to CI workflow
40367a2 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
CI: fix publish manifest
5113e7e 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Remove ARM build for the moment, and build after tests
b9698b0 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge all CI in one job to avoid long copies of the workspace
dc01217 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Simplify CI
df05568 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Fix unit tests
fc01039 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Parallelize Gradle execution
c5f648a 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Disable block calldata tests until we have the plugin
26474b6 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
d763c8d
@fab-10
Fix test failing on WSL due to different ways of getting the hostname
a02e320 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Increase CI gradle memory, update actions and use no-daemon option
0a1b973 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Setup CI (#12)
295f7c8 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge remote-tracking branch 'upstream/main'
21e623a 
# Conflicts:
#	build.gradle
@fab-10
Set the architecture for the docker image
b030e57 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Layered txpool by default and txpool options hoverhaul (hyperledger#5772
25c2065 
)


Signed-off-by: Fabio Di Fabio <[email protected]>
@ahamlat
Fix issue 5824 - Duplicate key errors in EthScheduler-Transactions (h…
7fd7224 
…yperledger#5857)

Fix issue 5824 - Duplicate key errors in EthScheduler-Transactions

Signed-off-by: Ameziane H <[email protected]>
@fab-10
Use larger runner
1c005dd 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10
Merge branch 'main' into fabio
f61e570 
# Conflicts:
#	.github/workflows/checks.yml
#	.github/workflows/codeql.yml
#	.github/workflows/dco-merge-group.yml
#	.github/workflows/dco.yml
#	.github/workflows/gradle-wrapper-validation.yml
#	.github/workflows/pr-checklist-on-open.yml
#	.github/workflows/release.yml
#	.github/workflows/repolinter.yml
#	besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java
#	gradle.properties
@fab-10
Run CI on zkbesu branch and PR against it
05c0f6e 
Signed-off-by: Fabio Di Fabio <[email protected]>
@fab-10 fab-10 merged commit bbf2f47 into zkbesu Sep 12, 2023
2 of 3 checks passed
@fab-10 fab-10 deleted the fabio branch March 19, 2024 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@fab-10 @pinges @garyschulte @Gabriel-Trintinalia @ahamlat