fix: Gas Upgrades Beta Fixes pt. 2 (#1070)

Co-authored-by: Andy Golay <[email protected]>
Co-authored-by: musitdev <[email protected]>
Co-authored-by: Mikhail Zabaluev <[email protected]>
Co-authored-by: Richard Melkonian <[email protected]>
Co-authored-by: Icarus131 <[email protected]>
Co-authored-by: primata <[email protected]>
Co-authored-by: Icarus131 <[email protected]>
Co-authored-by: Richard Melkonian <[email protected]>
Co-authored-by: Radu Popa <[email protected]>

Author: 8 people

.github/workflows/build-push-container.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         architecture: [x86_64, arm64]        
-    runs-on: ${{ matrix.architecture == 'x86_64' && 'buildjet-8vcpu-ubuntu-2204' || 'buildjet-8vcpu-ubuntu-2204-arm' }}
+    runs-on: ${{ matrix.architecture == 'x86_64' && 'buildjet-16vcpu-ubuntu-2204' || 'buildjet-16vcpu-ubuntu-2204-arm' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

Cargo.lock

@@ -234,7 +234,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)))?;

protocol-units/da/movement/protocol/light-node/src/passthrough.rs

@@ -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 }

protocol-units/da/movement/protocol/util/Cargo.toml

@@ -27,11 +27,12 @@ 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 {
+		// Define the block timestamp value. Aptos framework need a timestamp in micro sec.
+		// Changing this value will generate blocks that can't be executed.
+		let timestamp = chrono::Utc::now().timestamp_micros() as u64;
+
+		Self::new(blob, timestamp)
 	}
 
 	/// Gets an owned copy of the bytes to be signed
@@ -76,31 +77,7 @@ pub mod block {
 
 		fn try_from(block: block::Block) -> Result<Self, Self::Error> {
 			let blob = bcs::to_bytes(&block)?;
-			Self::now(blob)
-		}
-	}
-
-	impl<C> TryFrom<block::Id> for InnerSignedBlobV1Data<C>
-	where
-		C: Curve + Verify<C> + Digester<C>,
-	{
-		type Error = anyhow::Error;
-
-		fn try_from(id: block::Id) -> Result<Self, Self::Error> {
-			let blob = id.as_bytes().to_vec();
-			Self::now(blob)
-		}
-	}
-
-	impl<C> TryFrom<Vec<block::Id>> for InnerSignedBlobV1Data<C>
-	where
-		C: Curve + Verify<C> + Digester<C>,
-	{
-		type Error = anyhow::Error;
-
-		fn try_from(ids: Vec<block::Id>) -> Result<Self, Self::Error> {
-			let blob = bcs::to_bytes(&ids)?;
-			Self::now(blob)
+			Ok(Self::now(blob))
 		}
 	}
 }

protocol-units/da/movement/protocol/util/src/blob/ir/data.rs

@@ -11,7 +11,7 @@ generate_gas_upgrade_module!(gas_upgrade, BiarritzRc1, {
 	let mut gas_parameters = AptosGasParameters::initial();
 	gas_parameters.vm.txn.max_transaction_size_in_bytes = GasQuantity::new(100_000_000);
 	gas_parameters.vm.txn.max_execution_gas = GasQuantity::new(10_000_000_000);
-
+	gas_parameters.vm.txn.gas_unit_scaling_factor = GasQuantity::new(50_000);
 	aptos_types::on_chain_config::GasScheduleV2 {
 		feature_version: aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION,
 		entries: gas_parameters

protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/cached.rs

@@ -102,9 +102,14 @@ impl TransactionPipe {
 		}
 	}
 
-	/// Pipes a batch of transactions from the mempool to the transaction channel.
-	/// todo: it may be wise to move the batching logic up a level to the consuming structs.
+	/// Performs a transaction read, mempool batch formation, and garbage collection.
 	pub(crate) async fn tick(&mut self) -> Result<(), Error> {
+		self.receive_transaction_tick().await
+	}
+
+	/// Receives a transaction and adds it to the mempool.
+	/// todo: it may be wise to move the batching logic up a level to the consuming structs.
+	pub(crate) async fn receive_transaction_tick(&mut self) -> Result<(), Error> {
 		let next = self.mempool_client_receiver.next().await;
 		if let Some(request) = next {
 			match request {