fix: Celestia mainnet config (#1038)

Co-authored-by: Liam Monninger <[email protected]>

Author: 2 people

Cargo.lock

@@ -152,7 +152,6 @@ movement-signing-eth = { path = "util/signing/integrations/eth" }
 vaultrs = { version = "0.7.3" }
 aws-sdk-kms = "1.51.0"
 google-cloud-kms = "0.6.0"
-base64 = { version = "0.13.0" }
 
 # Serialization and Deserialization
 serde = "1.0"
@@ -229,8 +228,8 @@ secp256k1 = { version = "0.27", default-features = false, features = [
 ] }
 
 ## Celestia Dependencies
-celestia-rpc = { git = "https://github.com/movementlabsxyz/lumina", rev = "2d16e6733949f6bf70849eb60c14114e6d8ea63e" }   #{ version = "0.7.0" }
-celestia-types = { git = "https://github.com/movementlabsxyz/lumina", rev = "2d16e6733949f6bf70849eb60c14114e6d8ea63e" } #{ version = "0.7.0" }
+celestia-rpc = { git = "https://github.com/eigerco/lumina", rev = "c6e5b7f5e3a3040bce4262fe5fba5c21a2637b5" }   #{ version = "0.7.0" }
+celestia-types = { git = "https://github.com/eigerco/lumina", rev = "c6e5b7f5e3a3040bce4262fe5fba5c21a2637b5" } #{ version = "0.7.0" }
 
 # External Dependencies
 
@@ -267,6 +266,7 @@ async-stream = "0.3.0"
 async-trait = "0.1.71"
 async-recursion = "1.1.1"
 auto_impl = "1.2.0"
+base64 = { version = "0.22.1" }
 blake3 = { version = "1.4.0", features = ["traits-preview"] }
 bytes = { version = "1.2.1", default-features = false }
 chrono = "0.4.37"
@@ -288,9 +288,8 @@ hex = { version = "0.4.3", default-features = false, features = [
 ics23 = { version = "0.11.0" }
 k256 = { version = "0.13.3" }
 keccak-hash = "0.10.0"
-itertools = { version = "0.12.1", default-features = false }
+itertools = { version = "0.13.0", default-features = false }
 jmt = "0.9.0"
-jsonrpsee = { version = "0.20.1", features = ["jsonrpsee-types"] }
 log = "0.4.21"
 mirai-annotations = "1.10.1"
 move-vm-integration-test-helpers = { path = "test-helpers/move-vm-integration-test-helpers" }

Cargo.toml

@@ -0,0 +1,47 @@
+services:
+  setup:
+    image: ghcr.io/movementlabsxyz/movement-full-node-setup:${CONTAINER_REV}
+    container_name: setup
+    environment:
+      CELESTIA_NAMESPACE: "0xa21de06de7aa38c2a812"
+      CELESTIA_NETWORK: mainnet
+      # ws://celestia-light-node:26658
+      CELESTIA_WEBSOCKET_CONNECTION_PROTOCOL: ws
+      CELESTIA_WEBSOCKET_CONNECTION_HOSTNAME: celestia-light-node
+      CELESTIA_WEBSOCKET_CONNECTION_PORT: 26658
+      INDEXER_PROCESSOR_POSTGRES_CONNECTION_STRING: postgres://postgres:password@postgres:5432/postgres
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      AWS_REGION: ${AWS_DEFAULT_REGION}
+    volumes:
+      - ${DOT_MOVEMENT_PATH}:/.movement
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 30
+      interval: 10s
+      timeout: 5s
+
+  celestia-light-node:
+    image: ghcr.io/celestiaorg/celestia-node:v0.21.5
+    container_name: celestia-light-node
+    command: |
+      celestia light start
+        --core.ip rpc.celestia.pops.one
+        --p2p.network celestia
+        --node.store /.movement/celestia/movement/.celestia-light
+        --keyring.backend test
+        --keyring.keyname movement_celestia_light
+        --log.level WARN
+    environment:
+      - NODE_TYPE=light
+      - P2P_NETWORK=celestia
+    volumes:
+      - ${DOT_MOVEMENT_PATH}/celestia:/.movement/celestia
+    ports:
+      - 26658:26658
+    depends_on:
+      setup:
+        condition: service_healthy
+    healthcheck:
+      test: "celestia node info"
+    restart: on-failure:3

docker/compose/movement-full-node/docker-compose.celestia-mainnet.yml

@@ -0,0 +1,11 @@
+services:
+
+  # turn off movement-faucet-service
+  movement-faucet-service:
+    image: busybox
+    container_name: movement-faucet-service
+    command: sleep infinity
+    healthcheck:
+      test: [ "CMD-SHELL", "echo 'health check'" ]
+      retries: 3
+      start_period: 3s

docker/compose/movement-full-node/docker-compose.mainnet-leader.yml

@@ -607,8 +607,11 @@ mod tests {
 			})
 		);
 
-		let da_signers = match &config.celestia_da_light_node.celestia_da_light_node_config {
-			movement_da_util::config::Config::Local(local) => &local.da_light_node.da_signers,
+		let da_light_node_config = &config.celestia_da_light_node.celestia_da_light_node_config;
+		let da_signers = match &da_light_node_config.network {
+			movement_da_util::config::Network::Local => {
+				&da_light_node_config.da_light_node.da_signers
+			}
 			_ => panic!("Expected Local"),
 		};
 

networks/movement/movement-config/src/migrations/elsa_to_biarritz_rc1/mod.rs

@@ -5,12 +5,15 @@ use serde::{Deserialize, Serialize};
 pub struct Config {
 	#[serde(default = "default_da_db_path")]
 	pub da_db_path: String,
+	#[serde(default = "default_start_sync_height")]
+	pub start_sync_height: u64,
 }
 
 impl Default for Config {
 	fn default() -> Self {
-		Self { da_db_path: default_da_db_path() }
+		Self { da_db_path: default_da_db_path(), start_sync_height: default_start_sync_height() }
 	}
 }
 
 env_default!(default_da_db_path, "SUZUKA_DA_DB_PATH", String, "movement-da-db".to_string());
+env_default!(default_start_sync_height, "MOVEMENT_START_SYNC_HEIGHT", u64, 0);

networks/movement/movement-config/src/releases/biarritz_rc1/da_db.rs

@@ -77,6 +77,7 @@ impl DaDB {
 		Ok(())
 	}
 
+	/// Get the synced height marker stored in the database.
 	pub async fn get_synced_height(&self) -> Result<u64, anyhow::Error> {
 		// This is heavy for this purpose, but progressively the contents of the DA DB will be used for more things
 		let da_db = self.inner.clone();
@@ -97,4 +98,28 @@ impl DaDB {
 		.await??;
 		Ok(height)
 	}
+
+	/// Set the initial value of the synced height, unless a value is stored.
+	pub async fn initialize_synced_height(&self, min_height: u64) -> Result<(), anyhow::Error> {
+		// This is heavy for this purpose, but progressively the contents of the DA DB will be used for more things
+		let da_db = self.inner.clone();
+		tokio::task::spawn_blocking(move || {
+			let cf = da_db
+				.cf_handle(SYNCED_HEIGHT)
+				.ok_or(anyhow::anyhow!("No synced_height column family"))?;
+			let height = da_db
+				.get_cf(&cf, "synced_height")
+				.map_err(|e| anyhow::anyhow!("Failed to get synced height: {:?}", e))?;
+			if height.is_none() {
+				let height = serde_json::to_string(&min_height)
+					.map_err(|e| anyhow::anyhow!("Failed to serialize synced height: {:?}", e))?;
+				da_db
+					.put_cf(&cf, "synced_height", height)
+					.map_err(|e| anyhow::anyhow!("Failed to set synced height: {:?}", e))?;
+			}
+			Ok::<(), anyhow::Error>(())
+		})
+		.await??;
+		Ok(())
+	}
 }

networks/movement/movement-full-node/src/node/da_db.rs

@@ -164,6 +164,13 @@ impl MovementPartialNode<Executor> {
 		let da_db =
 			DaDB::open(&config.da_db.da_db_path).context("Failed to create or get DA DB")?;
 
+		// FIXME: the config value is probably misplaced
+		da_db
+			.initialize_synced_height(
+				config.celestia_da_light_node.celestia_da_light_node_config.initial_height,
+			)
+			.await?;
+
 		Ok(Self {
 			executor,
 			light_node_client,

networks/movement/movement-full-node/src/node/partial.rs

@@ -69,7 +69,7 @@ where
 {
 	pub async fn run(mut self) -> anyhow::Result<()> {
 		let synced_height = self.da_db.get_synced_height().await?;
-		info!("Synced height: {:?}", synced_height);
+		info!("DA synced height: {:?}", synced_height);
 		let mut blocks_from_da = self
 			.da_light_node_client
 			.stream_read_from_height(StreamReadFromHeightRequest { height: synced_height })

networks/movement/movement-full-node/src/node/tasks/execute_settle.rs

@@ -1,9 +1,9 @@
 //! Task to process incoming transactions and write to DA
 
 use maptos_dof_execution::SignedTransaction;
-use movement_da_util::config::Config as LightNodeConfig;
 use movement_da_light_node_client::MovementDaLightNodeClient;
 use movement_da_light_node_proto::{BatchWriteRequest, BlobWrite};
+use movement_da_util::config::Config as LightNodeConfig;
 
 use tokio::sync::mpsc;
 use tracing::{info, warn};
@@ -43,7 +43,7 @@ impl Task {
 
 		// limit the total time batching transactions
 		let start = Instant::now();
-		let (_, half_building_time) = self.da_light_node_config.try_block_building_parameters()?;
+		let (_, half_building_time) = self.da_light_node_config.block_building_parameters();
 
 		let mut transactions = Vec::new();