diff --git a/abis/Exchange.json b/abis/Exchange.json
index c43ce04..5da8b39 100644
--- a/abis/Exchange.json
+++ b/abis/Exchange.json
@@ -34,11 +34,6 @@
     "name": "InsufficientBalance",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "LockOrderMismatchSender",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "NotBroker",
@@ -566,180 +561,6 @@
     "stateMutability": "payable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "components": [
-              {
-                "internalType": "address",
-                "name": "senderAddress",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "matcherAddress",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "baseAsset",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "quoteAsset",
-                "type": "address"
-              },
-              {
-                "internalType": "address",
-                "name": "matcherFeeAsset",
-                "type": "address"
-              },
-              {
-                "internalType": "uint64",
-                "name": "amount",
-                "type": "uint64"
-              },
-              {
-                "internalType": "uint64",
-                "name": "price",
-                "type": "uint64"
-              },
-              {
-                "internalType": "uint64",
-                "name": "matcherFee",
-                "type": "uint64"
-              },
-              {
-                "internalType": "uint64",
-                "name": "nonce",
-                "type": "uint64"
-              },
-              {
-                "internalType": "uint64",
-                "name": "expiration",
-                "type": "uint64"
-              },
-              {
-                "internalType": "uint8",
-                "name": "buySide",
-                "type": "uint8"
-              },
-              {
-                "internalType": "bytes",
-                "name": "signature",
-                "type": "bytes"
-              }
-            ],
-            "internalType": "struct LibValidator.Order",
-            "name": "limitOrder",
-            "type": "tuple"
-          },
-          {
-            "internalType": "uint24",
-            "name": "targetChainId",
-            "type": "uint24"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "secretHash",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "uint64",
-            "name": "lockOrderExpiration",
-            "type": "uint64"
-          }
-        ],
-        "internalType": "struct LibValidator.CrossChainOrder",
-        "name": "userOrder",
-        "type": "tuple"
-      },
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "senderAddress",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "matcherAddress",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "baseAsset",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "quoteAsset",
-            "type": "address"
-          },
-          {
-            "internalType": "address",
-            "name": "matcherFeeAsset",
-            "type": "address"
-          },
-          {
-            "internalType": "uint64",
-            "name": "amount",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint64",
-            "name": "price",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint64",
-            "name": "matcherFee",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint64",
-            "name": "nonce",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint64",
-            "name": "expiration",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint8",
-            "name": "buySide",
-            "type": "uint8"
-          },
-          {
-            "internalType": "bytes",
-            "name": "signature",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct LibValidator.Order",
-        "name": "brokerOrder",
-        "type": "tuple"
-      },
-      {
-        "internalType": "uint64",
-        "name": "filledPrice",
-        "type": "uint64"
-      },
-      {
-        "internalType": "uint64",
-        "name": "filledAmount",
-        "type": "uint64"
-      }
-    ],
-    "name": "fillAndLockAtomic",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -1240,7 +1061,7 @@
     "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "user",
         "type": "address"
       }
     ],
@@ -1252,7 +1073,7 @@
         "type": "uint256"
       }
     ],
-    "stateMutability": "pure",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -1342,15 +1163,10 @@
             "internalType": "bytes32",
             "name": "secretHash",
             "type": "bytes32"
-          },
-          {
-            "internalType": "bytes",
-            "name": "signature",
-            "type": "bytes"
           }
         ],
-        "internalType": "struct LibValidator.LockOrder",
-        "name": "lockOrder",
+        "internalType": "struct LibAtomic.LockOrder",
+        "name": "swap",
         "type": "tuple"
       }
     ],
@@ -1360,66 +1176,44 @@
     "type": "function"
   },
   {
-    "inputs": [
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
       {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "sender",
-            "type": "address"
-          },
-          {
-            "internalType": "uint64",
-            "name": "expiration",
-            "type": "uint64"
-          },
-          {
-            "internalType": "address",
-            "name": "asset",
-            "type": "address"
-          },
-          {
-            "internalType": "uint64",
-            "name": "amount",
-            "type": "uint64"
-          },
-          {
-            "internalType": "uint24",
-            "name": "targetChainId",
-            "type": "uint24"
-          },
-          {
-            "internalType": "bytes32",
-            "name": "secretHash",
-            "type": "bytes32"
-          },
-          {
-            "internalType": "bytes",
-            "name": "signature",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct LibValidator.LockOrder",
-        "name": "lockOrder",
-        "type": "tuple"
+        "internalType": "address",
+        "name": "",
+        "type": "address"
       }
     ],
-    "name": "lockAtomicByMatcher",
-    "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
+    "inputs": [
       {
         "internalType": "address",
-        "name": "",
+        "name": "broker",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "redeemedAsset",
         "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "collateralAsset",
+        "type": "address"
+      },
+      {
+        "internalType": "uint112",
+        "name": "amount",
+        "type": "uint112"
       }
     ],
-    "stateMutability": "view",
+    "name": "partiallyLiquidate",
+    "outputs": [],
+    "stateMutability": "nonpayable",
     "type": "function"
   },
   {
@@ -1716,11 +1510,6 @@
         "internalType": "address",
         "name": "WETH_",
         "type": "address"
-      },
-      {
-        "internalType": "uint64",
-        "name": "claimAtomicFee",
-        "type": "uint64"
       }
     ],
     "name": "setBasicParams",
@@ -1886,6 +1675,87 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "senderAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "matcherAddress",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "baseAsset",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "quoteAsset",
+            "type": "address"
+          },
+          {
+            "internalType": "address",
+            "name": "matcherFeeAsset",
+            "type": "address"
+          },
+          {
+            "internalType": "uint64",
+            "name": "amount",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint64",
+            "name": "price",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint64",
+            "name": "matcherFee",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint64",
+            "name": "nonce",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint64",
+            "name": "expiration",
+            "type": "uint64"
+          },
+          {
+            "internalType": "uint8",
+            "name": "buySide",
+            "type": "uint8"
+          },
+          {
+            "internalType": "bytes",
+            "name": "signature",
+            "type": "bytes"
+          }
+        ],
+        "internalType": "struct LibValidator.Order",
+        "name": "order",
+        "type": "tuple"
+      }
+    ],
+    "name": "validateOrder",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "isValid",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -1948,30 +1818,5 @@
   {
     "stateMutability": "payable",
     "type": "receive"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "user",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "asset",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "int192",
-        "name": "delta",
-        "type": "int192"
-      }
-    ],
-    "name": "BalanceChange",
-    "type": "event"
   }
-]
\ No newline at end of file
+]
diff --git a/package.json b/package.json
index 0bd6540..33f508f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/contracts",
-  "version": "1.23.15",
+  "version": "1.23.15-rc0",
   "type": "module",
   "description": "Orion Protocol contracts typings",
   "scripts": {