Merge branch 'l-monninger/gas-upgrades-beta-fixes' of https://github.…

…com/movementlabsxyz/movement into l-monninger/gas-upgrades-beta-fixes
movementlabsxyz · Feb 26, 2025 · c73de9f · c73de9f
2 parents c7dc78a + b63dbfc
commit c73de9f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/protocol-units/da/movement/protocol/light-node/src/passthrough.rs b/protocol-units/da/movement/protocol/light-node/src/passthrough.rs
@@ -211,7 +211,6 @@ where
 		let blobs = request.into_inner().blobs;
 		for data in blobs {
 			let blob = InnerSignedBlobV1Data::now(data.data)
-				.map_err(|e| tonic::Status::internal(format!("Failed to create blob data: {}", e)))?
 				.try_to_sign(&self.signer)
 				.await
 				.map_err(|e| tonic::Status::internal(format!("Failed to sign blob: {}", e)))?;

diff --git a/protocol-units/da/movement/protocol/util/Cargo.toml b/protocol-units/da/movement/protocol/util/Cargo.toml
@@ -49,6 +49,7 @@ movement-da-light-node-signer = { workspace = true }
 movement-signer = { workspace = true }
 movement-signer-loader = { workspace = true }
 movement-types = { workspace = true }
+chrono = { workspace = true }
 
 [dev-dependencies]
 tempfile = { workspace = true }

diff --git a/protocol-units/da/movement/protocol/util/src/blob/ir/data.rs b/protocol-units/da/movement/protocol/util/src/blob/ir/data.rs
@@ -27,11 +27,11 @@ where
 		Self { blob, timestamp, __curve_marker: std::marker::PhantomData }
 	}
 
-	pub fn now(blob: Vec<u8>) -> Result<Self, anyhow::Error> {
-		Ok(Self::new(
-			blob,
-			std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?.as_secs(),
-		))
+	pub fn now(blob: Vec<u8>) -> Self {
+		// mark the timestamp as now in milliseconds
+		let timestamp = chrono::Utc::now().timestamp_micros() as u64;
+
+		Self::new(blob, timestamp)
 	}
 
 	/// Gets an owned copy of the bytes to be signed
@@ -76,7 +76,7 @@ pub mod block {
 
 		fn try_from(block: block::Block) -> Result<Self, Self::Error> {
 			let blob = bcs::to_bytes(&block)?;
-			Self::now(blob)
+			Ok(Self::now(blob))
 		}
 	}
 
@@ -88,7 +88,7 @@ pub mod block {
 
 		fn try_from(id: block::Id) -> Result<Self, Self::Error> {
 			let blob = id.as_bytes().to_vec();
-			Self::now(blob)
+			Ok(Self::now(blob))
 		}
 	}
 
@@ -100,7 +100,7 @@ pub mod block {
 
 		fn try_from(ids: Vec<block::Id>) -> Result<Self, Self::Error> {
 			let blob = bcs::to_bytes(&ids)?;
-			Self::now(blob)
+			Ok(Self::now(blob))
 		}
 	}
 }