feat(dev-cluster): changes for da sync

charts/celestia-local/Chart.yaml

@@ -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.3.0
+version: 0.3.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: "1.3.0"
+appVersion: "1.3.1"
 
 maintainers:
   - name: wafflesvonmaple

charts/celestia-local/values.yaml

@@ -16,7 +16,7 @@ storage:
       path: "/data/celestia-data"
 
 celestiaAppImage: "ghcr.io/celestiaorg/celestia-app:v1.3.0"
-celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.12.0"
+celestiaNodeImage: "ghcr.io/celestiaorg/celestia-node:v0.12.1"
 tokenServerImage: "busybox:1.35.0-musl"
 
 podSecurityContext:

charts/rollup/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.6.0
+version: 0.6.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/rollup/templates/configmap.yaml

@@ -9,13 +9,16 @@ data:
   ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ include "celestiaNode.service.adresses.rpc" (index .Subcharts "celestia-node") }}"
   TOKEN_SERVER_URL: "{{ include "celestiaNode.service.adresses.token" (index .Subcharts "celestia-node") }}"
   {{- else }}
-  ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ .Values.config.celestiaNode.rpc }}"
+  ASTRIA_CONDUCTOR_CELESTIA_NODE_URL: "{{ .Values.config.celestia.rpc }}"
+  TOKEN_SERVER_URL: "{{ .Values.config.celestia.token }}"
   {{- end }}
   ASTRIA_CONDUCTOR_CHAIN_ID: "{{ .Values.config.rollup.chainId }}"
   ASTRIA_CONDUCTOR_EXECUTION_RPC_URL: "http://127.0.0.1:{{ .Values.ports.executionGRPC }}"
   ASTRIA_CONDUCTOR_EXECUTION_COMMIT_LEVEL: "{{ .Values.config.rollup.executionCommitLevel }}"
   ASTRIA_CONDUCTOR_SEQUENCER_URL: "{{ .Values.config.sequencer.websocket }}"
   ASTRIA_CONDUCTOR_INITIAL_SEQUENCER_BLOCK_HEIGHT: "{{ .Values.config.sequencer.initialBlockHeight }}"
+  ASTRIA_CONDUCTOR_INITIAL_DA_BLOCK_HEIGHT: "{{ .Values.config.celestia.initialBlockHeight }}"
+  ASTRIA_CONDUCTOR_DA_BLOCK_RANGE: "{{ .Values.config.celestia.blockRange }}"
   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 }}"

charts/rollup/values.yaml

@@ -50,7 +50,7 @@ config:
   # Configuration related to sequencer connection for rollup
   sequencer:
     # Block height to start syncing rollup from
-    initialBlockHeight: 1
+    initialBlockHeight: 48
     # Websocket connection used for
     websocket: "ws://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657/websocket"
     # URL path for the sequencer
@@ -61,9 +61,15 @@ config:
     privateKey: "2bd806c97f0e00af1a1fc3328fa763a9269723c8db8fac4f93af71db186d6e90"
 
   celestia:
+    # Block height to start syncing rollup from
+    initialBlockHeight: 10
+    # The number of blocks on DA in which the first sequencer block for the rollup should be
+    # found
+    blockRange: 100
     # if config.rollup.executionLevel is NOT 'SoftOnly' AND celestia-node is not enabled
     # this must be set to access celestia network.
     rpc: ""
+    token: ""
 
 celestia-node:
   # Strongly recommend leaving enabled when not doing `SoftOnly` execution
@@ -81,13 +87,15 @@ celestia-node:
     # # using the default generated when deploying "celestia-local" chart
     # coreIp: celestia-service.astria-dev-cluster.svc.cluster.local
     # # The custom info below must be grabbed from the custom network bridge on startup
-    # customInfo: "<GENESIS_HASH>:<BRIDGE_MULTIADDRESS>"
+    # # customInfo: "<GENESIS_HASH>:<BRIDGE_MULTIADDRESS>"
+    # customInfo: "724B4048D8D030C0D9B16BDA5C26D57D5D09AE6EC212676D18246019D8C491E9:/ip4/10.10.3.44/tcp/2121/p2p/12D3KooWErJjB1vtH2DkveGPfs9Bdf2NW7bnztKZ6bZHeXVbWedf"
 
 images:
   # Core images for the rollup, developed for Astria
   geth: "ghcr.io/astriaorg/go-ethereum:0.4.1"
-  conductor: "ghcr.io/astriaorg/conductor:0.10.0--conductor"
-  composer: "ghcr.io/astriaorg/composer:0.2.5--composer"
+  # conductor: "ghcr.io/astriaorg/conductor:0.11.0--conductor"
+  conductor: "astria-conductor:local"
+  composer: "ghcr.io/astriaorg/composer:0.3.0--composer"
 
   # Rollup faucet
   faucet: "ghcr.io/astriaorg/ria-faucet:0.0.1"

justfile

@@ -25,7 +25,7 @@ load-image image:
   kind load docker-image {{image}} --name astria-dev-cluster
 
 deploy-chart chart:
-  helm install --debug --dry-run {{chart}}-chart ./charts/{{chart}} 
+  helm install --debug {{chart}}-chart ./charts/{{chart}} 
 
 delete-chart chart:
   helm uninstall {{chart}}-chart
@@ -69,6 +69,16 @@ deploy-rollup rollupName=defaultRollupName networkId=defaultNetworkId genesisAll
     {{ if sequencerStartBlock != '' { replace('--set config.sequencer.initialBlockHeight=#', '#', sequencerStartBlock) } else { '' } }} \
     {{rollupName}}chain-chart-deploy ./charts/rollup
 
+deploy-local-rollup rollupName=defaultRollupName networkId=defaultNetworkId genesisAllocAddress=defaultGenesisAllocAddress privateKey=defaultPrivateKey sequencerStartBlock=defaultSequencerStartBlock:
+  helm install --debug \
+    {{ if rollupName          != '' { replace('--set config.rollup.name=# --set config.rollup.chainId=#chain --set celestia-node.config.labelPrefix=#', '#', rollupName) } else { '' } }} \
+    {{ if networkId           != '' { replace('--set config.rollup.networkId=#', '#', networkId) } else { '' } }} \
+    {{ if genesisAllocAddress != '' { replace('--set config.rollup.genesisAccounts[0].address=#', '#', genesisAllocAddress) } else { '' } }} \
+    {{ if privateKey          != '' { replace('--set config.faucet.privateKey=#', '#', privateKey) } else { '' } }} \
+    {{ if sequencerStartBlock != '' { replace('--set config.sequencer.initialBlockHeight=#', '#', sequencerStartBlock) } else { '' } }} \
+    -f values/rollup/dev.yaml \
+    {{rollupName}}chain-chart-deploy ./charts/rollup
+
 wait-for-rollup rollupName=defaultRollupName:
   kubectl wait -n astria-dev-cluster deployment {{rollupName}}-geth --for=condition=Available=True --timeout=600s
   kubectl wait -n astria-dev-cluster deployment {{rollupName}}-blockscout --for=condition=Available=True --timeout=600s

values/rollup/dev.yaml

@@ -0,0 +1,7 @@
+config:
+  celestia:
+     rpc: "http://celestia-service.astria-dev-cluster.svc.cluster.local:26658"
+     token: "http://celestia-service.astria-dev-cluster.svc.cluster.local:5353"
+
+celestia-node:
+  enabled: false