Merge branch 'master' into testing-namespace

Author: fjl

clients/besu/besu.sh

@@ -152,13 +152,13 @@ FLAGS="$FLAGS --snapsync-server-enabled"
 # Configure RPC.
 RPCFLAGS="--host-allowlist=*"
 if [ "$HIVE_GRAPHQL_ENABLED" == "" ]; then
-    RPCFLAGS="$RPCFLAGS --rpc-http-enabled --rpc-http-api=DEBUG,TRACE,ETH,NET,WEB3,ADMIN,TESTING --rpc-http-host=0.0.0.0"
+    RPCFLAGS="$RPCFLAGS --rpc-http-enabled --rpc-http-api=DEBUG,TRACE,ETH,NET,TXPOOL,WEB3,ADMIN,TESTING --rpc-http-host=0.0.0.0"
 else
     RPCFLAGS="$RPCFLAGS --graphql-http-enabled --graphql-http-host=0.0.0.0 --graphql-http-port=8545"
 fi
 
 # Enable WebSocket.
-RPCFLAGS="$RPCFLAGS --rpc-ws-enabled --rpc-ws-api=DEBUG,TRACE,ETH,NET,WEB3,ADMIN,TESTING --rpc-ws-host=0.0.0.0"
+RPCFLAGS="$RPCFLAGS --rpc-ws-enabled --rpc-ws-api=DEBUG,TRACE,ETH,NET,TXPOOL,WEB3,ADMIN,TESTING --rpc-ws-host=0.0.0.0"
 
 # Enable merge support if needed
 if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then

clients/nimbus-el/Dockerfile

@@ -9,14 +9,14 @@ SHELL ["/bin/bash", "-c"]
 
 RUN apt-get clean \
     && apt-get update \
-    && apt-get install -y build-essential librocksdb-dev jq curl \
+    && apt-get install -y build-essential jq curl \
     && apt -y upgrade
 
 RUN ldd --version
 
-COPY --from=source /home/user/nimbus-eth1/build/nimbus_execution_client /usr/bin/nimbus_execution_client
+COPY --from=source /home/user/nimbus-eth1/build/nimbus /usr/bin/nimbus
 
-RUN usr/bin/nimbus_execution_client --version > /version.txt
+RUN usr/bin/nimbus --version > /version.txt
 
 # Add genesis mapper script.
 ADD genesis.json /genesis.json

clients/nimbus-el/Dockerfile.git

@@ -5,7 +5,7 @@ FROM debian:testing-slim AS build
 SHELL ["/bin/bash", "-c"]
 
 RUN apt-get clean && apt update \
- && apt -y install curl build-essential git-lfs librocksdb-dev
+ && apt -y install curl build-essential git-lfs
 
 RUN ldd --version
 
@@ -18,22 +18,22 @@ WORKDIR /nimbus-eth1
 
 RUN NPROC=$(nproc); make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" V=1 update
 
-RUN NPROC=$(nproc); make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:chronicles_colors=none" nimbus_execution_client && \
-    mv build/nimbus_execution_client /usr/bin/
+RUN NPROC=$(nproc); make -j${NPROC} NIMFLAGS="--parallelBuild:${NPROC} -d:chronicles_colors=none" nimbus && \
+    mv build/nimbus /usr/bin/
 
 # --------------------------------- #
 # Starting new image to reduce size #
 # --------------------------------- #
 FROM debian:testing-slim AS deploy
 
 RUN apt-get clean && apt update \
- && apt -y install build-essential librocksdb-dev jq curl
+ && apt -y install build-essential jq curl
 RUN apt update && apt -y upgrade
 
 RUN ldd --version
 
-COPY --from=build /usr/bin/nimbus_execution_client /usr/bin/nimbus_execution_client
-RUN usr/bin/nimbus_execution_client --version > /version.txt
+COPY --from=build /usr/bin/nimbus /usr/bin/nimbus
+RUN usr/bin/nimbus --version > /version.txt
 
 # Add genesis mapper script.
 ADD genesis.json /genesis.json

clients/nimbus-el/nimbus.sh

@@ -47,7 +47,7 @@
 # Immediately abort the script on any error encountered
 set -e
 
-nimbus=/usr/bin/nimbus_execution_client
+nimbus="/usr/bin/nimbus executionClient"
 FLAGS="--nat:extip:0.0.0.0 --debug-dynamic-batch-size:true"
 
 loglevel=DEBUG

clients/reth/reth.sh

@@ -153,8 +153,8 @@ if [ -n "${HIVE_CLIQUE_PRIVATEKEY}" ] || [ -n "${HIVE_CLIQUE_PERIOD}" ]; then
 fi
 
 # Configure RPC.
-FLAGS="$FLAGS --http --http.addr=0.0.0.0 --http.api=admin,debug,trace,eth,net,web3,testing"
-FLAGS="$FLAGS --ws --ws.addr=0.0.0.0 --ws.api=admin,debug,trace,eth,net,web3,testing"
+FLAGS="$FLAGS --http --http.addr=0.0.0.0 --http.api=admin,debug,trace,eth,net,txpool,web3,testing"
+FLAGS="$FLAGS --ws --ws.addr=0.0.0.0 --ws.api=admin,debug,trace,eth,net,txpool,web3,testing"
 
 if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then
     JWT_SECRET="7365637265747365637265747365637265747365637265747365637265747365"