fix: celestia node address, go number formatting bullshit (#190)

The celestia node address helpers were broken, and when parsing larger
numbers for sequencer height or celestia heights we got scientific
notation, this is hack used elsewhere to handle this of wrapping as
string and then replacing quotes with nothing

charts/celestia-node/Chart.yaml

@@ -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.2.0
+version: 0.2.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

charts/celestia-node/templates/_helpers.tpl

@@ -23,7 +23,7 @@ Define the service name
 Define the k8s path to rpc service
 */}}
 {{- define "celestiaNode.service.addresses.base" -}}
-{{ include "celestiaNode.service.name" . }}.{{ .Values.global.namespace }}.svc.cluster.local:{{ .Values.ports.celestia.rpc }}
+{{ include "celestiaNode.service.name" . }}.{{ include "celestiaNode.namespace" . }}.svc.cluster.local:{{ .Values.ports.celestia.rpc }}
 {{- end }}
 
 

charts/rollup/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: celestia-node
   repository: file://../celestia-node
-  version: 0.2.0
-digest: sha256:d259cf4f2d0f17d0c70a2e88f9735ab011831410284dade0f5846677fc836ba4
-generated: "2024-02-15T15:04:33.506122-08:00"
+  version: 0.2.1
+digest: sha256:42e3beb2b8dac70b3288ba9bea36cf87d1d51357f84197847895f5056aaafef5
+generated: "2024-03-20T15:44:26.418305-04:00"

charts/rollup/Chart.yaml

@@ -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.10.1
+version: 0.10.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. Versions are not expected to
@@ -26,7 +26,7 @@ appVersion: "0.7.0"
 
 dependencies:
   - name: celestia-node
-    version: "0.2.0"
+    version: "0.2.1"
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
 

charts/rollup/files/genesis/geth-genesis.json

@@ -1,6 +1,6 @@
 {
     "config": {
-        "chainId": {{ .Values.config.rollup.networkId }},
+        "chainId": {{ toString .Values.config.rollup.networkId | replace "\"" "" }},
         "homesteadBlock": 0,
         "eip150Block": 0,
         "eip155Block": 0,
@@ -18,10 +18,10 @@
         "astriaExtraDataOverride": "{{ .Values.config.rollup.genesis.extraDataOverride }}",
         {{- end }}
         "astriaOverrideGenesisExtraData": {{ .Values.config.rollup.genesis.overrideGenesisExtraData }},
-        "astriaSequencerInitialHeight": {{ .Values.config.sequencer.initialBlockHeight }},
+        "astriaSequencerInitialHeight": {{ toString .Values.config.sequencer.initialBlockHeight | replace "\"" "" }},
         "astriaRollupName": "{{ .Values.config.rollup.name }}",
-        "astriaCelestiaInitialHeight": {{ .Values.config.celestia.initialBlockHeight }},
-        "astriaCelestiaHeightVariance": {{ .Values.config.celestia.heightVariance }}
+        "astriaCelestiaInitialHeight": {{ toString .Values.config.celestia.initialBlockHeight | replace "\"" "" }},
+        "astriaCelestiaHeightVariance":{{ toString .Values.config.celestia.heightVariance | replace "\"" "" }}
         {{- if not .Values.global.dev }}
         {{- else }}
         {{- end }}

charts/rollup/templates/_helpers.tpl

@@ -61,6 +61,7 @@ Return if ingress supports pathType.
 {{- or (eq (include "rollup.ingress.isStable" .) "true") (and (eq (include "rollup.ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" .Capabilities.KubeVersion.Version)) }}
 {{- end }}
 
+{{/*
 Return the appropriate apiVersion for ingress.
 */}}
 {{- define "rollup.ingress.apiVersion" -}}

charts/rollup/values.yaml

@@ -45,7 +45,7 @@ config:
     # Set to true to keep history of all blocks
     archiveNode: false
     # EVM network ID used by the chain
-    networkId: 1337
+    networkId: "1337"
     # Determines what will drive block execution, options are:
     # - "SoftOnly" -> blocks are only pulled from the sequencer
     # - "FirmOnly" -> blocks are only pulled from DA
@@ -118,7 +118,7 @@ config:
   # Configuration related to sequencer connection for rollup
   sequencer:
     # Block height to start syncing rollup from
-    initialBlockHeight: 2
+    initialBlockHeight: "2"
     # Fastest block time possible in MS
     blockTimeMs: 2000
     # URL path for the sequencer
@@ -136,8 +136,8 @@ config:
     rpc: ""
     ws: ""
     token: ""
-    initialBlockHeight: 2
-    heightVariance: 10
+    initialBlockHeight: "2"
+    heightVariance: "10"
 
   blockscout:
     enabled: true

values/rollup/dev.yaml

@@ -4,9 +4,9 @@ global:
 
 config:
   celestia:
-     rpc: "http://celestia-service.astria-dev-cluster.svc.cluster.local:26658"
-     ws: "ws://celestia-service.astria-dev-cluster.svc.cluster.local:26658"
-     token: "http://celestia-service.astria-dev-cluster.svc.cluster.local:5353"
+    rpc: "http://celestia-service.astria-dev-cluster.svc.cluster.local:26658"
+    ws: "ws://celestia-service.astria-dev-cluster.svc.cluster.local:26658"
+    token: "http://celestia-service.astria-dev-cluster.svc.cluster.local:5353"
 
 celestia-node:
   enabled: false