Update Vert.x to 4.5.4 (hyperledger#6666)

* Update Vert.x to 4.5.4 Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> * Enable websocket write handlers Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> --------- Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net> Signed-off-by: Justin Florentine <justin+github@florentine.us>
jflo · Mar 8, 2024 · d3a135d · d3a135d
1 parent 051c78f
commit d3a135d
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 177 deletions.
diff --git 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
@@ -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/...i/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/websocket/WebSocketService.java b/...i/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())