Compare commits

..

1 Commits

4 changed files with 10 additions and 9 deletions

View File

@@ -323,9 +323,7 @@ detect_client_type() {
local node_name="$1" local node_name="$1"
local name_lower=$(echo "$node_name" | tr '[:upper:]' '[:lower:]') local name_lower=$(echo "$node_name" | tr '[:upper:]' '[:lower:]')
if [[ "$name_lower" == *"op-geth"* ]]; then if [[ "$name_lower" == *"geth"* ]]; then
echo "op-geth"
elif [[ "$name_lower" == *"geth"* ]]; then
echo "geth" echo "geth"
elif [[ "$name_lower" == *"reth"* ]]; then elif [[ "$name_lower" == *"reth"* ]]; then
echo "reth" echo "reth"
@@ -353,7 +351,7 @@ add_static_peer() {
# Geth supports admin_addStaticPeer # Geth supports admin_addStaticPeer
method="admin_addStaticPeer" method="admin_addStaticPeer"
else else
# Reth, op-geth, and most other clients use admin_addPeer # Reth and most other clients use admin_addPeer
method="admin_addPeer" method="admin_addPeer"
fi fi

View File

@@ -82,7 +82,6 @@ PEER_COUNT="$(echo "$PEERS_JSON" | jq -r '.result | length' 2>/dev/null || echo
NAME_LC="$(echo "$CLIENT_NAME" | tr '[:upper:]' '[:lower:]')" NAME_LC="$(echo "$CLIENT_NAME" | tr '[:upper:]' '[:lower:]')"
CLIENT_TYPE="unknown" CLIENT_TYPE="unknown"
case "$NAME_LC" in case "$NAME_LC" in
*op-geth*) CLIENT_TYPE="op-geth" ;;
*geth*) CLIENT_TYPE="geth" ;; *geth*) CLIENT_TYPE="geth" ;;
*reth*) CLIENT_TYPE="reth" ;; *reth*) CLIENT_TYPE="reth" ;;
*erigon*) CLIENT_TYPE="erigon" ;; *erigon*) CLIENT_TYPE="erigon" ;;

View File

@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# peer-reinject.sh — generic .after-start hook: re-seed peers from peer-capture state. # peer-reinject.sh — generic .after-start hook: re-seed peers from peer-capture state.
# Uses admin_addStaticPeer for geth, admin_addPeer for op-geth and others (connect-peers.sh). # Uses admin_addStaticPeer for geth, admin_addPeer otherwise (connect-peers.sh).
# In-network vantage (rpc_chains). Idempotent; best-effort (never fails the restart). # In-network vantage (rpc_chains). Idempotent; best-effort (never fails the restart).
# #
# Seed order (one path for us and customers): # Seed order (one path for us and customers):

View File

@@ -9,13 +9,17 @@ RUN chmod +x /usr/local/bin/init.sh
ARG ZERO_GRAVITY_VERSION ARG ZERO_GRAVITY_VERSION
ARG ZERO_GRAVITY_CHAIN_SPEC ARG ZERO_GRAVITY_CHAIN_SPEC
RUN if [ "${ZERO_GRAVITY_CHAIN_SPEC}" = "aristotle" ]; then \ RUN if [ "${ZERO_GRAVITY_CHAIN_SPEC}" = "aristotle" ]; then \
curl -sL https://github.com/0gfoundation/0gchain-Aristotle/releases/download/${ZERO_GRAVITY_VERSION}/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz -o /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz; \ curl -sL https://github.com/0gfoundation/0gchain-Aristotle/releases/download/v${ZERO_GRAVITY_VERSION}/aristotle-v${ZERO_GRAVITY_VERSION}.tar.gz -o /tmp/aristotle-v${ZERO_GRAVITY_VERSION}.tar.gz; \
else \ else \
curl -sL https://github.com/0gfoundation/0gchain-NG/releases/download/v${ZERO_GRAVITY_VERSION}/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz -o /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz; \ curl -sL https://github.com/0gfoundation/0gchain-NG/releases/download/v${ZERO_GRAVITY_VERSION}/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz -o /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz; \
fi fi
RUN tar -xzf /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz -C /tmp RUN if [ "${ZERO_GRAVITY_CHAIN_SPEC}" = "aristotle" ]; then \
tar -xzf /tmp/aristotle-v${ZERO_GRAVITY_VERSION}.tar.gz -C /tmp; \
else \
tar -xzf /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}.tar.gz -C /tmp; \
fi
RUN if [ "${ZERO_GRAVITY_CHAIN_SPEC}" = "galileo" ]; then \ RUN if [ "${ZERO_GRAVITY_CHAIN_SPEC}" = "galileo" ]; then \
mv /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}/rpc /0g; \ mv /tmp/galileo-v${ZERO_GRAVITY_VERSION}/rpc /0g; \
else \ else \
mkdir -p /0g && \ mkdir -p /0g && \
cp -a /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}/* /0g/ 2>/dev/null || true; \ cp -a /tmp/${ZERO_GRAVITY_CHAIN_SPEC}-v${ZERO_GRAVITY_VERSION}/* /0g/ 2>/dev/null || true; \