escrow Payment in EscrowData

escrow/SPECIFICATION.md

@@ -69,14 +69,18 @@ pub enum EscrowStatus {
 ### EscrowData (Struct)
 ```rust
 pub struct EscrowData<M: ManagedTypeApi> {
-    pub employer: ManagedAddress<M>,       // Who deposited the funds
-    pub receiver: ManagedAddress<M>,       // Who receives on release (agent)
-    pub token_id: EgldOrEsdtTokenIdentifier<M>, // EGLD or ESDT token
-    pub token_nonce: u64,                  // SFT/NFT nonce (0 for fungible)
-    pub amount: BigUint<M>,               // Locked amount
-    pub poa_hash: ManagedBuffer<M>,       // Proof-of-Agreement hash
-    pub deadline: u64,                     // Unix timestamp (seconds)
-    pub status: EscrowStatus,             // Current state
+    /// Who deposited the funds
+    pub employer: ManagedAddress<M>,
+    /// Who receives on release (agent)
+    pub receiver: ManagedAddress<M>,
+    /// Payment details: token, nonce, amount
+    pub payment: Payment<M>,
+    /// Proof-of-Agreement hash
+    pub poa_hash: ManagedBuffer<M>,
+    /// Unix timestamp (seconds) of the block for the escrow deadline
+    pub deadline: TimestampSeconds,
+    /// Current state of the escrow
+    pub status: EscrowStatus,
 }
 ```
 
@@ -200,7 +204,7 @@ The `release` function reads job data directly from the Validation Registry's st
 ### 5.4 Zero-Allocation Compliance
 
 The contract uses **only** `Managed*` types:
-- `ManagedBuffer`, `ManagedAddress`, `BigUint`, `EgldOrEsdtTokenIdentifier`
+- `ManagedBuffer`, `ManagedAddress`, `BigUint`, `TokenId`
 - No `String`, `Vec`, `Box`, `HashMap`, `format!`, or `alloc` anywhere
 - `#![no_std]` at the crate root
 

escrow/multiversx.json

@@ -0,0 +1,3 @@
+{
+    "language": "rust"
+}

escrow/src/errors.rs

@@ -5,4 +5,3 @@ pub const ERR_JOB_NOT_VERIFIED: &str = "Job must be verified before release";
 pub const ERR_DEADLINE_NOT_PASSED: &str = "Deadline has not passed yet";
 pub const ERR_DEADLINE_IN_PAST: &str = "Deadline must be in the future";
 pub const ERR_ALREADY_SETTLED: &str = "Escrow already settled";
-pub const ERR_ZERO_DEPOSIT: &str = "Deposit amount must be greater than zero";

escrow/src/events.rs

@@ -2,27 +2,27 @@ multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait EventsModule {
-    #[event("escrow_deposited")]
+    #[event("escrowDeposited")]
     fn escrow_deposited_event(
         &self,
         #[indexed] job_id: &ManagedBuffer,
         #[indexed] employer: &ManagedAddress,
-        amount: BigUint,
+        amount: &NonZeroBigUint,
     );
 
-    #[event("escrow_released")]
+    #[event("escrowReleased")]
     fn escrow_released_event(
         &self,
         #[indexed] job_id: &ManagedBuffer,
         #[indexed] receiver: &ManagedAddress,
-        amount: BigUint,
+        amount: &NonZeroBigUint,
     );
 
-    #[event("escrow_refunded")]
+    #[event("escrowRefunded")]
     fn escrow_refunded_event(
         &self,
         #[indexed] job_id: &ManagedBuffer,
         #[indexed] employer: &ManagedAddress,
-        amount: BigUint,
+        amount: &NonZeroBigUint,
     );
 }

escrow/src/lib.rs

@@ -45,8 +45,7 @@ pub trait EscrowContract:
         poa_hash: ManagedBuffer,
         deadline: TimestampSeconds,
     ) {
-        let payment = self.call_value().egld_or_single_esdt();
-        require!(payment.amount > 0u64, ERR_ZERO_DEPOSIT);
+        let payment = self.call_value().single();
 
         let current_timestamp = self.blockchain().get_block_timestamp_seconds();
         require!(deadline > current_timestamp, ERR_DEADLINE_IN_PAST);
@@ -59,9 +58,7 @@ pub trait EscrowContract:
         let escrow = EscrowData {
             employer: caller.clone(),
             receiver,
-            token_id: payment.token_identifier.clone(),
-            token_nonce: payment.token_nonce,
-            amount: payment.amount.clone(),
+            payment: payment.clone(),
             poa_hash,
             deadline,
             status: EscrowStatus::Active,
@@ -70,7 +67,7 @@ pub trait EscrowContract:
         // Effects: store escrow
         escrow_mapper.set(&escrow);
 
-        self.escrow_deposited_event(&job_id, &caller, payment.amount);
+        self.escrow_deposited_event(&job_id, &caller, &payment.amount);
     }
 
     /// Release escrowed funds to the receiver.
@@ -99,19 +96,15 @@ pub trait EscrowContract:
 
         // Effects: mark as released BEFORE interactions
         escrow.status = EscrowStatus::Released;
-        let receiver = escrow.receiver.clone();
-        let amount = escrow.amount.clone();
-        let token_id = escrow.token_id.clone();
-        let token_nonce = escrow.token_nonce;
         escrow_mapper.set(&escrow);
 
         // Interactions: transfer funds to receiver
         self.tx()
-            .to(&receiver)
-            .egld_or_single_esdt(&token_id, token_nonce, &amount)
+            .to(&escrow.receiver)
+            .payment(&escrow.payment)
             .transfer();
 
-        self.escrow_released_event(&job_id, &receiver, amount);
+        self.escrow_released_event(&job_id, &escrow.receiver, &escrow.payment.amount);
     }
 
     /// Refund escrowed funds to the employer if the deadline has passed.
@@ -129,18 +122,14 @@ pub trait EscrowContract:
 
         // Effects: mark as refunded BEFORE interactions
         escrow.status = EscrowStatus::Refunded;
-        let employer = escrow.employer.clone();
-        let amount = escrow.amount.clone();
-        let token_id = escrow.token_id.clone();
-        let token_nonce = escrow.token_nonce;
         escrow_mapper.set(&escrow);
 
         // Interactions: transfer funds back to employer
         self.tx()
-            .to(&employer)
-            .egld_or_single_esdt(&token_id, token_nonce, &amount)
+            .to(&escrow.employer)
+            .payment(&escrow.payment)
             .transfer();
 
-        self.escrow_refunded_event(&job_id, &employer, amount);
+        self.escrow_refunded_event(&job_id, &escrow.employer, &escrow.payment.amount);
     }
 }

escrow/src/storage.rs

@@ -14,13 +14,17 @@ pub enum EscrowStatus {
 #[type_abi]
 #[derive(TopEncode, TopDecode, NestedEncode, NestedDecode, PartialEq, Debug)]
 pub struct EscrowData<M: ManagedTypeApi> {
+    /// Who deposited the funds
     pub employer: ManagedAddress<M>,
+    /// Who receives on release (agent)
     pub receiver: ManagedAddress<M>,
-    pub token_id: EgldOrEsdtTokenIdentifier<M>,
-    pub token_nonce: u64,
-    pub amount: BigUint<M>,
+    /// Payment details: token, nonce, amount
+    pub payment: Payment<M>,
+    /// Proof-of-Agreement hash
     pub poa_hash: ManagedBuffer<M>,
+    /// Unix timestamp (seconds) of the block for the escrow deadline
     pub deadline: TimestampSeconds,
+    /// Current state of the escrow
     pub status: EscrowStatus,
 }
 

identity-registry/src/views.rs

@@ -30,14 +30,10 @@ pub trait ViewsModule: crate::storage::StorageModule {
         &self,
         nonce: u64,
         service_id: u32,
-    ) -> OptionalValue<EgldOrEsdtTokenPayment<Self::Api>> {
+    ) -> OptionalValue<Payment<Self::Api>> {
         let mapper = self.agent_service_config(nonce);
         if let Some(payment) = mapper.get(&service_id) {
-            OptionalValue::Some(EgldOrEsdtTokenPayment::new(
-                EgldOrEsdtTokenIdentifier::from(payment.token_identifier),
-                payment.token_nonce,
-                payment.amount.into_big_uint(),
-            ))
+            OptionalValue::Some(payment)
         } else {
             OptionalValue::None
         }

tests/src/interact.rs

@@ -379,7 +379,6 @@ impl CsInteract {
 
     // ── Reputation Registry ──
 
-
     pub async fn give_feedback_simple(
         &mut self,
         from: &Address,
@@ -507,7 +506,6 @@ impl CsInteract {
             .await;
     }
 
-
     pub async fn submit_proof_expect_err(
         &mut self,
         from: &Address,

tests/src/setup.rs

@@ -574,7 +574,6 @@ impl AgentTestState {
 
     // ── Reputation Registry ──
 
-
     pub fn give_feedback_simple(
         &mut self,
         from: &multiversx_sc::types::TestAddress,
@@ -1104,7 +1103,6 @@ impl AgentTestState {
             .run();
     }
 
-
     pub fn append_response_expect_err(
         &mut self,
         from: &multiversx_sc::types::TestAddress,