[NEXT] 42161-main DO NOT MERGE!

Synthetixio · Jun 12, 2024 · a05c8de · a05c8de
1 parent d5d26a4
commit a05c8de
Show file tree

Hide file tree

Showing 6 changed files with 539 additions and 113 deletions.
diff --git a/42161-main/AllErrors.json b/42161-main/AllErrors.json
@@ -1372,20 +1372,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "AcceptablePriceExceeded",
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "fillPrice"
-      },
-      {
-        "type": "uint256",
-        "name": "acceptablePrice"
-      }
-    ]
-  },
   {
     "type": "error",
     "name": "InsufficientMargin",
@@ -1455,6 +1441,20 @@
     "name": "ZeroSizeOrder",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "AcceptablePriceExceeded",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "fillPrice"
+      },
+      {
+        "type": "uint256",
+        "name": "acceptablePrice"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "InsufficientAccountMargin",

diff --git a/42161-main/AllErrors.readable.json b/42161-main/AllErrors.readable.json
@@ -132,12 +132,12 @@
   "error PendingOrderExists()",
   "error PriceFeedNotSet(uint128 marketId)",
   "error SynthNotEnabledForCollateral(uint128 synthMarketId)",
-  "error AcceptablePriceExceeded(uint256 fillPrice, uint256 acceptablePrice)",
   "error InsufficientMargin(int256 availableMargin, uint256 minMargin)",
   "error MaxOpenInterestReached(uint128 marketId, uint256 maxMarketSize, int256 newSideSize)",
   "error MaxPositionsPerAccountReached(uint128 maxPositionsPerAccount)",
   "error MaxUSDOpenInterestReached(uint128 marketId, uint256 maxMarketValue, int256 newSideSize, uint256 price)",
   "error ZeroSizeOrder()",
+  "error AcceptablePriceExceeded(uint256 fillPrice, uint256 acceptablePrice)",
   "error InsufficientAccountMargin(uint256 leftover)",
   "error OrderNotValid()",
   "error SettlementWindowExpired(uint256 timestamp, uint256 settlementTime, uint256 settlementExpiration)",

diff --git a/42161-main/PerpsMarketProxy.json b/42161-main/PerpsMarketProxy.json
@@ -1600,20 +1600,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "AcceptablePriceExceeded",
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "fillPrice"
-      },
-      {
-        "type": "uint256",
-        "name": "acceptablePrice"
-      }
-    ]
-  },
   {
     "type": "error",
     "name": "InsufficientMargin",
@@ -2086,6 +2072,20 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "AcceptablePriceExceeded",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "fillPrice"
+      },
+      {
+        "type": "uint256",
+        "name": "acceptablePrice"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "InsufficientAccountMargin",
@@ -4091,6 +4091,25 @@
       }
     ]
   },
+  {
+    "type": "function",
+    "name": "globalCollateralValue",
+    "constant": true,
+    "stateMutability": "view",
+    "payable": false,
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "collateralId"
+      }
+    ],
+    "outputs": [
+      {
+        "type": "uint256",
+        "name": "collateralValue"
+      }
+    ]
+  },
   {
     "type": "function",
     "name": "setCollateralConfiguration",

diff --git a/42161-main/PerpsMarketProxy.readable.json b/42161-main/PerpsMarketProxy.readable.json
@@ -100,7 +100,6 @@
   "function metadata(uint128 marketId) view returns (string name, string symbol)",
   "function size(uint128 marketId) view returns (uint256)",
   "function skew(uint128 marketId) view returns (int256)",
-  "error AcceptablePriceExceeded(uint256 fillPrice, uint256 acceptablePrice)",
   "error InsufficientMargin(int256 availableMargin, uint256 minMargin)",
   "error InvalidSettlementStrategy(uint256 settlementStrategyId)",
   "error MaxOpenInterestReached(uint128 marketId, uint256 maxMarketSize, int256 newSideSize)",
@@ -117,6 +116,7 @@
   "function getSettlementRewardCost(uint128 marketId, uint128 settlementStrategyId) view returns (uint256)",
   "function requiredMarginForOrder(uint128 accountId, uint128 marketId, int128 sizeDelta) view returns (uint256 requiredMargin)",
   "function requiredMarginForOrderWithPrice(uint128 accountId, uint128 marketId, int128 sizeDelta, uint256 price) view returns (uint256 requiredMargin)",
+  "error AcceptablePriceExceeded(uint256 fillPrice, uint256 acceptablePrice)",
   "error InsufficientAccountMargin(uint256 leftover)",
   "error OrderNotValid()",
   "error OverflowInt128ToUint128()",
@@ -210,6 +210,7 @@
   "function getReferrerShare(address referrer) view returns (uint256 shareRatioD18)",
   "function getSupportedCollaterals() view returns (uint256[] supportedCollaterals)",
   "function getSynthDeductionPriority() view returns (uint128[])",
+  "function globalCollateralValue(uint128 collateralId) view returns (uint256 collateralValue)",
   "function setCollateralConfiguration(uint128 synthMarketId, uint256 maxCollateralAmount)",
   "function setFeeCollector(address feeCollector)",
   "function setInterestRateParameters(uint128 lowUtilizationInterestRateGradient, uint128 interestRateGradientBreakpoint, uint128 highUtilizationInterestRateGradient)",