feat: Update Proven Transaction Submission with TX Inputs (0xMiden#1421)

sergerad · web-flow · commit 17f78b064d90 · 2025-10-27T09:13:50.000+13:00
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
@@ -26,6 +26,8 @@ jobs:
         with:
           targets: wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
+      - name: Ensure stable toolchain is installed
+        run: rustup toolchain install stable --profile minimal
       - name: Install cargo-msrv
         run: cargo install cargo-msrv
       - name: Check MSRV for each workspace member
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,9 +15,10 @@
 * Implemented shared source manager for better error reporting ([#1275](https://github.com/0xMiden/miden-client/pull/1275)).
 * Added `getMapEntries` method to `AccountStorage` in web client for iterating storage map entries ([#1323](https://github.com/0xMiden/miden-client/pull/1323)).
 * Refactored code into their own files and added `ProvenTransaction` and `TransactionStoreUpdate` bindings for the WebClient ([#1408](https://github.com/0xMiden/miden-client/pull/1408)).
-* Added `NoteFile` type, used for exporting and importing `Notes`([#1378](https://github.com/0xMiden/miden-client/pull/1383))
+* Added `NoteFile` type, used for exporting and importing `Notes` ([#1378](https://github.com/0xMiden/miden-client/pull/1383)).
 * Build `IndexedDB` code from a `build.rs` instead of pushing artifacts to the repo ([#1409](https://github.com/0xMiden/miden-client/pull/1409)).
 * Implemented missing RPC endpoints: `/SyncStorageMaps`, `/SyncAccountVault` & `/SyncTransactions` ([#1362](https://github.com/0xMiden/miden-client/pull/1362)).
+* Updated `submit_proven_transaction()` to include `TransactionInputs` for validator ([#1421](https://github.com/0xMiden/miden-client/pull/1421)).
 
 ### Changes
 
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/integration-tests/src/tests/client.rs b/bin/integration-tests/src/tests/client.rs
@@ -104,23 +104,41 @@ pub async fn test_multiple_tx_on_same_block(client_config: ClientConfig) -> Resu
     let transaction_id_1 = transaction_execution_result_1.executed_transaction().id();
     let tx_prove_1 =
         client.testing_prove_transaction(&transaction_execution_result_1).await.unwrap();
-    client.testing_apply_transaction(transaction_execution_result_1).await.unwrap();
+    client
+        .testing_apply_transaction(transaction_execution_result_1.clone())
+        .await
+        .unwrap();
 
     let transaction_execution_result_2 =
         client.new_transaction(from_account_id, tx_request_2).await.unwrap();
     let transaction_id_2 = transaction_execution_result_2.executed_transaction().id();
     let tx_prove_2 =
         client.testing_prove_transaction(&transaction_execution_result_2).await.unwrap();
-    client.testing_apply_transaction(transaction_execution_result_2).await.unwrap();
+    client
+        .testing_apply_transaction(transaction_execution_result_2.clone())
+        .await
+        .unwrap();
 
     client.sync_state().await.unwrap();
 
     // wait for 1 block
     wait_for_blocks(&mut client, 1).await;
 
     // Submit the proven transactions
-    client.testing_submit_proven_transaction(tx_prove_1).await.unwrap();
-    client.testing_submit_proven_transaction(tx_prove_2).await.unwrap();
+    client
+        .testing_submit_proven_transaction(
+            tx_prove_1,
+            transaction_execution_result_1.executed_transaction().tx_inputs().clone(),
+        )
+        .await
+        .unwrap();
+    client
+        .testing_submit_proven_transaction(
+            tx_prove_2,
+            transaction_execution_result_2.executed_transaction().tx_inputs().clone(),
+        )
+        .await
+        .unwrap();
 
     // wait for 1 block
     wait_for_tx(&mut client, transaction_id_1).await?;
diff --git a/bin/integration-tests/src/tests/network_transaction.rs b/bin/integration-tests/src/tests/network_transaction.rs
@@ -210,8 +210,18 @@ pub async fn test_recall_note_before_ntx_consumes_it(client_config: ClientConfig
     let consume_proof = client.testing_prove_transaction(&consume_transaction).await?;
 
     // Submit both transactions
-    client.testing_submit_proven_transaction(bump_proof).await?;
-    client.testing_submit_proven_transaction(consume_proof).await?;
+    client
+        .testing_submit_proven_transaction(
+            bump_proof,
+            bump_transaction.executed_transaction().tx_inputs().clone(),
+        )
+        .await?;
+    client
+        .testing_submit_proven_transaction(
+            consume_proof,
+            consume_transaction.executed_transaction().tx_inputs().clone(),
+        )
+        .await?;
 
     client.testing_apply_transaction(consume_transaction).await?;
 
diff --git a/crates/rust-client/src/rpc/generated/nostd/rpc_store.rs b/crates/rust-client/src/rpc/generated/nostd/rpc_store.rs
@@ -457,7 +457,7 @@ pub struct SyncTransactionsResponse {
 /// Represents a transaction record.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionRecord {
-    /// Block number in which the transaction was executed.
+    /// Block number in which the transaction was included.
     #[prost(fixed32, tag = "1")]
     pub block_num: u32,
     /// A transaction header.
diff --git a/crates/rust-client/src/rpc/generated/nostd/transaction.rs b/crates/rust-client/src/rpc/generated/nostd/transaction.rs
@@ -6,6 +6,10 @@ pub struct ProvenTransaction {
     /// \[miden_objects::transaction::proven_tx::ProvenTransaction\].
     #[prost(bytes = "vec", tag = "1")]
     pub transaction: ::prost::alloc::vec::Vec<u8>,
+    /// Transaction inputs encoded using \[winter_utils::Serializable\] implementation for
+    /// \[miden_objects::transaction::TransactionInputs\].
+    #[prost(bytes = "vec", optional, tag = "2")]
+    pub transaction_inputs: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProvenTransactionBatch {
diff --git a/crates/rust-client/src/rpc/generated/std/rpc_store.rs b/crates/rust-client/src/rpc/generated/std/rpc_store.rs
@@ -457,7 +457,7 @@ pub struct SyncTransactionsResponse {
 /// Represents a transaction record.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionRecord {
-    /// Block number in which the transaction was executed.
+    /// Block number in which the transaction was included.
     #[prost(fixed32, tag = "1")]
     pub block_num: u32,
     /// A transaction header.
diff --git a/crates/rust-client/src/rpc/generated/std/transaction.rs b/crates/rust-client/src/rpc/generated/std/transaction.rs
@@ -6,6 +6,10 @@ pub struct ProvenTransaction {
     /// \[miden_objects::transaction::proven_tx::ProvenTransaction\].
     #[prost(bytes = "vec", tag = "1")]
     pub transaction: ::prost::alloc::vec::Vec<u8>,
+    /// Transaction inputs encoded using \[winter_utils::Serializable\] implementation for
+    /// \[miden_objects::transaction::TransactionInputs\].
+    #[prost(bytes = "vec", optional, tag = "2")]
+    pub transaction_inputs: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ProvenTransactionBatch {
diff --git a/crates/rust-client/src/rpc/mod.rs b/crates/rust-client/src/rpc/mod.rs
@@ -55,7 +55,7 @@ use miden_objects::account::{Account, AccountCode, AccountHeader, AccountId};
 use miden_objects::block::{BlockHeader, BlockNumber, ProvenBlock};
 use miden_objects::crypto::merkle::{MmrProof, SmtProof};
 use miden_objects::note::{NoteId, NoteScript, NoteTag, Nullifier};
-use miden_objects::transaction::ProvenTransaction;
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 
 /// Contains domain types related to RPC requests and responses, as well as utility functions
 /// for dealing with them.
@@ -105,6 +105,7 @@ pub trait NodeRpcClient: Send + Sync {
     async fn submit_proven_transaction(
         &self,
         proven_transaction: ProvenTransaction,
+        transaction_inputs: TransactionInputs,
     ) -> Result<BlockNumber, RpcError>;
 
     /// Given a block number, fetches the block header corresponding to that height from the node
diff --git a/crates/rust-client/src/rpc/tonic_client/mod.rs b/crates/rust-client/src/rpc/tonic_client/mod.rs
@@ -9,7 +9,7 @@ use miden_objects::account::{Account, AccountCode, AccountId};
 use miden_objects::block::{AccountWitness, BlockHeader, BlockNumber, ProvenBlock};
 use miden_objects::crypto::merkle::{Forest, MerklePath, MmrProof, SmtProof};
 use miden_objects::note::{NoteId, NoteScript, NoteTag, Nullifier};
-use miden_objects::transaction::ProvenTransaction;
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 use miden_objects::utils::Deserializable;
 use miden_objects::{EMPTY_WORD, Word};
 use miden_tx::utils::Serializable;
@@ -126,9 +126,11 @@ impl NodeRpcClient for GrpcClient {
     async fn submit_proven_transaction(
         &self,
         proven_transaction: ProvenTransaction,
+        transaction_inputs: TransactionInputs,
     ) -> Result<BlockNumber, RpcError> {
         let request = proto::transaction::ProvenTransaction {
             transaction: proven_transaction.to_bytes(),
+            transaction_inputs: Some(transaction_inputs.to_bytes()),
         };
 
         let mut rpc_api = self.ensure_connected().await?;
diff --git a/crates/rust-client/src/test_utils/mock.rs b/crates/rust-client/src/test_utils/mock.rs
@@ -8,7 +8,7 @@ use miden_objects::account::{AccountCode, AccountId, StorageSlot};
 use miden_objects::block::{BlockHeader, BlockNumber, ProvenBlock};
 use miden_objects::crypto::merkle::{Forest, Mmr, MmrProof, SmtProof};
 use miden_objects::note::{NoteId, NoteScript, NoteTag, Nullifier};
-use miden_objects::transaction::ProvenTransaction;
+use miden_objects::transaction::{ProvenTransaction, TransactionInputs};
 use miden_testing::{MockChain, MockChainNote};
 use miden_tx::utils::sync::RwLock;
 
@@ -499,6 +499,7 @@ impl NodeRpcClient for MockRpcApi {
     async fn submit_proven_transaction(
         &self,
         proven_transaction: ProvenTransaction,
+        _tx_inputs: TransactionInputs, // Unnecessary for testing client itself.
     ) -> Result<BlockNumber, RpcError> {
         // TODO: add some basic validations to test error cases
 
diff --git a/crates/rust-client/src/transaction/mod.rs b/crates/rust-client/src/transaction/mod.rs
@@ -292,7 +292,12 @@ where
         tx_prover: Arc<dyn TransactionProver>,
     ) -> Result<(), ClientError> {
         let proven_transaction = self.prove_transaction(&tx_result, tx_prover).await?;
-        let block_num = self.submit_proven_transaction(proven_transaction).await?;
+        let block_num = self
+            .submit_proven_transaction(
+                proven_transaction,
+                tx_result.executed_transaction().tx_inputs().clone(),
+            )
+            .await?;
         self.apply_transaction(block_num, tx_result).await
     }
 
@@ -315,9 +320,13 @@ where
     async fn submit_proven_transaction(
         &mut self,
         proven_transaction: ProvenTransaction,
+        transaction_inputs: TransactionInputs,
     ) -> Result<BlockNumber, ClientError> {
         info!("Submitting transaction to the network...");
-        let block_num = self.rpc_api.submit_proven_transaction(proven_transaction).await?;
+        let block_num = self
+            .rpc_api
+            .submit_proven_transaction(proven_transaction, transaction_inputs)
+            .await?;
         info!("Transaction submitted.");
 
         Ok(block_num)
@@ -836,8 +845,9 @@ impl<AUTH: TransactionAuthenticator + Sync + 'static> Client<AUTH> {
     pub async fn testing_submit_proven_transaction(
         &mut self,
         proven_transaction: ProvenTransaction,
+        tx_inputs: TransactionInputs,
     ) -> Result<BlockNumber, ClientError> {
-        self.submit_proven_transaction(proven_transaction).await
+        self.submit_proven_transaction(proven_transaction, tx_inputs).await
     }
 
     pub async fn testing_apply_transaction(
