[Execution] Return transactions when committing a chunk.

666lcz · Dec 22, 2021 · 74bc0cf · 74bc0cf
1 parent 9eede8d
commit 74bc0cf
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/execution/executor-types/src/executed_chunk.rs b/execution/executor-types/src/executed_chunk.rs
@@ -60,6 +60,10 @@ impl ExecutedChunk {
             .collect()
     }
 
+    pub fn transactions(&self) -> Vec<Transaction> {
+        self.to_commit.iter().map(|(txn, _)| txn).cloned().collect()
+    }
+
     pub fn events_to_commit(&self) -> Vec<ContractEvent> {
         self.to_commit
             .iter()

diff --git a/execution/executor-types/src/lib.rs b/execution/executor-types/src/lib.rs
@@ -64,22 +64,23 @@ pub trait ChunkExecutorTrait: Send + Sync {
         epoch_change_li: Option<&LedgerInfoWithSignatures>,
     ) -> anyhow::Result<()>;
 
-    /// Commit a previously executed chunks, returns a vector of reconfiguration events in the chunk.
-    fn commit_chunk(&self) -> Result<Vec<ContractEvent>>;
+    /// Commit a previously executed chunk. Returns a vector of reconfiguration
+    /// events in the chunk and the transactions that were committed.
+    fn commit_chunk(&self) -> Result<(Vec<ContractEvent>, Vec<Transaction>)>;
 
     fn execute_and_commit_chunk(
         &self,
         txn_list_with_proof: TransactionListWithProof,
         verified_target_li: &LedgerInfoWithSignatures,
         epoch_change_li: Option<&LedgerInfoWithSignatures>,
-    ) -> Result<Vec<ContractEvent>>;
+    ) -> Result<(Vec<ContractEvent>, Vec<Transaction>)>;
 
     fn apply_and_commit_chunk(
         &self,
         txn_output_list_with_proof: TransactionOutputListWithProof,
         verified_target_li: &LedgerInfoWithSignatures,
         epoch_change_li: Option<&LedgerInfoWithSignatures>,
-    ) -> Result<Vec<ContractEvent>>;
+    ) -> Result<(Vec<ContractEvent>, Vec<Transaction>)>;
 }
 
 pub trait BlockExecutorTrait: Send + Sync {

diff --git a/execution/executor/src/chunk_executor.rs b/execution/executor/src/chunk_executor.rs
@@ -223,18 +223,21 @@ impl<V: VMExecutor> ChunkExecutorTrait for ChunkExecutor<V> {
         Ok(())
     }
 
-    fn commit_chunk(&self) -> Result<Vec<ContractEvent>> {
+    fn commit_chunk(&self) -> Result<(Vec<ContractEvent>, Vec<Transaction>)> {
         let _timer = DIEM_EXECUTOR_COMMIT_CHUNK_SECONDS.start_timer();
-
-        Ok(self.commit_chunk_impl()?.events_to_commit())
+        let executed_chunk = self.commit_chunk_impl()?;
+        Ok((
+            executed_chunk.events_to_commit(),
+            executed_chunk.transactions(),
+        ))
     }
 
     fn execute_and_commit_chunk(
         &self,
         txn_list_with_proof: TransactionListWithProof,
         verified_target_li: &LedgerInfoWithSignatures,
         epoch_change_li: Option<&LedgerInfoWithSignatures>,
-    ) -> Result<Vec<ContractEvent>> {
+    ) -> Result<(Vec<ContractEvent>, Vec<Transaction>)> {
         // Re-sync with DB, make sure the queue is empty.
         self.reset()?;
 
@@ -247,7 +250,7 @@ impl<V: VMExecutor> ChunkExecutorTrait for ChunkExecutor<V> {
         txn_output_list_with_proof: TransactionOutputListWithProof,
         verified_target_li: &LedgerInfoWithSignatures,
         epoch_change_li: Option<&LedgerInfoWithSignatures>,
-    ) -> Result<Vec<ContractEvent>> {
+    ) -> Result<(Vec<ContractEvent>, Vec<Transaction>)> {
         // Re-sync with DB, make sure the queue is empty.
         self.reset()?;
 

diff --git a/state-sync/state-sync-v1/src/executor_proxy.rs b/state-sync/state-sync-v1/src/executor_proxy.rs
@@ -105,7 +105,7 @@ impl<C: ChunkExecutorTrait> ExecutorProxyTrait for ExecutorProxy<C> {
     ) -> Result<(), Error> {
         // track chunk execution time
         let timer = counters::EXECUTE_CHUNK_DURATION.start_timer();
-        let events = self
+        let (events, _) = self
             .chunk_executor
             .execute_and_commit_chunk(
                 txn_list_with_proof,

diff --git a/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs b/state-sync/state-sync-v2/state-sync-driver/src/storage_synchronizer.rs
@@ -131,7 +131,7 @@ impl<ChunkExecutor: ChunkExecutorTrait> StorageSynchronizerInterface
         target_ledger_info: LedgerInfoWithSignatures,
         end_of_epoch_ledger_info: Option<LedgerInfoWithSignatures>,
     ) -> Result<Vec<ContractEvent>, Error> {
-        let committed_events = self
+        let (committed_events, _) = self
             .chunk_executor
             .apply_and_commit_chunk(
                 output_list_with_proof,
@@ -151,7 +151,7 @@ impl<ChunkExecutor: ChunkExecutorTrait> StorageSynchronizerInterface
         target_ledger_info: LedgerInfoWithSignatures,
         end_of_epoch_ledger_info: Option<LedgerInfoWithSignatures>,
     ) -> Result<Vec<ContractEvent>, Error> {
-        let committed_events = self
+        let (committed_events, _) = self
             .chunk_executor
             .execute_and_commit_chunk(
                 transaction_list_with_proof,