re-fix the previous update

balancednetwork · Nov 29, 2024 · c970764 · c970764
1 parent 4c2f87a
commit c970764
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/core-contracts/Router/src/main/java/network/balanced/score/core/router/RouterImpl.java b/core-contracts/Router/src/main/java/network/balanced/score/core/router/RouterImpl.java
@@ -261,8 +261,11 @@ private void executeRoute(String _from, byte[] data) {
         } else {
             receiver = _from;
         }
-
-        route(receiver, fromToken, routeData.actions, minimumReceive, EMPTY_DATA);
+        byte[] _data = EMPTY_DATA;
+        if(routeData.data!=null){
+            _data = routeData.data;
+        }
+        route(receiver, fromToken, routeData.actions, minimumReceive, _data);
     }
 
     private void jsonRoute(String _from, byte[] data) {
@@ -308,7 +311,11 @@ private void jsonRoute(String _from, byte[] data) {
         }
 
         Address fromToken = Context.getCaller();
-        route(receiver, fromToken, actions, minimumReceive, EMPTY_DATA);
+        byte[] _data = EMPTY_DATA;
+        if(params.get("data")!=null){
+            _data = params.get("data").asString().getBytes();
+        }
+        route(receiver, fromToken, actions, minimumReceive, _data);
     }
 
     @Payable
@@ -318,4 +325,4 @@ public void fallback() {
     @EventLog(indexed = 1)
     public void Route(Address from, BigInteger fromAmount, Address to, BigInteger toAmount) {
     }
-}
+}