feat(proto, conductor, cd)!: changes for Forma migration

charts/evm-rollup/Chart.yaml

@@ -21,7 +21,7 @@ version: 1.0.1
 # 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.0.0"
+appVersion: "1.0.1"
 
 maintainers:
   - name: wafflesvonmaple

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

@@ -27,20 +27,37 @@
         {{- range $key, $value := .Values.genesis.extra }}
         "{{ $key }}": {{ toPrettyJson $value | indent 8 | trim }},
         {{- end }}
-        {{- if .Values.genesis.extraDataOverride }}
-        "astriaExtraDataOverride": "{{ .Values.genesis.extraDataOverride }}",
-        {{- end }}
         "astriaOverrideGenesisExtraData": {{ .Values.genesis.overrideGenesisExtraData }},
-        "astriaSequencerInitialHeight": {{ toString .Values.genesis.sequencerInitialHeight | replace "\"" "" }},
         "astriaRollupName": "{{ tpl .Values.genesis.rollupName . }}",
-        "astriaCelestiaInitialHeight": {{ toString .Values.genesis.celestiaInitialHeight | replace "\"" "" }},
-        "astriaCelestiaHeightVariance": {{ toString .Values.genesis.celestiaHeightVariance | replace "\"" "" }},
-        "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }},
-        "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }},
-        "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }},
-        "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}"
         {{- if not .Values.global.dev }}
         {{- else }}
+        "astriaForks": {
+            "genesis": {
+                "height": {{ toString .Values.genesis.forks.genesis.height | replace "\"" "" }},
+                "halt": {{ toString .Values.genesis.forks.genesis.halt | replace "\"" "" }},
+                "snapshotChecksum": {{ toString .Values.genesis.forks.genesis.snapshotChecksum | replace "\"" "" }},
+                {{- if .Values.genesis.forks.genesis.extraDataOverride }}
+                "extraDataOverride": {{ toString .Values.genesis.forks.genesis.extraDataOverride }},
+                {{- end }}
+                "feeCollector": {{ toString .Values.genesis.forks.genesis.feeCollector | replace "\"" "" }},
+                "EIP1559Params": {{ toPrettyJson .Values.genesis.forks.genesis.eip1559Params | indent 8 | trim }},
+                "sequencer": {
+                    "chainId": {{ toString .Values.genesis.forks.genesis.sequencerChainId | replace "\"" "" }},
+                    "addressPrefix": {{ toString .Values.genesis.forks.genesis.sequencerAddressPrefix | replace "\"" "" }},
+                    "startHeight": {{ toString .Values.genesis.forks.genesis.sequencerStartHeight | replace "\"" "" }},
+                    "stopHeight": {{ toString .Values.genesis.forks.genesis.sequencerStopHeight | replace "\"" "" }},
+                },
+                "celestia": {
+                    "chainId": {{ toString .Values.genesis.forks.genesis.celestiaChainId | replace "\"" "" }},
+                    "startHeight": {{ toString .Values.genesis.forks.genesis.celestiaStartHeight | replace "\"" "" }},
+                    "heightVariance": {{ toString .Values.genesis.forks.genesis.celestiaHeightVariance | replace "\"" "" }},
+                },
+                "bridgeAddresses": {{ toPrettyJson .Values.genesis.forks.genesisbridgeAddresses | indent 8 | trim }},
+            }
+            {{- if .Values.genesis.forks.additionalForks }}
+            {{ toPrettyJson .Values.genesis.forks.additionalForks | indent 8 | trim }}
+            {{- end }}
+        },
         {{- end }}
     },
     "difficulty": "0",

charts/evm-rollup/templates/configmap.yaml

@@ -6,14 +6,12 @@ metadata:
 data:
   ASTRIA_CONDUCTOR_LOG: "astria_conductor={{ .Values.config.logLevel }}"
   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: "{{ .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 . }}"
   ASTRIA_CONDUCTOR_SEQUENCER_COMETBFT_URL: "{{ tpl .Values.config.conductor.sequencerRpc . }}"
-  ASTRIA_CONDUCTOR_EXPECTED_SEQUENCER_CHAIN_ID: "{{ tpl .Values.config.conductor.sequencerChainId . }}"
   ASTRIA_CONDUCTOR_SEQUENCER_BLOCK_TIME_MS: "{{ .Values.config.conductor.sequencerBlockTimeMs }}"
   ASTRIA_CONDUCTOR_NO_METRICS: "{{ not .Values.metrics.enabled }}"
   ASTRIA_CONDUCTOR_METRICS_HTTP_LISTENER_ADDR: "0.0.0.0:{{ .Values.ports.conductorMetrics }}"

charts/evm-rollup/values.yaml

@@ -11,65 +11,79 @@ images:
     repo: ghcr.io/astriaorg/astria-geth
     pullPolicy: IfNotPresent
     tag: 1.0.0
-    devTag: latest
+    devTag: pr-59
     overrideTag: ""
   conductor:
     repo: ghcr.io/astriaorg/conductor
     pullPolicy: IfNotPresent
-    tag: 1.0.0
+    tag: 1.0.1
     devTag: latest
 
 
 genesis:
-  ## These values are used to configure the genesis block of the rollup chain
-  ## no defaults as they are unique to each chain
-
   # The name of the rollup chain, used to generate the Rollup ID
   rollupName: ""
-  # Block height to start syncing rollup from, lowest possible is 2
-  sequencerInitialHeight: ""
-  # The first Celestia height to utilize when looking for rollup data
-  celestiaInitialHeight: ""
-  # The variance in Celestia height to allow before halting the chain
-  celestiaHeightVariance: ""
-  # Will fill the extra data in each block, can be left empty
-  # can also fill with something unique for your chain.
-  extraDataOverride: ""
+
+  # The "forks" for upgrading the chain. Contains necessary information for starting
+  # and, if desired, restarting the chain at a given height. The necessary fields
+  # for the genesis fork are provided, and additional forks can be added as needed.
+  forks:
+    ## These values are used to configure the genesis block of the rollup chain
+    ## no defaults as they are unique to each chain
+    genesis:
+      # The block height to start the chain at, 0 for genesis
+      height: "0"
+      # Whether to halt the rollup chain at the given height. False for genesis
+      halt: "false"
+      # Checksum of the snapshot to use upon restart
+      snapshotChecksum: ""
+      # Will fill the extra data in each block, can be left empty
+      # can also fill with something unique for your chain.
+      extraDataOverride: ""
+      # Configure the fee collector for the evm tx fees, activated at block heights.
+      # If not configured, all tx fees will be burned.
+      feeCollector: ""
+        # 1: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
+      # Configure EIP-1559 params, activated at block heights.
+      eip1559Params: {}
+        # 1:
+        #   minBaseFee: 0
+        #   elasticityMultiplier: 2
+        #   baseFeeChangeDenominator: 8
+      # The chain id of the sequencer chain
+      sequencerChainId: ""
+      # The hrp for bech32m addresses, unlikely to be changed
+      sequencerAddressPrefix: "astria"
+      # Block height to start syncing rollup from, lowest possible is 2
+      sequencerStartHeight: ""
+      # Block height (on sequencer) to stop syncing rollup at, continuing to next configuration fork
+      sequencerStopHeight: ""
+      # The chain id of the celestia chain
+      celestiaChainId: ""
+      # The first Celestia height to utilize when looking for rollup data
+      celestiaStartHeight: ""
+      # The variance in Celestia height to allow before halting the chain
+      celestiaHeightVariance: ""
+      # Configure the sequencer bridge addresses and allowed assets if using
+      # the astria canonical bridge. Recommend removing alloc values if so.
+      bridgeAddresses: []
+        # - address: "684ae50c49a434199199c9c698115391152d7b3f"
+        #   startHeight: 1
+        #   assetDenom: "nria"
+        #   senderAddress: "0x0000000000000000000000000000000000000000"
+        #   assetPrecision: 9
+    # JSON object with any additional desired forks. Can be used with any or all
+    # of the above fields. Any fields left empty will be populated with the previous
+    # fork's values.
+    additionalForks: {}
 
   ## These are general configuration values with some recommended defaults
 
   # Configure the gas Limit
   gasLimit: "50000000"
   # If set to true the genesis block will contain extra data
   overrideGenesisExtraData: true
-  # The hrp for bech32m addresses, unlikely to be changed
-  sequencerAddressPrefix: "astria"
-
-  ## These values are used to configure astria native bridging
-  ## Many of the fields have commented out example fields
-
-  # Configure the sequencer bridge addresses and allowed assets if using
-  # the astria canonical bridge. Recommend removing alloc values if so.
-  bridgeAddresses: []
-    # - address: "684ae50c49a434199199c9c698115391152d7b3f"
-    #   startHeight: 1
-    #   assetDenom: "nria"
-    #   senderAddress: "0x0000000000000000000000000000000000000000"
-    #   assetPrecision: 9
-
-
-  ## Fee configuration
 
-  # Configure the fee collector for the evm tx fees, activated at block heights.
-  # If not configured, all tx fees will be burned.
-  feeCollectors: {}
-  # 1: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
-  # Configure EIP-1559 params, activated at block heights
-  eip1559Params: {}
-    # 1:
-    #   minBaseFee: 0
-    #   elasticityMultiplier: 2
-    #   baseFeeChangeDenominator: 8
 
   ## Standard Eth Genesis config values
   # An EVM chain number id, different from the astria rollup name
@@ -167,8 +181,6 @@ config:
     # - "FirmOnly" -> blocks are only pulled from DA
     # - "SoftAndFirm" -> blocks are pulled from both the sequencer and DA
     executionCommitLevel: 'SoftAndFirm'
-    # The chain id of the Astria sequencer chain conductor communicates with
-    sequencerChainId: ""
     # The expected fastest block time possible from sequencer, determines polling
     # rate.
     sequencerBlockTimeMs: 2000
@@ -180,8 +192,6 @@ config:
     sequencerGrpc: ""
     # The maximum number of requests to make to the sequencer per second
     sequencerRequestsPerSecond: 500
-    # The chain id of the celestia network the conductor communicates with
-    celestiaChainId: ""
 
   celestia:
     # if config.rollup.executionLevel is NOT 'SoftOnly' AND celestia-node is not enabled

charts/evm-stack/values.yaml

@@ -13,7 +13,6 @@ global:
   rollupName: ""
   evmChainId: ""
   sequencerChainId: ""
-  celestiaChainId: ""
   otel:
     endpoint: ""
     tracesEndpoint: ""
@@ -29,8 +28,6 @@ evm-rollup:
     chainId: "{{ .Values.global.evmChainId }}"
   config:
     conductor:
-      sequencerChainId: "{{ .Values.global.sequencerChainId }}"
-      celestiaChainId: "{{ .Values.global.celestiaChainId }}"
       sequencerRpc: "{{ .Values.global.sequencerRpc }}"
       sequencerGrpc: "{{ .Values.global.sequencerGrpc }}"
   otel:

crates/astria-conductor/CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Add stop height logic, remove chain id env vars, accomodate new genesis info
+shape [#1843](https://github.com/astriaorg/astria/pull/1843).
 - Bump penumbra dependencies [#1740](https://github.com/astriaorg/astria/pull/1740).
 
 ## [1.0.0-rc.2] - 2024-10-23

crates/astria-conductor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "astria-conductor"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 rust-version = "1.81.0"
 license = "MIT OR Apache-2.0"

crates/astria-conductor/local.env.example

@@ -73,12 +73,6 @@ ASTRIA_CONDUCTOR_SEQUENCER_BLOCK_TIME_MS=2000
 # CometBFT node.
 ASTRIA_CONDUCTOR_SEQUENCER_REQUESTS_PER_SECOND=500
 
-# The chain ID of the sequencer network the conductor should be communicating with.
-ASTRIA_CONDUCTOR_EXPECTED_SEQUENCER_CHAIN_ID="test-sequencer-1000"
-
-# The chain ID of the Celestia network the conductor should be communicating with.
-ASTRIA_CONDUCTOR_EXPECTED_CELESTIA_CHAIN_ID="test-celestia-1000"
-
 # Set to true to enable prometheus metrics.
 ASTRIA_CONDUCTOR_NO_METRICS=true
 

crates/astria-conductor/src/celestia/builder.rs

@@ -1,4 +1,4 @@
 //! Boilerplate to construct a [`super::Reader`] via a type-state builder.
 
 use std::time::Duration;
 
@@ -23,8 +23,6 @@
     pub(crate) executor: executor::Handle,
     pub(crate) sequencer_cometbft_client: SequencerClient,
     pub(crate) sequencer_requests_per_second: u32,
-    pub(crate) expected_celestia_chain_id: String,
-    pub(crate) expected_sequencer_chain_id: String,
     pub(crate) shutdown: CancellationToken,
     pub(crate) metrics: &'static Metrics,
 }
@@ -39,8 +37,6 @@
             executor,
             sequencer_cometbft_client,
             sequencer_requests_per_second,
-            expected_celestia_chain_id,
-            expected_sequencer_chain_id,
             shutdown,
             metrics,
         } = self;
@@ -54,8 +50,6 @@
             executor,
             sequencer_cometbft_client,
             sequencer_requests_per_second,
-            expected_celestia_chain_id,
-            expected_sequencer_chain_id,
             shutdown,
             metrics,
         })

crates/astria-conductor/src/celestia/mod.rs

@@ -1,4 +1,4 @@
 use std::{
     cmp::max,
     sync::Arc,
     time::Duration,
@@ -141,12 +141,6 @@
     /// (usually to verify block data retrieved from Celestia blobs).
     sequencer_requests_per_second: u32,
 
-    /// The chain ID of the Celestia network the reader should be communicating with.
-    expected_celestia_chain_id: String,
-
-    /// The chain ID of the Sequencer the reader should be communicating with.
-    expected_sequencer_chain_id: String,
-
     /// Token to listen for Conductor being shut down.
     shutdown: CancellationToken,
 
@@ -178,45 +172,45 @@
     async fn initialize(
         &mut self,
     ) -> eyre::Result<((), executor::Handle<StateIsInit>, tendermint::chain::Id)> {
+        let executor = self
+            .executor
+            .wait_for_init()
+            .await
+            .wrap_err("handle to executor failed while waiting for it being initialized")?;
+
         let validate_celestia_chain_id = async {
             let actual_celestia_chain_id = get_celestia_chain_id(&self.celestia_client)
                 .await
                 .wrap_err("failed to fetch Celestia chain ID")?;
-            let expected_celestia_chain_id = &self.expected_celestia_chain_id;
+            let expected_celestia_chain_id = executor.celestia_chain_id();
             ensure!(
-                self.expected_celestia_chain_id == actual_celestia_chain_id.as_str(),
+                expected_celestia_chain_id == actual_celestia_chain_id.as_str(),
                 "expected Celestia chain id `{expected_celestia_chain_id}` does not match actual: \
                  `{actual_celestia_chain_id}`"
             );
             Ok(())
         };
 
-        let wait_for_init_executor = async {
-            self.executor
-                .wait_for_init()
-                .await
-                .wrap_err("handle to executor failed while waiting for it being initialized")
-        };
-
         let get_and_validate_sequencer_chain_id = async {
             let actual_sequencer_chain_id =
                 get_sequencer_chain_id(self.sequencer_cometbft_client.clone())
                     .await
                     .wrap_err("failed to get sequencer chain ID")?;
-            let expected_sequencer_chain_id = &self.expected_sequencer_chain_id;
+            let expected_sequencer_chain_id = executor.sequencer_chain_id();
             ensure!(
-                self.expected_sequencer_chain_id == actual_sequencer_chain_id.to_string(),
+                expected_sequencer_chain_id == actual_sequencer_chain_id.to_string(),
                 "expected Celestia chain id `{expected_sequencer_chain_id}` does not match \
                  actual: `{actual_sequencer_chain_id}`"
             );
             Ok(actual_sequencer_chain_id)
         };
 
-        try_join!(
+        let ((), sequencer_chain_id) = try_join!(
             validate_celestia_chain_id,
-            wait_for_init_executor,
             get_and_validate_sequencer_chain_id
-        )
+        )?;
+
+        Ok(((), executor, sequencer_chain_id))
     }
 }