From fea51fca26d14cc572a15587fc05a72747304903 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Fri, 1 Mar 2024 18:44:14 +0100 Subject: [PATCH 1/2] Update Vert.x to 4.5.4 Signed-off-by: Fabio Di Fabio --- CHANGELOG.md | 1 + .../api/jsonrpc/JsonRpcHttpService.java | 2 +- gradle/verification-metadata.xml | 311 ++++++++---------- gradle/versions.gradle | 2 +- 4 files changed, 140 insertions(+), 176 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1210e351382..7f984840ad2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ - RocksDB database metadata refactoring [#6555](https://github.com/hyperledger/besu/pull/6555) - Make layered txpool aware of minGasPrice and minPriorityFeePerGas dynamic options [#6611](https://github.com/hyperledger/besu/pull/6611) - Update commons-compress to 1.26.0 [#6648](https://github.com/hyperledger/besu/pull/6648) +- Update Vert.x to 4.5.4 [#6666](https://github.com/hyperledger/besu/pull/6666) - Add blob transaction support to `eth_call` [#6661](https://github.com/hyperledger/besu/pull/6661) - Add blobs to `eth_feeHistory` [#6679](https://github.com/hyperledger/besu/pull/6679) - Refactor and extend `TransactionPoolValidatorService` [#6636](https://github.com/hyperledger/besu/pull/6636) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java index 12d623bdacb..c2a247974b0 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcHttpService.java @@ -580,7 +580,7 @@ private String buildCorsRegexFromConfig() { return ""; } if (config.getCorsAllowedDomains().contains("*")) { - return ".*"; + return ".*://.*"; } else { final StringJoiner stringJoiner = new StringJoiner("|"); config.getCorsAllowedDomains().stream().filter(s -> !s.isEmpty()).forEach(stringJoiner::add); diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 6b879e1ced5..cf5b501ba8a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -121,11 +121,6 @@ - - - - - @@ -249,14 +244,6 @@ - - - - - - - - @@ -1690,9 +1677,9 @@ - - - + + + @@ -1701,48 +1688,42 @@ - - - - - - + + + + + + - - - - - - + + + - - + + - - - - - - + + + - - + + @@ -1754,19 +1735,16 @@ - - - - - - + + + - - + + @@ -1775,19 +1753,16 @@ - - - - - - + + + - - + + @@ -1823,19 +1798,16 @@ - - - - - - + + + - - + + @@ -1855,32 +1827,29 @@ - - - - - - + + + + + + - - - - - - + + + - - + + @@ -1889,19 +1858,16 @@ - - - - - - + + + - - + + @@ -1922,38 +1888,35 @@ - - - + + + - - - - - - + + + + + + - - - - - - + + + - - + + @@ -1997,16 +1960,16 @@ - - - - - - + + + + + + @@ -2673,54 +2636,49 @@ - - - + + + - - - - - - - + + - - - + + + - - + + - - - - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + @@ -2728,6 +2686,11 @@ + + + + + @@ -2738,12 +2701,12 @@ - - - + + + - - + + @@ -2772,49 +2735,49 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + diff --git a/gradle/versions.gradle b/gradle/versions.gradle index c7d1f87aa6b..cb66d14dce3 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -121,7 +121,7 @@ dependencyManagement { entry 'tuweni-units' } - dependencySet(group: 'io.vertx', version: '4.3.5') { + dependencySet(group: 'io.vertx', version: '4.5.4') { entry 'vertx-auth-jwt' entry 'vertx-codegen' entry 'vertx-core' From ed9a5bbf571b366b4f8bcad8e9396778abf4e43c Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Wed, 6 Mar 2024 14:06:50 +0100 Subject: [PATCH 2/2] Enable websocket write handlers Signed-off-by: Fabio Di Fabio --- .../besu/ethereum/api/jsonrpc/websocket/WebSocketService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java index 007cc3b4cba..80bb7d4fb1c 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java @@ -115,7 +115,8 @@ public CompletableFuture start() { .setCompressionSupported(true) .addWebSocketSubProtocol("undefined") .setMaxWebSocketFrameSize(configuration.getMaxFrameSize()) - .setMaxWebSocketMessageSize(configuration.getMaxFrameSize() * 4)) + .setMaxWebSocketMessageSize(configuration.getMaxFrameSize() * 4) + .setRegisterWebSocketWriteHandlers(true)) .webSocketHandler(websocketHandler()) .connectionHandler(connectionHandler()) .requestHandler(httpHandler())