Skip to content

Commit

Permalink
Merge branch 'main' into ENG-766/move_checks_to_parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanoroshiba committed Dec 23, 2024
2 parents d977b29 + 2d27d57 commit e84942b
Show file tree
Hide file tree
Showing 86 changed files with 823 additions and 369 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ jobs:
if: needs.run_checker.outputs.run_lint_rust == 'true'
steps:
- uses: actions/checkout@v4
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2024-09-15
components: rustfmt
- name: run rustfmt
run: cargo +nightly-2024-09-15 fmt --all -- --check
run: just lint rust-fmt

toml:
runs-on: ubuntu-22.04
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Scheduled
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'

Expand All @@ -14,3 +15,38 @@ jobs:
- uses: rustsec/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v9
with:
# Utilize a separate token for the stale worker to avoid rate limiting
repo-token: ${{ secrets.STALE_WORKER_TOKEN }}
# This is half the number of operations allowed per hour for the
# GitHub API.
operations-per-run: 2500
days-before-stale: 45
days-before-close: 7
# start with the oldest issues first, as they are most likely to be stale.
ascending: true
stale-issue-label: 'stale'
stale-pr-label: 'stale'
# Allow tagging issues in such a way that they are exempt from the stale check
exempt-issue-labels: 'ignore-stale'
exempt-pr-labels: 'ignore-stale'
# Labels to easily find issues closed because they are stale.
close-issue-label: 'closed-stale'
close-pr-label: 'closed-stale'
stale-issue-message: |
This issue is stale because it has been open 45 days with no activity. Remove stale label or this issue
be closed in 7 days.
close-issue-message: 'This issue was closed because it was stale'
stale-pr-message: |
This PR is stale because it has been open 45 days with no activity. Remove stale label or this PR will be
closed in 7 days.
close-pr-message: 'This PR was closed because it has been stale.'
# Exempt anything added to a milestone from being considered stale
exempt-all-milestones: true
19 changes: 8 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ env.RUSTUP_TOOLCHAIN }}
Expand All @@ -230,15 +232,10 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: run pedantic clippy on workspace crates
run: |
cargo clippy --all-targets --all-features \
-- --warn clippy::pedantic --warn clippy::arithmetic-side-effects \
--warn clippy::allow_attributes --warn clippy::allow_attributes_without_reason \
--deny warnings
just lint rust-clippy
- name: run pedantic clippy on tools/protobuf-compiler
run: |
cargo clippy --manifest-path tools/protobuf-compiler/Cargo.toml \
--all-targets --all-features \
-- --warn clippy::pedantic --deny warnings
just lint rust-clippy-tools
custom-lints:
runs-on: buildjet-8vcpu-ubuntu-2204
Expand All @@ -248,6 +245,8 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: 'true'
- name: Install just
uses: taiki-e/install-action@just
- uses: dtolnay/rust-toolchain@master
with:
# This has to match `rust-toolchain` in the rust-toolchain file of the dylint lints
Expand All @@ -266,17 +265,15 @@ jobs:
run: |
: # list all lint packages here to have clippy explicitly test them
: # uses the same nightly installed above to work around the entry in rust-toolchain.toml
cargo +nightly-2024-09-05 clippy --all-targets --all-features \
-p tracing_debug_field \
-- --warn clippy::pedantic --deny warnings
just lint rust-clippy-custom
- name: run dylint clippy on workspace crates
env:
# set the dylint driver path to the target/ directory so that it's hopefully cached by rust-cache
DYLINT_DRIVER_PATH: ${{ github.workspace }}/target/dylint_drivers/
DYLINT_RUSTFLAGS: "-D warnings"
run: |
mkdir -p "$DYLINT_DRIVER_PATH"
cargo dylint --all --workspace
just lint rust-dylint
test:
if: ${{ always() && !cancelled() }}
Expand Down
2 changes: 1 addition & 1 deletion charts/celestia-local/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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.7.0
version: 0.7.1

# 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
Expand Down
5 changes: 4 additions & 1 deletion charts/celestia-local/files/scripts/init-celestia-appd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ sed -i'.bak' 's#"null"#"kv"#g' "${home_dir}"/config/config.toml
sed -i'.bak' 's#discard_abci_responses = true#discard_abci_responses = false#g' "${home_dir}"/config/config.toml
# Override the VotingPeriod from 1 week to 1 minute
sed -i'.bak' 's#"604800s"#"60s"#g' "${home_dir}"/config/genesis.json
# Set the CommitTimeout to 5 second
sed -i'.bak' 's#timeout_commit = "11s"#timeout_commit = "5s"#g' "${home_dir}"/config/config.toml

if $fast; then
sed -i'.bak' 's#timeout_commit = "11s"#timeout_commit = "1s"#g' "${home_dir}"/config/config.toml
sed -i'.bak' 's#timeout_commit = "5s"#timeout_commit = "1s"#g' "${home_dir}"/config/config.toml
fi
2 changes: 1 addition & 1 deletion charts/celestia-local/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ storage:
path: "/data/celestia-data"

celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v2.3.1"
celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.18.3-mocha"
celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.20.4"

podSecurityContext:
runAsUser: 10001
Expand Down
2 changes: 1 addition & 1 deletion charts/evm-faucet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.1.2
version: 0.1.4

# 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
Expand Down
12 changes: 12 additions & 0 deletions charts/evm-faucet/templates/_helper.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,15 @@ Return the appropriate apiVersion for ingress.
{{- print "extensions/v1beta1" }}
{{- end }}
{{- end }}

{{/*
Service annotations
*/}}
{{- define "evmFaucet.serviceAnnotations" }}
{{- if .Values.additionalAnnotations }}
{{ toYaml .Values.additionalAnnotations }}
{{- end }}
{{- if .Values.service.annotations }}
{{ toYaml .Values.service.annotations }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/evm-faucet/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ data:
ETH_FAUCET_PORT: "{{ .Values.ports.faucet }}"
ETH_FAUCET_EVM_PROVIDER_URL: "{{ tpl .Values.config.providerUrl . }}"
ETH_FAUCET_AMOUNT: "{{ .Values.config.amount }}"
ETH_FAUCET_INTERVAL: "{{ .Values.config.intervalMinutes }}"
{{- if not .Values.secretProvider.enabled }}
ETH_FAUCET_EVM_PRIVATE_KEY: "{{ .Values.config.privateKey.devContent }}"
{{- end }}
Expand Down
3 changes: 2 additions & 1 deletion charts/evm-faucet/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
- -wallet.provider=$(ETH_FAUCET_EVM_PROVIDER_URL)
- -wallet.privkey=$(ETH_FAUCET_EVM_PRIVATE_KEY)
- -faucet.amount=$(ETH_FAUCET_AMOUNT)
- -faucet.minutes=$(ETH_FAUCET_INTERVAL)
- -proxycount=$(ETH_FAUCET_PROXYCOUNT)
image: {{ .Values.images.faucet.repo }}:{{ .Values.images.faucet.tag }}
imagePullPolicy: {{ .Values.images.faucet.pullPolicy }}
Expand Down Expand Up @@ -58,6 +59,6 @@ spec:
driver: secrets-store.csi.k8s.io
readOnly: true
volumeAttributes:
secretProviderClass: evm-faucet-private-key
secretProviderClass: faucet-private-key
{{- end }}
---
4 changes: 4 additions & 0 deletions charts/evm-faucet/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ apiVersion: v1
metadata:
name: {{tpl .Values.config.rollupName . }}-evm-faucet-service
namespace: {{ include "evmFaucet.namespace" . }}
{{- if or .Values.additionalAnnotations .Values.service.annotations }}
annotations:
{{- include "evmFaucet.serviceAnnotations" . | indent 4 }}
{{- end }}
spec:
selector:
app: {{tpl .Values.config.rollupName . }}-evm-faucet
Expand Down
4 changes: 4 additions & 0 deletions charts/evm-faucet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ config:
key: token
# The amount of token to give per request
amount: 1
intervalMinutes: 100
providerUrl: http://{{ .Values.config.rollupName }}-evm-service.{{ include "evmFaucet.namespace" . }}.svc.cluster.local:8545

ingress:
Expand Down Expand Up @@ -58,3 +59,6 @@ secretProvider:
ports:
faucet: 8080

service:
annotations: {}
2 changes: 1 addition & 1 deletion charts/evm-rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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: 1.0.0
version: 1.0.1

# 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
Expand Down
2 changes: 1 addition & 1 deletion charts/evm-rollup/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ data:
ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}"
ASTRIA_CONDUCTOR_EXPECTED_CELESTIA_CHAIN_ID: "{{ tpl .Values.config.conductor.celestiaChainId . }}"
ASTRIA_CONDUCTOR_CELESTIA_BEARER_TOKEN: "{{ .Values.config.celestia.token }}"
ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "12000"
ASTRIA_CONDUCTOR_CELESTIA_BLOCK_TIME_MS: "{{ .Values.config.conductor.celestiaBlockTimeMs }}"
ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}"
ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.conductor.executionCommitLevel }}"
ASTRIA_CONDUCTOR_SEQUENCER_GRPC_URL: "{{ tpl .Values.config.conductor.sequencerGrpc . }}"
Expand Down
2 changes: 2 additions & 0 deletions charts/evm-rollup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ config:
# The expected fastest block time possible from sequencer, determines polling
# rate.
sequencerBlockTimeMs: 2000
# The expected fastest block time possible from DA, determines polling rate.
celestiaBlockTimeMs: 6000
# URL path for the sequencer
sequencerRpc: ""
# gRPC path for the sequencer
Expand Down
8 changes: 4 additions & 4 deletions charts/evm-stack/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ dependencies:
version: 0.4.0
- name: evm-rollup
repository: file://../evm-rollup
version: 1.0.0
version: 1.0.1
- name: composer
repository: file://../composer
version: 1.0.0
- name: evm-faucet
repository: file://../evm-faucet
version: 0.1.2
version: 0.1.4
- name: evm-bridge-withdrawer
repository: file://../evm-bridge-withdrawer
version: 1.0.1
Expand All @@ -20,5 +20,5 @@ dependencies:
- name: blockscout-stack
repository: https://blockscout.github.io/helm-charts
version: 1.6.8
digest: sha256:618d0978ce1fa169bffa360010e8afeb06f21ffb7574e8a298d1d561bbcee05b
generated: "2024-11-11T13:27:42.868678+02:00"
digest: sha256:4715e557b6ceb0fa85c9efe86f5b26d665783f0be9162728efe808fa3a35d727
generated: "2024-12-12T19:52:24.992658+02:00"
7 changes: 3 additions & 4 deletions charts/evm-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ 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: 1.0.3
version: 1.0.6

dependencies:
- name: celestia-node
version: 0.4.0
repository: "file://../celestia-node"
condition: celestia-node.enabled
- name: evm-rollup
version: 1.0.0
version: 1.0.1
repository: "file://../evm-rollup"
- name: composer
version: 1.0.0
repository: "file://../composer"
condition: composer.enabled
- name: evm-faucet
version: 0.1.2
version: 0.1.4
repository: "file://../evm-faucet"
condition: evm-faucet.enabled
- name: evm-bridge-withdrawer
Expand All @@ -46,7 +46,6 @@ dependencies:
version: "1.6.8"
condition: blockscout-stack.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.
Expand Down
2 changes: 1 addition & 1 deletion charts/graph-node/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: graph-node
description: A Helm chart for Graph Node deployment
version: 0.2.0
version: 0.2.1
appVersion: "0.0.1"

maintainers:
Expand Down
21 changes: 21 additions & 0 deletions charts/graph-node/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,24 @@ Namepsace to deploy elements into.
{{- define "graphnode.namespace" -}}
{{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- end }}

{{/*
Service annotations
*/}}
{{- define "graphNode.serviceAnnotations" }}
{{- if .Values.graphNode.additionalAnnotations }}
{{ toYaml .Values.graphNode.additionalAnnotations }}
{{- end }}
{{- if .Values.graphNode.service.annotations }}
{{ toYaml .Values.graphNode.service.annotations }}
{{- end }}
{{- end }}

{{- define "ipfs.serviceAnnotations" }}
{{- if .Values.ipfs.additionalAnnotations }}
{{ toYaml .Values.ipfs.additionalAnnotations }}
{{- end }}
{{- if .Values.ipfs.service.annotations }}
{{ toYaml .Values.ipfs.service.annotations }}
{{- end }}
{{- end }}
8 changes: 8 additions & 0 deletions charts/graph-node/templates/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ kind: Service
metadata:
name: graph-node
namespace: {{ include "graphnode.namespace" . }}
{{- if or .Values.graphNode.additionalAnnotations .Values.graphNode.service.annotations }}
annotations:
{{- include "graphNode.serviceAnnotations" . | indent 4 }}
{{- end }}
spec:
selector:
app: graph-node
Expand All @@ -28,6 +32,10 @@ kind: Service
metadata:
name: ipfs
namespace: {{ include "graphnode.namespace" . }}
{{- if or .Values.ipfs.additionalAnnotations .Values.ipfs.service.annotations }}
annotations:
{{- include "ipfs.serviceAnnotations" . | indent 4 }}
{{- end }}
spec:
selector:
app: ipfs
Expand Down
4 changes: 4 additions & 0 deletions charts/graph-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ graphNode:
replicas: 1
metrics:
enabled: false
service:
annotations: {}
ports:
http: 8000
jsonRpc: 8001
Expand Down Expand Up @@ -41,6 +43,8 @@ ipfs:
enabled: false
local: true
size: 5Gi
service:
annotations: {}
ports:
api: 5001

Expand Down
4 changes: 2 additions & 2 deletions charts/sequencer-faucet/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ 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.9.0
version: 0.9.1

# 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.9.0"
appVersion: "0.9.1"

maintainers:
- name: wafflesvonmaple
Expand Down
Loading

0 comments on commit e84942b

Please sign in to comment.