Merge pull request #961 from multiversx/small-router-fixes

Small router fixes
multiversx · Oct 16, 2024 · 41c20f7 · 41c20f7
2 parents 3449c93 + c6c045d
commit 41c20f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/dex/router/src/events.rs b/dex/router/src/events.rs
@@ -107,7 +107,9 @@ pub trait EventsModule {
         self.multi_pair_swap_event(
             caller.clone(),
             token_in.clone(),
+            amount_in.clone(),
             token_out.token_identifier.clone(),
+            token_out.amount.clone(),
             epoch,
             MultiPairSwapEvent {
                 caller,
@@ -148,7 +150,9 @@ pub trait EventsModule {
         &self,
         #[indexed] caller: ManagedAddress,
         #[indexed] token_in: TokenIdentifier,
+        #[indexed] amount_in: BigUint,
         #[indexed] token_out: TokenIdentifier,
+        #[indexed] amount_out: BigUint,
         #[indexed] epoch: u64,
         multi_pair_swap_event: MultiPairSwapEvent<Self::Api>,
     );

diff --git a/dex/router/src/multi_pair_swap.rs b/dex/router/src/multi_pair_swap.rs
@@ -64,7 +64,10 @@ pub trait MultiPairSwap:
                 );
 
                 last_payment = payment;
-                payments.push(residuum);
+
+                if residuum.amount > 0 {
+                    payments.push(residuum);
+                }
             } else {
                 sc_panic!("Invalid function to call");
             }