Merge branch 'l-monninger/gas-upgrades-beta-fixes' into musitdev/fix_…

…block_timestamp_error

.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

protocol-units/execution/maptos/framework/releases/biarritz-rc1/src/cached.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/opt-executor/src/background/transaction_pipe.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 {