From 10de1f17597a837d3ff5026cb6a888ab94804d52 Mon Sep 17 00:00:00 2001 From: Vadim Smirnov Date: Tue, 23 Jul 2024 12:30:35 +0200 Subject: [PATCH] chore(ethexe): Add bootnodes, update chain-spec (#4069) --- ethexe/cli/src/chain_spec.rs | 7 +++++-- ethexe/cli/src/config.rs | 2 +- ethexe/docker/docker-compose.yml | 15 +++++++++------ ethexe/docker/ethexe_builder.Dockerfile | 8 ++++---- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ethexe/cli/src/chain_spec.rs b/ethexe/cli/src/chain_spec.rs index 63b0b84528b..7e61775ae26 100644 --- a/ethexe/cli/src/chain_spec.rs +++ b/ethexe/cli/src/chain_spec.rs @@ -14,8 +14,11 @@ pub struct ChainSpec { pub fn testnet_config() -> ChainSpec { ChainSpec { - ethereum_router_address: "0x05069E9045Ca0D2B72840c6A21C7bE588E02089A".to_string(), - bootnodes: vec![], + ethereum_router_address: "0xf90d2956B6F36194fbac181Fb95b2f67274821da".to_string(), + bootnodes: vec![ + "/ip4/54.183.94.171/udp/20333/quic-v1/p2p/12D3KooWQ5kJQs2WK5kzmBMShCNidpySDuLjt7aqZoVimdyCPRDz".parse().unwrap(), + "/ip4/54.183.94.171/udp/20334/quic-v1/p2p/12D3KooWAivseD2rweVeS2fyNuVFP1hWZ2gXRtMzrNK1ci4mmoMj".parse().unwrap() + ], } } diff --git a/ethexe/cli/src/config.rs b/ethexe/cli/src/config.rs index ec4690e25cf..6b5c072f636 100644 --- a/ethexe/cli/src/config.rs +++ b/ethexe/cli/src/config.rs @@ -142,7 +142,7 @@ impl TryFrom for Config { }; let chain_spec = match args.chain_spec.as_deref() { - Some("dev") => crate::chain_spec::testnet_config(), + Some("testnet") => crate::chain_spec::testnet_config(), Some(path) => crate::chain_spec::from_file(path)?, _ => crate::chain_spec::testnet_config(), }; diff --git a/ethexe/docker/docker-compose.yml b/ethexe/docker/docker-compose.yml index 54d0a6965f5..1e300f12cc4 100644 --- a/ethexe/docker/docker-compose.yml +++ b/ethexe/docker/docker-compose.yml @@ -6,21 +6,22 @@ services: ports: - "20333:20333/udp" - "9635:9635" - image: gear-tech/gear-egpu:latest + image: gear-tech/gear:latest environment: VALIDATOR_KEY: ${VALIDATOR_KEY} VALIDATOR_PUB_KEY: ${VALIDATOR_PUB_KEY} RUST_LOG: ethexe=debug volumes: - "gear-data-validator:/data" - command: bash -c "ethgpu + command: bash -c "ethexe -d /data insert-key ${VALIDATOR_KEY} && - ethgpu + ethexe -d /data --ethereum-rpc ws://54.67.75.1:8546 --ethereum-beacon-rpc https://eth-holesky-beacon.public.blastapi.io - --validator-key ${VALIDATOR_PUB_KEY}" + --validator-key ${VALIDATOR_PUB_KEY} + --prometheus-external" networks: testing_net: ipv4_address: 172.28.1.1 @@ -40,15 +41,17 @@ services: RUST_LOG: ethexe=debug links: - "node_validator:validator" - command: bash -c "ethgpu -d /data insert-key ${SEQUENCER_KEY} + command: bash -c "ethexe -d /data insert-key ${SEQUENCER_KEY} && sleep 1 - && ethgpu + && ethexe -d /data --port 20334 --bootnodes '/ip4/172.28.1.1/udp/20333/quic-v1' --ethereum-rpc ws://54.67.75.1:8546 --ethereum-beacon-rpc https://eth-holesky-beacon.public.blastapi.io --sequencer-key ${SEQUENCER_PUB_KEY}" + --prometheus-port 9636 + --prometheus-external" networks: testing_net: ipv4_address: 172.28.1.2 diff --git a/ethexe/docker/ethexe_builder.Dockerfile b/ethexe/docker/ethexe_builder.Dockerfile index 8da86119287..7f97b4ac2dc 100644 --- a/ethexe/docker/ethexe_builder.Dockerfile +++ b/ethexe/docker/ethexe_builder.Dockerfile @@ -33,7 +33,7 @@ FROM --platform=linux/amd64 ubuntu:22.04 MAINTAINER GEAR LABEL description="This is the 2nd stage: a very small image where we copy the ethexe binary." ARG PROFILE=release -COPY --from=builder /ethexe/target/$PROFILE/ethgpu /usr/local/bin +COPY --from=builder /ethexe/target/$PROFILE/ethexe /usr/local/bin RUN apt-get update && apt-get install -y openssl ca-certificates RUN useradd -m -u 1000 -U -s /bin/sh -d /ethexe ethexe && \ mkdir -p /ethexe/.local/share && \ @@ -41,10 +41,10 @@ RUN useradd -m -u 1000 -U -s /bin/sh -d /ethexe ethexe && \ chown -R ethexe:ethexe /data && \ ln -s /data /ethexe/.local/share/ethexe && \ # Sanity checks - ldd /usr/local/bin/ethgpu && \ - /usr/local/bin/ethgpu --version + ldd /usr/local/bin/ethexe && \ + /usr/local/bin/ethexe --version USER root EXPOSE 20333 9635 -CMD ["/usr/local/bin/ethgpu"] +CMD ["/usr/local/bin/ethexe"]