From d3c8225d8f84dc855a45aa2710e7f95060c48772 Mon Sep 17 00:00:00 2001 From: Anthony PHAM Date: Mon, 9 Dec 2024 14:33:44 +0100 Subject: [PATCH 1/2] feat: create automate pr for release (#295) --- .github/workflows/dispath-update.yml | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/dispath-update.yml diff --git a/.github/workflows/dispath-update.yml b/.github/workflows/dispath-update.yml new file mode 100644 index 0000000..dba3deb --- /dev/null +++ b/.github/workflows/dispath-update.yml @@ -0,0 +1,34 @@ +name: Dispatch Update Version + +on: + repository_dispatch: + types: [update-version] + +jobs: + update-version: + runs-on: ubuntu-latest + steps: + - name: Checkout this repository + uses: actions/checkout@v4 + + - name: Extract tag name + run: echo "TAG_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV + + - name: Update version in Ansible configuration + run: | + TAG_NAME="$(echo "${TAG_NAME}" | sed 's/^v//')" + + sed -i -E 's|(image: obolnetwork/charon:\$\{CHARON_VERSION:-)v\.?[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*}|\1v'"${TAG_NAME}"'}|' docker-compose.yml + sed -i -E 's|(image: obolnetwork/charon:\$\{CHARON_VERSION:-)v\.?[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*}|\1v'"${TAG_NAME}"'}|' relay/docker-compose.yml + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v7 + with: + token: ${{ secrets.GITHUB_TOKEN }} + base: main + branch: update-version-${{ env.TAG_NAME }} + title: "Update version to ${{ env.TAG_NAME }}" + body: "Automatically generated PR to update version to ${{ env.TAG_NAME }}" + commit-message: "Update version to ${{ env.TAG_NAME }}" + author-name: "obol-platform" + author-email: "platform@obol.tech" From 2b67639297c31a466ac6731e347a1291f448ce5b Mon Sep 17 00:00:00 2001 From: Kaloyan Tanev <24719519+KaloyanTanev@users.noreply.github.com> Date: Tue, 10 Dec 2024 18:38:36 +0100 Subject: [PATCH 2/2] Bump charon v1.2 stack (#296) --- .env.sample.holesky | 8 +++++++- .env.sample.mainnet | 8 +++++++- docker-compose.yml | 10 ++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.env.sample.holesky b/.env.sample.holesky index 4a2ce1a..2502727 100644 --- a/.env.sample.holesky +++ b/.env.sample.holesky @@ -60,6 +60,12 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/ # Connect to one or more external beacon nodes. Use a comma separated list excluding spaces. #CHARON_BEACON_NODE_ENDPOINTS= +# Increase the duration charon will wait for requests to the beacon node +#CHARON_BEACON_NODE_TIMEOUT= + +# Increase the duration charon will wait while publishing data to the beacon node +#CHARON_BEACON_NODE_SUBMIT_TIMEOUT= + # Override the charon logging level; debug, info, warning, error. #CHARON_LOG_LEVEL= @@ -127,4 +133,4 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://checkpoint-sync.holesky.ethpandaops.io/ # Grafana Loki docker container image version, e.g. `latest` or `2.8.2`. # See available tags https://hub.docker.com/r/grafana/loki/tags. -#LOKI_VERSION= \ No newline at end of file +#LOKI_VERSION= diff --git a/.env.sample.mainnet b/.env.sample.mainnet index 74f86d2..a103fbb 100644 --- a/.env.sample.mainnet +++ b/.env.sample.mainnet @@ -60,6 +60,12 @@ LIGHTHOUSE_CHECKPOINT_SYNC_URL=https://mainnet.checkpoint.sigp.io/ # Connect to one or more external beacon nodes. Use a comma separated list excluding spaces. #CHARON_BEACON_NODE_ENDPOINTS= +# Increase the duration charon will wait for requests to the beacon node +#CHARON_BEACON_NODE_TIMEOUT= + +# Increase the duration charon will wait while publishing data to the beacon node +#CHARON_BEACON_NODE_SUBMIT_TIMEOUT= + # Override the charon logging level; debug, info, warning, error. #CHARON_LOG_LEVEL= @@ -127,4 +133,4 @@ MEVBOOST_RELAYS=https://0xa15b52576bcbf1072f4a011c0f99f9fb6c66f3e1ff321f11f461d1 # Grafana Loki docker container image version, e.g. `latest` or `2.8.2`. # See available tags https://hub.docker.com/r/grafana/loki/tags. -#LOKI_VERSION= \ No newline at end of file +#LOKI_VERSION= diff --git a/docker-compose.yml b/docker-compose.yml index 8346049..4a47426 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: # | | | | __/ |_| | | | __/ | | | | | | | | | | | (_| | # |_| |_|\___|\__|_| |_|\___|_| |_| |_| |_|_|_| |_|\__,_| nethermind: - image: nethermind/nethermind:${NETHERMIND_VERSION:-1.28.0} + image: nethermind/nethermind:${NETHERMIND_VERSION:-1.29.0} restart: unless-stopped ports: - ${NETHERMIND_PORT_P2P:-30303}:30303/tcp # P2P TCP @@ -77,9 +77,11 @@ services: # \___|_| |_|\__,_|_| \___/|_| |_| charon: - image: obolnetwork/charon:${CHARON_VERSION:-v1.1.1} + image: obolnetwork/charon:${CHARON_VERSION:-v1.2.0} environment: - CHARON_BEACON_NODE_ENDPOINTS=${CHARON_BEACON_NODE_ENDPOINTS:-http://lighthouse:5052} + - CHARON_BEACON_NODE_TIMEOUT=${CHARON_BEACON_NODE_TIMEOUT:-3s} + - CHARON_BEACON_NODE_SUBMIT_TIMEOUT=${CHARON_BEACON_NODE_SUBMIT_TIMEOUT:-4s} - CHARON_LOG_LEVEL=${CHARON_LOG_LEVEL:-info} - CHARON_LOG_FORMAT=${CHARON_LOG_FORMAT:-console} - CHARON_P2P_RELAYS=${CHARON_P2P_RELAYS:-https://0.relay.obol.tech,https://1.relay.obol.tech/} @@ -107,7 +109,7 @@ services: # |_|\___/ \__,_|\___||___/\__\__,_|_| lodestar: - image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.20.2} + image: chainsafe/lodestar:${LODESTAR_VERSION:-v1.23.0} depends_on: [charon] entrypoint: /opt/lodestar/run.sh networks: [dvnode] @@ -128,7 +130,7 @@ services: # | | | | | | __/\ V /_____| |_) | (_) | (_) \__ \ |_ # |_| |_| |_|\___| \_/ |_.__/ \___/ \___/|___/\__| mev-boost: - image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.7.0} + image: ${MEVBOOST_IMAGE:-flashbots/mev-boost}:${MEVBOOST_VERSION:-1.8.1} command: | -${NETWORK} -loglevel=debug