Return Commitment from executors' execute_block

In MonzaExecutor and SuzukaExecutor, return the Commitment
value from execute_block. The underlying opt-executor is changed
to produce the commitment from proof data.

Author: mzabaluev

Cargo.lock

@@ -33,6 +33,8 @@ tokio = { workspace = true }
 rand = { workspace = true }
 rand_core = { workspace = true }
 bcs = { workspace = true}
+futures = { workspace = true }
+async-channel = { workspace = true }
 
 aptos-vm = { workspace = true }
 aptos-config = { workspace = true }
@@ -58,9 +60,8 @@ aptos-mempool = { workspace = true }
 aptos-temppath = { workspace = true }
 aptos-faucet-core = { workspace = true }
 aptos-cached-packages = { workspace = true }
-futures = { workspace = true }
-async-channel = { workspace = true }
 maptos-execution-util = { workspace = true }
+movement-types = { workspace = true }
 
 dirs = { workspace = true }
 tempfile = { workspace = true }

protocol-units/execution/maptos/opt-executor/Cargo.toml

@@ -35,6 +35,7 @@ use aptos_vm::AptosVM;
 use aptos_vm_genesis::{
 	default_gas_schedule, encode_genesis_change_set, GenesisConfiguration, TestValidator, Validator,
 };
+use movement_types::Commitment;
 
 use anyhow::Context as _;
 use futures::channel::mpsc as futures_mpsc;
@@ -256,7 +257,7 @@ impl Executor {
 	pub async fn execute_block(
 		&self,
 		block: ExecutableBlock,
-	) -> Result<(), anyhow::Error> {
+	) -> Result<Commitment, anyhow::Error> {
 
 		let block_id = block.block_id.clone();
 		let parent_block_id = {
@@ -285,14 +286,14 @@ impl Executor {
 			)?;
 		} 
 
-		{
+		let proof = {
 			let reader = self.db.read().await.reader.clone();
-			let proof = reader.get_state_proof(
+			reader.get_state_proof(
 				state_compute.version(),
-			)?;
-		}
+			)?
+		};
 
-		Ok(())
+		Ok(Commitment::digest_state_proof(&proof))
 	}
 
 	pub async fn try_get_context(&self) -> Result<Arc<Context>, anyhow::Error> {
@@ -582,7 +583,9 @@ mod tests {
 
 			// Create and execute the block.
 			let block = ExecutableBlock::new(block_id.clone(), transactions);
-			executor.execute_block(block).await?;
+			let commitment = executor.execute_block(block).await?;
+
+			// TODO: verify commitment against the state.
 
 			// Access the database reader to verify state after execution.
 			let db_reader = executor.db.read().await.reader.clone();

protocol-units/execution/maptos/opt-executor/src/executor.rs

@@ -63,6 +63,7 @@ aptos-proptest-helpers = { workspace = true }
 
 maptos-opt-executor = { workspace = true }
 maptos-execution-util = { workspace = true }
+movement-types = { workspace = true }
 
 dirs = "5.0.1"
 tempfile = "3.10.1"

protocol-units/execution/monza/executor/Cargo.toml

@@ -7,10 +7,12 @@ pub use aptos_types::{
     transaction::{SignedTransaction, Transaction}
 };
 pub use aptos_crypto::hash::HashValue;
-use async_channel::Sender;
 use aptos_api::runtime::Apis;
+
 pub use maptos_execution_util::FinalityMode;
+use movement_types::Commitment;
 
+use async_channel::Sender;
 
 #[tonic::async_trait]
 pub trait MonzaExecutor {
@@ -26,7 +28,7 @@ pub trait MonzaExecutor {
         &self,
         mode : &FinalityMode, 
         block: ExecutableBlock,
-    ) -> Result<(), anyhow::Error>;
+    ) -> Result<Commitment, anyhow::Error>;
 
     /// Sets the transaction channel.
     async fn set_tx_channel(&mut self, tx_channel: Sender<SignedTransaction>) -> Result<(), anyhow::Error>;

protocol-units/execution/monza/executor/src/lib.rs

@@ -2,6 +2,7 @@ use crate::*;
 use aptos_types::transaction::SignedTransaction;
 use async_channel::Sender;
 use maptos_opt_executor::Executor;
+use movement_types::Commitment;
 
 #[derive(Clone)]
 pub struct MonzaExecutorV1 {
@@ -45,7 +46,7 @@ impl MonzaExecutor for MonzaExecutorV1 {
 		&self,
 		mode: &FinalityMode,
 		block: ExecutableBlock,
-	) -> Result<(), anyhow::Error> {
+	) -> Result<Commitment, anyhow::Error> {
 		match mode {
 			FinalityMode::Dyn => unimplemented!(),
 			FinalityMode::Opt => {

protocol-units/execution/monza/executor/src/v1.rs

@@ -62,6 +62,7 @@ aptos-temppath = { workspace = true }
 
 maptos-opt-executor = { workspace = true }
 maptos-execution-util = { workspace = true }
+movement-types = { workspace = true }
 
 dirs = "5.0.1"
 tempfile = "3.10.1"

protocol-units/execution/suzuka/executor/Cargo.toml

@@ -7,10 +7,12 @@ pub use aptos_types::{
     transaction::{SignedTransaction, Transaction}
 };
 pub use aptos_crypto::hash::HashValue;
-use async_channel::Sender;
 use aptos_api::runtime::Apis;
+
 pub use maptos_execution_util::FinalityMode;
+use movement_types::Commitment;
 
+use async_channel::Sender;
 
 #[tonic::async_trait]
 pub trait SuzukaExecutor {
@@ -26,7 +28,7 @@ pub trait SuzukaExecutor {
         &self,
         mode : &FinalityMode, 
         block: ExecutableBlock,
-    ) -> Result<(), anyhow::Error>;
+    ) -> Result<Commitment, anyhow::Error>;
 
     /// Sets the transaction channel.
     async fn set_tx_channel(&mut self, tx_channel: Sender<SignedTransaction>) -> Result<(), anyhow::Error>;

protocol-units/execution/suzuka/executor/src/lib.rs

@@ -2,6 +2,7 @@ use crate::*;
 use maptos_opt_executor::Executor;
 use async_channel::Sender;
 use aptos_types::transaction::SignedTransaction;
+use movement_types::Commitment;
 
 #[derive(Clone)]
 pub struct SuzukaExecutorV1 {
@@ -50,7 +51,7 @@ impl SuzukaExecutor for SuzukaExecutorV1 {
         &self,
         mode : &FinalityMode, 
         block: ExecutableBlock,
-    ) -> Result<(), anyhow::Error> {
+    ) -> Result<Commitment, anyhow::Error> {
 
         match mode {
             FinalityMode::Dyn => unimplemented!(),
@@ -138,7 +139,7 @@ mod opt_tests {
 	#[tokio::test]
 	async fn test_execute_opt_block() -> Result<(), anyhow::Error> {
         let (tx, rx) = async_channel::unbounded();
-		let mut executor = SuzukaExecutorV1::try_from_env(tx).await?;
+		let executor = SuzukaExecutorV1::try_from_env(tx).await?;
 		let block_id = HashValue::random();
 		let tx = SignatureVerifiedTransaction::Valid(Transaction::UserTransaction(
 			create_signed_transaction(0),
@@ -228,7 +229,11 @@ mod opt_tests {
         ));
         let txs = ExecutableTransactions::Unsharded(vec![tx]);
         let block = ExecutableBlock::new(block_id.clone(), txs);
-        executor.execute_block(&FinalityMode::Opt, block).await?;
+        let commitment = executor.execute_block(&FinalityMode::Opt, block).await?;
+
+        println!("Commitment: {:?}", commitment);
+
+        // TODO: test the commitment
 
         services_handle.abort();
         background_handle.abort();