Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

chore: new release cuts #187

Merged
merged 2 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ type: application
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)

version: 0.9.1
version: 0.10.0

# 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.5.2"
appVersion: "0.7.0"

dependencies:
- name: celestia-node
Expand Down
6 changes: 2 additions & 4 deletions charts/rollup/files/genesis/geth-genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
{{- end }}
"astriaOverrideGenesisExtraData": {{ .Values.config.rollup.genesis.overrideGenesisExtraData }},
"astriaSequencerInitialHeight": {{ .Values.config.sequencer.initialBlockHeight }},
{{- if not .Values.global.dev }}
"astriaDataAvailabilityInitialHeight": {{ .Values.config.celestia.initialBlockHeight }},
"astriaDataAvailabilityHeightVariance": {{ .Values.config.celestia.heightVariance }}
{{- else }}
"astriaRollupName": "{{ .Values.config.rollup.name }}",
"astriaCelestiaInitialHeight": {{ .Values.config.celestia.initialBlockHeight }},
"astriaCelestiaHeightVariance": {{ .Values.config.celestia.heightVariance }}
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
},
"difficulty": "10000000",
Expand Down
36 changes: 11 additions & 25 deletions charts/rollup/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,16 @@ data:
ASTRIA_CONDUCTOR_LOG: "astria_conductor={{ .Values.config.logLevel }}"
{{- if (index .Values "celestia-node").enabled }}
TOKEN_SERVER_URL: "{{ include "celestiaNode.service.addresses.token" (index .Subcharts "celestia-node") }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}"
{{- else }}
TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}"
{{- end }}
ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}"
ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}"
ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}"
{{- if not .Values.global.dev }}
ASTRIA_CONDUCTOR_CHAIN_ID: "{{ .Values.config.rollup.name }}"
ASTRIA_CONDUCTOR_ENABLE_OPTIMISM: "{{ .Values.config.rollup.optimism.enabled }}"
ASTRIA_CONDUCTOR_ETHEREUM_L1_URL: "{{ .Values.config.rollup.optimism.ethereumL1Websocket }}"
ASTRIA_CONDUCTOR_OPTIMISM_PORTAL_CONTRACT_ADDRESS: "{{ .Values.config.rollup.optimism.portalContractAddress }}"
ASTRIA_CONDUCTOR_INITIAL_ETHEREUM_L1_BLOCK_HEIGHT: "{{ .Values.config.rollup.optimism.initialEthereumL1BlockHeight }}"
ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}"
{{- if (index .Values "celestia-node").enabled }}
ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}"
{{- else }}
ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ .Values.config.celestia.rpc }}"
{{- end }}
{{- else }}
{{- if (index .Values "celestia-node").enabled }}
ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ include "celestiaNode.service.addresses.rpc" (index .Subcharts "celestia-node") }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ include "celestiaNode.service.addresses.ws" (index .Subcharts "celestia-node") }}"
{{- else }}
ASTRIA_CONDUCTOR_CELESTIA_NODE_HTTP_URL: "{{ .Values.config.celestia.rpc }}"
ASTRIA_CONDUCTOR_CELESTIA_NODE_WEBSOCKET_URL: "{{ .Values.config.celestia.ws }}"
{{- end }}
ASTRIA_CONDUCTOR_SEQUENCER_GRPC_URL: "{{ .Values.config.sequencer.grpc }}"
ASTRIA_CONDUCTOR_SEQUENCER_COMETBFT_URL: "{{ .Values.config.sequencer.rpc }}"
ASTRIA_CONDUCTOR_SEQUENCER_BLOCK_TIME_MS: "{{ .Values.config.sequencer.blockTimeMs }}"
Expand All @@ -47,6 +31,8 @@ data:
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.rollup.otel.tracesCompression }}"
OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}"
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}"
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
---
apiVersion: v1
Expand All @@ -68,11 +54,6 @@ data:
ASTRIA_COMPOSER_API_LISTEN_ADDR: "0.0.0.0:0"
ASTRIA_COMPOSER_SEQUENCER_URL: "{{ .Values.config.sequencer.rpc }}"
ASTRIA_COMPOSER_ROLLUPS: "{{ .Values.config.rollup.name }}::ws://127.0.0.1:{{ .Values.ports.wsRPC }}"
{{- if not .Values.secretProvider.enabled }}
ASTRIA_COMPOSER_PRIVATE_KEY: "{{ .Values.config.sequencer.privateKey }}"
{{- end }}
{{- if not .Values.global.dev }}
{{- else }}
ASTRIA_COMPOSER_MAX_BYTES_PER_BUNDLE: "{{ .Values.config.rollup.maxBytesPerBundle }}"
ASTRIA_COMPOSER_MAX_SUBMIT_INTERVAL_MS: "{{ .Values.config.rollup.maxSubmitInterval }}"
ASTRIA_COMPOSER_NO_METRICS: "{{ not .Values.config.rollup.metrics.enabled }}"
Expand All @@ -86,6 +67,11 @@ data:
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.rollup.otel.tracesCompression }}"
OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.rollup.otel.otlpHeaders }}"
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.rollup.otel.traceHeaders }}"
{{- if not .Values.secretProvider.enabled }}
ASTRIA_COMPOSER_PRIVATE_KEY: "{{ .Values.config.sequencer.privateKey }}"
{{- end }}
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
---
apiVersion: v1
Expand Down
6 changes: 3 additions & 3 deletions charts/rollup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ global:
images:
geth:
repo: ghcr.io/astriaorg/go-ethereum
tag: "0.5.2" # 0.7.0
tag: "0.7.0"
devTag: latest
conductor:
repo: ghcr.io/astriaorg/conductor
tag: "0.11.1" # 0.13.0
tag: "0.13.0"
devTag: latest
composer:
repo: ghcr.io/astriaorg/composer
tag: "0.3.1" # 0.5.0
tag: "0.5.0"
devTag: latest

# Rollup faucet
Expand Down
4 changes: 2 additions & 2 deletions charts/sequencer-relayer/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.4.1
version: 0.5.0

# 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.10.0"
appVersion: "0.11.0"

maintainers:
- name: wafflesvonmaple
Expand Down
6 changes: 2 additions & 4 deletions charts/sequencer-relayer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ data:
ASTRIA_SEQUENCER_RELAYER_RELAY_ONLY_VALIDATOR_KEY_BLOCKS: "false"
ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN: "{{ .Values.config.relayer.celestiaBearerToken }}"
TOKEN_SERVER: "{{ .Values.config.relayer.tokenServer }}"
{{- if not .Values.global.dev }}
ASTRIA_SEQUENCER_RELAYER_RPC_PORT: "{{ .Values.ports.relayerRPC }}"
ASTRIA_SEQUENCER_RELAYER_SEQUENCER_ENDPOINT: "{{ .Values.config.relayer.cometbftRpc }}"
{{- else }}
ASTRIA_SEQUENCER_RELAYER_COMETBFT_ENDPOINT: "{{ .Values.config.relayer.cometbftRpc }}"
ASTRIA_SEQUENCER_RELAYER_SEQUENCER_GRPC_ENDPOINT: "{{ .Values.config.relayer.sequencerGrpc }}"
ASTRIA_SEQUENCER_RELAYER_API_ADDR: "127.0.0.1:{{ .Values.ports.relayerRPC }}"
Expand All @@ -31,6 +27,8 @@ data:
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.relayer.otel.tracesCompression }}"
OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.relayer.otel.otlpHeaders }}"
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.relayer.otel.traceHeaders }}"
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
---
apiVersion: v1
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer-relayer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ global:
images:
sequencerRelayer:
repo: ghcr.io/astriaorg/sequencer-relayer
tag: "0.9.1" # 0.11.0
tag: "0.11.0"
devTag: latest

config:
Expand Down
6 changes: 3 additions & 3 deletions charts/sequencer/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: sequencer-relayer
repository: file://../sequencer-relayer
version: 0.4.1
digest: sha256:3c0aa045ffcdc16f1343d9f8b3e9dc43d316c776941b11a13698fdc77b80c4f2
generated: "2024-03-15T20:09:55.604722-07:00"
version: 0.5.0
digest: sha256:87682039537a0eb948d855e6ad8afb5fc15a9c55799023fa0fe85dfe1e3d9456
generated: "2024-03-19T15:53:53.609181-04:00"
6 changes: 3 additions & 3 deletions charts/sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ 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.10.1
version: 0.11.0

# 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.10.0"

dependencies:
- name: sequencer-relayer
version: "0.4.1"
version: "0.5.0"
repository: "file://../sequencer-relayer"
condition: sequencer-relayer.enabled

Expand Down
Binary file removed charts/sequencer/charts/sequencer-relayer-0.4.1.tgz
Binary file not shown.
Binary file not shown.
6 changes: 2 additions & 4 deletions charts/sequencer/files/cometbft/config/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
}
{{- end }}
],
{{- if not .Values.global.dev }}
"authority_sudo_key": "{{ .Values.config.sequencer.authoritySudoAddress }}",
"native_asset_base_denomination": "nria"
{{- else }}
"authority_sudo_address": "{{ .Values.config.sequencer.authoritySudoAddress }}",
"native_asset_base_denomination": "{{ .Values.config.sequencer.nativeAssetBaseDenomination }}",
"allowed_fee_assets": [
Expand All @@ -34,6 +30,8 @@
"inbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.inboundEnabled }},
"outbound_ics20_transfers_enabled": {{ .Values.config.sequencer.ibc.outboundEnabled }}
}
{{- if not .Values.global.dev }}
{{- else }}
{{- end}}
},
"chain_id": "{{ .Values.config.cometBFT.chainId }}",
Expand Down
4 changes: 2 additions & 2 deletions charts/sequencer/templates/configmaps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ data:
ASTRIA_SEQUENCER_ENABLE_MINT: "false"
# Socket address for gRPC server
ASTRIA_SEQUENCER_GRPC_ADDR: "0.0.0.0:{{ .Values.ports.sequencerGRPC }}"
{{- if not .Values.global.dev }}
{{- else }}
ASTRIA_SEQUENCER_NO_METRICS: "{{ not .Values.config.sequencer.metrics.enabled }}"
ASTRIA_SEQUENCER_METRICS_HTTP_LISTENER_ADDR: "127.0.0.1:{{ .Values.ports.sequencerMetrics }}"
ASTRIA_SEQUENCER_FORCE_STDOUT: "{{ .Values.global.useTTY }}"
Expand All @@ -55,5 +53,7 @@ data:
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: "{{ .Values.config.sequencer.otel.tracesCompression }}"
OTEL_EXPORTER_OTLP_HEADERS: "{{ .Values.config.sequencer.otel.otlpHeaders }}"
OTEL_EXPORTER_OTLP_TRACE_HEADERS: "{{ .Values.config.sequencer.otel.traceHeaders }}"
{{- if not .Values.global.dev }}
{{- else }}
{{- end }}
---
2 changes: 1 addition & 1 deletion charts/sequencer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ images:
devTag: v0.37.x
sequencer:
repo: ghcr.io/astriaorg/sequencer
tag: "0.8.0" # 0.10.0
tag: "0.10.0"
devTag: latest

config:
Expand Down
Loading