feat: add empty asset check for p2id notes

0xPolygonMiden · Feb 3, 2025 · 35a4d6c · 35a4d6c
1 parent 1dd7908
commit 35a4d6c
Show file tree

Hide file tree

Showing 4 changed files with 90 additions and 40 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rust-client/src/tests.rs b/crates/rust-client/src/tests.rs
@@ -12,7 +12,7 @@ use miden_objects::{
         Account, AccountBuilder, AccountCode, AccountHeader, AccountId, AccountStorageMode,
         AccountType, AuthSecretKey,
     },
-    asset::{FungibleAsset, TokenSymbol},
+    asset::{Asset, FungibleAsset, TokenSymbol},
     crypto::{dsa::rpo_falcon512::SecretKey, rand::FeltRng},
     note::{
         Note, NoteAssets, NoteExecutionHint, NoteExecutionMode, NoteFile, NoteMetadata, NoteTag,
@@ -34,7 +34,8 @@ use crate::{
     rpc::NodeRpcClient,
     store::{InputNoteRecord, NoteFilter, Store, StoreError},
     transaction::{
-        TransactionRequestBuilder, TransactionRequestError, TransactionScriptBuilderError,
+        PaymentTransactionData, TransactionRequestBuilder, TransactionRequestError,
+        TransactionScriptBuilderError,
     },
     Client, ClientError,
 };
@@ -692,4 +693,38 @@ async fn test_note_without_asset() {
             )
         )
     ));
+
+    let error = TransactionRequestBuilder::pay_to_id(
+        PaymentTransactionData::new(vec![], faucet.id(), wallet.id()),
+        None,
+        NoteType::Public,
+        client.rng(),
+    )
+    .unwrap_err();
+
+    assert!(matches!(
+        error,
+        TransactionRequestError::TransactionScriptBuilderError(
+            TransactionScriptBuilderError::P2IDNoteWithoutAsset
+        )
+    ));
+
+    let error = TransactionRequestBuilder::pay_to_id(
+        PaymentTransactionData::new(
+            vec![Asset::Fungible(FungibleAsset::new(faucet.id(), 0).unwrap())],
+            faucet.id(),
+            wallet.id(),
+        ),
+        None,
+        NoteType::Public,
+        client.rng(),
+    )
+    .unwrap_err();
+
+    assert!(matches!(
+        error,
+        TransactionRequestError::TransactionScriptBuilderError(
+            TransactionScriptBuilderError::P2IDNoteWithoutAsset
+        )
+    ));
 }
diff --git a/crates/rust-client/src/transaction/request/builder.rs b/crates/rust-client/src/transaction/request/builder.rs
@@ -20,6 +20,7 @@ use super::{
     ForeignAccount, NoteArgs, TransactionRequest, TransactionRequestError,
     TransactionScriptTemplate,
 };
+use crate::transaction::TransactionScriptBuilderError;
 
 // TRANSACTION REQUEST BUILDER
 // ================================================================================================
@@ -290,6 +291,19 @@ impl TransactionRequestBuilder {
             sender_account_id,
             target_account_id,
         } = payment_data;
+
+        if assets.iter().all(|asset| {
+            if let Asset::Fungible(asset) = asset {
+                asset.amount() == 0
+            } else {
+                false
+            }
+        }) {
+            return Err(TransactionRequestError::TransactionScriptBuilderError(
+                TransactionScriptBuilderError::P2IDNoteWithoutAsset,
+            ));
+        }
+
         let created_note = if let Some(recall_height) = recall_height {
             create_p2idr_note(
                 sender_account_id,

diff --git a/crates/rust-client/src/transaction/script_builder.rs b/crates/rust-client/src/transaction/script_builder.rs
@@ -238,6 +238,8 @@ impl TransactionScriptBuilder {
 pub enum TransactionScriptBuilderError {
     #[error("invalid asset: {0}")]
     InvalidAsset(AccountIdPrefix),
+    #[error("pay to id note doesn't contain at least one asset")]
+    P2IDNoteWithoutAsset,
     #[error("note created by the faucet doesn't contain exactly one asset")]
     FaucetNoteWithoutAsset,
     #[error("invalid transaction script")]