From 8c60cff55c367e84966ca55c37f1e7aae6de6020 Mon Sep 17 00:00:00 2001
From: Andrei Baltariu <102856257+andreiblt1304@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:38:00 +0200
Subject: [PATCH 1/3] Updated deposit event logs

---
 esdt-safe/src/to_sovereign/create_tx.rs | 13 +++++++++++--
 esdt-safe/src/to_sovereign/events.rs    |  6 +++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs
index dbdde9e6..80417b48 100644
--- a/esdt-safe/src/to_sovereign/create_tx.rs
+++ b/esdt-safe/src/to_sovereign/create_tx.rs
@@ -151,6 +151,7 @@ pub trait CreateTxModule:
         let own_sc_address = self.blockchain().get_sc_address();
         let mut all_token_data = ManagedVec::new();
         let mut total_tokens_for_fees = 0usize;
+        let mut event_payments = MultiValueEncoded::new();
         let burn_mapper = self.burn_tokens();
         for payment in &payments {
             self.require_below_max_amount(&payment.token_identifier, &payment.amount);
@@ -170,6 +171,15 @@ pub trait CreateTxModule:
             } else {
                 all_token_data.push(StolenFromFrameworkEsdtTokenData::default());
             }
+            
+            event_payments.push(
+                (
+                    payment.token_identifier,
+                    payment.token_nonce,
+                    payment.amount
+                )
+                    .into(),
+            );
 
             if burn_mapper.contains(&payment.token_identifier) {
                 self.send().esdt_local_burn(
@@ -196,8 +206,7 @@ pub trait CreateTxModule:
 
         self.deposit_event(
             &to,
-            &final_payments.fee,
-            &payments,
+            &event_payments,
             DepositEvent::from(tx_nonce, &opt_transfer_data),
         );
 
diff --git a/esdt-safe/src/to_sovereign/events.rs b/esdt-safe/src/to_sovereign/events.rs
index 6cf84e7b..b9b1d743 100644
--- a/esdt-safe/src/to_sovereign/events.rs
+++ b/esdt-safe/src/to_sovereign/events.rs
@@ -1,5 +1,6 @@
+use num_bigint::BigUint;
 use transaction::{
-    transaction_status::TransactionStatus, BatchId, GasLimit, PaymentsVec, TransferData, TxId,
+    transaction_status::TransactionStatus, BatchId, BlockNonce, GasLimit, PaymentsVec, TransferData, TxId
 };
 
 multiversx_sc::imports!();
@@ -38,8 +39,7 @@ pub trait EventsModule {
     fn deposit_event(
         &self,
         #[indexed] dest_address: &ManagedAddress,
-        #[indexed] fee: &EsdtTokenPayment,
-        #[indexed] tokens: &PaymentsVec<Self::Api>,
+        #[indexed] tokens: &MultivalueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
         event_data: DepositEvent<Self::Api>,
     );
 

From 5b603690aed92d60ebf3d83a5a29f5e8ab9780f8 Mon Sep 17 00:00:00 2001
From: Andrei Baltariu <102856257+andreiblt1304@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:38:28 +0200
Subject: [PATCH 2/3] Fixed typo

---
 esdt-safe/src/to_sovereign/create_tx.rs | 11 +++++------
 esdt-safe/src/to_sovereign/events.rs    |  5 ++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs
index 80417b48..9b983f90 100644
--- a/esdt-safe/src/to_sovereign/create_tx.rs
+++ b/esdt-safe/src/to_sovereign/create_tx.rs
@@ -173,12 +173,11 @@ pub trait CreateTxModule:
             }
             
             event_payments.push(
-                (
-                    payment.token_identifier,
-                    payment.token_nonce,
-                    payment.amount
-                )
-                    .into(),
+                MultiValue3 ((
+                    payment.token_identifier.clone(),
+                    payment.token_nonce.clone(),
+                    payment.amount.clone()    
+                ))
             );
 
             if burn_mapper.contains(&payment.token_identifier) {
diff --git a/esdt-safe/src/to_sovereign/events.rs b/esdt-safe/src/to_sovereign/events.rs
index b9b1d743..3ae00c23 100644
--- a/esdt-safe/src/to_sovereign/events.rs
+++ b/esdt-safe/src/to_sovereign/events.rs
@@ -1,6 +1,5 @@
-use num_bigint::BigUint;
 use transaction::{
-    transaction_status::TransactionStatus, BatchId, BlockNonce, GasLimit, PaymentsVec, TransferData, TxId
+    transaction_status::TransactionStatus, BatchId, GasLimit, TransferData, TxId
 };
 
 multiversx_sc::imports!();
@@ -39,7 +38,7 @@ pub trait EventsModule {
     fn deposit_event(
         &self,
         #[indexed] dest_address: &ManagedAddress,
-        #[indexed] tokens: &MultivalueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
+        #[indexed] tokens: &MultiValueEncoded<MultiValue3<TokenIdentifier, u64, BigUint>>,
         event_data: DepositEvent<Self::Api>,
     );
 

From 2a1dd950d732d419bb14b2ee6eb26d296532b063 Mon Sep 17 00:00:00 2001
From: Andrei Baltariu <102856257+andreiblt1304@users.noreply.github.com>
Date: Tue, 30 Jan 2024 16:48:30 +0200
Subject: [PATCH 3/3] Clippy fixes

---
 esdt-safe/src/to_sovereign/create_tx.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esdt-safe/src/to_sovereign/create_tx.rs b/esdt-safe/src/to_sovereign/create_tx.rs
index 9b983f90..0cd1862f 100644
--- a/esdt-safe/src/to_sovereign/create_tx.rs
+++ b/esdt-safe/src/to_sovereign/create_tx.rs
@@ -175,7 +175,7 @@ pub trait CreateTxModule:
             event_payments.push(
                 MultiValue3 ((
                     payment.token_identifier.clone(),
-                    payment.token_nonce.clone(),
+                    payment.token_nonce,
                     payment.amount.clone()    
                 ))
             );