Skip to content

Commit

Permalink
Remove Peer upper limit of peers on CL (#404)
Browse files Browse the repository at this point in the history
* Remove Peer upper limit on teku because of new peers management

* Remove Peer force setup from CL layer

* Fix typo

* Delete sh.exe.stackdump
  • Loading branch information
kamilchodola authored Aug 29, 2024
1 parent 01fcb11 commit ffd0eae
Show file tree
Hide file tree
Showing 55 changed files with 1 addition and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/down_tests/case_1/sedge-data/.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
NETHERMIND_ETHSTATSCONFIG_SECRET=secret
NETHERMIND_ETHSTATSCONFIG_CONTACT=[email protected]
EC_DATA_DIR=./execution-data
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
NETWORK=mainnet
EC_NODE=http://localhost:8545
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ services:
- --logging=${CC_LOG_LEVEL}
- --network=${NETWORK}
- --p2p-port=9000
- --p2p-peer-upper-bound=${CC_PEER_COUNT}
- --rest-api-host-allowlist=*
- --rest-api-enabled=true
- --rest-api-port=4000
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/logs_tests/case_1/sedge-data/.env
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
NETHERMIND_ETHSTATSCONFIG_SECRET=secret
NETHERMIND_ETHSTATSCONFIG_CONTACT=[email protected]
EC_DATA_DIR=./execution-data
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
NETWORK=mainnet
EC_NODE=http://localhost:8545
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ services:
- --logging=${CC_LOG_LEVEL}
- --network=${NETWORK}
- --p2p-port=9000
- --p2p-peer-upper-bound=${CC_PEER_COUNT}
- --rest-api-host-allowlist=*
- --rest-api-enabled=true
- --rest-api-port=4000
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/no_env/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/no_services/.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/no_version/.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/no_version/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/valid/.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
1 change: 0 additions & 1 deletion cli/testdata/run_tests/valid/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
NETHERMIND_ETHSTATSCONFIG_SECRET=secret
NETHERMIND_ETHSTATSCONFIG_CONTACT=[email protected]
EC_DATA_DIR=./execution-data
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
NETWORK=mainnet
EC_NODE=http://localhost:8545
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ services:
- --logging=${CC_LOG_LEVEL}
- --network=${NETWORK}
- --p2p-port=9000
- --p2p-peer-upper-bound=${CC_PEER_COUNT}
- --rest-api-host-allowlist=*
- --rest-api-enabled=true
- --rest-api-port=4000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ NETHERMIND_ETHSTATSCONFIG_NAME=Nethermind
NETHERMIND_ETHSTATSCONFIG_SECRET=secret
NETHERMIND_ETHSTATSCONFIG_CONTACT=[email protected]
EC_DATA_DIR=./execution-data
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
NETWORK=mainnet
EC_NODE=http://localhost:8545
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ services:
- --logging=${CC_LOG_LEVEL}
- --network=${NETWORK}
- --p2p-port=9000
- --p2p-peer-upper-bound=${CC_PEER_COUNT}
- --rest-api-host-allowlist=*
- --rest-api-enabled=true
- --rest-api-port=4000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
1 change: 0 additions & 1 deletion internal/utils/testdata/validate_compose_tests/valid/.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ EC_DATA_DIR=./execution-data
EC_SNAP_SYNC_ENABLED=true
EC_JWT_SECRET_PATH=/Users/teno/go/src/github.com/NethermindEth/1Click/sedge-data/jwtsecret
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL=http://execution:8545
EC_AUTH_URL=http://execution:8551
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ services:
- --http-address=0.0.0.0
- --http-port=4000
- --network=${NETWORK}
- --target-peers=${CC_PEER_COUNT}
- --execution-endpoints=${EC_AUTH_URL}
- --execution-jwt=/tmp/jwt/jwtsecret
- --eth1
Expand Down
1 change: 0 additions & 1 deletion templates/envs/chiado/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/chiado/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/chiado/consensus/teku.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* teku.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/custom/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/custom/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/custom/consensus/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* prysm.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/custom/consensus/teku.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* teku.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/gnosis/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/gnosis/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
CC_LODESTAR_PRESET=gnosis
EC_API_URL={{.ExecutionApiURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/gnosis/consensus/teku.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* teku.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/consensus/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* prysm.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/holesky/consensus/teku.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* teku.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/mainnet/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/mainnet/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/mainnet/consensus/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* prysm.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/mainnet/consensus/teku.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* teku.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/sepolia/consensus/lighthouse.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lighthouse.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/sepolia/consensus/lodestar.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* lodestar.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
1 change: 0 additions & 1 deletion templates/envs/sepolia/consensus/prysm.tmpl
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{/* prysm.tmpl */}}
{{ define "consensus" }}
# --- Consensus Layer - Beacon Node - configuration ---
CC_PEER_COUNT=50
CC_LOG_LEVEL=info
EC_API_URL={{.ExecutionApiURL}}
EC_AUTH_URL={{.ExecutionAuthURL}}
Expand Down
Loading

0 comments on commit ffd0eae

Please sign in to comment.