feat: Feat/crosschain savings

core-contracts/Router/src/main/java/network/balanced/score/core/router/RouterImpl.java

@@ -245,8 +245,18 @@ public void xTokenFallback(String _from, BigInteger _value, byte[] _data) {
         executeRoute(_from, _data);
     }
 
+    private RouteData getRouteData(byte[] data){
+        RouteData routeData;
+        try {
+            routeData = RouteData.fromBytes(data);
+        }catch(IllegalStateException ignored ){
+            routeData = RouteData.fromBytesOld(data);
+        }
+        return routeData;
+    }
+
     private void executeRoute(String _from, byte[] data) {
-        RouteData routeData = RouteData.fromBytes(data);
+        RouteData routeData = getRouteData(data);
         Context.require(routeData.method.contains("_swap"), TAG + ": Fallback directly not allowed.");
 
         Address fromToken = Context.getCaller();
@@ -261,8 +271,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 +321,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.contains("data")){
+            _data = params.get("data").asString().getBytes();
+        }
+        route(receiver, fromToken, actions, minimumReceive, _data);
     }
 
     @Payable
@@ -318,4 +335,4 @@ public void fallback() {
     @EventLog(indexed = 1)
     public void Route(Address from, BigInteger fromAmount, Address to, BigInteger toAmount) {
     }
-}
+}

core-contracts/Router/src/test/java/network/balanced/score/core/router/RouterTest.java

@@ -28,14 +28,10 @@
 import network.balanced.score.lib.structs.RouteData;
 import network.balanced.score.lib.test.mock.MockBalanced;
 import network.balanced.score.lib.test.mock.MockContract;
-import network.balanced.score.lib.tokens.HubTokenImpl;
-import network.balanced.score.lib.tokens.IRC2Base;
-import network.balanced.score.lib.tokens.IRC2Mintable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 import score.Address;
-import score.Context;
 import scorex.util.ArrayList;
 
 import java.math.BigInteger;
@@ -44,11 +40,8 @@
 
 import static network.balanced.score.core.router.RouterImpl.*;
 import static network.balanced.score.lib.test.UnitTest.*;
-import static network.balanced.score.lib.utils.Constants.EXA;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -182,14 +175,7 @@ void tokenFallback() throws Exception {
         when(balanced.baln.mock.balanceOf(routerScore.getAddress())).thenReturn(BigInteger.TEN);
         when(balanced.sicx.mock.balanceOf(routerScore.getAddress())).thenReturn(BigInteger.TEN);
 
-//        byte[] invalidPathWithSicxTerminalToken = tokenData("_swap", Map.of("path",
-//                new Object[]{balanced.baln.getAddress().toString(), null}));
-//        Executable nonSicxIcxTrade = () -> routerScore.invoke(sicxScore.account, "tokenFallback", owner.getAddress(),
-//                BigInteger.TEN, invalidPathWithSicxTerminalToken);
-//        expectedErrorMessage = "Reverted(0): " + TAG + ": Native swaps not available to icon from " + balanced.baln.getAddress();
-//        expectErrorMessage(nonSicxIcxTrade, expectedErrorMessage);
-//
-//        resetInRoute();
+
         Account newReceiver = sm.createAccount();
         byte[] pathWithSicxTerminalToken = tokenData("_swap", Map.of("path",
                 new Object[]{sicxScore.getAddress().toString(), null}, "receiver",
@@ -501,7 +487,42 @@ void tokenFallback_swapStable() throws Exception {
         }
 
         Account newReceiver = sm.createAccount();
-        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions).toBytes();
+        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions, null).toBytes();
+
+        // Act
+        routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), balnToSwap,
+                data);
+
+        // Assert
+        int i = 0;
+        for (MockContract<IRC2> token : tokens) {
+            if (i < tokens.size() - 1) {
+                byte[] d = tokens.get(i + 1).getAddress().toString().getBytes();
+                verify(token.mock).transfer(balanced.stability.getAddress(), balnToSwap, d);
+            }
+            i++;
+        }
+    }
+
+    @Test
+    void tokenFallback_swapStableOldRouteData() throws Exception {
+        // Arrange
+        BigInteger balnToSwap = BigInteger.TEN.multiply(ICX);
+        List<RouteAction> actions = new ArrayList<>(MAX_NUMBER_OF_ITERATIONS);
+        List<MockContract<IRC2>> tokens = new ArrayList<>(MAX_NUMBER_OF_ITERATIONS - 1);
+        for (int i = 0; i < MAX_NUMBER_OF_ITERATIONS; i++) {
+            if (i == 0) {
+                actions.add(new RouteAction(SWAP, balanced.sicx.getAddress()));
+                continue;
+            }
+            MockContract<IRC2> token = new MockContract<>(IRC2ScoreInterface.class, IRC2.class, sm, owner);
+            when(token.mock.balanceOf(routerScore.getAddress())).thenReturn(balnToSwap);
+            actions.add(new RouteAction(STABILITY_SWAP, token.getAddress()));
+            tokens.add(token);
+        }
+
+        Account newReceiver = sm.createAccount();
+        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions, null).toBytesOld();
 
         // Act
         routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), balnToSwap,
@@ -531,7 +552,30 @@ void tokenFallback_swapToICX() throws Exception {
         routerScore.getAccount().addBalance("ICX", ICXResult);
 
         Account newReceiver = sm.createAccount();
-        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions).toBytes();
+        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions, null).toBytes();
+
+        // Act
+        routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), USDToSwap,
+                data);
+
+        // Assert
+        assertEquals(ICXResult, newReceiver.getBalance());
+    }
+
+    @Test
+    void tokenFallback_swapToICXOldRouteData() throws Exception {
+        // Arrange
+        BigInteger USDToSwap = BigInteger.TEN.multiply(ICX);
+        BigInteger sICXResult = BigInteger.valueOf(100).multiply(ICX);
+        BigInteger ICXResult = BigInteger.valueOf(110).multiply(ICX);
+        List<RouteAction> actions = new ArrayList<>(2);
+        actions.add(new RouteAction(SWAP, balanced.sicx.getAddress()));
+        actions.add(new RouteAction(SWAP, null));
+        when(balanced.sicx.mock.balanceOf(routerScore.getAddress())).thenReturn(sICXResult);
+        routerScore.getAccount().addBalance("ICX", ICXResult);
+
+        Account newReceiver = sm.createAccount();
+        byte[] data = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions, null).toBytesOld();
 
         // Act
         routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), USDToSwap,
@@ -586,4 +630,51 @@ private void resetInRoute() {
         // in Production this happens between each tx
         ((RouterImpl)routerScore.getInstance()).inRoute = false;
     }
+
+    @Test
+    void stakeToSavingsWithJSONRoute(){
+        // Arrange
+        //baln as usdc
+        when(balanced.baln.mock.balanceOf(routerScore.getAddress())).thenReturn(BigInteger.TEN);
+        when(balanced.bnUSD.mock.balanceOf(routerScore.getAddress())).thenReturn(BigInteger.TEN);
+
+        String data = new String(tokenData("_lock", Map.of()));
+        Account newReceiver = balanced.savings.account;
+        byte[] pathWithUSDCBnUSD = tokenData("_swap", Map.of("path",
+                new Object[]{balanced.bnUSD.getAddress().toString()}, "receiver",
+                newReceiver.getAddress().toString(), "data", data));
+
+        // Act
+        routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), BigInteger.TEN,
+                pathWithUSDCBnUSD);
+
+
+        // Verify
+        verify(balanced.bnUSD.mock).transfer(balanced.savings.getAddress(), BigInteger.TEN, data.getBytes());
+    }
+
+    @Test
+    void stakeToSavingsWithRLPData(){
+        // Arrange
+        //baln as usdc
+        BigInteger balnToSwap = BigInteger.TEN.multiply(ICX);
+        when(balanced.baln.mock.balanceOf(routerScore.getAddress())).thenReturn(balnToSwap);
+        when(balanced.bnUSD.mock.balanceOf(routerScore.getAddress())).thenReturn(balnToSwap);
+
+        List<RouteAction> actions = new ArrayList<>(1);
+        actions.add(new RouteAction(SWAP, balanced.bnUSD.getAddress()));
+
+        byte[] data = tokenData("_lock", Map.of());
+        Account newReceiver = balanced.savings.account;
+        byte[] routeData = new RouteData("_swap", newReceiver.getAddress().toString(), BigInteger.ZERO, actions, data).toBytes();
+
+        // Act
+        routerScore.invoke(balanced.baln.account, "tokenFallback", owner.getAddress(), balnToSwap,
+                routeData);
+
+
+        // Verify
+        verify(balanced.bnUSD.mock).transfer(balanced.savings.getAddress(), balnToSwap, data);
+    }
+
 }

core-contracts/Savings/build.gradle

@@ -30,6 +30,7 @@ dependencies {
     implementation Dependencies.javaeeScorex
     implementation Dependencies.minimalJson
     implementation project(':score-lib')
+    implementation 'xyz.venture23:xcall-lib:2.1.0'
 
     testImplementation Dependencies.javaeeUnitTest
     testImplementation Dependencies.javaeeTokens