From 5d46b543ef8b14928edacdba3910519595d515df Mon Sep 17 00:00:00 2001 From: Rafael Matias Date: Fri, 29 Nov 2024 14:10:55 +0100 Subject: [PATCH] ethereum-node: bump chart deps (#346) * ethereum-node: bump chart depedency version * fix erigon and ethjs * fix lint * fix nc issue erigon rpc daemon --------- Co-authored-by: Barnabas Busa --- charts/erigon/Chart.yaml | 2 +- charts/erigon/README.md | 6 +++--- charts/erigon/values.yaml | 6 +++--- charts/ethereum-node/Chart.lock | 12 ++++++------ charts/ethereum-node/Chart.yaml | 10 +++++----- charts/ethereum-node/README.md | 10 +++++----- charts/ethereumjs/Chart.yaml | 2 +- charts/ethereumjs/README.md | 4 ++-- charts/ethereumjs/values.yaml | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/charts/erigon/Chart.yaml b/charts/erigon/Chart.yaml index bcdf2878..fcf38dda 100644 --- a/charts/erigon/Chart.yaml +++ b/charts/erigon/Chart.yaml @@ -6,7 +6,7 @@ icon: https://pbs.twimg.com/profile_images/1420080204148576274/-4OFIs2x_400x400. sources: - https://github.com/ledgerwatch/erigon type: application -version: 1.0.10 +version: 1.0.11 maintainers: - name: skylenet email: rafael@skyle.net diff --git a/charts/erigon/README.md b/charts/erigon/README.md index 9bc947db..54b63f74 100644 --- a/charts/erigon/README.md +++ b/charts/erigon/README.md @@ -1,7 +1,7 @@ # erigon -![Version: 1.0.10](https://img.shields.io/badge/Version-1.0.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 1.0.11](https://img.shields.io/badge/Version-1.0.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Erigon, formerly known as Turbo‐Geth, is a fork of Go Ethereum (geth) oriented toward speed and disk‐space efficiency. Erigon is a completely re-architected implementation of Ethereum, currently written in Go but with implementations in other languages planned. Erigon's goal is to provide a faster, more modular, and more optimized implementation of Ethereum. @@ -34,8 +34,8 @@ Erigon, formerly known as Turbo‐Geth, is a fork of Go Ethereum (geth) oriented | fullnameOverride | string | `""` | Overrides the chart's computed fullname | | httpPort | int | `8545` | HTTP Port | | image.pullPolicy | string | `"IfNotPresent"` | erigon container pull policy | -| image.repository | string | `"thorax/erigon"` | erigon container image repository | -| image.tag | string | `"devel"` | erigon container image tag | +| image.repository | string | `"erigontech/erigon"` | erigon container image repository | +| image.tag | string | `"latest"` | erigon container image tag | | imagePullSecrets | list | `[]` | Image pull secrets for Docker images | | ingress.annotations | object | `{}` | Annotations for Ingress | | ingress.enabled | bool | `false` | Ingress resource for the HTTP API | diff --git a/charts/erigon/values.yaml b/charts/erigon/values.yaml index 767200f5..83448c9b 100644 --- a/charts/erigon/values.yaml +++ b/charts/erigon/values.yaml @@ -9,9 +9,9 @@ replicas: 1 image: # -- erigon container image repository - repository: thorax/erigon + repository: erigontech/erigon # -- erigon container image tag - tag: devel + tag: latest # -- erigon container pull policy pullPolicy: IfNotPresent @@ -73,7 +73,7 @@ defaultCommandRPCDaemonTemplate: | - sh - -ac - > - while ! nc -z 127.0.0.1 9090; do sleep 1; done; + until timeout 1 bash -c ">/dev/tcp/127.0.0.1/9090" 2>/dev/null; do echo "Waiting for erigon..."; sleep 1; done; exec rpcdaemon --datadir=/data --private.api.addr=127.0.0.1:9090 diff --git a/charts/ethereum-node/Chart.lock b/charts/ethereum-node/Chart.lock index 33db3bc9..32600d9d 100644 --- a/charts/ethereum-node/Chart.lock +++ b/charts/ethereum-node/Chart.lock @@ -4,16 +4,16 @@ dependencies: version: 1.0.7 - name: erigon repository: file://../erigon - version: 1.0.10 + version: 1.0.11 - name: ethereumjs repository: file://../ethereumjs - version: 0.0.8 + version: 0.0.9 - name: geth repository: file://../geth version: 1.0.8 - name: nethermind repository: file://../nethermind - version: 1.0.12 + version: 1.0.13 - name: reth repository: file://../reth version: 0.0.14 @@ -22,7 +22,7 @@ dependencies: version: 0.1.2 - name: lighthouse repository: file://../lighthouse - version: 1.1.3 + version: 1.1.4 - name: lodestar repository: file://../lodestar version: 1.1.3 @@ -44,5 +44,5 @@ dependencies: - name: tracoor-agent repository: file://../tracoor-agent version: 0.0.1 -digest: sha256:73378194a52810152edf2c4fc108ecf43c4375907f942f19b9eb7877188711d9 -generated: "2024-10-10T12:53:23.85313+10:00" +digest: sha256:3086525e579dab1ac0a581b85f55be8af22912f3181951ab9cd259a7c32ce7b0 +generated: "2024-11-29T13:28:33.718182+01:00" diff --git a/charts/ethereum-node/Chart.yaml b/charts/ethereum-node/Chart.yaml index c4345bd6..cac13a3e 100644 --- a/charts/ethereum-node/Chart.yaml +++ b/charts/ethereum-node/Chart.yaml @@ -8,7 +8,7 @@ icon: https://avatars.githubusercontent.com/u/6250754?s=200&v=4 sources: - https://github.com/ethpandaops/ethereum-helm-charts type: application -version: 0.0.26 +version: 0.0.27 maintainers: - name: skylenet email: rafael@skyle.net @@ -20,12 +20,12 @@ dependencies: repository: "file://../besu" condition: besu.enabled - name: erigon - version: "1.0.10" + version: "1.0.11" #repository: "https://ethpandaops.github.io/ethereum-helm-charts" repository: "file://../erigon" condition: erigon.enabled - name: ethereumjs - version: "0.0.8" + version: "0.0.9" #repository: "https://ethpandaops.github.io/ethereum-helm-charts" repository: "file://../ethereumjs" condition: ethereumjs.enabled @@ -35,7 +35,7 @@ dependencies: repository: "file://../geth" condition: geth.enabled - name: nethermind - version: "1.0.12" + version: "1.0.13" #repository: "https://ethpandaops.github.io/ethereum-helm-charts" repository: "file://../nethermind" condition: nethermind.enabled @@ -51,7 +51,7 @@ dependencies: repository: "file://../grandine" condition: grandine.enabled - name: lighthouse - version: "1.1.3" + version: "1.1.4" #repository: "https://ethpandaops.github.io/ethereum-helm-charts" repository: "file://../lighthouse" condition: lighthouse.enabled diff --git a/charts/ethereum-node/README.md b/charts/ethereum-node/README.md index 22654fe0..0fa53d48 100644 --- a/charts/ethereum-node/README.md +++ b/charts/ethereum-node/README.md @@ -1,7 +1,7 @@ # ethereum-node -![Version: 0.0.26](https://img.shields.io/badge/Version-0.0.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.27](https://img.shields.io/badge/Version-0.0.27-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) This chart acts as an umbrella chart and allows to run a ethereum execution and consensus layer client. It's also able to deploy optional monitoring applications. @@ -15,14 +15,14 @@ This chart acts as an umbrella chart and allows to run a ethereum execution and | Repository | Name | Version | |------------|------|---------| | file://../besu | besu | 1.0.7 | -| file://../erigon | erigon | 1.0.10 | +| file://../erigon | erigon | 1.0.11 | | file://../ethereum-metrics-exporter | ethereum-metrics-exporter | 0.2.0 | -| file://../ethereumjs | ethereumjs | 0.0.8 | +| file://../ethereumjs | ethereumjs | 0.0.9 | | file://../geth | geth | 1.0.8 | | file://../grandine | grandine | 0.1.2 | -| file://../lighthouse | lighthouse | 1.1.3 | +| file://../lighthouse | lighthouse | 1.1.4 | | file://../lodestar | lodestar | 1.1.3 | -| file://../nethermind | nethermind | 1.0.12 | +| file://../nethermind | nethermind | 1.0.13 | | file://../nimbus | nimbus | 1.1.3 | | file://../prysm | prysm | 1.1.4 | | file://../reth | reth | 0.0.14 | diff --git a/charts/ethereumjs/Chart.yaml b/charts/ethereumjs/Chart.yaml index 34af6d2f..a6167be9 100644 --- a/charts/ethereumjs/Chart.yaml +++ b/charts/ethereumjs/Chart.yaml @@ -7,7 +7,7 @@ icon: https://user-images.githubusercontent.com/47108/78779352-d0839500-796a-11e sources: - https://github.com/ethereumjs/ethereumjs-monorepo type: application -version: 0.0.8 +version: 0.0.9 maintainers: - name: barnabasbusa email: busa.barnabas@gmail.com diff --git a/charts/ethereumjs/README.md b/charts/ethereumjs/README.md index 982687a4..622f2065 100644 --- a/charts/ethereumjs/README.md +++ b/charts/ethereumjs/README.md @@ -1,7 +1,7 @@ # ethereumjs -![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.9](https://img.shields.io/badge/Version-0.0.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) The EthereumJS Client is an Ethereum Execution Client (similar to go-ethereum or Nethermind) written in TypeScript/JavaScript, the non-Smart-Contract language Ethereum dApp developers are most familiar with. It is targeted to be a client for research and development and not meant to be used in production on mainnet for the foreseeable future (out of resource and security considerations). @@ -20,7 +20,7 @@ The EthereumJS Client is an Ethereum Execution Client (similar to go-ethereum or | authPort | int | `8551` | Engine Port (Auth Port) | | containerSecurityContext | object | See `values.yaml` | The security context for containers | | customCommand | list | `[]` | Legacy way of overwriting the default command. You may prefer to change defaultCommandTemplate instead. | -| defaultBinaryPath | string | `"node /usr/app/node_modules/.bin/ethereumjs"` | Path within the container to the beacon node binary | +| defaultBinaryPath | string | `"node /usr/app/packages/client/dist/esm/bin/cli.js"` | Path within the container to the beacon node binary | | defaultCommandTemplate | string | See `values.yaml` | Template used for the default command | | extraArgs | list | `[]` | Extra args for the ethereumjs container | | extraContainerPorts | list | `[]` | Additional ports for the main container | diff --git a/charts/ethereumjs/values.yaml b/charts/ethereumjs/values.yaml index 6d72c44d..12b43735 100644 --- a/charts/ethereumjs/values.yaml +++ b/charts/ethereumjs/values.yaml @@ -23,7 +23,7 @@ extraArgs: [] jwt: ecb22bc24e7d4061f7ed690ccd5846d7d73f5d2b9733267e12f56790398d908a # -- Path within the container to the beacon node binary -defaultBinaryPath: node /usr/app/node_modules/.bin/ethereumjs +defaultBinaryPath: node /usr/app/packages/client/dist/esm/bin/cli.js # -- Template used for the default command # @default -- See `values.yaml`