Merge branch 'decouple-order-3-leyers' into typechain-build

Author: lmcorbalan

solidity/src/Base7683.sol

@@ -63,7 +63,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
     mapping(address => mapping(uint256 => bool)) public usedNonces;
 
     /// @notice Stores the resolved orders by their ID.
-    mapping(bytes32 orderId => bytes resolvedOrder) public orders;
+    mapping(bytes32 orderId => bytes orderData) public openOrders;
 
     /// @notice Tracks filled orders and their associated data.
     mapping(bytes32 orderId => FilledOrder filledOrder) public filledOrders;
@@ -150,7 +150,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
 
         (ResolvedCrossChainOrder memory resolvedOrder, bytes32 orderId, uint256 nonce) = _resolveOrder(_order, _originFillerData);
 
-        orders[orderId] = abi.encode(resolvedOrder);
+        openOrders[orderId] = abi.encode(_order.orderDataType, _order.orderData);
         orderStatus[orderId] = OPENED;
         _useNonce(_order.user, nonce);
 
@@ -168,7 +168,7 @@ abstract contract Base7683 is IOriginSettler, IDestinationSettler {
     function open(OnchainCrossChainOrder calldata _order) external payable virtual {
         (ResolvedCrossChainOrder memory resolvedOrder, bytes32 orderId, uint256 nonce) = _resolveOrder(_order);
 
-        orders[orderId] = abi.encode(resolvedOrder);
+        openOrders[orderId] = abi.encode(_order.orderDataType, _order.orderData);
         orderStatus[orderId] = OPENED;
         _useNonce(msg.sender, nonce);
 

solidity/src/BasicSwap7683.sol

@@ -134,9 +134,8 @@ abstract contract BasicSwap7683 is Base7683 {
         // check if the order is opened to ensure it belongs to this domain, skip otherwise
         if (orderStatus[_orderId] != OPENED) return;
 
-        ResolvedCrossChainOrder memory resolvedOrder = abi.decode(orders[_orderId], (ResolvedCrossChainOrder));
-
-        OrderData memory orderData = OrderEncoder.decode(resolvedOrder.fillInstructions[0].originData);
+        (,bytes memory _orderData) = abi.decode(openOrders[_orderId], (bytes32, bytes));
+        OrderData memory orderData = OrderEncoder.decode(_orderData);
 
         orderStatus[_orderId] = SETTLED;
 
@@ -161,9 +160,8 @@ abstract contract BasicSwap7683 is Base7683 {
         // check if the order is opened to ensure it belongs to this domain, skip otherwise
         if (orderStatus[_orderId] != OPENED) return;
 
-        ResolvedCrossChainOrder memory resolvedOrder = abi.decode(orders[_orderId], (ResolvedCrossChainOrder));
-
-        OrderData memory orderData = OrderEncoder.decode(resolvedOrder.fillInstructions[0].originData);
+        (,bytes memory _orderData) = abi.decode(openOrders[_orderId], (bytes32, bytes));
+        OrderData memory orderData = OrderEncoder.decode(_orderData);
 
         orderStatus[_orderId] = REFUNDED;
 

solidity/test/BaseTest.sol

@@ -316,9 +316,8 @@ contract BaseTest is Test, DeployPermit2 {
     }
 
     function _orderDataById(bytes32 orderId) internal view returns (bytes memory orderData) {
-        (ResolvedCrossChainOrder memory resolvedOrder) =
-            abi.decode(_base7683.orders(orderId), (ResolvedCrossChainOrder));
-        orderData = resolvedOrder.fillInstructions[0].originData;
+        (,orderData) =
+            abi.decode(_base7683.openOrders(orderId), (bytes32, bytes));
     }
 
     function _assertOpenOrder(

solidity/test/BasicSwap7683.t.sol

@@ -100,8 +100,8 @@ contract BasicSwap7683ForTest is BasicSwap7683 {
         _handleRefundOrder(_orderId);
     }
 
-    function setOrderOpened(bytes32 _orderId, ResolvedCrossChainOrder memory rOrder) public {
-        orders[_orderId] = abi.encode(rOrder);
+    function setOrderOpened(bytes32 _orderId, OrderData memory orderData) public {
+        openOrders[_orderId] = abi.encode(OrderEncoder.orderDataType(), OrderEncoder.encode(orderData));
         orderStatus[_orderId] = OPENED;
     }
 
@@ -268,11 +268,9 @@ contract BasicSwap7683Test is BaseTest {
     function test__handleSettleOrder_works() public {
         OrderData memory orderData = prepareOrderData();
         bytes32 orderId = bytes32("order1");
-        ResolvedCrossChainOrder memory rOrder =
-            baseSwap.resolvedOrder(OrderEncoder.orderDataType(), kakaroto, 0, 0, OrderEncoder.encode(orderData));
 
         // set the order as opened
-        baseSwap.setOrderOpened(orderId, rOrder);
+        baseSwap.setOrderOpened(orderId, orderData);
 
         deal(address(inputToken), address(baseSwap), 1_000_000, true);
 
@@ -295,11 +293,9 @@ contract BasicSwap7683Test is BaseTest {
         orderData.inputToken = TypeCasts.addressToBytes32(address(0));
         orderData.outputToken = TypeCasts.addressToBytes32(address(0));
         bytes32 orderId = bytes32("order1");
-        ResolvedCrossChainOrder memory rOrder =
-            baseSwap.resolvedOrder(OrderEncoder.orderDataType(), kakaroto, 0, 0, OrderEncoder.encode(orderData));
 
         // set the order as opened
-        baseSwap.setOrderOpened(orderId, rOrder);
+        baseSwap.setOrderOpened(orderId, orderData);
 
         deal(address(baseSwap), 1_000_000);
 
@@ -337,11 +333,9 @@ contract BasicSwap7683Test is BaseTest {
     function test__handleRefundOrder_works() public {
         OrderData memory orderData = prepareOrderData();
         bytes32 orderId = bytes32("order1");
-        ResolvedCrossChainOrder memory rOrder =
-            baseSwap.resolvedOrder(OrderEncoder.orderDataType(), kakaroto, 0, 0, OrderEncoder.encode(orderData));
 
         // set the order as opened
-        baseSwap.setOrderOpened(orderId, rOrder);
+        baseSwap.setOrderOpened(orderId, orderData);
 
         deal(address(inputToken), address(baseSwap), 1_000_000, true);
 
@@ -364,11 +358,9 @@ contract BasicSwap7683Test is BaseTest {
         orderData.inputToken = TypeCasts.addressToBytes32(address(0));
         orderData.outputToken = TypeCasts.addressToBytes32(address(0));
         bytes32 orderId = bytes32("order1");
-        ResolvedCrossChainOrder memory rOrder =
-            baseSwap.resolvedOrder(OrderEncoder.orderDataType(), kakaroto, 0, 0, OrderEncoder.encode(orderData));
 
         // set the order as opened
-        baseSwap.setOrderOpened(orderId, rOrder);
+        baseSwap.setOrderOpened(orderId, orderData);
 
         deal(address(baseSwap), 1_000_000);