From a24b3d2476e8f8e545769562488aa29c8ac9a10d Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Mon, 9 Sep 2024 14:59:57 -0700 Subject: [PATCH 01/16] start --- charts/graph-node/.helmignore | 23 +++++++ charts/graph-node/Chart.yaml | 39 +++++++++++ charts/graph-node/templates/_helpers.tpl | 75 +++++++++++++++++++++ charts/graph-node/templates/configmap.yaml | 13 ++++ charts/graph-node/templates/deployment.yaml | 30 +++++++++ charts/graph-node/values.yaml | 24 +++++++ 6 files changed, 204 insertions(+) create mode 100644 charts/graph-node/.helmignore create mode 100644 charts/graph-node/Chart.yaml create mode 100644 charts/graph-node/templates/_helpers.tpl create mode 100644 charts/graph-node/templates/configmap.yaml create mode 100644 charts/graph-node/templates/deployment.yaml create mode 100644 charts/graph-node/values.yaml diff --git a/charts/graph-node/.helmignore b/charts/graph-node/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/charts/graph-node/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/graph-node/Chart.yaml b/charts/graph-node/Chart.yaml new file mode 100644 index 0000000000..c39ef7c72e --- /dev/null +++ b/charts/graph-node/Chart.yaml @@ -0,0 +1,39 @@ +apiVersion: v2 +name: graph-node +description: Configure and + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.0.1 + +dependencies: + - name: postgresql + version: "15.2.4" + repository: "https://charts.bitnami.com/bitnami" + condition: postgresql.enabled + + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "0.1.0" + +maintainers: + - name: wafflesvonmaple + url: astria.org + - name: quasystaty1 + url: astria.org + - name: joroshiba + url: astria.org diff --git a/charts/graph-node/templates/_helpers.tpl b/charts/graph-node/templates/_helpers.tpl new file mode 100644 index 0000000000..e3c0231f2a --- /dev/null +++ b/charts/graph-node/templates/_helpers.tpl @@ -0,0 +1,75 @@ +{{/* +Namepsace to deploy elements into. +*/}} +{{- define "graph-node.namespace" -}} +{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}} +{{- end }} + +{{/* The name of the graph-node */}} +{{- define "graph-node.name" -}} +"{{ default "graph-node" .Values.config.graphNodeName }}" +{{- end }} + +{{/* +Expand the name of the chart. +*/}} +{{- define "graph-node.appName" -}} +{{- default (include "graph-node.name" .) | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "graph-node.labels" -}} +{{ include "graph-node.selectorLabels" . }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "graph-node.selectorLabels" -}} +app: {{ include "graph-node.appName" . }} +{{- end }} + +{{/* +Full image paths for Astria built images +*/}} +{{- define "graph-node.image" -}} +{{ .Values.images.graph-node.repo }}:{{ .Values.images.graph-node.tag }} +{{- end }} + + +{{/* +Return if ingress is stable. +*/}} +{{- define "graph-node.ingress.isStable" -}} +{{- eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1" }} +{{- end }} + +{{/* +Return if ingress supports ingressClassName. +*/}} +{{- define "graph-node.ingress.supportsIngressClassName" -}} +{{- or (eq (include "graph-node.ingress.isStable" .) "true") (and (eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }} +{{- end }} + +{{/* +Return if ingress supports pathType. +*/}} +{{- define "graph-node.ingress.supportsPathType" -}} +{{- or (eq (include "graph-node.ingress.isStable" .) "true") (and (eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }} +{{- end }} + +{{/* +Return the appropriate apiVersion for ingress. +*/}} +{{- define "graph-node.ingress.apiVersion" -}} +{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version) }} +{{- print "networking.k8s.io/v1" }} +{{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +{{- print "networking.k8s.io/v1beta1" }} +{{- else }} +{{- print "extensions/v1beta1" }} +{{- end }} +{{- end }} + diff --git a/charts/graph-node/templates/configmap.yaml b/charts/graph-node/templates/configmap.yaml new file mode 100644 index 0000000000..3060b8c6de --- /dev/null +++ b/charts/graph-node/templates/configmap.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "graph-node.name" . }}-env + namespace: {{ include "graph-node.namespace" . }} +data: + postgres_host: "{{ .Values.config.postgresHost }}" + postgres_user: "{{ tpl .Values.config.postgresUser . }}" + postgres_password: "{{ .Values.config.postgresPassword }}" + postgres_db: "{{ .Values.config.postgresDB }}" + ipfs: "{{ .Values.config.ipfs }}" + ethereum: "{{ .Values.config.evm }}" + GRAPH_LOG: "{{ .Values.config.logLevel }}" \ No newline at end of file diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml new file mode 100644 index 0000000000..4ffcd9eade --- /dev/null +++ b/charts/graph-node/templates/deployment.yaml @@ -0,0 +1,30 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "graph-node.name" . }} + labels: + app: {{ include "graph-node.appName" . }} + namespace: {{ include "graph-node.namespace" . }} +spec: + replicas: {{ .Values.global.replicaCount }} + selector: + matchLabels: + app: {{ include "graph-node.appName" . }} + template: + metadata: + name: {{ include "graph-node.name" . }} + labels: + app: {{ include "graph-node.appName" . }} + spec: + containers: + - name: sequencer-faucet + image: {{ include "graph-node.image" }} + envFrom: + - configMapRef: + name: {{ include "graph-node.name" . }}-env + ports: + - containerPort: 8000 + - containerPort: 8001 + - containerPort: 8020 + - containerPort: 8030 + - containerPort: 8040 diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml new file mode 100644 index 0000000000..c3cdaca3ee --- /dev/null +++ b/charts/graph-node/values.yaml @@ -0,0 +1,24 @@ +global: + namespaceOverride: "" + replicaCount: 1 + # Whether to use tty readable logging for astria services, when false use json. + # Best to be false in production environments, true for clean logs on local dev. + useTTY: false + +images: + graph-node: + repo: graphprotocol/graph-node + tag: latest + +config: + nodeName: "graph-node" + postgresHost: "postgresql" + postgresUser: "{{ .Values.postgres.auth.username }}" + postgresPassword: "{{ .Values.postgres.auth.password }}" + postgresDB: "graph-node" + ipfs: "ipfs:5001" + evm: "astria-rollup:http://astria-rollup:8545" + logLevel: "info" + +postgres: + enabled: false From 1512efdbf7e0f0d2465463a4eec9536e5d432d74 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Wed, 11 Sep 2024 12:46:01 -0600 Subject: [PATCH 02/16] working chart --- charts/deploy.just | 5 + charts/graph-node/Chart.yaml | 32 +---- charts/graph-node/templates/_helpers.tpl | 74 +--------- charts/graph-node/templates/configmap.yaml | 13 -- charts/graph-node/templates/deployment.yaml | 128 +++++++++++++++--- .../templates/persistent-volume-claims.yaml | 25 ++++ charts/graph-node/templates/services.yaml | 50 +++++++ charts/graph-node/values.yaml | 44 +++--- 8 files changed, 218 insertions(+), 153 deletions(-) delete mode 100644 charts/graph-node/templates/configmap.yaml create mode 100644 charts/graph-node/templates/persistent-volume-claims.yaml create mode 100644 charts/graph-node/templates/services.yaml diff --git a/charts/deploy.just b/charts/deploy.just index 5b7954130d..1716f8db75 100644 --- a/charts/deploy.just +++ b/charts/deploy.just @@ -53,6 +53,11 @@ deploy-metrics-server: deploy-ingress-controller: kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml +deploy-graph-node namespace=defaultNamespace: (deploy-chart "graph-node" namespace) +delete-graph-node namespace=defaultNamespace: (delete-chart "graph-node" namespace) +delete-pvc namespace=defaultNamespace: + kubectl delete pvc --all -n namespace + [private] deploy-celestia-local namespace=defaultNamespace: (deploy-chart "celestia-local" namespace) diff --git a/charts/graph-node/Chart.yaml b/charts/graph-node/Chart.yaml index c39ef7c72e..c7b30ada1b 100644 --- a/charts/graph-node/Chart.yaml +++ b/charts/graph-node/Chart.yaml @@ -1,34 +1,8 @@ apiVersion: v2 name: graph-node -description: Configure and - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1 - -dependencies: - - name: postgresql - version: "15.2.4" - repository: "https://charts.bitnami.com/bitnami" - condition: postgresql.enabled - - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "0.1.0" +description: A Helm chart for Graph Node deployment +version: 0.1.0 +appVersion: "0.0.1" maintainers: - name: wafflesvonmaple diff --git a/charts/graph-node/templates/_helpers.tpl b/charts/graph-node/templates/_helpers.tpl index e3c0231f2a..f0143f9fa2 100644 --- a/charts/graph-node/templates/_helpers.tpl +++ b/charts/graph-node/templates/_helpers.tpl @@ -1,75 +1,7 @@ -{{/* -Namepsace to deploy elements into. -*/}} -{{- define "graph-node.namespace" -}} -{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}} -{{- end }} - -{{/* The name of the graph-node */}} {{- define "graph-node.name" -}} -"{{ default "graph-node" .Values.config.graphNodeName }}" -{{- end }} - -{{/* -Expand the name of the chart. -*/}} -{{- define "graph-node.appName" -}} -{{- default (include "graph-node.name" .) | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "graph-node.labels" -}} -{{ include "graph-node.selectorLabels" . }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "graph-node.selectorLabels" -}} -app: {{ include "graph-node.appName" . }} +{{ .Release.Name }} {{- end }} -{{/* -Full image paths for Astria built images -*/}} -{{- define "graph-node.image" -}} -{{ .Values.images.graph-node.repo }}:{{ .Values.images.graph-node.tag }} +{{- define "graph-node.fullname" -}} +{{ include "graph-node.name" . }}-graph-node {{- end }} - - -{{/* -Return if ingress is stable. -*/}} -{{- define "graph-node.ingress.isStable" -}} -{{- eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1" }} -{{- end }} - -{{/* -Return if ingress supports ingressClassName. -*/}} -{{- define "graph-node.ingress.supportsIngressClassName" -}} -{{- or (eq (include "graph-node.ingress.isStable" .) "true") (and (eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }} -{{- end }} - -{{/* -Return if ingress supports pathType. -*/}} -{{- define "graph-node.ingress.supportsPathType" -}} -{{- or (eq (include "graph-node.ingress.isStable" .) "true") (and (eq (include "graph-node.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }} -{{- end }} - -{{/* -Return the appropriate apiVersion for ingress. -*/}} -{{- define "graph-node.ingress.apiVersion" -}} -{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version) }} -{{- print "networking.k8s.io/v1" }} -{{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} -{{- print "networking.k8s.io/v1beta1" }} -{{- else }} -{{- print "extensions/v1beta1" }} -{{- end }} -{{- end }} - diff --git a/charts/graph-node/templates/configmap.yaml b/charts/graph-node/templates/configmap.yaml deleted file mode 100644 index 3060b8c6de..0000000000 --- a/charts/graph-node/templates/configmap.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "graph-node.name" . }}-env - namespace: {{ include "graph-node.namespace" . }} -data: - postgres_host: "{{ .Values.config.postgresHost }}" - postgres_user: "{{ tpl .Values.config.postgresUser . }}" - postgres_password: "{{ .Values.config.postgresPassword }}" - postgres_db: "{{ .Values.config.postgresDB }}" - ipfs: "{{ .Values.config.ipfs }}" - ethereum: "{{ .Values.config.evm }}" - GRAPH_LOG: "{{ .Values.config.logLevel }}" \ No newline at end of file diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index 4ffcd9eade..f50877e9ae 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -1,30 +1,120 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "graph-node.name" . }} - labels: - app: {{ include "graph-node.appName" . }} - namespace: {{ include "graph-node.namespace" . }} + name: graph-node spec: - replicas: {{ .Values.global.replicaCount }} + replicas: {{ .Values.graphNode.replicas }} selector: matchLabels: - app: {{ include "graph-node.appName" . }} + app: graph-node template: metadata: - name: {{ include "graph-node.name" . }} labels: - app: {{ include "graph-node.appName" . }} + app: graph-node spec: containers: - - name: sequencer-faucet - image: {{ include "graph-node.image" }} - envFrom: - - configMapRef: - name: {{ include "graph-node.name" . }}-env - ports: - - containerPort: 8000 - - containerPort: 8001 - - containerPort: 8020 - - containerPort: 8030 - - containerPort: 8040 + - name: graph-node + image: {{ .Values.graphNode.image }}:{{ .Values.graphNode.tag }} + ports: + - containerPort: 8000 + - containerPort: 8001 + - containerPort: 8020 + - containerPort: 8030 + - containerPort: 8040 + env: + - name: postgres_host + value: postgres + - name: postgres_user + value: {{ .Values.postgres.user }} + - name: postgres_pass + value: {{ .Values.postgres.password }} + - name: postgres_db + value: {{ .Values.postgres.database }} + - name: ipfs + value: ipfs:5001 + - name: ethereum + value: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} + - name: GRAPH_LOG + value: info + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: ipfs +spec: + replicas: 1 + selector: + matchLabels: + app: ipfs + template: + metadata: + labels: + app: ipfs + spec: + containers: + - name: ipfs + image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} + ports: + - containerPort: 5001 + volumeMounts: + - name: ipfs-storage + mountPath: /data/ipfs + volumes: + - name: ipfs-storage + persistentVolumeClaim: + claimName: ipfs-pvc + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: postgres +spec: + replicas: 1 + selector: + matchLabels: + app: postgres + template: + metadata: + labels: + app: postgres + spec: + securityContext: + fsGroup: 999 + containers: + - name: postgres + image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} + ports: + - containerPort: 5432 + env: + - name: POSTGRES_USER + value: {{ .Values.postgres.user }} + - name: POSTGRES_PASSWORD + value: {{ .Values.postgres.password }} + - name: POSTGRES_DB + value: {{ .Values.postgres.database }} + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + - name: POSTGRES_INITDB_ARGS + value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" + securityContext: + runAsUser: 999 + runAsGroup: 999 + volumeMounts: + - name: postgres-storage + mountPath: /var/lib/postgresql/data + readinessProbe: + exec: + command: ["pg_isready", "-U", "{{ .Values.postgres.user }}"] + initialDelaySeconds: 10 + periodSeconds: 5 + resources: + requests: + cpu: 100m + memory: 256Mi + volumes: + - name: postgres-storage + persistentVolumeClaim: + claimName: postgres-pvc diff --git a/charts/graph-node/templates/persistent-volume-claims.yaml b/charts/graph-node/templates/persistent-volume-claims.yaml new file mode 100644 index 0000000000..0d2a083d25 --- /dev/null +++ b/charts/graph-node/templates/persistent-volume-claims.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ipfs-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ .Values.ipfs.storage.size }} + storageClassName: {{ .Values.persistence.storageClass }} + +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: postgres-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ .Values.postgres.storage.size }} + storageClassName: {{ .Values.persistence.storageClass }} diff --git a/charts/graph-node/templates/services.yaml b/charts/graph-node/templates/services.yaml new file mode 100644 index 0000000000..b9faf909b1 --- /dev/null +++ b/charts/graph-node/templates/services.yaml @@ -0,0 +1,50 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: graph-node +spec: + selector: + app: graph-node + ports: + - name: http + port: 8000 + targetPort: 8000 + - name: json-rpc + port: 8001 + targetPort: 8001 + - name: index-node + port: 8020 + targetPort: 8020 + - name: metrics + port: 8030 + targetPort: 8030 + - name: subgraph-metrics + port: 8040 + targetPort: 8040 + +--- +apiVersion: v1 +kind: Service +metadata: + name: ipfs +spec: + selector: + app: ipfs + ports: + - name: api + port: 5001 + targetPort: 5001 + +--- +apiVersion: v1 +kind: Service +metadata: + name: postgres +spec: + selector: + app: postgres + ports: + - name: postgres + port: 5432 + targetPort: 5432 diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index c3cdaca3ee..a584c1fa50 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -1,24 +1,26 @@ -global: - namespaceOverride: "" - replicaCount: 1 - # Whether to use tty readable logging for astria services, when false use json. - # Best to be false in production environments, true for clean logs on local dev. - useTTY: false +graphNode: + image: graphprotocol/graph-node + tag: latest + replicas: 1 -images: - graph-node: - repo: graphprotocol/graph-node - tag: latest - -config: - nodeName: "graph-node" - postgresHost: "postgresql" - postgresUser: "{{ .Values.postgres.auth.username }}" - postgresPassword: "{{ .Values.postgres.auth.password }}" - postgresDB: "graph-node" - ipfs: "ipfs:5001" - evm: "astria-rollup:http://astria-rollup:8545" - logLevel: "info" +ipfs: + image: ipfs/kubo + tag: v0.17.0 + storage: + size: 5Gi postgres: - enabled: false + image: postgres + tag: latest + user: graph-node + password: let-me-in + database: graph-node + storage: + size: 10Gi + +environment: + ethereumNetwork: flame-devnet + ethereumRPC: https://rpc.evm.dusk-10.devnet.astria.org/ + +persistence: + storageClass: standard From 3c8212288c0ea271a3a20d5808590813dabd5844 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Wed, 11 Sep 2024 12:50:22 -0600 Subject: [PATCH 03/16] use rollup within dev-cluster --- charts/graph-node/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index a584c1fa50..2177e9abc1 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -20,7 +20,7 @@ postgres: environment: ethereumNetwork: flame-devnet - ethereumRPC: https://rpc.evm.dusk-10.devnet.astria.org/ + ethereumRPC: http://astria-evm-service.astria-dev-cluster.svc.cluster.local:8545 persistence: storageClass: standard From bf23ae8958c54989177d33e966866aff17e98887 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Wed, 11 Sep 2024 15:32:20 -0600 Subject: [PATCH 04/16] add service monitor --- .../graph-node/templates/servicemonitor.yaml | 36 +++++++++++++++++++ charts/graph-node/values.yaml | 8 +++++ 2 files changed, 44 insertions(+) create mode 100644 charts/graph-node/templates/servicemonitor.yaml diff --git a/charts/graph-node/templates/servicemonitor.yaml b/charts/graph-node/templates/servicemonitor.yaml new file mode 100644 index 0000000000..d3707c535d --- /dev/null +++ b/charts/graph-node/templates/servicemonitor.yaml @@ -0,0 +1,36 @@ +{{- if .Values.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: graph-node-metrics + labels: + app: graph-node + {{- with .Values.serviceMonitor.additionalLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + jobLabel: graph-node-metrics + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + app: graph-node + endpoints: + - port: metrics + path: /metrics + {{- with .Values.serviceMonitor.interval }} + interval: {{ . }} + {{- end }} + {{- with .Values.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ . }} + {{- end }} + - port: subgraph-metrics + path: /metrics + {{- with .Values.serviceMonitor.interval }} + interval: {{ . }} + {{- end }} + {{- with .Values.serviceMonitor.scrapeTimeout }} + scrapeTimeout: {{ . }} + {{- end }} +{{- end }} diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index 2177e9abc1..6545578b61 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -1,7 +1,15 @@ +serviceMonitor: + enabled: false + additionalLabels: {} + interval: 15s + scrapeTimeout: 10s + graphNode: image: graphprotocol/graph-node tag: latest replicas: 1 + metrics: + enabled: false ipfs: image: ipfs/kubo From 66257039e596bd7f6522e1a736d32ebd313725d5 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Mon, 16 Sep 2024 12:49:45 -0600 Subject: [PATCH 05/16] add ingress --- charts/graph-node/templates/ingress.yaml | 35 +++++++++++++++++++ .../graph-node/templates/servicemonitor.yaml | 2 +- charts/graph-node/values.yaml | 20 ++++++++++- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 charts/graph-node/templates/ingress.yaml diff --git a/charts/graph-node/templates/ingress.yaml b/charts/graph-node/templates/ingress.yaml new file mode 100644 index 0000000000..353af76907 --- /dev/null +++ b/charts/graph-node/templates/ingress.yaml @@ -0,0 +1,35 @@ +{{- if .Values.ingress.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: graph-node + annotations: + {{- with .Values.ingress.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + rules: + - host: {{ .Values.ingress.host | quote }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: graph-node + port: + number: 8000 + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/graph-node/templates/servicemonitor.yaml b/charts/graph-node/templates/servicemonitor.yaml index d3707c535d..088fc92ea9 100644 --- a/charts/graph-node/templates/servicemonitor.yaml +++ b/charts/graph-node/templates/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceMonitor.enabled }} +{{- if and .Values.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index 6545578b61..87adb442ea 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -11,6 +11,24 @@ graphNode: metrics: enabled: false +ingress: + enabled: true + className: "nginx" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + host: graph-node.localdev.me + tls: [] + # - secretName: graph-node-tls + # hosts: + # - graph-node.example.com + +serviceMonitor: + enabled: false + additionalLabels: {} + interval: 15s + scrapeTimeout: 10s + ipfs: image: ipfs/kubo tag: v0.17.0 @@ -27,7 +45,7 @@ postgres: size: 10Gi environment: - ethereumNetwork: flame-devnet + ethereumNetwork: flame-local ethereumRPC: http://astria-evm-service.astria-dev-cluster.svc.cluster.local:8545 persistence: From d1a4472b36f5d5bddd94f0315e51d3228bf732ac Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Tue, 17 Sep 2024 10:35:14 -0600 Subject: [PATCH 06/16] updates --- Cargo.lock | 387 ++++++++++++++++++++++++++--------------------------- 1 file changed, 188 insertions(+), 199 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1cf124250..0444f40a85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "ark-bls12-377" @@ -279,7 +279,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -544,7 +544,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tracing", "tryhard", @@ -622,7 +622,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tonic-health", "tracing", @@ -654,7 +654,7 @@ dependencies = [ "hex", "http 0.2.12", "humantime", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "itertools 0.12.1", "itoa", @@ -674,7 +674,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -709,7 +709,7 @@ dependencies = [ "ed25519-consensus", "hex", "ibc-types", - "indexmap 2.4.0", + "indexmap 2.5.0", "insta", "pbjson", "pbjson-types", @@ -908,7 +908,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tracing", @@ -1026,18 +1026,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1064,7 +1064,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1090,7 +1090,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1263,7 +1263,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -1345,7 +1345,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.6", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1358,7 +1358,7 @@ dependencies = [ "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq 0.3.1", ] [[package]] @@ -1409,10 +1409,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "syn_derive", ] @@ -1472,9 +1472,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -1542,9 +1542,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.13" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +checksum = "45bcde016d64c21da4be18b655631e5ab6d3107607e71a73a9f53eb48aae23fb" dependencies = [ "jobserver", "libc", @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -1769,9 +1769,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -1789,7 +1789,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2024,18 +2024,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -2050,9 +2050,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -2081,9 +2081,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -2196,9 +2196,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.74+curl-8.9.0" +version = "0.4.75+curl-8.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" +checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" dependencies = [ "cc", "libc", @@ -2244,7 +2244,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "strsim", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2255,7 +2255,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2427,7 +2427,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2513,7 +2513,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2538,7 +2538,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2738,7 +2738,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2921,7 +2921,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.75", + "syn 2.0.77", "toml 0.8.19", "walkdir", ] @@ -2939,7 +2939,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "serde_json", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -2965,7 +2965,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.75", + "syn 2.0.77", "tempfile", "thiserror", "tiny-keccak", @@ -3117,9 +3117,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -3159,9 +3159,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.24" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", @@ -3189,9 +3189,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3328,7 +3328,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -3453,9 +3453,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -3499,18 +3499,18 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", ] [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -3518,10 +3518,10 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", ] @@ -3676,9 +3676,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http 1.1.0", @@ -3693,7 +3693,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -3778,16 +3778,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", - "http-body 1.0.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", @@ -3827,16 +3827,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.0", - "hyper 1.3.1", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", "socket2", "tokio", @@ -3847,9 +3847,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4266,9 +4266,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4308,9 +4308,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -4330,9 +4330,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -4455,9 +4455,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4471,9 +4471,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" dependencies = [ "futures-util", "http 0.2.12", @@ -4484,16 +4484,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tracing", "url", ] [[package]] name = "jsonrpsee-core" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4516,9 +4516,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" dependencies = [ "async-trait", "hyper 0.14.30", @@ -4536,9 +4536,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4549,9 +4549,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" +checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" dependencies = [ "futures-util", "http 0.2.12", @@ -4565,16 +4565,16 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" dependencies = [ "anyhow", "beef", @@ -4586,9 +4586,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" dependencies = [ "http 0.2.12", "jsonrpsee-client-transport", @@ -4750,9 +4750,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.19" +version = "1.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" +checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" dependencies = [ "cc", "libc", @@ -4790,9 +4790,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lz4-sys" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" +checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" dependencies = [ "cc", "libc", @@ -4841,15 +4841,15 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.15.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26eb45aff37b45cff885538e1dcbd6c2b462c04fe84ce0155ea469f325672c98" +checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.1", "hyper-util", - "indexmap 2.4.0", + "indexmap 2.5.0", "ipnet", "metrics 0.23.0", "metrics-util", @@ -4947,7 +4947,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "smallvec", "tagptr", "thiserror", @@ -5117,10 +5117,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5332,7 +5332,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -5340,9 +5340,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -5449,7 +5449,7 @@ dependencies = [ "proc-macro2 1.0.86", "proc-macro2-diagnostics", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5757,7 +5757,7 @@ dependencies = [ "tendermint-proto", "tokio", "tokio-stream", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tonic 0.10.2", "tower", "tower-service", @@ -5786,9 +5786,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" dependencies = [ "memchr", "thiserror", @@ -5802,7 +5802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.4.0", + "indexmap 2.5.0", ] [[package]] @@ -5812,7 +5812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -5832,7 +5832,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -5985,12 +5985,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6019,11 +6019,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.21", ] [[package]] @@ -6075,7 +6075,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "version_check", "yansi", ] @@ -6123,7 +6123,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.75", + "syn 2.0.77", "tempfile", ] @@ -6137,7 +6137,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -6175,9 +6175,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2 1.0.86", ] @@ -6308,9 +6308,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -6561,7 +6561,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rust-embed-utils", - "syn 2.0.75", + "syn 2.0.77", "walkdir", ] @@ -6611,9 +6611,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -6632,9 +6632,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -6781,7 +6781,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -6789,11 +6789,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6911,9 +6911,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -6929,20 +6929,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -6979,7 +6979,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7013,7 +7013,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -7030,7 +7030,7 @@ dependencies = [ "darling", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7039,7 +7039,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -7277,7 +7277,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rustversion", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7314,9 +7314,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.75" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -7332,7 +7332,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7381,7 +7381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7563,7 +7563,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7635,9 +7635,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -7670,7 +7670,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7685,9 +7685,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -7735,9 +7735,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -7779,7 +7779,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit 0.22.21", ] [[package]] @@ -7797,7 +7797,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -7806,22 +7806,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -7897,7 +7886,7 @@ dependencies = [ "proc-macro2 1.0.86", "prost-build", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -7928,7 +7917,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower-layer", "tower-service", "tracing", @@ -7963,7 +7952,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.11", + "tokio-util 0.7.12", "tower", "tracing", ] @@ -8018,7 +8007,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8227,15 +8216,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -8370,7 +8359,7 @@ dependencies = [ "cfg-if", "git2", "regex", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "rustversion", "time", ] @@ -8449,7 +8438,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -8483,7 +8472,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8781,7 +8770,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -8822,7 +8811,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] @@ -8842,7 +8831,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.75", + "syn 2.0.77", ] [[package]] From 69968a2ec541909aa332916d7613d2e665d71578 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Tue, 17 Sep 2024 10:44:35 -0600 Subject: [PATCH 07/16] remove duplicate service monitor --- charts/graph-node/values.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index 87adb442ea..c6484fa5b2 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -23,12 +23,6 @@ ingress: # hosts: # - graph-node.example.com -serviceMonitor: - enabled: false - additionalLabels: {} - interval: 15s - scrapeTimeout: 10s - ipfs: image: ipfs/kubo tag: v0.17.0 From 2165f40a84108661f92f07ae4a4e57e41990455c Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 20 Sep 2024 12:19:13 -0600 Subject: [PATCH 08/16] update to statefulsets --- charts/graph-node/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index f50877e9ae..63447c2d78 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -40,7 +40,7 @@ spec: --- apiVersion: apps/v1 -kind: Deployment +kind: StatefulSet metadata: name: ipfs spec: @@ -68,7 +68,7 @@ spec: --- apiVersion: apps/v1 -kind: Deployment +kind: StatefulSet metadata: name: postgres spec: From 579f1a3315878f92fd71a0130ca95f8d23fad08a Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 20 Sep 2024 12:38:10 -0600 Subject: [PATCH 09/16] update delete pvc command to be more specific to the graph-node --- charts/deploy.just | 9 +++++++-- charts/graph-node/values.yaml | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/charts/deploy.just b/charts/deploy.just index 1716f8db75..d1a3949d5d 100644 --- a/charts/deploy.just +++ b/charts/deploy.just @@ -55,8 +55,13 @@ deploy-ingress-controller: deploy-graph-node namespace=defaultNamespace: (deploy-chart "graph-node" namespace) delete-graph-node namespace=defaultNamespace: (delete-chart "graph-node" namespace) -delete-pvc namespace=defaultNamespace: - kubectl delete pvc --all -n namespace +delete-graph-node-pvc namespace=defaultNamespace: + kubectl delete pvc -n namespace \ + -l 'app.kubernetes.io/instance=graph-node-chart' \ + -o name | xargs -r kubectl delete -n ${namespace} && \ + kubectl delete pvc -n namespace \ + -l 'app.kubernetes.io/managed-by=Helm' \ + --field-selector 'metadata.name in (ipfs-pvc,postgres-pvc)' [private] deploy-celestia-local namespace=defaultNamespace: (deploy-chart "celestia-local" namespace) diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index c6484fa5b2..d509039885 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -1,3 +1,7 @@ +global: + namespaceOverride: "" + replicaCount: 1 + serviceMonitor: enabled: false additionalLabels: {} From 2c84f2d38f9ee44f94523ccc4e858a4ca743d463 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 20 Sep 2024 13:48:26 -0600 Subject: [PATCH 10/16] add namespace overrides --- charts/graph-node/templates/deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index 63447c2d78..cc90fae466 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: graph-node + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: replicas: {{ .Values.graphNode.replicas }} selector: @@ -43,6 +44,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: ipfs + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: replicas: 1 selector: @@ -71,6 +73,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: postgres + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: replicas: 1 selector: From 7e8b571a45adc66d1f6bcea1a36513c6a6feb725 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 20 Sep 2024 13:58:06 -0600 Subject: [PATCH 11/16] configurable ports --- charts/graph-node/templates/deployment.yaml | 14 +++++----- charts/graph-node/templates/services.yaml | 31 +++++++++++---------- charts/graph-node/values.yaml | 10 +++++++ 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index cc90fae466..785faab6f7 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -18,11 +18,11 @@ spec: - name: graph-node image: {{ .Values.graphNode.image }}:{{ .Values.graphNode.tag }} ports: - - containerPort: 8000 - - containerPort: 8001 - - containerPort: 8020 - - containerPort: 8030 - - containerPort: 8040 + - containerPort: {{ .Values.graphNode.ports.http | default 8000 }} + - containerPort: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} + - containerPort: {{ .Values.graphNode.ports.indexNode | default 8020 }} + - containerPort: {{ .Values.graphNode.ports.metrics | default 8030 }} + - containerPort: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} env: - name: postgres_host value: postgres @@ -59,7 +59,7 @@ spec: - name: ipfs image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} ports: - - containerPort: 5001 + - containerPort: {{ .Values.ipfs.ports.api | default 5001 }} volumeMounts: - name: ipfs-storage mountPath: /data/ipfs @@ -90,7 +90,7 @@ spec: - name: postgres image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} ports: - - containerPort: 5432 + - containerPort: {{ .Values.postgres.ports.postgres | default 5432 }} env: - name: POSTGRES_USER value: {{ .Values.postgres.user }} diff --git a/charts/graph-node/templates/services.yaml b/charts/graph-node/templates/services.yaml index b9faf909b1..eb568783de 100644 --- a/charts/graph-node/templates/services.yaml +++ b/charts/graph-node/templates/services.yaml @@ -3,48 +3,51 @@ apiVersion: v1 kind: Service metadata: name: graph-node + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: selector: app: graph-node ports: - name: http - port: 8000 - targetPort: 8000 + port: {{ .Values.graphNode.ports.http | default 8000 }} + targetPort: {{ .Values.graphNode.ports.http | default 8000 }} - name: json-rpc - port: 8001 - targetPort: 8001 + port: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} + targetPort: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} - name: index-node - port: 8020 - targetPort: 8020 + port: {{ .Values.graphNode.ports.indexNode | default 8020 }} + targetPort: {{ .Values.graphNode.ports.indexNode | default 8020 }} - name: metrics - port: 8030 - targetPort: 8030 + port: {{ .Values.graphNode.ports.metrics | default 8030 }} + targetPort: {{ .Values.graphNode.ports.metrics | default 8030 }} - name: subgraph-metrics - port: 8040 - targetPort: 8040 + port: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} + targetPort: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} --- apiVersion: v1 kind: Service metadata: name: ipfs + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: selector: app: ipfs ports: - name: api - port: 5001 - targetPort: 5001 + port: {{ .Values.ipfs.ports.api | default 5001 }} + targetPort: {{ .Values.ipfs.ports.api | default 5001 }} --- apiVersion: v1 kind: Service metadata: name: postgres + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} spec: selector: app: postgres ports: - name: postgres - port: 5432 - targetPort: 5432 + port: {{ .Values.postgres.ports.postgres | default 5432 }} + targetPort: {{ .Values.postgres.ports.postgres | default 5432 }} diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index d509039885..a48e360ce8 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -14,6 +14,12 @@ graphNode: replicas: 1 metrics: enabled: false + ports: + http: 8000 + jsonRpc: 8001 + indexNode: 8020 + metrics: 8030 + subgraphMetrics: 8040 ingress: enabled: true @@ -32,6 +38,8 @@ ipfs: tag: v0.17.0 storage: size: 5Gi + ports: + api: 5001 postgres: image: postgres @@ -41,6 +49,8 @@ postgres: database: graph-node storage: size: 10Gi + ports: + postgres: 5432 environment: ethereumNetwork: flame-local From 6ace4837735642545d59d42853daf5c22197b5b5 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Thu, 26 Sep 2024 13:45:18 -0600 Subject: [PATCH 12/16] add specific statefulsets file, template port config for ingress --- charts/graph-node/templates/deployment.yaml | 83 ------------------- charts/graph-node/templates/ingress.yaml | 2 +- charts/graph-node/templates/statefulsets.yaml | 81 ++++++++++++++++++ 3 files changed, 82 insertions(+), 84 deletions(-) create mode 100644 charts/graph-node/templates/statefulsets.yaml diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index 785faab6f7..0cb64bc6b7 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -38,86 +38,3 @@ spec: value: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} - name: GRAPH_LOG value: info - ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: ipfs - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} -spec: - replicas: 1 - selector: - matchLabels: - app: ipfs - template: - metadata: - labels: - app: ipfs - spec: - containers: - - name: ipfs - image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} - ports: - - containerPort: {{ .Values.ipfs.ports.api | default 5001 }} - volumeMounts: - - name: ipfs-storage - mountPath: /data/ipfs - volumes: - - name: ipfs-storage - persistentVolumeClaim: - claimName: ipfs-pvc - ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: postgres - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} -spec: - replicas: 1 - selector: - matchLabels: - app: postgres - template: - metadata: - labels: - app: postgres - spec: - securityContext: - fsGroup: 999 - containers: - - name: postgres - image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} - ports: - - containerPort: {{ .Values.postgres.ports.postgres | default 5432 }} - env: - - name: POSTGRES_USER - value: {{ .Values.postgres.user }} - - name: POSTGRES_PASSWORD - value: {{ .Values.postgres.password }} - - name: POSTGRES_DB - value: {{ .Values.postgres.database }} - - name: PGDATA - value: /var/lib/postgresql/data/pgdata - - name: POSTGRES_INITDB_ARGS - value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" - securityContext: - runAsUser: 999 - runAsGroup: 999 - volumeMounts: - - name: postgres-storage - mountPath: /var/lib/postgresql/data - readinessProbe: - exec: - command: ["pg_isready", "-U", "{{ .Values.postgres.user }}"] - initialDelaySeconds: 10 - periodSeconds: 5 - resources: - requests: - cpu: 100m - memory: 256Mi - volumes: - - name: postgres-storage - persistentVolumeClaim: - claimName: postgres-pvc diff --git a/charts/graph-node/templates/ingress.yaml b/charts/graph-node/templates/ingress.yaml index 353af76907..e2d20b99e2 100644 --- a/charts/graph-node/templates/ingress.yaml +++ b/charts/graph-node/templates/ingress.yaml @@ -21,7 +21,7 @@ spec: service: name: graph-node port: - number: 8000 + number: {{ .Values.graphNode.ports.http | default 8000 }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/charts/graph-node/templates/statefulsets.yaml b/charts/graph-node/templates/statefulsets.yaml new file mode 100644 index 0000000000..eea5b50828 --- /dev/null +++ b/charts/graph-node/templates/statefulsets.yaml @@ -0,0 +1,81 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: ipfs + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} +spec: + replicas: 1 + selector: + matchLabels: + app: ipfs + template: + metadata: + labels: + app: ipfs + spec: + containers: + - name: ipfs + image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} + ports: + - containerPort: {{ .Values.ipfs.ports.api | default 5001 }} + volumeMounts: + - name: ipfs-storage + mountPath: /data/ipfs + volumes: + - name: ipfs-storage + persistentVolumeClaim: + claimName: ipfs-pvc + +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: postgres + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} +spec: + replicas: 1 + selector: + matchLabels: + app: postgres + template: + metadata: + labels: + app: postgres + spec: + securityContext: + fsGroup: 999 + containers: + - name: postgres + image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} + ports: + - containerPort: {{ .Values.postgres.ports.postgres | default 5432 }} + env: + - name: POSTGRES_USER + value: {{ .Values.postgres.user }} + - name: POSTGRES_PASSWORD + value: {{ .Values.postgres.password }} + - name: POSTGRES_DB + value: {{ .Values.postgres.database }} + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + - name: POSTGRES_INITDB_ARGS + value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" + securityContext: + runAsUser: 999 + runAsGroup: 999 + volumeMounts: + - name: postgres-storage + mountPath: /var/lib/postgresql/data + readinessProbe: + exec: + command: ["pg_isready", "-U", "{{ .Values.postgres.user }}"] + initialDelaySeconds: 10 + periodSeconds: 5 + resources: + requests: + cpu: 100m + memory: 256Mi + volumes: + - name: postgres-storage + persistentVolumeClaim: + claimName: postgres-pvc From 2591c671af2fe7b683af347e2f2b49f0107b4d57 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Thu, 26 Sep 2024 15:52:30 -0600 Subject: [PATCH 13/16] pvc updates --- charts/graph-node/templates/_helpers.tpl | 13 ++- charts/graph-node/templates/deployment.yaml | 46 ++++---- charts/graph-node/templates/ingress.yaml | 2 +- .../templates/persistent-volume-claims.yaml | 25 ---- charts/graph-node/templates/services.yaml | 37 +++--- charts/graph-node/templates/statefulsets.yaml | 99 ++++++++-------- .../graph-node/templates/storageclasses.yaml | 13 +++ charts/graph-node/templates/volumes.yaml | 109 ++++++++++++++++++ charts/graph-node/values.yaml | 7 +- 9 files changed, 232 insertions(+), 119 deletions(-) delete mode 100644 charts/graph-node/templates/persistent-volume-claims.yaml create mode 100644 charts/graph-node/templates/storageclasses.yaml create mode 100644 charts/graph-node/templates/volumes.yaml diff --git a/charts/graph-node/templates/_helpers.tpl b/charts/graph-node/templates/_helpers.tpl index f0143f9fa2..c6aba56008 100644 --- a/charts/graph-node/templates/_helpers.tpl +++ b/charts/graph-node/templates/_helpers.tpl @@ -1,7 +1,14 @@ -{{- define "graph-node.name" -}} +{{- define "graphnode.name" -}} {{ .Release.Name }} {{- end }} -{{- define "graph-node.fullname" -}} -{{ include "graph-node.name" . }}-graph-node +{{- define "graphnode.fullname" -}} +{{ include "graphnode.name" . }}-graph-node +{{- end }} + +{{/* +Namepsace to deploy elements into. +*/}} +{{- define "graphnode.namespace" -}} +{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}} {{- end }} diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index 0cb64bc6b7..23970b0054 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -15,26 +15,26 @@ spec: app: graph-node spec: containers: - - name: graph-node - image: {{ .Values.graphNode.image }}:{{ .Values.graphNode.tag }} - ports: - - containerPort: {{ .Values.graphNode.ports.http | default 8000 }} - - containerPort: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} - - containerPort: {{ .Values.graphNode.ports.indexNode | default 8020 }} - - containerPort: {{ .Values.graphNode.ports.metrics | default 8030 }} - - containerPort: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} - env: - - name: postgres_host - value: postgres - - name: postgres_user - value: {{ .Values.postgres.user }} - - name: postgres_pass - value: {{ .Values.postgres.password }} - - name: postgres_db - value: {{ .Values.postgres.database }} - - name: ipfs - value: ipfs:5001 - - name: ethereum - value: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} - - name: GRAPH_LOG - value: info + - name: graph-node + image: {{ .Values.graphNode.image }}:{{ .Values.graphNode.tag }} + ports: + - containerPort: {{ .Values.graphNode.ports.http }} + - containerPort: {{ .Values.graphNode.ports.jsonRpc }} + - containerPort: {{ .Values.graphNode.ports.indexNode }} + - containerPort: {{ .Values.graphNode.ports.metrics }} + - containerPort: {{ .Values.graphNode.ports.subgraphMetrics }} + env: + - name: postgres_host + value: postgres + - name: postgres_user + value: {{ .Values.postgres.user }} + - name: postgres_pass + value: {{ .Values.postgres.password }} + - name: postgres_db + value: {{ .Values.postgres.database }} + - name: ipfs + value: ipfs:{{ .Values.ipfs.ports.api }} + - name: ethereum + value: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} + - name: GRAPH_LOG + value: info diff --git a/charts/graph-node/templates/ingress.yaml b/charts/graph-node/templates/ingress.yaml index e2d20b99e2..dfd9fe7be2 100644 --- a/charts/graph-node/templates/ingress.yaml +++ b/charts/graph-node/templates/ingress.yaml @@ -21,7 +21,7 @@ spec: service: name: graph-node port: - number: {{ .Values.graphNode.ports.http | default 8000 }} + number: {{ .Values.graphNode.ports.http }} {{- if .Values.ingress.tls }} tls: {{- range .Values.ingress.tls }} diff --git a/charts/graph-node/templates/persistent-volume-claims.yaml b/charts/graph-node/templates/persistent-volume-claims.yaml deleted file mode 100644 index 0d2a083d25..0000000000 --- a/charts/graph-node/templates/persistent-volume-claims.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: ipfs-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: {{ .Values.ipfs.storage.size }} - storageClassName: {{ .Values.persistence.storageClass }} - ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: postgres-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: {{ .Values.postgres.storage.size }} - storageClassName: {{ .Values.persistence.storageClass }} diff --git a/charts/graph-node/templates/services.yaml b/charts/graph-node/templates/services.yaml index eb568783de..54613bd4ae 100644 --- a/charts/graph-node/templates/services.yaml +++ b/charts/graph-node/templates/services.yaml @@ -1,53 +1,50 @@ ---- apiVersion: v1 kind: Service metadata: name: graph-node - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} + namespace: {{ include "graphnode.namespace" . }} spec: selector: app: graph-node ports: - name: http - port: {{ .Values.graphNode.ports.http | default 8000 }} - targetPort: {{ .Values.graphNode.ports.http | default 8000 }} + port: {{ .Values.graphNode.ports.http }} + targetPort: {{ .Values.graphNode.ports.http }} - name: json-rpc - port: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} - targetPort: {{ .Values.graphNode.ports.jsonRpc | default 8001 }} + port: {{ .Values.graphNode.ports.jsonRpc }} + targetPort: {{ .Values.graphNode.ports.jsonRpc }} - name: index-node - port: {{ .Values.graphNode.ports.indexNode | default 8020 }} - targetPort: {{ .Values.graphNode.ports.indexNode | default 8020 }} + port: {{ .Values.graphNode.ports.indexNode }} + targetPort: {{ .Values.graphNode.ports.indexNode }} - name: metrics - port: {{ .Values.graphNode.ports.metrics | default 8030 }} - targetPort: {{ .Values.graphNode.ports.metrics | default 8030 }} + port: {{ .Values.graphNode.ports.metrics }} + targetPort: {{ .Values.graphNode.ports.metrics }} - name: subgraph-metrics - port: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} - targetPort: {{ .Values.graphNode.ports.subgraphMetrics | default 8040 }} - + port: {{ .Values.graphNode.ports.subgraphMetrics }} + targetPort: {{ .Values.graphNode.ports.subgraphMetrics }} --- apiVersion: v1 kind: Service metadata: name: ipfs - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} + namespace: {{ include "graphnode.namespace" . }} spec: selector: app: ipfs ports: - name: api - port: {{ .Values.ipfs.ports.api | default 5001 }} - targetPort: {{ .Values.ipfs.ports.api | default 5001 }} - + port: {{ .Values.ipfs.ports.api }} + targetPort: {{ .Values.ipfs.ports.api }} --- apiVersion: v1 kind: Service metadata: name: postgres - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} + namespace: {{ include "graphnode.namespace" . }} spec: selector: app: postgres ports: - name: postgres - port: {{ .Values.postgres.ports.postgres | default 5432 }} - targetPort: {{ .Values.postgres.ports.postgres | default 5432 }} + port: {{ .Values.postgres.ports.postgres }} + targetPort: {{ .Values.postgres.ports.postgres }} diff --git a/charts/graph-node/templates/statefulsets.yaml b/charts/graph-node/templates/statefulsets.yaml index eea5b50828..c232509ed5 100644 --- a/charts/graph-node/templates/statefulsets.yaml +++ b/charts/graph-node/templates/statefulsets.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: ipfs - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} + namespace: {{ include "graphnode.namespace" . }} spec: replicas: 1 selector: @@ -14,24 +14,27 @@ spec: app: ipfs spec: containers: - - name: ipfs - image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} - ports: - - containerPort: {{ .Values.ipfs.ports.api | default 5001 }} - volumeMounts: - - name: ipfs-storage - mountPath: /data/ipfs + - name: ipfs + image: {{ .Values.ipfs.image }}:{{ .Values.ipfs.tag }} + ports: + - containerPort: {{ .Values.ipfs.ports.api }} + volumeMounts: + - name: ipfs-storage + mountPath: /data/ipfs volumes: - - name: ipfs-storage - persistentVolumeClaim: - claimName: ipfs-pvc - + - name: ipfs-storage + {{- if .Values.ipfs.storage.enabled }} + persistentVolumeClaim: + claimName: ipfs-pvc + {{- else }} + emptyDir: {} + {{- end }} --- apiVersion: apps/v1 kind: StatefulSet metadata: name: postgres - namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} + namespace: {{ include "graphnode.namespace" . }} spec: replicas: 1 selector: @@ -45,37 +48,41 @@ spec: securityContext: fsGroup: 999 containers: - - name: postgres - image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} - ports: - - containerPort: {{ .Values.postgres.ports.postgres | default 5432 }} - env: - - name: POSTGRES_USER - value: {{ .Values.postgres.user }} - - name: POSTGRES_PASSWORD - value: {{ .Values.postgres.password }} - - name: POSTGRES_DB - value: {{ .Values.postgres.database }} - - name: PGDATA - value: /var/lib/postgresql/data/pgdata - - name: POSTGRES_INITDB_ARGS - value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" - securityContext: - runAsUser: 999 - runAsGroup: 999 - volumeMounts: - - name: postgres-storage - mountPath: /var/lib/postgresql/data - readinessProbe: - exec: - command: ["pg_isready", "-U", "{{ .Values.postgres.user }}"] - initialDelaySeconds: 10 - periodSeconds: 5 - resources: - requests: - cpu: 100m - memory: 256Mi + - name: postgres + image: {{ .Values.postgres.image }}:{{ .Values.postgres.tag }} + ports: + - containerPort: {{ .Values.postgres.ports.postgres }} + env: + - name: POSTGRES_USER + value: {{ .Values.postgres.user }} + - name: POSTGRES_PASSWORD + value: {{ .Values.postgres.password }} + - name: POSTGRES_DB + value: {{ .Values.postgres.database }} + - name: PGDATA + value: /var/lib/postgresql/data/pgdata + - name: POSTGRES_INITDB_ARGS + value: "--lc-collate=C --lc-ctype=C --encoding=UTF8" + securityContext: + runAsUser: 999 + runAsGroup: 999 + volumeMounts: + - name: postgres-storage + mountPath: /var/lib/postgresql/data + readinessProbe: + exec: + command: ["pg_isready", "-U", "{{ .Values.postgres.user }}"] + initialDelaySeconds: 10 + periodSeconds: 5 + resources: + requests: + cpu: 100m + memory: 256Mi volumes: - - name: postgres-storage - persistentVolumeClaim: - claimName: postgres-pvc + - name: postgres-storage + {{- if .Values.postgres.storage.enabled }} + persistentVolumeClaim: + claimName: postgres-pvc + {{- else }} + emptyDir: {} + {{- end }} diff --git a/charts/graph-node/templates/storageclasses.yaml b/charts/graph-node/templates/storageclasses.yaml new file mode 100644 index 0000000000..3fe8ebcb13 --- /dev/null +++ b/charts/graph-node/templates/storageclasses.yaml @@ -0,0 +1,13 @@ +{{/* We only want to create a storage class if we are local. */}} +{{/* For production, you need to create a StorageClass on GKE. */}} +{{- if or (and .Values.ipfs.storage.enabled .Values.ipfs.storage.local) (and .Values.postgres.storage.enabled .Values.postgres.storage.local) }} + {{- range $key, $value := .Values.storage.entities }} +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: {{ include "graphnode.name" $ }}-{{ $value.persistentVolumeName }}-graph-node-local +provisioner: kubernetes.io/no-provisioner +volumeBindingMode: WaitForFirstConsumer +reclaimPolicy: Retain + {{- end }} +{{- end }} diff --git a/charts/graph-node/templates/volumes.yaml b/charts/graph-node/templates/volumes.yaml new file mode 100644 index 0000000000..4d82f71710 --- /dev/null +++ b/charts/graph-node/templates/volumes.yaml @@ -0,0 +1,109 @@ +{{/* We need to manually create a PersistentVolume when local. */}} +{{/* In prod, a PV will be created by the StorageClass' provisioner using dynamic provisioning feature. */}} +{{- if and .Values.ipfs.storage.enabled }} + {{- range $key, $value := .Values.storage.entities }} + {{- if $.Values.storage.local }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ipfs-pvc +spec: + capacity: + storage: {{ $value.size }} + volumeMode: Filesystem + persistentVolumeReclaimPolicy: Retain + storageClassName: {{ .Values.persistence.storageClass }} + accessModes: + - ReadWriteOnce + local: + path: {{ $value.path }} + resources: + requests: + storage: {{ .Values.ipfs.storage.size }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - astria-dev-cluster-control-plane + - astria-dev-cluster-worker +--- + {{- end }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: ipfs-pvc + namespace: {{ include "graphnode.namespace" $ }} + labels: + "app.kubernetes.io/name": "ipfs-pvc-{{ $.Chart.Name }}" + "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} + "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }} +spec: + {{- if $.Values.storage.local }} + storageClassName: {{ .Values.persistence.storageClass }} + {{- end }} + {{- if $value.storageClassName }} + storageClassName: {{ $value.storageClassName }} + {{- end }} + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ $value.size }} +--- + {{- end }} +{{- end }} +{{- if and .Values.postgres.storage.enabled }} + {{- range $key, $value := .Values.storage.entities }} + {{- if $.Values.storage.local }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: postgres-pvc +spec: + capacity: + storage: {{ $value.size }} + volumeMode: Filesystem + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Retain + storageClassName: {{ .Values.persistence.storageClass }} + local: + path: {{ $value.path }} + nodeAffinity: + required: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/hostname + operator: In + values: + - astria-dev-cluster-control-plane + - astria-dev-cluster-worker +--- + {{- end }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: postgres-pvc + namespace: {{ include "graphnode.namespace" $ }} + labels: + "app.kubernetes.io/name": "postgres-pvc-{{ $.Chart.Name }}" + "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }} + "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }} +spec: + {{- if $.Values.storage.local }} + storageClassName: {{ .Values.persistence.storageClass }} + {{- end }} + {{- if $value.storageClassName }} + storageClassName: {{ $value.storageClassName }} + {{- end }} + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ $value.size }} +--- + {{- end }} +{{- end }} diff --git a/charts/graph-node/values.yaml b/charts/graph-node/values.yaml index a48e360ce8..1fcb3146ea 100644 --- a/charts/graph-node/values.yaml +++ b/charts/graph-node/values.yaml @@ -24,7 +24,8 @@ graphNode: ingress: enabled: true className: "nginx" - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" host: graph-node.localdev.me @@ -37,6 +38,8 @@ ipfs: image: ipfs/kubo tag: v0.17.0 storage: + enabled: false + local: true size: 5Gi ports: api: 5001 @@ -48,6 +51,8 @@ postgres: password: let-me-in database: graph-node storage: + enabled: false + local: true size: 10Gi ports: postgres: 5432 From 5ba824d866b8ca135267aadd0f9eef9dc9ac08a3 Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Thu, 26 Sep 2024 16:22:22 -0600 Subject: [PATCH 14/16] add config map --- charts/graph-node/templates/configmap.yaml | 13 +++++++++++++ charts/graph-node/templates/deployment.yaml | 20 ++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 charts/graph-node/templates/configmap.yaml diff --git a/charts/graph-node/templates/configmap.yaml b/charts/graph-node/templates/configmap.yaml new file mode 100644 index 0000000000..1d2cdfd54e --- /dev/null +++ b/charts/graph-node/templates/configmap.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: graph-node-config + namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }} +data: + postgres_host: postgres + postgres_user: {{ .Values.postgres.user }} + postgres_pass: {{ .Values.postgres.password }} + postgres_db: {{ .Values.postgres.database }} + ipfs: ipfs:{{ .Values.ipfs.ports.api }} + ethereum: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} + GRAPH_LOG: info diff --git a/charts/graph-node/templates/deployment.yaml b/charts/graph-node/templates/deployment.yaml index 23970b0054..86bc0d135d 100644 --- a/charts/graph-node/templates/deployment.yaml +++ b/charts/graph-node/templates/deployment.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -16,6 +15,9 @@ spec: spec: containers: - name: graph-node + envFrom: + - configMapRef: + name: graph-node-config image: {{ .Values.graphNode.image }}:{{ .Values.graphNode.tag }} ports: - containerPort: {{ .Values.graphNode.ports.http }} @@ -23,18 +25,4 @@ spec: - containerPort: {{ .Values.graphNode.ports.indexNode }} - containerPort: {{ .Values.graphNode.ports.metrics }} - containerPort: {{ .Values.graphNode.ports.subgraphMetrics }} - env: - - name: postgres_host - value: postgres - - name: postgres_user - value: {{ .Values.postgres.user }} - - name: postgres_pass - value: {{ .Values.postgres.password }} - - name: postgres_db - value: {{ .Values.postgres.database }} - - name: ipfs - value: ipfs:{{ .Values.ipfs.ports.api }} - - name: ethereum - value: {{ .Values.environment.ethereumNetwork }}:{{ .Values.environment.ethereumRPC }} - - name: GRAPH_LOG - value: info + From f852a6de47e00101e54fe4017fb173e54f5793ea Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 27 Sep 2024 10:29:25 -0600 Subject: [PATCH 15/16] revert cargo lock --- Cargo.lock | 545 ++++++++++++++++++++++++----------------------------- 1 file changed, 250 insertions(+), 295 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2eabfc0d4f..f1cf124250 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ark-bls12-377" @@ -279,7 +279,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "zeroize", ] @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -544,7 +544,7 @@ dependencies = [ "tendermint-rpc", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tracing", "tryhard", @@ -622,7 +622,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tonic-health", "tracing", @@ -654,7 +654,7 @@ dependencies = [ "hex", "http 0.2.12", "humantime", - "indexmap 2.5.0", + "indexmap 2.4.0", "insta", "itertools 0.12.1", "itoa", @@ -674,7 +674,7 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tracing", @@ -709,7 +709,7 @@ dependencies = [ "ed25519-consensus", "hex", "ibc-types", - "indexmap 2.5.0", + "indexmap 2.4.0", "insta", "pbjson", "pbjson-types", @@ -908,7 +908,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-test", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tracing", @@ -1026,18 +1026,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1064,7 +1064,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.1", + "rustc_version 0.4.0", ] [[package]] @@ -1090,7 +1090,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1263,7 +1263,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1345,7 +1345,7 @@ checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec 0.7.6", - "constant_time_eq 0.3.1", + "constant_time_eq 0.3.0", ] [[package]] @@ -1358,7 +1358,7 @@ dependencies = [ "arrayvec 0.7.6", "cc", "cfg-if", - "constant_time_eq 0.3.1", + "constant_time_eq 0.3.0", ] [[package]] @@ -1409,10 +1409,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" dependencies = [ "once_cell", - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "syn_derive", ] @@ -1472,9 +1472,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" [[package]] name = "byteorder" @@ -1542,9 +1542,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.1.20" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bcde016d64c21da4be18b655631e5ab6d3107607e71a73a9f53eb48aae23fb" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -1769,9 +1769,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -1789,7 +1789,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -1800,23 +1800,23 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clippy_config" -version = "0.1.83" -source = "git+https://github.com/rust-lang/rust-clippy?rev=a95afe2d0a2051d97b723b0b197393b7811bc4e4#a95afe2d0a2051d97b723b0b197393b7811bc4e4" +version = "0.1.77" +source = "git+https://github.com/rust-lang/rust-clippy?rev=ac4c2094a6030530661bee3876e0228ddfeb6b8b#ac4c2094a6030530661bee3876e0228ddfeb6b8b" dependencies = [ - "itertools 0.12.1", + "rustc-semver", "serde", "toml 0.7.8", ] [[package]] name = "clippy_utils" -version = "0.1.83" -source = "git+https://github.com/rust-lang/rust-clippy?rev=a95afe2d0a2051d97b723b0b197393b7811bc4e4#a95afe2d0a2051d97b723b0b197393b7811bc4e4" +version = "0.1.77" +source = "git+https://github.com/rust-lang/rust-clippy?rev=ac4c2094a6030530661bee3876e0228ddfeb6b8b#ac4c2094a6030530661bee3876e0228ddfeb6b8b" dependencies = [ "arrayvec 0.7.6", "clippy_config", - "itertools 0.12.1", - "rustc_apfloat", + "itertools 0.11.0", + "rustc-semver", ] [[package]] @@ -1956,9 +1956,9 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.11.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" +checksum = "7225fee1bcf9247bb3a1b1a2d7ecfe2f7a990e549a09d766a257a4ae30dac0d6" dependencies = [ "diff", "filetime", @@ -2024,18 +2024,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -2050,9 +2050,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -2081,9 +2081,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -2196,9 +2196,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.75+curl-8.10.0" +version = "0.4.74+curl-8.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4fd752d337342e4314717c0d9b6586b059a120c80029ebe4d49b11fec7875e" +checksum = "8af10b986114528fcdc4b63b6f5f021b7057618411046a4de2ba0f0149a097bf" dependencies = [ "cc", "libc", @@ -2244,7 +2244,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2255,7 +2255,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2427,7 +2427,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2513,7 +2513,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2538,7 +2538,7 @@ checksum = "27540baf49be0d484d8f0130d7d8da3011c32a44d4fc873368154f1510e574a2" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2555,9 +2555,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dylint" -version = "3.2.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60c66a33f0ecdb430682ffd8fa085ad57d0df028c9edaebb16e1b31b8c0240b8" +checksum = "4d6259cf4df09300534dcfa6a49918bb442327111e370c656b31f1c10ec08145" dependencies = [ "ansi_term", "anyhow", @@ -2576,9 +2576,9 @@ dependencies = [ [[package]] name = "dylint_internal" -version = "3.2.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30490df8338ad9f2c9b2e5766632083cd4b08f12b93994042c020e1c4604381" +checksum = "9400420c9ffa71c6b1b75d84225a150e3428eb12159e5bf4f56285bd9eb1c095" dependencies = [ "ansi_term", "anyhow", @@ -2590,18 +2590,15 @@ dependencies = [ "is-terminal", "log", "once_cell", - "regex", "rust-embed", - "serde", - "thiserror", - "toml 0.8.19", + "sedregex", ] [[package]] name = "dylint_linting" -version = "3.2.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b1935d10c8bbfa22ee0b54ef6c05bbb432d36dd048f2723a2a5dfefa77e414" +checksum = "43fc05c7103dfadd497486bbbf941899888f4e19271da70b58f66385247230c2" dependencies = [ "cargo_metadata", "dylint_internal", @@ -2614,9 +2611,9 @@ dependencies = [ [[package]] name = "dylint_testing" -version = "3.2.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee051ff840d2cdc82574ce73c604bc01c0e204ec07ae8b297530b494dd0df319" +checksum = "785fa52ac8fe5f1056a71955f4ebda3ca90c269ef28b172ad85a3901752d5fdf" dependencies = [ "anyhow", "cargo_metadata", @@ -2741,30 +2738,20 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", -] - -[[package]] -name = "env_filter" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" -dependencies = [ - "log", - "regex", + "syn 2.0.75", ] [[package]] name = "env_logger" -version = "0.11.5" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ - "anstream", - "anstyle", - "env_filter", "humantime", + "is-terminal", "log", + "regex", + "termcolor", ] [[package]] @@ -2934,7 +2921,7 @@ dependencies = [ "regex", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.75", "toml 0.8.19", "walkdir", ] @@ -2952,7 +2939,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "serde_json", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -2978,7 +2965,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.77", + "syn 2.0.75", "tempfile", "thiserror", "tiny-keccak", @@ -3130,9 +3117,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fastrlp" @@ -3172,9 +3159,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", @@ -3202,9 +3189,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -3341,7 +3328,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -3466,9 +3453,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.15" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", @@ -3512,18 +3499,18 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.4.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "h2" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ "atomic-waker", "bytes", @@ -3531,10 +3518,10 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.4.0", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tracing", ] @@ -3689,9 +3676,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ "bytes", "http 1.1.0", @@ -3706,7 +3693,7 @@ dependencies = [ "bytes", "futures-util", "http 1.1.0", - "http-body 1.0.1", + "http-body 1.0.0", "pin-project-lite", ] @@ -3791,16 +3778,16 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.6", + "h2 0.4.5", "http 1.1.0", - "http-body 1.0.1", + "http-body 1.0.0", "httparse", "httpdate", "itoa", @@ -3840,16 +3827,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", + "http-body 1.0.0", + "hyper 1.3.1", "pin-project-lite", "socket2", "tokio", @@ -3860,9 +3847,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4279,9 +4266,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4321,9 +4308,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", @@ -4343,9 +4330,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -4468,9 +4455,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -4484,9 +4471,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-util", "http 0.2.12", @@ -4497,16 +4484,16 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tracing", "url", ] [[package]] name = "jsonrpsee-core" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -4529,9 +4516,9 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", "hyper 0.14.30", @@ -4549,9 +4536,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -4562,9 +4549,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ "futures-util", "http 0.2.12", @@ -4578,16 +4565,16 @@ dependencies = [ "thiserror", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -4599,9 +4586,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ "http 0.2.12", "jsonrpsee-client-transport", @@ -4763,9 +4750,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.20" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -4803,9 +4790,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", @@ -4854,15 +4841,15 @@ dependencies = [ [[package]] name = "metrics-exporter-prometheus" -version = "0.15.3" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" +checksum = "26eb45aff37b45cff885538e1dcbd6c2b462c04fe84ce0155ea469f325672c98" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.3.1", "hyper-util", - "indexmap 2.5.0", + "indexmap 2.4.0", "ipnet", "metrics 0.23.0", "metrics-util", @@ -4931,11 +4918,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "windows-sys 0.42.0", + "winapi", ] [[package]] @@ -4960,7 +4947,7 @@ dependencies = [ "once_cell", "parking_lot", "quanta", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "smallvec", "tagptr", "thiserror", @@ -5130,10 +5117,10 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5345,7 +5332,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -5353,9 +5340,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -5462,7 +5449,7 @@ dependencies = [ "proc-macro2 1.0.86", "proc-macro2-diagnostics", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5770,7 +5757,7 @@ dependencies = [ "tendermint-proto", "tokio", "tokio-stream", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tonic 0.10.2", "tower", "tower-service", @@ -5799,9 +5786,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -5815,7 +5802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.4.0", ] [[package]] @@ -5825,7 +5812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.1", + "rustc_version 0.4.0", ] [[package]] @@ -5845,7 +5832,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -5998,12 +5985,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2 1.0.86", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -6032,11 +6019,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.22.21", + "toml_edit 0.21.1", ] [[package]] @@ -6088,7 +6075,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "version_check", "yansi", ] @@ -6136,7 +6123,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.75", "tempfile", ] @@ -6150,7 +6137,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -6188,9 +6175,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2 1.0.86", ] @@ -6321,9 +6308,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ "bitflags 2.6.0", ] @@ -6574,7 +6561,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rust-embed-utils", - "syn 2.0.77", + "syn 2.0.75", "walkdir", ] @@ -6608,14 +6595,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] -name = "rustc_apfloat" -version = "0.2.1+llvm-462a31f5a5ab" +name = "rustc-semver" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886d94c63c812a8037c4faca2607453a0fa4cf82f734665266876b022244543f" -dependencies = [ - "bitflags 1.3.2", - "smallvec", -] +checksum = "5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84" [[package]] name = "rustc_version" @@ -6628,30 +6611,30 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver 1.0.23", ] [[package]] name = "rustfix" -version = "0.8.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" +checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" dependencies = [ + "anyhow", + "log", "serde", "serde_json", - "thiserror", - "tracing", ] [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.6.0", "errno", @@ -6798,7 +6781,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2 1.0.86", "quote", "syn 1.0.109", @@ -6806,11 +6789,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -6878,6 +6861,15 @@ dependencies = [ "libc", ] +[[package]] +name = "sedregex" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19411e23596093f03bbd11dc45603b6329bb4bfec77b9fd13e2b9fc9b02efe3e" +dependencies = [ + "regex", +] + [[package]] name = "semver" version = "0.11.0" @@ -6919,9 +6911,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] @@ -6937,20 +6929,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", "memchr", @@ -6987,7 +6979,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7021,7 +7013,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_derive", "serde_json", @@ -7038,7 +7030,7 @@ dependencies = [ "darling", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7047,7 +7039,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "itoa", "ryu", "serde", @@ -7285,7 +7277,7 @@ dependencies = [ "proc-macro2 1.0.86", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7322,9 +7314,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ "proc-macro2 1.0.86", "quote", @@ -7340,7 +7332,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7389,7 +7381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.1.1", + "fastrand 2.1.0", "once_cell", "rustix", "windows-sys 0.59.0", @@ -7516,6 +7508,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "terminal_size" version = "0.3.0" @@ -7562,7 +7563,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7634,9 +7635,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", @@ -7669,7 +7670,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7684,9 +7685,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -7734,9 +7735,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -7778,7 +7779,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.21", + "toml_edit 0.22.20", ] [[package]] @@ -7796,7 +7797,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -7805,11 +7806,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.4.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.4.0", "serde", "serde_spanned", "toml_datetime", @@ -7885,7 +7897,7 @@ dependencies = [ "proc-macro2 1.0.86", "prost-build", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -7916,7 +7928,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower-layer", "tower-service", "tracing", @@ -7951,7 +7963,7 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.11", "tower", "tracing", ] @@ -8006,7 +8018,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -8215,15 +8227,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -8358,7 +8370,7 @@ dependencies = [ "cfg-if", "git2", "regex", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "rustversion", "time", ] @@ -8437,7 +8449,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "wasm-bindgen-shared", ] @@ -8471,7 +8483,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8560,21 +8572,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -8633,12 +8630,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -8651,12 +8642,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -8669,12 +8654,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -8693,12 +8672,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -8711,12 +8684,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -8729,12 +8696,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -8747,12 +8708,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -8826,7 +8781,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.1", + "rustc_version 0.4.0", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -8867,7 +8822,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] @@ -8887,7 +8842,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2 1.0.86", "quote", - "syn 2.0.77", + "syn 2.0.75", ] [[package]] From cd4a0cb55b12cad686534d1959dbfc6e3a539b1d Mon Sep 17 00:00:00 2001 From: Sam Bukowski Date: Fri, 27 Sep 2024 10:31:16 -0600 Subject: [PATCH 16/16] match cargo.lock --- Cargo.lock | 158 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a0c001aea..522729f894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1795,23 +1795,23 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clippy_config" -version = "0.1.77" -source = "git+https://github.com/rust-lang/rust-clippy?rev=ac4c2094a6030530661bee3876e0228ddfeb6b8b#ac4c2094a6030530661bee3876e0228ddfeb6b8b" +version = "0.1.83" +source = "git+https://github.com/rust-lang/rust-clippy?rev=a95afe2d0a2051d97b723b0b197393b7811bc4e4#a95afe2d0a2051d97b723b0b197393b7811bc4e4" dependencies = [ - "rustc-semver", + "itertools 0.12.1", "serde", "toml 0.7.8", ] [[package]] name = "clippy_utils" -version = "0.1.77" -source = "git+https://github.com/rust-lang/rust-clippy?rev=ac4c2094a6030530661bee3876e0228ddfeb6b8b#ac4c2094a6030530661bee3876e0228ddfeb6b8b" +version = "0.1.83" +source = "git+https://github.com/rust-lang/rust-clippy?rev=a95afe2d0a2051d97b723b0b197393b7811bc4e4#a95afe2d0a2051d97b723b0b197393b7811bc4e4" dependencies = [ "arrayvec 0.7.6", "clippy_config", - "itertools 0.11.0", - "rustc-semver", + "itertools 0.12.1", + "rustc_apfloat", ] [[package]] @@ -1951,9 +1951,9 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7225fee1bcf9247bb3a1b1a2d7ecfe2f7a990e549a09d766a257a4ae30dac0d6" +checksum = "2b0f4b0a27f9efcea6a012305682f0f7c5691df7097b9eaf6abb50b75c89a8af" dependencies = [ "diff", "filetime", @@ -2550,9 +2550,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dylint" -version = "2.6.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6259cf4df09300534dcfa6a49918bb442327111e370c656b31f1c10ec08145" +checksum = "60c66a33f0ecdb430682ffd8fa085ad57d0df028c9edaebb16e1b31b8c0240b8" dependencies = [ "ansi_term", "anyhow", @@ -2571,9 +2571,9 @@ dependencies = [ [[package]] name = "dylint_internal" -version = "2.6.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9400420c9ffa71c6b1b75d84225a150e3428eb12159e5bf4f56285bd9eb1c095" +checksum = "d30490df8338ad9f2c9b2e5766632083cd4b08f12b93994042c020e1c4604381" dependencies = [ "ansi_term", "anyhow", @@ -2585,15 +2585,18 @@ dependencies = [ "is-terminal", "log", "once_cell", + "regex", "rust-embed", - "sedregex", + "serde", + "thiserror", + "toml 0.8.19", ] [[package]] name = "dylint_linting" -version = "2.6.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43fc05c7103dfadd497486bbbf941899888f4e19271da70b58f66385247230c2" +checksum = "82b1935d10c8bbfa22ee0b54ef6c05bbb432d36dd048f2723a2a5dfefa77e414" dependencies = [ "cargo_metadata", "dylint_internal", @@ -2606,9 +2609,9 @@ dependencies = [ [[package]] name = "dylint_testing" -version = "2.6.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785fa52ac8fe5f1056a71955f4ebda3ca90c269ef28b172ad85a3901752d5fdf" +checksum = "ee051ff840d2cdc82574ce73c604bc01c0e204ec07ae8b297530b494dd0df319" dependencies = [ "anyhow", "cargo_metadata", @@ -2736,17 +2739,27 @@ dependencies = [ "syn 2.0.75", ] +[[package]] +name = "env_filter" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -4913,11 +4926,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" dependencies = [ - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -6590,10 +6603,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] -name = "rustc-semver" -version = "1.1.0" +name = "rustc_apfloat" +version = "0.2.1+llvm-462a31f5a5ab" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be1bdc7edf596692617627bbfeaba522131b18e06ca4df2b6b689e3c5d5ce84" +checksum = "886d94c63c812a8037c4faca2607453a0fa4cf82f734665266876b022244543f" +dependencies = [ + "bitflags 1.3.2", + "smallvec", +] [[package]] name = "rustc_version" @@ -6615,14 +6632,14 @@ dependencies = [ [[package]] name = "rustfix" -version = "0.6.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" +checksum = "70f5b7fc8060f4f8373f9381a630304b42e1183535d9beb1d3f596b236c9106a" dependencies = [ - "anyhow", - "log", "serde", "serde_json", + "thiserror", + "tracing", ] [[package]] @@ -6856,15 +6873,6 @@ dependencies = [ "libc", ] -[[package]] -name = "sedregex" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19411e23596093f03bbd11dc45603b6329bb4bfec77b9fd13e2b9fc9b02efe3e" -dependencies = [ - "regex", -] - [[package]] name = "semver" version = "0.11.0" @@ -7503,15 +7511,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "terminal_size" version = "0.3.0" @@ -8567,6 +8566,21 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -8625,6 +8639,12 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -8637,6 +8657,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -8649,6 +8675,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -8667,6 +8699,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -8679,6 +8717,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -8691,6 +8735,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -8703,6 +8753,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5"