Update 421614-main (#162)

Synthetixio · Aug 3, 2024 · ddf3959 · ddf3959
1 parent 4d6f7b8
commit ddf3959
Show file tree

Hide file tree

Showing 24 changed files with 11,802 additions and 3,089 deletions.
diff --git a/421614-main/AllErrors.json b/421614-main/AllErrors.json
@@ -967,6 +967,16 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "InvalidTransactionTypeIndex",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "txnType"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "OnlyMarketOwner",
@@ -1269,7 +1279,7 @@
     "inputs": [
       {
         "type": "uint128",
-        "name": "synthMarketId"
+        "name": "collateralId"
       },
       {
         "type": "uint256",
@@ -1286,12 +1296,12 @@
     "name": "InsufficientCollateralAvailableForWithdraw",
     "inputs": [
       {
-        "type": "uint256",
-        "name": "availableUsdDenominated"
+        "type": "int256",
+        "name": "withdrawableMarginUsd"
       },
       {
         "type": "uint256",
-        "name": "requiredUsdDenominated"
+        "name": "requestedMarginUsd"
       }
     ]
   },
@@ -1301,7 +1311,7 @@
     "inputs": [
       {
         "type": "uint128",
-        "name": "synthMarketId"
+        "name": "collateralId"
       },
       {
         "type": "uint256",
@@ -1323,6 +1333,16 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "InvalidId",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "id"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "KeeperCostsNotSet",
@@ -1334,7 +1354,7 @@
     "inputs": [
       {
         "type": "uint128",
-        "name": "synthMarketId"
+        "name": "collateralId"
       },
       {
         "type": "uint256",
@@ -1360,6 +1380,16 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "NonexistentDebt",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "accountId"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "PendingOrderExists",
@@ -1381,7 +1411,21 @@
     "inputs": [
       {
         "type": "uint128",
-        "name": "synthMarketId"
+        "name": "collateralId"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ExceedsMarketCreditCapacity",
+    "inputs": [
+      {
+        "type": "int256",
+        "name": "delegatedCollateral"
+      },
+      {
+        "type": "int256",
+        "name": "newLockedCredit"
       }
     ]
   },
@@ -1468,16 +1512,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "InsufficientAccountMargin",
-    "inputs": [
-      {
-        "type": "uint256",
-        "name": "leftover"
-      }
-    ]
-  },
   {
     "type": "error",
     "name": "OrderNotValid",
@@ -1529,6 +1563,30 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "AccountHasOpenPositions",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "accountId"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "InvalidDistributor",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "id"
+      },
+      {
+        "type": "address",
+        "name": "distributor"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "NotEligibleForLiquidation",
@@ -1539,6 +1597,26 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "NotEligibleForMarginLiquidation",
+    "inputs": [
+      {
+        "type": "uint128",
+        "name": "accountId"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "InvalidDistributorContract",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "distributor"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "InvalidInterestRateParameters",

diff --git a/421614-main/AllErrors.readable.json b/421614-main/AllErrors.readable.json
@@ -95,6 +95,7 @@
   "error StringTooLong(string str)",
   "error InvalidMarketOwner()",
   "error InvalidSynthImplementation(uint256 synthImplementation)",
+  "error InvalidTransactionTypeIndex(uint128 txnType)",
   "error OnlyMarketOwner(address marketOwner, address sender)",
   "error ExceedsMaxSynthAmount(uint256 maxSynthAmount, uint256 synthAmountCharged)",
   "error ExceedsMaxUsdAmount(uint256 maxUsdAmount, uint256 usdAmountCharged)",
@@ -122,28 +123,34 @@
   "error PerpsMarketAlreadyInitialized()",
   "error PerpsMarketNotInitialized()",
   "error AccountLiquidatable(uint128 accountId)",
-  "error InsufficientCollateral(uint128 synthMarketId, uint256 collateralAmount, uint256 withdrawAmount)",
-  "error InsufficientCollateralAvailableForWithdraw(uint256 availableUsdDenominated, uint256 requiredUsdDenominated)",
-  "error InsufficientSynthCollateral(uint128 synthMarketId, uint256 collateralAmount, uint256 withdrawAmount)",
+  "error InsufficientCollateral(uint128 collateralId, uint256 collateralAmount, uint256 withdrawAmount)",
+  "error InsufficientCollateralAvailableForWithdraw(int256 withdrawableMarginUsd, uint256 requestedMarginUsd)",
+  "error InsufficientSynthCollateral(uint128 collateralId, uint256 collateralAmount, uint256 withdrawAmount)",
   "error InvalidAmountDelta(int256 amountDelta)",
+  "error InvalidId(uint128 id)",
   "error KeeperCostsNotSet()",
-  "error MaxCollateralExceeded(uint128 synthMarketId, uint256 maxAmount, uint256 collateralAmount, uint256 depositAmount)",
+  "error MaxCollateralExceeded(uint128 collateralId, uint256 maxAmount, uint256 collateralAmount, uint256 depositAmount)",
   "error MaxCollateralsPerAccountReached(uint128 maxCollateralsPerAccount)",
+  "error NonexistentDebt(uint128 accountId)",
   "error PendingOrderExists()",
   "error PriceFeedNotSet(uint128 marketId)",
-  "error SynthNotEnabledForCollateral(uint128 synthMarketId)",
+  "error SynthNotEnabledForCollateral(uint128 collateralId)",
+  "error ExceedsMarketCreditCapacity(int256 delegatedCollateral, int256 newLockedCredit)",
   "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)",
   "error SettlementWindowNotOpen(uint256 timestamp, uint256 settlementTime)",
   "error AcceptablePriceNotExceeded(uint256 fillPrice, uint256 acceptablePrice)",
+  "error AccountHasOpenPositions(uint128 accountId)",
+  "error InvalidDistributor(uint128 id, address distributor)",
   "error NotEligibleForLiquidation(uint128 accountId)",
+  "error NotEligibleForMarginLiquidation(uint128 accountId)",
+  "error InvalidDistributorContract(address distributor)",
   "error InvalidInterestRateParameters(uint128 lowUtilizationInterestRateGradient, uint128 highUtilizationInterestRateGradient)",
   "error InvalidReferrerShareRatio(uint256 shareRatioD18)",
   "error FeeRequired(uint256 amount)",