Merge branch 'main' into at/nitro-remove-updatestrategy-defaults

charts/das/Chart.yaml

@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.5.6
+version: 0.5.8
 
-appVersion: "v3.1.0-7d1d84c"
+appVersion: "v3.1.2-309340a"

charts/das/README.md

@@ -320,7 +320,7 @@ Option | Description | Default
 `data-availability.rest-aggregator.sync-to-storage.eager-lower-bound-block` | uint             when eagerly syncing, start indexing forward from this L1 block. Only used if there is no sync state | None
 `data-availability.rest-aggregator.sync-to-storage.ignore-write-errors` | log only on failures to write when syncing; otherwise treat it as an error | `true`
 `data-availability.rest-aggregator.sync-to-storage.parent-chain-blocks-per-read` | uint        when eagerly syncing, max l1 blocks to read per poll | `100`
-`data-availability.rest-aggregator.sync-to-storage.retention-period` | duration                period to request storage to retain synced data | `504h0m0s`
+`data-availability.rest-aggregator.sync-to-storage.retention-period` | duration                period to request storage to retain synced data | `360h0m0s`
 `data-availability.rest-aggregator.sync-to-storage.state-dir` | string                         directory to store the sync state in, ie the block number currently synced up to, so that we don't sync from scratch each time | None
 `data-availability.rest-aggregator.sync-to-storage.sync-expired-data` | sync even data that is expired; needed for mirror configuration | `true`
 `data-availability.rest-aggregator.urls` | strings                                             list of URLs including 'http://' or 'https://' prefixes and port numbers to REST DAS endpoints; additive with the online-url-list option | None

charts/das/templates/perreplicaservice.yaml

@@ -1,19 +1,32 @@
 {{- if .Values.perReplicaService.enabled }}
-{{- $replicas := .Values.statefulset.replicas }}
-{{- range until $replicas }}
+{{- range $i := until ($.Values.replicaCount | int) }}
+{{- $iStr := ($i | print)}}
+---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "das.fullname" $ }}-{{ . }}
+  name: {{ include "das.fullname" $ }}-{{ $i }}
   labels:
     {{- include "das.labels" $ | nindent 4 }}
 spec:
   ports:
-    {{- range .Values.service.ports }}
-    - port: {{ .port }}
-      targetPort: {{ .targetPort }}
-      protocol: {{ .protocol | default "TCP" }}
-      name: {{ .name }}
+    {{- if index $.Values.configmap.data "enable-rpc" }}
+    - port: {{ index $.Values.configmap.data "rpc-port" }}
+      targetPort: http-rpc
+      protocol: TCP
+      name: http-rpc
+    {{- end }}
+    {{- if index $.Values.configmap.data "enable-rest" }}
+    - port: {{ index $.Values.configmap.data "rest-port" }}
+      targetPort: http-rest
+      protocol: TCP
+      name: http-rest
+    {{- end }}
+    {{- if index $.Values.configmap.data "metrics" }}
+    - port: {{ index $.Values.configmap.data "metrics-server" "port" }}
+      targetPort: metrics
+      protocol: TCP
+      name: metrics
     {{- end }}
   selector:
     statefulset.kubernetes.io/pod-name: {{ include "das.fullname" $ }}-{{ . }}

charts/nitro/Chart.yaml

@@ -9,4 +9,4 @@ type: application
 
 version: 0.6.14
 
-appVersion: "v3.1.0-7d1d84c"
+appVersion: "v3.1.2-309340a"

charts/nitro/ci/sepolia-values.yaml

@@ -50,6 +50,9 @@ configmap:
       blob-client:
         blob-directory: /home/user/blobdata/
     metrics: true
+    execution:
+      tx-pre-checker:
+        strictness: 0
 
 wallet:
   files:

charts/nitro/templates/validator/servicemonitor.yaml

@@ -14,6 +14,9 @@ metadata:
   name: {{ include "nitro.fullname" $ }}-val-{{ .name }}
   labels:
     {{- $labels | nindent 4 }}
+    {{- if $mergedValues.serviceMonitor.additionalLabels }}
+    {{- toYaml $mergedValues.serviceMonitor.additionalLabels | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:

charts/nitro/values.yaml

@@ -69,12 +69,14 @@ blobPersistence:
 ## @param serviceMonitor.portName Name of the port to monitor
 ## @param serviceMonitor.path Path to monitor
 ## @param serviceMonitor.interval Interval to monitor
+## @param serviceMonitor.additionalLabels Additional labels for the service monitor
 ## @param serviceMonitor.relabelings Add relabelings for the metrics being scraped
 serviceMonitor:
   enabled: false
   portName: metrics
   path: /debug/metrics/prometheus
   interval: 5s
+  additionalLabels: {}
   relabelings: []
 
 ## @param perReplicaService.enabled Enable a service for each sts replica
@@ -321,6 +323,8 @@ validator:
         path: /debug/metrics/prometheus
         ## @param validator.splitvalidator.global.serviceMonitor.interval Interval to monitor
         interval: 5s
+        ## @param validator.splitvalidator.global.serviceMonitor.additionalLabels Additional labels for the service monitor
+        additionalLabels: {}
         ## @param validator.splitvalidator.global.serviceMonitor.relabelings Add relabelings for the metrics being scraped
         relabelings: []
 

charts/relay/Chart.yaml

@@ -7,6 +7,6 @@ maintainers:
 
 type: application
 
-version: 0.5.5
+version: 0.5.6
 
-appVersion: "v3.1.0-7d1d84c"
+appVersion: "v3.1.2-309340a"