From 737e084338673c93da57f7aa92ffe6ec850318c9 Mon Sep 17 00:00:00 2001 From: antares-sw <23400824+antares-sw@users.noreply.github.com> Date: Wed, 14 Dec 2022 11:14:02 +0400 Subject: [PATCH 1/2] Update docker-compose p2p settings --- deploy/gnosis/docker-compose.yml | 10 ++++++++++ deploy/goerli/docker-compose.yml | 19 +++++++++++++++++++ deploy/harbour_goerli/docker-compose.yml | 21 ++++++++++++++++++++- deploy/harbour_mainnet/docker-compose.yml | 19 +++++++++++++++++++ deploy/mainnet/docker-compose.yml | 19 +++++++++++++++++++ 5 files changed, 87 insertions(+), 1 deletion(-) diff --git a/deploy/gnosis/docker-compose.yml b/deploy/gnosis/docker-compose.yml index 67bf816..1f3de15 100644 --- a/deploy/gnosis/docker-compose.yml +++ b/deploy/gnosis/docker-compose.yml @@ -133,8 +133,13 @@ services: - --JsonRpc.EnginePort=8551 - --JsonRpc.EngineHost=0.0.0.0 - --JsonRpc.EngineEnabledModules=Net,Eth,Subscribe,Engine,Web3,Client + - --Network.P2PPort=30330 + - --Network.DiscoveryPort=30330 volumes: ["nethermind:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["nethermind"] + ports: + - 30330:30330/tcp + - 30330:30330/udp networks: gnosis: aliases: @@ -155,8 +160,13 @@ services: - --execution-endpoint - $ETH1_ENDPOINT - --execution-jwt=/jwtsecret + - --port=30331 + - --enr-udp-port=30332 volumes: ["lighthouse:/root/.lighthouse","../configs/jwtsecret:/jwtsecret"] profiles: ["lighthouse"] + ports: + - 30331:30331/tcp + - 30332:30332/udp networks: gnosis: aliases: diff --git a/deploy/goerli/docker-compose.yml b/deploy/goerli/docker-compose.yml index 589716d..74d41af 100644 --- a/deploy/goerli/docker-compose.yml +++ b/deploy/goerli/docker-compose.yml @@ -138,8 +138,12 @@ services: - --datadir=/data/ethereum - --ethash.dagdir=/data/ethereum/.ethash - --ipcdisable + - --port=30300 volumes: ["geth:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["geth"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: goerli: aliases: @@ -165,9 +169,14 @@ services: --engine-rpc-port=8551 --host-allowlist=* --max-peers=50 + --p2p-enabled=true + --p2p-port=30300 volumes: ["besu:/data","../configs/jwtsecret:/jwtsecret"] user: "0:0" profiles: ["besu"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: goerli: aliases: @@ -188,8 +197,13 @@ services: - --http-web3provider=$ETH1_ENDPOINT - --slots-per-archive-point=1024 - --accept-terms-of-use + - --p2p-tcp-port=30301 + - --p2p-udp-port=30301 volumes: ["prysm:/data","../configs/genesis.ssz:/data/gensis.ssz","../configs/jwtsecret:/jwtsecret"] profiles: ["prysm"] + ports: + - 30301:30301/tcp + - 30301:30301/udp networks: goerli: aliases: @@ -210,8 +224,13 @@ services: - --execution-endpoint - $ETH1_ENDPOINT - --execution-jwt=/jwtsecret + - --port=30301 + - --enr-udp-port=30302 volumes: ["lighthouse:/root/.lighthouse","../configs/jwtsecret:/jwtsecret"] profiles: ["lighthouse"] + ports: + - 30302:30302/tcp + - 30302:30302/udp networks: goerli: aliases: diff --git a/deploy/harbour_goerli/docker-compose.yml b/deploy/harbour_goerli/docker-compose.yml index 287b8b1..ba2ef08 100644 --- a/deploy/harbour_goerli/docker-compose.yml +++ b/deploy/harbour_goerli/docker-compose.yml @@ -138,8 +138,12 @@ services: - --datadir=/data/ethereum - --ethash.dagdir=/data/ethereum/.ethash - --ipcdisable + - --port=30300 volumes: ["geth:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["geth"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: harbour_goerli: aliases: @@ -165,9 +169,14 @@ services: --engine-rpc-port=8551 --host-allowlist=* --max-peers=50 - volumes: ["besu:/opt/besu/database","../configs/jwtsecret:/jwtsecret"] + --p2p-enabled=true + --p2p-port=30300 + volumes: ["besu:/data","../configs/jwtsecret:/jwtsecret"] user: "0:0" profiles: ["besu"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: harbour_goerli: aliases: @@ -188,8 +197,13 @@ services: - --http-web3provider=$ETH1_ENDPOINT - --slots-per-archive-point=1024 - --accept-terms-of-use + - --p2p-tcp-port=30301 + - --p2p-udp-port=30301 volumes: ["prysm:/data","../configs/genesis.ssz:/data/gensis.ssz","../configs/jwtsecret:/jwtsecret"] profiles: ["prysm"] + ports: + - 30301:30301/tcp + - 30301:30301/udp networks: harbour_goerli: aliases: @@ -210,8 +224,13 @@ services: - --execution-endpoint - $ETH1_ENDPOINT - --execution-jwt=/jwtsecret + - --port=30301 + - --enr-udp-port=30302 volumes: ["lighthouse:/root/.lighthouse","../configs/jwtsecret:/jwtsecret"] profiles: ["lighthouse"] + ports: + - 30302:30302/tcp + - 30302:30302/udp networks: harbour_goerli: aliases: diff --git a/deploy/harbour_mainnet/docker-compose.yml b/deploy/harbour_mainnet/docker-compose.yml index b57d871..cf7f1bd 100644 --- a/deploy/harbour_mainnet/docker-compose.yml +++ b/deploy/harbour_mainnet/docker-compose.yml @@ -138,8 +138,12 @@ services: - --datadir=/data/ethereum - --ethash.dagdir=/data/ethereum/.ethash - --ipcdisable + - --port=30300 volumes: ["geth:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["geth"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: harbour_mainnet: aliases: @@ -165,9 +169,14 @@ services: --engine-rpc-port=8551 --host-allowlist=* --max-peers=50 + --p2p-enabled=true + --p2p-port=30300 volumes: ["besu:/data","../configs/jwtsecret:/jwtsecret"] user: "0:0" profiles: ["besu"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: harbour_mainnet: aliases: @@ -187,8 +196,13 @@ services: - --http-web3provider=$ETH1_ENDPOINT - --slots-per-archive-point=1024 - --accept-terms-of-use + - --p2p-tcp-port=30301 + - --p2p-udp-port=30301 volumes: ["prysm:/data","../configs/genesis.ssz:/data/gensis.ssz","../configs/jwtsecret:/jwtsecret"] profiles: ["prysm"] + ports: + - 30301:30301/tcp + - 30301:30301/udp networks: harbour_mainnet: aliases: @@ -209,8 +223,13 @@ services: - --execution-endpoint - $ETH1_ENDPOINT - --execution-jwt=/jwtsecret + - --port=30301 + - --enr-udp-port=30302 volumes: ["lighthouse:/root/.lighthouse","../configs/jwtsecret:/jwtsecret"] profiles: ["lighthouse"] + ports: + - 30302:30302/tcp + - 30302:30302/udp networks: harbour_mainnet: aliases: diff --git a/deploy/mainnet/docker-compose.yml b/deploy/mainnet/docker-compose.yml index 1057c38..81e6bd2 100644 --- a/deploy/mainnet/docker-compose.yml +++ b/deploy/mainnet/docker-compose.yml @@ -138,8 +138,12 @@ services: - --datadir=/data/ethereum - --ethash.dagdir=/data/ethereum/.ethash - --ipcdisable + - --port=30300 volumes: ["geth:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["geth"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: mainnet: aliases: @@ -165,9 +169,14 @@ services: --engine-rpc-port=8551 --host-allowlist=* --max-peers=50 + --p2p-enabled=true + --p2p-port=30300 volumes: ["besu:/data","../configs/jwtsecret:/jwtsecret"] user: "0:0" profiles: ["besu"] + ports: + - 30300:30300/tcp + - 30300:30300/udp networks: mainnet: aliases: @@ -186,8 +195,13 @@ services: - --http-web3provider=$ETH1_ENDPOINT - --slots-per-archive-point=1024 - --accept-terms-of-use + - --p2p-tcp-port=30301 + - --p2p-udp-port=30301 volumes: ["prysm:/data","../configs/jwtsecret:/jwtsecret"] profiles: ["prysm"] + ports: + - 30301:30301/tcp + - 30301:30301/udp networks: mainnet: aliases: @@ -208,8 +222,13 @@ services: - --execution-endpoint - $ETH1_ENDPOINT - --execution-jwt=/jwtsecret + - --port=30301 + - --enr-udp-port=30302 volumes: ["lighthouse:/root/.lighthouse","../configs/jwtsecret:/jwtsecret"] profiles: ["lighthouse"] + ports: + - 30302:30302/tcp + - 30302:30302/udp networks: mainnet: aliases: From efed695aadd82eaef80ea96be984a7bc002088e9 Mon Sep 17 00:00:00 2001 From: antares-sw <23400824+antares-sw@users.noreply.github.com> Date: Wed, 14 Dec 2022 11:14:48 +0400 Subject: [PATCH 2/2] Update version --- deploy/gnosis/docker-compose.yml | 4 ++-- deploy/goerli/docker-compose.yml | 4 ++-- deploy/harbour_goerli/docker-compose.yml | 4 ++-- deploy/harbour_mainnet/docker-compose.yml | 4 ++-- deploy/mainnet/docker-compose.yml | 4 ++-- pyproject.toml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/gnosis/docker-compose.yml b/deploy/gnosis/docker-compose.yml index 1f3de15..c99343e 100644 --- a/deploy/gnosis/docker-compose.yml +++ b/deploy/gnosis/docker-compose.yml @@ -24,7 +24,7 @@ networks: services: oracle: container_name: oracle_gnosis - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -34,7 +34,7 @@ services: keeper: container_name: keeper_gnosis - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/goerli/docker-compose.yml b/deploy/goerli/docker-compose.yml index 74d41af..81ca2ba 100644 --- a/deploy/goerli/docker-compose.yml +++ b/deploy/goerli/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/harbour_goerli/docker-compose.yml b/deploy/harbour_goerli/docker-compose.yml index ba2ef08..bcda098 100644 --- a/deploy/harbour_goerli/docker-compose.yml +++ b/deploy/harbour_goerli/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_harbour_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_harbour_goerli - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/harbour_mainnet/docker-compose.yml b/deploy/harbour_mainnet/docker-compose.yml index cf7f1bd..6e7f8e5 100644 --- a/deploy/harbour_mainnet/docker-compose.yml +++ b/deploy/harbour_mainnet/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_harbour_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_harbour_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/deploy/mainnet/docker-compose.yml b/deploy/mainnet/docker-compose.yml index 81e6bd2..f31a7da 100644 --- a/deploy/mainnet/docker-compose.yml +++ b/deploy/mainnet/docker-compose.yml @@ -26,7 +26,7 @@ networks: services: oracle: container_name: oracle_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/oracle/main.py"] @@ -36,7 +36,7 @@ services: keeper: container_name: keeper_mainnet - image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.8 + image: europe-west4-docker.pkg.dev/stakewiselabs/public/oracle:v2.8.9 restart: always entrypoint: ["python"] command: ["oracle/keeper/main.py"] diff --git a/pyproject.toml b/pyproject.toml index 2594ab9..8402744 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "oracle" -version = "2.8.8" +version = "2.8.9" description = "StakeWise Oracles are responsible for submitting off-chain data." authors = ["Dmitri Tsumak "] license = "AGPL-3.0-only"