From a6dc64aff8626d3a496f314cf347c898d2bc8b52 Mon Sep 17 00:00:00 2001 From: squidbear <379651+czarly@users.noreply.github.com> Date: Sun, 30 Mar 2025 14:00:30 +0200 Subject: [PATCH] no path --- ...it-mainnet-op-geth-pruned-pebble-hash.yml} | 36 +++++++++---------- ...it-testnet-op-geth-pruned-pebble-hash.yml} | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) rename zircuit/op-geth/{zircuit-mainnet-op-geth-pruned-pebble-path.yml => zircuit-mainnet-op-geth-pruned-pebble-hash.yml} (79%) rename zircuit/op-geth/{zircuit-testnet-op-geth-pruned-pebble-path.yml => zircuit-testnet-op-geth-pruned-pebble-hash.yml} (80%) diff --git a/zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml b/zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml similarity index 79% rename from zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml rename to zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml index 3ccf3f88..a705b375 100644 --- a/zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml +++ b/zircuit/op-geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml @@ -4,20 +4,20 @@ services: zircuit-mainnet: image: zircuit1/l2-geth:e81568966f2a42a57b1347fb1dffdd5257dde73a volumes: - - "zircuit-mainnet-op-geth-pruned-pebble-path:/data" + - "zircuit-mainnet-op-geth-pruned-pebble-hash:/data" - ".jwtsecret:/jwtsecret:ro" - ./zircuit_config:/config environment: - "GETH_GCMODE=full" - - "GETH_SYNCMODE=snap" - - "GETH_STATE_SCHEME=path" + - "GETH_SYNCMODE=full" + - "GETH_STATE_SCHEME=hash" - "GETH_DB_ENGINE=pebble" - "GETH_NAT=extip:${IP}" - - "GETH_PORT=10359" + - "GETH_PORT=10688" - "GETH_DATADIR=/data" ports: - - "10359:10359" - - "10359:10359/udp" + - "10688:10688" + - "10688:10688/udp" env_file: - ./zircuit_config/env entrypoint: ["/bin/sh", "-c", "[ ! -d /data/geth ] && geth init /config/genesis.json; exec geth \"$@\""] @@ -47,12 +47,12 @@ services: - chains labels: - "traefik.enable=true" - - "traefik.http.middlewares.zircuit-mainnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/zircuit-mainnet" - - "traefik.http.services.zircuit-mainnet-op-geth-pruned-pebble-path.loadbalancer.server.port=80" - - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-path.entrypoints=websecure" - - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver" - - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/zircuit-mainnet`)" - - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-path.middlewares=zircuit-mainnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist" + - "traefik.http.middlewares.zircuit-mainnet-op-geth-pruned-pebble-hash-stripprefix.stripprefix.prefixes=/zircuit-mainnet" + - "traefik.http.services.zircuit-mainnet-op-geth-pruned-pebble-hash.loadbalancer.server.port=80" + - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-hash.entrypoints=websecure" + - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-hash.tls.certresolver=myresolver" + - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-hash.rule=Host(`$DOMAIN`) && PathPrefix(`/zircuit-mainnet`)" + - "traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-hash.middlewares=zircuit-mainnet-op-geth-pruned-pebble-hash-stripprefix, ipwhitelist" zircuit-mainnet-node: @@ -60,8 +60,8 @@ services: - zircuit-mainnet image: zircuit1/op-node:e81568966f2a42a57b1347fb1dffdd5257dde73a ports: - - "15359:15359" - - "15359:15359/udp" + - "15688:15688" + - "15688:15688/udp" volumes: - ".jwtsecret:/jwtsecret:ro" - ./zircuit_config:/config @@ -85,10 +85,10 @@ services: OP_NODE_L1_EPOCH_POLL_INTERVAL: 384s OP_NODE_HEARTBEAT_ENABLED: "false" OP_NODE_L1_BEACON: ${ETHEREUM_MAINNET_BEACON_REST} - OP_NODE_SYNCMODE: execution-layer + OP_NODE_SYNCMODE: consensus-layer OP_NODE_P2P_LISTEN_IP: "0.0.0.0" - OP_NODE_P2P_LISTEN_TCP_PORT: 15359 - OP_NODE_P2P_LISTEN_UDP_PORT: 15359 + OP_NODE_P2P_LISTEN_TCP_PORT: 15688 + OP_NODE_P2P_LISTEN_UDP_PORT: 15688 OP_NODE_P2P_PEER_SCORING: light OP_NODE_P2P_PEER_BANNING: "true" OP_NODE_P2P_STATIC: ${ZIRCUIT_MAINNET_STATIC_PEERS} @@ -98,4 +98,4 @@ services: OP_NODE_LOG_COLOR: "false" volumes: - zircuit-mainnet-op-geth-pruned-pebble-path: + zircuit-mainnet-op-geth-pruned-pebble-hash: diff --git a/zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-path.yml b/zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml similarity index 80% rename from zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-path.yml rename to zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml index dae9c41b..7469a0a4 100644 --- a/zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-path.yml +++ b/zircuit/op-geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml @@ -4,20 +4,20 @@ services: zircuit-testnet: image: zircuit1/l2-geth:e81568966f2a42a57b1347fb1dffdd5257dde73a volumes: - - "zircuit-testnet-op-geth-pruned-pebble-path:/data" + - "zircuit-testnet-op-geth-pruned-pebble-hash:/data" - ".jwtsecret:/jwtsecret:ro" - ./zircuit_testnet_config:/config environment: - "GETH_GCMODE=full" - - "GETH_SYNCMODE=snap" - - "GETH_STATE_SCHEME=path" + - "GETH_SYNCMODE=full" + - "GETH_STATE_SCHEME=hash" - "GETH_DB_ENGINE=pebble" - "GETH_NAT=extip:${IP}" - - "GETH_PORT=10804" + - "GETH_PORT=10357" - "GETH_DATADIR=/data" ports: - - "10804:10804" - - "10804:10804/udp" + - "10357:10357" + - "10357:10357/udp" env_file: - ./zircuit_testnet_config/env entrypoint: ["/bin/sh", "-c", "[ ! -d /data/geth ] && geth init /config/genesis.json; exec geth \"$@\""] @@ -47,12 +47,12 @@ services: - chains labels: - "traefik.enable=true" - - "traefik.http.middlewares.zircuit-testnet-op-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/zircuit-testnet" - - "traefik.http.services.zircuit-testnet-op-geth-pruned-pebble-path.loadbalancer.server.port=80" - - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-path.entrypoints=websecure" - - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-path.tls.certresolver=myresolver" - - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && PathPrefix(`/zircuit-testnet`)" - - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-path.middlewares=zircuit-testnet-op-geth-pruned-pebble-path-stripprefix, ipwhitelist" + - "traefik.http.middlewares.zircuit-testnet-op-geth-pruned-pebble-hash-stripprefix.stripprefix.prefixes=/zircuit-testnet" + - "traefik.http.services.zircuit-testnet-op-geth-pruned-pebble-hash.loadbalancer.server.port=80" + - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-hash.entrypoints=websecure" + - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-hash.tls.certresolver=myresolver" + - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-hash.rule=Host(`$DOMAIN`) && PathPrefix(`/zircuit-testnet`)" + - "traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-hash.middlewares=zircuit-testnet-op-geth-pruned-pebble-hash-stripprefix, ipwhitelist" zircuit-testnet-node: @@ -60,8 +60,8 @@ services: - zircuit-testnet image: zircuit1/op-node:e81568966f2a42a57b1347fb1dffdd5257dde73a ports: - - "15804:15804" - - "15804:15804/udp" + - "15357:15357" + - "15357:15357/udp" volumes: - ".jwtsecret:/jwtsecret:ro" - ./zircuit_testnet_config:/config @@ -85,10 +85,10 @@ services: OP_NODE_L1_EPOCH_POLL_INTERVAL: 384s OP_NODE_HEARTBEAT_ENABLED: "false" OP_NODE_L1_BEACON: ${ETHEREUM_SEPOLIA_BEACON_REST} - OP_NODE_SYNCMODE: execution-layer + OP_NODE_SYNCMODE: consensus-layer OP_NODE_P2P_LISTEN_IP: "0.0.0.0" - OP_NODE_P2P_LISTEN_TCP_PORT: 15804 - OP_NODE_P2P_LISTEN_UDP_PORT: 15804 + OP_NODE_P2P_LISTEN_TCP_PORT: 15357 + OP_NODE_P2P_LISTEN_UDP_PORT: 15357 OP_NODE_P2P_PEER_SCORING: light OP_NODE_P2P_PEER_BANNING: "true" OP_NODE_P2P_STATIC: ${ZIRCUIT_MAINNET_STATIC_PEERS} @@ -98,4 +98,4 @@ services: OP_NODE_LOG_COLOR: "false" volumes: - zircuit-testnet-op-geth-pruned-pebble-path: + zircuit-testnet-op-geth-pruned-pebble-hash: