Skip to content

Commit c8ac63e

Browse files
itamarreifitamarreif
committed
Merge branch 'main' of github.com:astriaorg/astria into itamarreif/bridge-contracts/hash-fix
2 parents 8b89da3 + 8bc06f1 commit c8ac63e

File tree

90 files changed

+1448
-755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+1448
-755
lines changed

‎.github/workflows/docker-build.yml

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
package-name: composer
5252
binary-name: composer
5353
tag: ${{ inputs.tag }}
54+
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'composer' }}
5455
secrets: inherit
5556

5657
conductor:
@@ -66,6 +67,7 @@ jobs:
6667
package-name: conductor
6768
binary-name: conductor
6869
tag: ${{ inputs.tag }}
70+
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'conductor' }}
6971
secrets: inherit
7072

7173
sequencer:
@@ -81,6 +83,7 @@ jobs:
8183
package-name: sequencer
8284
binary-name: sequencer
8385
tag: ${{ inputs.tag }}
86+
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'sequencer' }}
8487
secrets: inherit
8588

8689
sequencer-relayer:
@@ -96,6 +99,7 @@ jobs:
9699
package-name: sequencer-relayer
97100
binary-name: sequencer-relayer
98101
tag: ${{ inputs.tag }}
102+
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'sequencer-relayer' }}
99103
secrets: inherit
100104

101105
evm-bridge-withdrawer:
@@ -111,6 +115,7 @@ jobs:
111115
package-name: evm-bridge-withdrawer
112116
binary-name: bridge-withdrawer
113117
tag: ${{ inputs.tag }}
118+
force: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target == 'evm-bridge-withdrawer' }}
114119
secrets: inherit
115120

116121
smoke-test:

‎.github/workflows/reusable-docker-build.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
tag:
1919
required: false
2020
type: string
21+
force:
22+
required: false
23+
type: boolean
24+
default: false
2125
secrets:
2226
DOCKER_TOKEN:
2327
required: false
@@ -34,7 +38,7 @@ jobs:
3438
contents: read
3539
id-token: write
3640
packages: write
37-
if: startsWith(inputs.tag, inputs.binary-name) || !inputs.tag && (startsWith(github.ref, format('refs/tags/{0}-v', inputs.binary-name)) || github.ref == 'refs/heads/main' || github.event_name == 'pull_request' || github.event_name == 'merge_group')
41+
if: inputs.force || startsWith(inputs.tag, inputs.binary-name) || !inputs.tag && (startsWith(github.ref, format('refs/tags/{0}-v', inputs.binary-name)) || github.ref == 'refs/heads/main' || github.event_name == 'pull_request' || github.event_name == 'merge_group')
3842
steps:
3943
# Checking out the repo
4044
- uses: actions/checkout@v4

‎Cargo.lock

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/celestia-local/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.6.2
18+
version: 0.6.3
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/celestia-local/templates/_helpers.tpl

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{{/*
2+
Namepsace to deploy elements into.
3+
*/}}
4+
{{- define "celestia.namespace" -}}
5+
{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}}
6+
{{- end }}
7+
8+
9+
{{/*
10+
Expand the name of the chart.
11+
*/}}
12+
{{- define "celestia.appName" -}}
13+
{{- default (include "celestia.name" .) | trunc 63 | trimSuffix "-" }}-astria-dev-cluster
14+
{{- end }}
15+
16+
{{/*
17+
Common labels
18+
*/}}
19+
{{- define "celestia.labels" -}}
20+
{{ include "celestia.selectorLabels" . }}
21+
{{- end }}
22+
23+
{{/*
24+
Selector labels
25+
*/}}
26+
{{- define "celestia.selectorLabels" -}}
27+
app: {{ include "celestia.appName" . }}
28+
{{- end }}
29+
30+
{{/*
31+
The log level represented as a number
32+
*/}}
33+
{{- define "celestia.logLevelNum" -}}
34+
{{- if eq .Values.config.logLevel "error" }}
35+
1
36+
{{- else if eq .Values.config.logLevel "warn" }}
37+
2
38+
{{- else if eq .Values.config.logLevel "info" }}
39+
3
40+
{{- else if eq .Values.config.logLevel "debug" }}
41+
4
42+
{{- else if eq .Values.config.logLevel "trace" }}
43+
5
44+
{{- end }}
45+
{{- end }}
46+
47+
48+
49+
50+
{{/*
51+
Return if ingress is stable.
52+
*/}}
53+
{{- define "celestia.ingress.isStable" -}}
54+
{{- eq (include "celestia.ingress.apiVersion" .) "networking.k8s.io/v1" }}
55+
{{- end }}
56+
57+
{{/*
58+
Return if ingress supports ingressClassName.
59+
*/}}
60+
{{- define "celestia.ingress.supportsIngressClassName" -}}
61+
{{- or (eq (include "celestia.ingress.isStable" .) "true") (and (eq (include "celestia.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }}
62+
{{- end }}
63+
64+
{{/*
65+
Return if ingress supports pathType.
66+
*/}}
67+
{{- define "celestia.ingress.supportsPathType" -}}
68+
{{- or (eq (include "celestia.ingress.isStable" .) "true") (and (eq (include "celestia.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }}
69+
{{- end }}
70+
71+
{{/*
72+
Return the appropriate apiVersion for ingress.
73+
*/}}
74+
{{- define "celestia.ingress.apiVersion" -}}
75+
{{- if and ($.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" .Capabilities.KubeVersion.Version) }}
76+
{{- print "networking.k8s.io/v1" }}
77+
{{- else if $.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
78+
{{- print "networking.k8s.io/v1beta1" }}
79+
{{- else }}
80+
{{- print "extensions/v1beta1" }}
81+
{{- end }}
82+
{{- end }}

‎charts/celestia-local/templates/ingress.yaml

+25-51
Original file line numberDiff line numberDiff line change
@@ -5,62 +5,36 @@ metadata:
55
namespace: {{ $.Values.global.namespace }}
66
labels:
77
app: celestia-local-network
8+
{{- with $.Values.ingress.labels }}
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
811
annotations:
912
nginx.ingress.kubernetes.io/enable-cors: "true"
1013
# allow requests from bridge web app
1114
nginx.ingress.kubernetes.io/cors-allow-origin: "http://localhost:3000"
1215
nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
1316
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
17+
{{- range $key, $value := $.Values.ingress.annotations }}
18+
{{ $key }}: {{ tpl $value $ | quote }}
19+
{{- end }}
1420
spec:
15-
ingressClassName: nginx
21+
ingressClassName: {{ $.Values.ingress.className }}
1622
rules:
17-
- host: rpc.node.celestia.localdev.me
18-
http:
19-
paths:
20-
- path: /
21-
pathType: Prefix
22-
backend:
23-
service:
24-
name: celestia-service
25-
port:
26-
name: bridge-jsonrpc
27-
- host: rest.node.celestia.localdev.me
28-
http:
29-
paths:
30-
- path: /
31-
pathType: Prefix
32-
backend:
33-
service:
34-
name: celestia-service
35-
port:
36-
name: bridge-rest
37-
- host: token.node.celestia.localdev.me
38-
http:
39-
paths:
40-
- path: /
41-
pathType: Prefix
42-
backend:
43-
service:
44-
name: celestia-service
45-
port:
46-
name: token-svc
47-
- host: rpc.app.celestia.localdev.me
48-
http:
49-
paths:
50-
- path: /
51-
pathType: Prefix
52-
backend:
53-
service:
54-
name: celestia-app-service
55-
port:
56-
name: app-rpc
57-
- host: rest.app.celestia.localdev.me
58-
http:
59-
paths:
60-
- path: /
61-
pathType: Prefix
62-
backend:
63-
service:
64-
name: celestia-app-service
65-
port:
66-
name: app-rest
23+
{{- range $service, $ingress := $.Values.ingress.services }}
24+
{{- with $ingress.hosts }}
25+
{{- range $host := . }}
26+
- host: {{ tpl $host $ }}
27+
http:
28+
paths:
29+
- path: {{ $ingress.path }}
30+
pathType: {{ $ingress.pathType }}
31+
backend:
32+
service:
33+
{{- with $ingress.service }}
34+
name: {{ .name }}
35+
port:
36+
name: {{ .port.name }}
37+
{{- end }}
38+
{{- end }}
39+
{{- end }}
40+
{{- end }}

‎charts/celestia-local/templates/volumes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apiVersion: v1
3333
kind: PersistentVolumeClaim
3434
metadata:
3535
name: {{ $value.persistentVolumeName }}-pvc
36-
namespace: astria-dev-cluster
36+
namespace: {{ $.Values.global.namespace }}
3737
labels:
3838
"app.kubernetes.io/name": "{{ $.Chart.Name }}"
3939
"app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}

‎charts/celestia-local/values.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,55 @@ ports:
5555
celestiaAppRestPort: 1317
5656
bridgeRPC: 26658
5757
bridgeHTTP: 26659
58+
59+
ingress:
60+
labels: {}
61+
annotations: {}
62+
hostname: localdev.me
63+
className: nginx
64+
services:
65+
bridgeRpc:
66+
hosts:
67+
- 'rpc.node.celestia.{{ .Values.ingress.hostname }}'
68+
path: /
69+
pathType: Prefix
70+
service:
71+
name: celestia-service
72+
port:
73+
name: bridge-jsonrpc
74+
bridgeRest:
75+
hosts:
76+
- rest.node.celestia.{{ .Values.ingress.hostname }}
77+
path: /
78+
pathType: Prefix
79+
service:
80+
name: celestia-service
81+
port:
82+
name: bridge-rest
83+
token:
84+
hosts:
85+
- token.node.celestia.{{ .Values.ingress.hostname }}
86+
path: /
87+
pathType: Prefix
88+
service:
89+
name: celestia-service
90+
port:
91+
name: token-svc
92+
appRpc:
93+
hosts:
94+
- 'rpc.app.celestia.{{ .Values.ingress.hostname }}'
95+
path: /
96+
pathType: Prefix
97+
service:
98+
name: celestia-app-service
99+
port:
100+
name: app-rpc
101+
appRest:
102+
hosts:
103+
- rest.app.celestia.{{ .Values.ingress.hostname }}
104+
path: /
105+
pathType: Prefix
106+
service:
107+
name: celestia-app-service
108+
port:
109+
name: app-rest

‎charts/composer/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.2
18+
version: 0.1.3
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/composer/templates/deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ spec:
1818
containers:
1919
- name: composer
2020
image: {{ include "composer.image" . }}
21+
imagePullPolicy: {{ .Values.images.composer.pullPolicy }}
2122
command: ["/usr/local/bin/astria-composer"]
2223
stdin: {{ .Values.global.useTTY }}
2324
tty: {{ .Values.global.useTTY }}

‎charts/composer/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ global:
88
images:
99
composer:
1010
repo: ghcr.io/astriaorg/composer
11+
pullPolicy: IfNotPresent
1112
tag: "0.8.2"
1213
devTag: latest
1314

‎charts/evm-bridge-withdrawer/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.2.0
18+
version: 0.2.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/evm-bridge-withdrawer/templates/deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ spec:
2020
containers:
2121
- name: evm-bridge-withdrawer
2222
image: {{ include "evm-bridge-withdrawer.image" . }}
23+
imagePullPolicy: {{ .Values.images.evmBridgeWithdrawer.pullPolicy }}
2324
command: [ "/usr/local/bin/astria-bridge-withdrawer" ]
2425
stdin: {{ .Values.global.useTTY }}
2526
tty: {{ .Values.global.useTTY }}

‎charts/evm-bridge-withdrawer/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ global:
1111
images:
1212
evmBridgeWithdrawer:
1313
repo: ghcr.io/astriaorg/evm-bridge-withdrawer
14+
pullPolicy: IfNotPresent
1415
tag: "0.2.1"
1516
devTag: latest
1617

‎charts/evm-faucet/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
1818

19-
version: 0.1.1
19+
version: 0.1.2
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎charts/evm-faucet/templates/deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ spec:
2626
- -faucet.amount=$(ETH_FAUCET_AMOUNT)
2727
- -proxycount=$(ETH_FAUCET_PROXYCOUNT)
2828
image: {{ .Values.images.faucet.repo }}:{{ .Values.images.faucet.tag }}
29+
imagePullPolicy: {{ .Values.images.faucet.pullPolicy }}
2930
envFrom:
3031
- configMapRef:
3132
name: {{tpl .Values.config.rollupName . }}-evm-faucet-env

‎charts/evm-faucet/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ global:
99
images:
1010
faucet:
1111
repo: "ghcr.io/astriaorg/ria-faucet"
12+
pullPolicy: IfNotPresent
1213
tag: "0.0.1"
1314

1415
config:

0 commit comments

Comments
 (0)