Skip to content

Commit

Permalink
Merge 0742952 into 7912594
Browse files Browse the repository at this point in the history
  • Loading branch information
smuu authored Jan 22, 2025
2 parents 7912594 + 0742952 commit ca3597c
Show file tree
Hide file tree
Showing 21 changed files with 1,243 additions and 75 deletions.
4 changes: 2 additions & 2 deletions charts/celestia-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: v2
appVersion: v0.21.2
dependencies:
- name: common-celestia-node
version: 0.1.1
version: 0.1.2
repository: https://celestiaorg.github.io/helm-charts
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
Expand All @@ -24,4 +24,4 @@ maintainers:
name: celestia-node
sources:
- https://github.com/celestiaorg/helm-charts
version: 0.11.1
version: 0.11.2
5 changes: 3 additions & 2 deletions charts/celestia-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,9 @@ node:
ShutdownTimeout: 2m0s
Core:
IP: ""
RPCPort: "26657"
GRPCPort: "9090"
Port: "9090"
TLSEnabled: false
XTokenPath: ""
State:
DefaultKeyName: my_celes_key
DefaultBackendName: test
Expand Down
4 changes: 2 additions & 2 deletions common-charts/common-celestia-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ type: library

# 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.
version: 0.1.1
version: 0.1.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application and it is recommended to use it with quotes.
appVersion: "0.18.3"
appVersion: "0.21.2"
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
ShutdownTimeout = "{{ .Values.node.config.bridge.configtoml.Node.ShutdownTimeout }}"
[Core]
IP = "{{ .Values.node.config.bridge.configtoml.Core.IP }}"
RPCPort = "{{ .Values.node.config.bridge.configtoml.Core.RPCPort }}"
GRPCPort = "{{ .Values.node.config.bridge.configtoml.Core.GRPCPort }}"
Port = "{{ .Values.node.config.bridge.configtoml.Core.Port }}"
TLSEnabled = {{ .Values.node.config.bridge.configtoml.Core.TLSEnabled }}
XTokenPath = "{{ .Values.node.config.bridge.configtoml.Core.XTokenPath }}"
[State]
DefaultKeyName = "{{ .Values.node.config.bridge.configtoml.State.DefaultKeyName }}"
DefaultBackendName = "{{ .Values.node.config.bridge.configtoml.State.DefaultBackendName }}"
Expand Down
80 changes: 33 additions & 47 deletions scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,69 +15,54 @@ UPLOAD_KEYS_SCRIPT := $(SCRIPTS_DIR)/create_new_key_upload_1pass.sh
# Function to strip suffix from version
strip_suffix = $(shell echo $(1) | sed 's/-.*//')

# Prompt for celestia-app version if not set
prompt_app_version:
ifndef CELESTIA_APP_VERSION
@read -p "Enter celestia-app version [$(DEFAULT_CELESTIA_APP_VERSION)]: " input; \
if [ -z "$$input" ]; then \
CELESTIA_APP_VERSION=$(DEFAULT_CELESTIA_APP_VERSION); \
else \
CELESTIA_APP_VERSION=$$input; \
fi; \
export CELESTIA_APP_VERSION; \
$(MAKE) $(MAKECMDGOALS) CELESTIA_APP_VERSION=$$CELESTIA_APP_VERSION; \
exit 0;
endif

# Prompt for celestia-node version if not set
prompt_node_version:
ifndef CELESTIA_NODE_VERSION
@read -p "Enter celestia-node version [$(DEFAULT_CELESTIA_NODE_VERSION)]: " input; \
if [ -z "$$input" ]; then \
CELESTIA_NODE_VERSION=$(DEFAULT_CELESTIA_NODE_VERSION); \
else \
CELESTIA_NODE_VERSION=$$input; \
fi; \
export CELESTIA_NODE_VERSION; \
$(MAKE) $(MAKECMDGOALS) CELESTIA_NODE_VERSION=$$CELESTIA_NODE_VERSION; \
exit 0;
endif
# Check if version is specified
check_version = $(if $(1),,$(error Version not specified. Please provide $(2) as a environment variable.))

# Extract config files for celestia-app
.PHONY: extract-app
extract-app: prompt_app_version
extract-app:
$(call check_version,$(CELESTIA_APP_VERSION),CELESTIA_APP_VERSION)
@echo "Extracting config files for celestia-app version $(CELESTIA_APP_VERSION)"
./$(EXTRACT_CONFIGS_APP_SCRIPT) $(CELESTIA_APP_VERSION)

# Extract config files for celestia-node
.PHONY: extract-node
extract-node: prompt_node_version
extract-node:
$(call check_version,$(CELESTIA_NODE_VERSION),CELESTIA_NODE_VERSION)
@echo "Extracting config files for celestia-node version $(CELESTIA_NODE_VERSION)"
./$(EXTRACT_CONFIGS_NODE_SCRIPT) $(CELESTIA_NODE_VERSION)

# Convert TOML to templated TOML for celestia-app
.PHONY: toml-app
toml-app: prompt_app_version
toml-app:
$(call check_version,$(CELESTIA_APP_VERSION),CELESTIA_APP_VERSION)
@echo "Converting TOML to templated HELM for celestia-app version $(CELESTIA_APP_VERSION)"
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/app.toml app; \
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/client.toml app; \
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/config.toml app

# Convert TOML to templated TOML for celestia-node
.PHONY: toml-node
toml-node: prompt_node_version
toml-node:
$(call check_version,$(CELESTIA_NODE_VERSION),CELESTIA_NODE_VERSION)
@echo "Converting TOML to templated HELM for celestia-node version $(CELESTIA_NODE_VERSION)"
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/node/bridge/$(CELESTIA_NODE_VERSION)/config.toml node bridge; \
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/node/full/$(CELESTIA_NODE_VERSION)/config.toml node full; \
./$(CONVERT_TOML_TO_TEMPLATE_SCRIPT) $(CONFIG_DIR)/node/light/$(CELESTIA_NODE_VERSION)/config.toml node light

# Convert TOML to YAML for celestia-app
.PHONY: yaml-app
yaml-app: prompt_app_version
yaml-app:
$(call check_version,$(CELESTIA_APP_VERSION),CELESTIA_APP_VERSION)
@echo "Converting TOML to YAML for celestia-app version $(CELESTIA_APP_VERSION)"
./$(CONVERT_TOML_TO_YAML_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/app.toml; \
./$(CONVERT_TOML_TO_YAML_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/client.toml; \
./$(CONVERT_TOML_TO_YAML_SCRIPT) $(CONFIG_DIR)/app/$(CELESTIA_APP_VERSION)/config.toml

# Convert TOML to YAML for celestia-node
.PHONY: yaml-node
yaml-node: prompt_node_version
yaml-node:
$(call check_version,$(CELESTIA_NODE_VERSION),CELESTIA_NODE_VERSION)
@echo "Converting TOML to YAML for celestia-node version $(CELESTIA_NODE_VERSION)"
./$(CONVERT_TOML_TO_YAML_SCRIPT) $(CONFIG_DIR)/node/bridge/$(CELESTIA_NODE_VERSION)/config.toml; \
./$(CONVERT_TOML_TO_YAML_SCRIPT) $(CONFIG_DIR)/node/full/$(CELESTIA_NODE_VERSION)/config.toml; \
Expand All @@ -91,13 +76,14 @@ generate-docs:

# Upload keys to 1Password
.PHONY: upload-keys
upload-keys: prompt_node_version
upload-keys:
$(call check_version,$(CELESTIA_NODE_VERSION),CELESTIA_NODE_VERSION)
@echo "Uploading keys to 1Password for celestia-node version $(CELESTIA_NODE_VERSION)"
./$(UPLOAD_KEYS_SCRIPT) $(CELESTIA_NODE_VERSION) secret-name vault-name chain

# Group targets for celestia-app
.PHONY: app
app: extract-app
app: extract-app yaml-app toml-app

# Group targets for celestia-node
.PHONY: node
Expand All @@ -111,15 +97,15 @@ all: app node
.PHONY: help
help:
@echo "Usage:"
@echo " make extract-app Extract config files for celestia-app"
@echo " make toml-app Convert TOML to templated HELM for celestia-app"
@echo " make yaml-app Convert TOML to YAML for celestia-app"
@echo " make extract-node Extract config files for celestia-node"
@echo " make toml-node Convert TOML to templated HELM for celestia-node"
@echo " make yaml-node Convert TOML to YAML for celestia-node"
@echo " make generate-docs Generate documentation for Helm charts"
@echo " make upload-keys Upload keys to 1Password for celestia-node"
@echo " make app Run all tasks for celestia-app"
@echo " make node Run all tasks for celestia-node"
@echo " make all Run all tasks for both celestia-app and celestia-node"
@echo " make help Display this help message"
@echo " make extract-app CELESTIA_APP_VERSION=<version> Extract config files for celestia-app"
@echo " make toml-app CELESTIA_APP_VERSION=<version> Convert TOML to templated HELM for celestia-app"
@echo " make yaml-app CELESTIA_APP_VERSION=<version> Convert TOML to YAML for celestia-app"
@echo " make extract-node CELESTIA_NODE_VERSION=<version> Extract config files for celestia-node"
@echo " make toml-node CELESTIA_NODE_VERSION=<version> Convert TOML to templated HELM for celestia-node"
@echo " make yaml-node CELESTIA_NODE_VERSION=<version> Convert TOML to YAML for celestia-node"
@echo " make generate-docs Generate documentation for Helm charts"
@echo " make upload-keys CELESTIA_NODE_VERSION=<version> Upload keys to 1Password for celestia-node"
@echo " make app CELESTIA_APP_VERSION=<version> Run all tasks for celestia-app"
@echo " make node CELESTIA_NODE_VERSION=<version> Run all tasks for celestia-node"
@echo " make all CELESTIA_APP_VERSION=<version> CELESTIA_NODE_VERSION=<version> Run all tasks for both celestia-app and celestia-node"
@echo " make help Display this help message"
63 changes: 63 additions & 0 deletions scripts/config/app/v3.3.0-arabica/app.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
minimum_gas_prices: 0.002utia
pruning: default
pruning_keep_recent: "0"
pruning_interval: "0"
halt_height: 0
halt_time: 0
min_retain_blocks: 0
inter_block_cache: true
index_events: []
iavl_cache_size: 781250
iavl_disable_fastnode: false
iavl_lazy_loading: false
app_db_backend: ""
telemetry:
service_name: ""
enabled: false
enable_hostname: false
enable_hostname_label: false
enable_service_label: false
prometheus_retention_time: 0
global_labels: []
api:
enable: false
swagger: false
address: tcp://0.0.0.0:1317
max_open_connections: 1000
rpc_read_timeout: 10
rpc_write_timeout: 0
rpc_max_body_bytes: 1000000
enabled_unsafe_cors: false
rosetta:
enable: false
address: :8080
blockchain: app
network: network
retries: 3
offline: false
enable_fee_suggestion: false
gas_to_suggest: 210000
denom_to_suggest: uatom
grpc:
enable: false
address: 0.0.0.0:9090
max_recv_msg_size: "20971520"
max_send_msg_size: "2147483647"
grpc_web:
enable: false
address: 0.0.0.0:9091
enable_unsafe_cors: false
state_sync:
snapshot_interval: 1500
snapshot_keep_recent: 2
store:
streamers: []
streamers:
file:
keys:
- '*'
write_dir: ""
prefix: ""
output_metadata: "true"
stop_node_on_error: "true"
fsync: "false"
5 changes: 5 additions & 0 deletions scripts/config/app/v3.3.0-arabica/client.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
chain_id: celestia
keyring_backend: test
output: text
node: tcp://localhost:26657
broadcast_mode: sync
134 changes: 134 additions & 0 deletions scripts/config/app/v3.3.0-arabica/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
proxy_app: tcp://127.0.0.1:26658
moniker: app
fast_sync: true
db_backend: goleveldb
db_dir: data
log_level: info
log_format: plain
genesis_file: config/genesis.json
priv_validator_key_file: config/priv_validator_key.json
priv_validator_state_file: data/priv_validator_state.json
priv_validator_laddr: ""
node_key_file: config/node_key.json
abci: socket
filter_peers: false
rpc:
laddr: tcp://127.0.0.1:26657
cors_allowed_origins: []
cors_allowed_methods:
- HEAD
- GET
- POST
cors_allowed_headers:
- Origin
- Accept
- Content-Type
- X-Requested-With
- X-Server-Time
grpc_laddr: ""
grpc_max_open_connections: 900
unsafe: false
max_open_connections: 900
max_subscription_clients: 100
max_subscriptions_per_client: 5
experimental_subscription_buffer_size: 200
experimental_websocket_write_buffer_size: 200
experimental_close_on_slow_client: false
timeout_broadcast_tx_commit: 50s
max_body_bytes: 8388608
max_header_bytes: 1048576
tls_cert_file: ""
tls_key_file: ""
pprof_laddr: localhost:6060
p2p:
laddr: tcp://0.0.0.0:26656
external_address: ""
seeds: ""
persistent_peers: ""
upnp: false
addr_book_file: config/addrbook.json
addr_book_strict: true
max_num_inbound_peers: 40
max_num_outbound_peers: 10
unconditional_peer_ids: ""
persistent_peers_max_dial_period: 0s
flush_throttle_timeout: 100ms
max_packet_msg_payload_size: 1024
send_rate: 10485760
recv_rate: 10485760
pex: true
seed_mode: false
private_peer_ids: ""
allow_duplicate_ip: false
handshake_timeout: 20s
dial_timeout: 3s
mempool:
version: v1
recheck: true
broadcast: true
wal_dir: ""
size: 5000
max_txs_bytes: 39485440
cache_size: 10000
keep_invalid_txs_in_cache: false
max_tx_bytes: 7897088
max_batch_bytes: 0
ttl_duration: 1m15s
ttl_num_blocks: 12
max_gossip_delay: 0s
experimental_max_gossip_connections_to_persistent_peers: 0
experimental_max_gossip_connections_to_non_persistent_peers: 0
statesync:
enable: false
rpc_servers: ""
trust_height: 0
trust_hash: ""
trust_period: 168h0m0s
discovery_time: 15s
temp_dir: ""
chunk_request_timeout: 10s
chunk_fetchers: "4"
fastsync:
version: v0
consensus:
only_internal_wal: "true"
wal_file: data/cs.wal/wal
timeout_propose: 3.5s
timeout_propose_delta: 500ms
timeout_prevote: 1s
timeout_prevote_delta: 500ms
timeout_precommit: 1s
timeout_precommit_delta: 500ms
timeout_commit: 4.2s
double_sign_check_height: 0
skip_timeout_commit: false
create_empty_blocks: true
create_empty_blocks_interval: 0s
peer_gossip_sleep_duration: 100ms
peer_query_maj23_sleep_duration: 2s
storage:
discard_abci_responses: true
tx_index:
indexer: "null"
psql_conn: ""
instrumentation:
prometheus: false
prometheus_listen_addr: :26660
max_open_connections: 3
namespace: cometbft
trace_push_config: ""
trace_pull_address: ""
trace_type: noop
trace_push_batch_size: 1000
tracing_tables: mempool_tx,mempool_peer_state,consensus_round_state,consensus_block_parts,consensus_block,consensus_vote,consensus_state,consensus_proposal,peers,pending_bytes,received_bytes,abci
pyroscope_url: ""
pyroscope_trace: false
pyroscope_profile_types:
- cpu
- alloc_objects
- inuse_objects
- goroutines
- mutex_count
- mutex_duration
- block_count
- block_duration
Loading

0 comments on commit ca3597c

Please sign in to comment.