From aa5ffb63b6c6345cc3f88c8da0f266a87db28535 Mon Sep 17 00:00:00 2001 From: goldsquid Date: Sat, 6 Jun 2026 11:49:31 +0700 Subject: [PATCH] fix --- taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml | 11 +---------- taiko/geth/taiko-hoodi-geth-pruned-pebble-path.yml | 11 +---------- .../taiko-alethia-nethermind-pruned-rocksdb-trace.yml | 11 +---------- .../taiko-hoodi-nethermind-pruned-rocksdb-trace.yml | 11 +---------- volume-utils.sh | 4 ++-- 5 files changed, 6 insertions(+), 42 deletions(-) diff --git a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml index 81dbff77..5573b053 100644 --- a/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml +++ b/taiko/geth/taiko-alethia-geth-pruned-pebble-path.yml @@ -114,12 +114,10 @@ services: ports: - 15251:15251 - 15251:15251/udp - - 35251:35251 - - 35251:35251/udp env_file: - ./taiko/alethia.env environment: - - ENABLE_PRECONFS_P2P=true + - ENABLE_PRECONFS_P2P=false - JWT_SECRET=/jwtsecret - L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST} - L1_WS=${ETHEREUM_MAINNET_EXECUTION_WS} @@ -128,13 +126,6 @@ services: - NODE_IMAGE=us-docker.pkg.dev/evmchain/images/taiko-client - P2P_CHECK_POINT_SYNC_URL=https://rpc.mainnet.taiko.xyz - P2P_SYNC=true - - PRECONFIRMATION_P2P_ADVERTISE_IP=${IP} - - PRECONFIRMATION_P2P_ADVERTISE_TCP_PORT=35251 - - PRECONFIRMATION_P2P_ADVERTISE_UDP_PORT=35251 - - PRECONFIRMATION_P2P_BOOTNODES=enode://c263741b17759f3850d24d67d6c3cbc307c73e17d80c6b12a63a4792a10529d1125d00ecf7ef4c9b0dc51d28b94dfc1b8798fb524f61a1f93946748649f73b23@34.142.239.251:4001?discport=30304,enode://2f37c3affd83274b262fa2a259d32d41510dd5a48d6e916696efe7f1598cb3f905305f5989e7b6607aab50697fb2e52cb4b6904116ed67cc5fcea1e6d66ccaba@35.247.159.156:4001?discport=30304,enode://dd83dedeff622ecfca0c5edf320266506c811539a553ddd91589cdfcc9bbd74d0d620f251d8d5e1180f19a446abbdd8b6b5301e9aa6cbad35cfd9716f80f2416@34.126.90.255:4001?discport=30304 - - PRECONFIRMATION_P2P_LISTEN_TCP_PORT=35251 - - PRECONFIRMATION_P2P_LISTEN_UDP_PORT=35251 - - PRECONFIRMATION_SERVER_PORT=9871 entrypoint: [taiko-client, driver] restart: unless-stopped depends_on: diff --git a/taiko/geth/taiko-hoodi-geth-pruned-pebble-path.yml b/taiko/geth/taiko-hoodi-geth-pruned-pebble-path.yml index 7df8e7e6..ee0a7250 100644 --- a/taiko/geth/taiko-hoodi-geth-pruned-pebble-path.yml +++ b/taiko/geth/taiko-hoodi-geth-pruned-pebble-path.yml @@ -114,13 +114,11 @@ services: ports: - 17953:17953 - 17953:17953/udp - - 37953:37953 - - 37953:37953/udp env_file: - ./taiko/hoodi.env environment: - BLOB_SERVER_URL=${ETHEREUM_HOODI_BEACON_ARCHIVER} - - ENABLE_PRECONFS_P2P=true + - ENABLE_PRECONFS_P2P=false - JWT_SECRET=/jwtsecret - L1_BEACON=${ETHEREUM_HOODI_BEACON_REST} - L1_WS=${ETHEREUM_HOODI_EXECUTION_WS} @@ -129,13 +127,6 @@ services: - NODE_IMAGE=us-docker.pkg.dev/evmchain/images/taiko-client - P2P_CHECK_POINT_SYNC_URL=https://rpc.hoodi.taiko.xyz - P2P_SYNC=true - - PRECONFIRMATION_P2P_ADVERTISE_IP=${IP} - - PRECONFIRMATION_P2P_ADVERTISE_TCP_PORT=37953 - - PRECONFIRMATION_P2P_ADVERTISE_UDP_PORT=37953 - - PRECONFIRMATION_P2P_BOOTNODES=enode://ea5b8a797985f500afa37ba03ce47b0039792a942f0ac9bee9fa19a7a5410273fe43b4e8a9a28fa42cdec1b6435deb809fcb79479c55cc2ddbaf02de7a83f456@35.239.142.239:4001?discport=30304,enode://404e9493066107431bdf3f47bbb360a353244a6069903c76928fca3067575f2adf62ef396b0a8a74696669ef53cab8373e38ddd9b3d3d2d76f356d2cd2708951@34.63.118.244:4001?discport=30304,enode://b2d094ade1ce68990878b197bf818bd41d5b32e4019d42dc63d91d7020f531532f063833e44e84f78792969f69fd5553370216703c40fcc0cb835f17177fbe07@34.63.52.157:4001?discport=30304 - - PRECONFIRMATION_P2P_LISTEN_TCP_PORT=37953 - - PRECONFIRMATION_P2P_LISTEN_UDP_PORT=37953 - - PRECONFIRMATION_SERVER_PORT=9871 entrypoint: [taiko-client, driver] restart: unless-stopped depends_on: diff --git a/taiko/nethermind/taiko-alethia-nethermind-pruned-rocksdb-trace.yml b/taiko/nethermind/taiko-alethia-nethermind-pruned-rocksdb-trace.yml index c6c2f23f..43d9f722 100644 --- a/taiko/nethermind/taiko-alethia-nethermind-pruned-rocksdb-trace.yml +++ b/taiko/nethermind/taiko-alethia-nethermind-pruned-rocksdb-trace.yml @@ -100,12 +100,10 @@ services: ports: - 18861:18861 - 18861:18861/udp - - 38861:38861 - - 38861:38861/udp env_file: - ./taiko/alethia.env environment: - - ENABLE_PRECONFS_P2P=true + - ENABLE_PRECONFS_P2P=false - JWT_SECRET=/jwtsecret - L1_BEACON=${ETHEREUM_MAINNET_BEACON_REST} - L1_WS=${ETHEREUM_MAINNET_EXECUTION_WS} @@ -114,13 +112,6 @@ services: - NODE_IMAGE=us-docker.pkg.dev/evmchain/images/taiko-client - P2P_CHECK_POINT_SYNC_URL=https://rpc.mainnet.taiko.xyz - P2P_SYNC=true - - PRECONFIRMATION_P2P_ADVERTISE_IP=${IP} - - PRECONFIRMATION_P2P_ADVERTISE_TCP_PORT=38861 - - PRECONFIRMATION_P2P_ADVERTISE_UDP_PORT=38861 - - PRECONFIRMATION_P2P_BOOTNODES=enode://c263741b17759f3850d24d67d6c3cbc307c73e17d80c6b12a63a4792a10529d1125d00ecf7ef4c9b0dc51d28b94dfc1b8798fb524f61a1f93946748649f73b23@34.142.239.251:4001?discport=30304,enode://2f37c3affd83274b262fa2a259d32d41510dd5a48d6e916696efe7f1598cb3f905305f5989e7b6607aab50697fb2e52cb4b6904116ed67cc5fcea1e6d66ccaba@35.247.159.156:4001?discport=30304,enode://dd83dedeff622ecfca0c5edf320266506c811539a553ddd91589cdfcc9bbd74d0d620f251d8d5e1180f19a446abbdd8b6b5301e9aa6cbad35cfd9716f80f2416@34.126.90.255:4001?discport=30304 - - PRECONFIRMATION_P2P_LISTEN_TCP_PORT=38861 - - PRECONFIRMATION_P2P_LISTEN_UDP_PORT=38861 - - PRECONFIRMATION_SERVER_PORT=9871 entrypoint: [taiko-client, driver] restart: unless-stopped depends_on: diff --git a/taiko/nethermind/taiko-hoodi-nethermind-pruned-rocksdb-trace.yml b/taiko/nethermind/taiko-hoodi-nethermind-pruned-rocksdb-trace.yml index 875e5cca..fa65204f 100644 --- a/taiko/nethermind/taiko-hoodi-nethermind-pruned-rocksdb-trace.yml +++ b/taiko/nethermind/taiko-hoodi-nethermind-pruned-rocksdb-trace.yml @@ -100,13 +100,11 @@ services: ports: - 16610:16610 - 16610:16610/udp - - 36610:36610 - - 36610:36610/udp env_file: - ./taiko/hoodi.env environment: - BLOB_SERVER_URL=${ETHEREUM_HOODI_BEACON_ARCHIVER} - - ENABLE_PRECONFS_P2P=true + - ENABLE_PRECONFS_P2P=false - JWT_SECRET=/jwtsecret - L1_BEACON=${ETHEREUM_HOODI_BEACON_REST} - L1_WS=${ETHEREUM_HOODI_EXECUTION_WS} @@ -115,13 +113,6 @@ services: - NODE_IMAGE=us-docker.pkg.dev/evmchain/images/taiko-client - P2P_CHECK_POINT_SYNC_URL=https://rpc.hoodi.taiko.xyz - P2P_SYNC=true - - PRECONFIRMATION_P2P_ADVERTISE_IP=${IP} - - PRECONFIRMATION_P2P_ADVERTISE_TCP_PORT=36610 - - PRECONFIRMATION_P2P_ADVERTISE_UDP_PORT=36610 - - PRECONFIRMATION_P2P_BOOTNODES=enode://ea5b8a797985f500afa37ba03ce47b0039792a942f0ac9bee9fa19a7a5410273fe43b4e8a9a28fa42cdec1b6435deb809fcb79479c55cc2ddbaf02de7a83f456@35.239.142.239:4001?discport=30304,enode://404e9493066107431bdf3f47bbb360a353244a6069903c76928fca3067575f2adf62ef396b0a8a74696669ef53cab8373e38ddd9b3d3d2d76f356d2cd2708951@34.63.118.244:4001?discport=30304,enode://b2d094ade1ce68990878b197bf818bd41d5b32e4019d42dc63d91d7020f531532f063833e44e84f78792969f69fd5553370216703c40fcc0cb835f17177fbe07@34.63.52.157:4001?discport=30304 - - PRECONFIRMATION_P2P_LISTEN_TCP_PORT=36610 - - PRECONFIRMATION_P2P_LISTEN_UDP_PORT=36610 - - PRECONFIRMATION_SERVER_PORT=9871 entrypoint: [taiko-client, driver] restart: unless-stopped depends_on: diff --git a/volume-utils.sh b/volume-utils.sh index 133ab232..9dcf53ab 100755 --- a/volume-utils.sh +++ b/volume-utils.sh @@ -12,7 +12,7 @@ is_ephemeral_volume_key() { if [[ -n "$compose_file" && -f "$compose_file" ]]; then local ephemeral - ephemeral=$(yaml2json "$compose_file" 2>/dev/null | jq -r '.["x-ephemeral-volumes"] // [] | .[]' 2>/dev/null) + ephemeral=$(yaml2json < "$compose_file" 2>/dev/null | jq -r '.["x-ephemeral-volumes"] // [] | .[]' 2>/dev/null) while IFS= read -r vol; do [[ -z "$vol" ]] && continue [[ "$key" == "$vol" ]] && return 0 @@ -24,7 +24,7 @@ is_ephemeral_volume_key() { get_volume_keys() { local compose_file=$1 - yaml2json "$compose_file" 2>/dev/null | jq -r '.volumes | keys[]' 2>/dev/null + yaml2json < "$compose_file" 2>/dev/null | jq -r '.volumes | keys[]' 2>/dev/null } get_persistent_volume_keys() {