Merge branch 'main' into ENG-73/conductor_chain_id_verification

.github/workflows/docker-build.yml

@@ -217,7 +217,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup IBC Bridge Test Environment
-        timeout-minutes: 5
+        timeout-minutes: 8
         run: |
           TAG=sha-$(git rev-parse --short HEAD)
           just deploy cluster

.github/workflows/test.yml

@@ -231,7 +231,9 @@ jobs:
       - name: run pedantic clippy on workspace crates
         run: |
           cargo clippy --all-targets --all-features \
-          -- --warn clippy::pedantic --warn clippy::arithmetic-side-effects --deny warnings
+          -- --warn clippy::pedantic --warn clippy::arithmetic-side-effects \
+          --warn clippy::allow_attributes --warn clippy::allow_attributes_without_reason \
+          --deny warnings
       - name: run pedantic clippy on tools/protobuf-compiler
         run: |
           cargo clippy --manifest-path tools/protobuf-compiler/Cargo.toml \

Cargo.toml

@@ -73,7 +73,6 @@ insta = "1.36.1"
 itertools = "0.12.1"
 itoa = "1.0.10"
 jsonrpsee = { version = "0.20" }
-once_cell = "1.17.1"
 pbjson-types = "0.6"
 # Note that when updating the penumbra versions, vendored types in `proto/sequencerapis/astria_vendored` may need to be updated as well.
 # can update to a tagged release when https://github.com/penumbra-zone/penumbra/pull/4822 is included

README.md

@@ -11,7 +11,7 @@ network. Other components of the Astria network can be found in the
 [astriaorg](https://github.com/astriaorg) organization.
 
 To run locally, we utilize a dev-cluster which can be found at
-[astriaorg/dev-cluster](https://github.com/astriaorg/dev-cluster).
+[astriaorg/astria/charts](https://github.com/astriaorg/astria/tree/main/charts).
 
 To learn more about Astria, please visit [astria.org](https://astria.org).
 

charts/README.md

@@ -46,13 +46,11 @@ just deploy astria-local
 
 # Deploys a geth rollup chain + faucet + blockscout + ingress
 # w/ defaults running against local network, along with a bridge withdawer.
-# NOTE - default values can be found in `helm/rollup/values.yaml`
+# NOTE - default values can be found in `../dev/values/rollup/dev.yaml`
 just deploy rollup
 
-# Deploy only the rollup chain, faucet, blockscout instance without withdrawer:
-just deploy dev-rollup
 # w/ custom name and id for further customization see the values file at
-# `dev/values/rollup/dev.yml`
+# `../dev/values/rollup/dev.yml`
 just deploy dev-rollup <rollup_name> <network_id>
 
 # Send funds into the rollup chain, by default transfers 10 RIA to the rollup
@@ -80,16 +78,19 @@ The default rollup faucet is available at <http://faucet.astria.localdev.me>.
 If you deploy a custom faucet, it will be reachable at
 `http://faucet.<rollup_name>.localdev.me`.
 
-By default, the faucet is funded by the account that is funded during geth
-genesis. This key is defined in `./evm-rollup/values.yaml` and is identical to
-the key in `./evm-rollup/files/keys/private_key.txt`.
+By default, no account is funded during geth genesis.
+Run `just init-rollup-bridge` to fund the faucet account. This account key is
+defined in `../dev/values/rollup/dev.yaml` and is identical to the key in
+`./evm-rollup/files/keys/private_key.txt`.
+
+The default sequencer faucet is available at <http://sequencer-faucet.localdev.me>.
 
 ### Blockscout
 
-The default Blockscout app is available at <http://blockscout.astria.localdev.me>.
+The default Blockscout app is available at <http://explorer.astria.localdev.me>.
 
 If you deploy a custom Blockscout app, it will be available at
-`http://blockscout.<rollup_name>.localdev.me`.
+`http://explorer.<rollup_name>.localdev.me`.
 
 ### Sequencer
 

charts/deploy.just

@@ -53,6 +53,16 @@ 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-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)
 

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/

charts/graph-node/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+name: graph-node
+description: A Helm chart for Graph Node deployment
+version: 0.1.0
+appVersion: "0.0.1"
+
+maintainers:
+  - name: wafflesvonmaple
+    url: astria.org
+  - name: quasystaty1
+    url: astria.org
+  - name: joroshiba
+    url: astria.org

charts/graph-node/templates/_helpers.tpl

@@ -0,0 +1,14 @@
+{{- define "graphnode.name" -}}
+{{ .Release.Name }}
+{{- end }}
+
+{{- 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 }}

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

charts/graph-node/templates/deployment.yaml

@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: graph-node
+  namespace: {{ .Values.global.namespaceOverride | default .Release.Namespace }}
+spec:
+  replicas: {{ .Values.graphNode.replicas }}
+  selector:
+    matchLabels:
+      app: graph-node
+  template:
+    metadata:
+      labels:
+        app: graph-node
+    spec:
+      containers:
+        - name: graph-node
+          envFrom:
+            - configMapRef:
+                name: graph-node-config
+          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 }}
+

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: {{ .Values.graphNode.ports.http }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+{{- end }}

charts/graph-node/templates/servicemonitor.yaml

@@ -0,0 +1,36 @@
+{{- if and .Values.serviceMonitor.enabled (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") }}
+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 }}

charts/graph-node/templates/services.yaml

@@ -0,0 +1,50 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: graph-node
+  namespace: {{ include "graphnode.namespace" . }}
+spec:
+  selector:
+    app: graph-node
+  ports:
+    - name: http
+      port: {{ .Values.graphNode.ports.http }}
+      targetPort: {{ .Values.graphNode.ports.http }}
+    - name: json-rpc
+      port: {{ .Values.graphNode.ports.jsonRpc }}
+      targetPort: {{ .Values.graphNode.ports.jsonRpc }}
+    - name: index-node
+      port: {{ .Values.graphNode.ports.indexNode }}
+      targetPort: {{ .Values.graphNode.ports.indexNode }}
+    - name: metrics
+      port: {{ .Values.graphNode.ports.metrics }}
+      targetPort: {{ .Values.graphNode.ports.metrics }}
+    - name: subgraph-metrics
+      port: {{ .Values.graphNode.ports.subgraphMetrics }}
+      targetPort: {{ .Values.graphNode.ports.subgraphMetrics }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: ipfs
+  namespace: {{ include "graphnode.namespace" . }}
+spec:
+  selector:
+    app: ipfs
+  ports:
+    - name: api
+      port: {{ .Values.ipfs.ports.api }}
+      targetPort: {{ .Values.ipfs.ports.api }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: postgres
+  namespace: {{ include "graphnode.namespace" . }}
+spec:
+  selector:
+    app: postgres
+  ports:
+    - name: postgres
+      port: {{ .Values.postgres.ports.postgres }}
+      targetPort: {{ .Values.postgres.ports.postgres }}