Add load tests and refactor orderbook

web3-nomad · Jun 17, 2024 · 1c5d071 · 1c5d071
1 parent a43683d
commit 1c5d071
Show file tree

Hide file tree

Showing 12 changed files with 1,113 additions and 28 deletions.
diff --git a/contracts/orderbook/hts/ExchangeHTS.sol b/contracts/orderbook/hts/ExchangeHTS.sol
@@ -38,7 +38,7 @@ contract ExchangeHTS is OrderBookHTS, ReentrancyGuard {
             _insertBuyOrder(msg.sender, price, remainVolume);
         }
 
-        return 0;
+        return currentOrderId;
     }
 
     /**

diff --git a/contracts/orderbook/hts/OrderBookHTS.sol b/contracts/orderbook/hts/OrderBookHTS.sol
@@ -17,9 +17,9 @@ abstract contract OrderBookHTS {
 
     event Trade(int64 tradedVolume, int64 price, address buyer, address seller);
     event NewOrder(bool isBuy, uint256 orderId, address trader, int64 price, int64 volume);
-    event Deposit(address indexed trader, address token, int64 amount);
+    event Deposit(address trader, address token, int64 amount);
     event Withdraw(address trader, address token, int64 amount);
-    event OrderCanceled(bool isBuy, uint256 indexed orderId, address indexed trader);
+    event OrderCanceled(bool isBuy, uint256 orderId, address trader);
 
     struct Order {
         uint256 id;
@@ -93,8 +93,10 @@ abstract contract OrderBookHTS {
         int64 sellVolume
     ) internal returns (int64) {
         uint256 currentBuyId = firstBuyOrderId;
+        uint256 maxIterations = 10; // Define a maximum number of iterations per call
+        uint256 iterations = 0;
 
-        while (currentBuyId != 0 && sellVolume > 0) {
+        while (currentBuyId != 0 && sellVolume > 0 && iterations < maxIterations) {
             Order storage buyOrder = buyOrders[currentBuyId];
 
             if (sellPrice <= buyOrder.price) {
@@ -118,6 +120,7 @@ abstract contract OrderBookHTS {
             } else {
                 break;
             }
+            iterations++;
         }
 
         firstBuyOrderId = currentBuyId;  // Update the first buy order ID
@@ -130,8 +133,10 @@ abstract contract OrderBookHTS {
         int64 buyVolume
     ) internal returns (int64) {
         uint256 currentSellId = firstSellOrderId;
+        uint256 maxIterations = 10; // Define a maximum number of iterations per call
+        uint256 iterations = 0;
 
-        while (currentSellId != 0 && buyVolume > 0) {
+        while (currentSellId != 0 && buyVolume > 0 && iterations < maxIterations) {
             Order storage sellOrder = sellOrders[currentSellId];
 
             if (buyPrice >= sellOrder.price) {
@@ -155,6 +160,7 @@ abstract contract OrderBookHTS {
             } else {
                 break;
             }
+            iterations++;
         }
 
         firstSellOrderId = currentSellId;  // Update the first sell order ID

diff --git a/data/abis/ExchangeFactory.json b/data/abis/ExchangeFactory.json
diff --git a/data/abis/ExchangeFactoryHTS.json b/data/abis/ExchangeFactoryHTS.json
diff --git a/data/abis/ExchangeHTS.json b/data/abis/ExchangeHTS.json
diff --git a/data/abis/OrderBookHTS.json b/data/abis/OrderBookHTS.json
@@ -7,7 +7,7 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": true,
+          "indexed": false,
           "internalType": "address",
           "name": "trader",
           "type": "address"
@@ -75,13 +75,13 @@
           "type": "bool"
         },
         {
-          "indexed": true,
+          "indexed": false,
           "internalType": "uint256",
           "name": "orderId",
           "type": "uint256"
         },
         {
-          "indexed": true,
+          "indexed": false,
           "internalType": "address",
           "name": "trader",
           "type": "address"

diff --git a/package.json b/package.json
@@ -27,10 +27,12 @@
     "@typechain/ethers-v6": "^0.5.0",
     "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
+    "@types/elliptic": "^6.4.18",
     "@types/mocha": "^9.1.0",
     "@types/node": "^18.0.0",
     "chai": "^4.2.0",
     "dotenv": "^16.4.5",
+    "elliptic": "^6.5.5",
     "eslint": "^8.57.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-plugin-import": "^2.29.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,7 @@ contract ExchangeHTS is OrderBookHTS, ReentrancyGuard { @@
                 _insertBuyOrder(msg.sender, price, remainVolume);
             }
-            return 0;
+            return currentOrderId;
         }
         /**
@@ Expand Down @@