chore: Remove leftovers

Author: igamigo

crates/miden-tx/src/executor/data_store.rs

@@ -15,15 +15,15 @@ use crate::DataStoreError;
 // DATA STORE TRAIT
 // ================================================================================================
 
-/// The [`DataStore] trait defines the interface that transaction objects use to fetch data
+/// The [DataStore] trait defines the interface that transaction objects use to fetch data
 /// required for transaction execution.
 #[maybe_async_trait]
 pub trait DataStore {
     /// Returns blockchain-related data required to execute a transaction against a specific
     /// account, that consumes specific notes.
     ///
     /// The returned [`ChainMmr`] is expected to contain the complete set of requested
-    /// block numbers.
+    /// block numbers (`ref_blocks`).
     ///
     /// # Errors
     /// Returns an error if:
@@ -34,6 +34,7 @@ pub trait DataStore {
     fn get_chain_inputs(
         &self,
         ref_blocks: BTreeSet<BlockNumber>,
+        block_header: BlockNumber,
     ) -> Result<(ChainMmr, BlockHeader), DataStoreError>;
 
     /// Returns account data required to execute a transaction.

crates/miden-tx/src/executor/mod.rs

@@ -114,6 +114,7 @@ impl TransactionExecutor {
         notes: InputNotes<InputNote>,
         tx_args: TransactionArgs,
     ) -> Result<ExecutedTransaction, TransactionExecutorError> {
+        // Get all required
         let mut ref_blocks: BTreeSet<BlockNumber> = BTreeSet::new();
         ref_blocks.insert(block_ref);
         for notes in notes.iter() {
@@ -128,7 +129,7 @@ impl TransactionExecutor {
         let (account, seed) = maybe_await!(self.data_store.get_account_inputs(account_id))
             .map_err(TransactionExecutorError::FetchTransactionInputsFailed)?;
 
-        let (mmr, header) = maybe_await!(self.data_store.get_chain_inputs(ref_blocks))
+        let (mmr, header) = maybe_await!(self.data_store.get_chain_inputs(ref_blocks, block_ref))
             .map_err(TransactionExecutorError::FetchTransactionInputsFailed)?;
 
         let tx_inputs = TransactionInputs::new(account, seed, header, mmr, notes)
@@ -139,9 +140,6 @@ impl TransactionExecutor {
 
         let advice_recorder: RecAdviceProvider = advice_inputs.into();
 
-        // load note script MAST into the MAST store
-        // self.mast_store.load_transaction_code(&tx_inputs, &tx_args);
-
         let mut host = TransactionHost::new(
             tx_inputs.account().into(),
             advice_recorder,
@@ -205,7 +203,7 @@ impl TransactionExecutor {
         let (account, seed) = maybe_await!(self.data_store.get_account_inputs(account_id))
             .map_err(TransactionExecutorError::FetchTransactionInputsFailed)?;
 
-        let (mmr, header) = maybe_await!(self.data_store.get_chain_inputs(ref_blocks))
+        let (mmr, header) = maybe_await!(self.data_store.get_chain_inputs(ref_blocks, block_ref))
             .map_err(TransactionExecutorError::FetchTransactionInputsFailed)?;
 
         let tx_inputs = TransactionInputs::new(account, seed, header, mmr, Default::default())

crates/miden-tx/src/testing/tx_context/mod.rs

@@ -155,6 +155,7 @@ impl DataStore for TransactionContext {
     fn get_chain_inputs(
         &self,
         _ref_blocks: BTreeSet<BlockNumber>,
+        _block_header: BlockNumber,
     ) -> Result<(ChainMmr, BlockHeader), DataStoreError> {
         let mmr = self.tx_inputs.block_chain().clone();
         let block = self.tx_inputs.block_header().clone();

crates/miden-tx/src/tests/kernel_tests/test_note.rs

@@ -625,21 +625,26 @@ pub fn test_timelock() {
 
     let code = format!(
         "	
-      use.miden::note	
-      use.miden::tx	
+      use.miden::note
+      use.miden::tx
+
       begin	
           # store the note inputs to memory starting at address 0	
           push.0 exec.note::get_inputs	
           # => [num_inputs, inputs_ptr]	
+
           # make sure the number of inputs is 1	
           eq.1 assert.err=789	
           # => [inputs_ptr]	
+
           # read the timestamp at which the note can be consumed	
           mem_load	
           # => [timestamp]	
+
           exec.tx::get_block_timestamp	
           # => [block_timestamp, timestamp]	
           # ensure block timestamp is newer than timestamp	
+
           lte assert.err={TIMESTAMP_ERROR}	
           # => []	
       end"