[NEXT] 1-main DO NOT MERGE!

Synthetixio · Apr 5, 2024 · e6b0a94 · e6b0a94
1 parent ac9d5d4
commit e6b0a94
Show file tree

Hide file tree

Showing 10 changed files with 2,318 additions and 939 deletions.
diff --git a/1-main/AllErrors.json b/1-main/AllErrors.json
@@ -536,24 +536,6 @@
       }
     ]
   },
-  {
-    "type": "error",
-    "name": "DeniedMulticallTarget",
-    "inputs": [
-      {
-        "type": "address"
-      }
-    ]
-  },
-  {
-    "type": "error",
-    "name": "RecursiveMulticall",
-    "inputs": [
-      {
-        "type": "address"
-      }
-    ]
-  },
   {
     "type": "error",
     "name": "CapacityLocked",
@@ -618,6 +600,16 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "InsufficientAccountCollateral",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "requestedAmount"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "InsufficientDelegation",
@@ -807,6 +799,20 @@
       }
     ]
   },
+  {
+    "type": "error",
+    "name": "OracleDataRequired",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "oracleContract"
+      },
+      {
+        "type": "bytes",
+        "name": "oracleQuery"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "OverflowInt56ToInt24",
@@ -846,5 +852,101 @@
         "name": "operation"
       }
     ]
+  },
+  {
+    "type": "error",
+    "name": "AddressInsufficientBalance",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "account"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC2771ForwarderExpiredRequest",
+    "inputs": [
+      {
+        "type": "uint48",
+        "name": "deadline"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC2771ForwarderInvalidSigner",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "signer"
+      },
+      {
+        "type": "address",
+        "name": "from"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC2771ForwarderMismatchedValue",
+    "inputs": [
+      {
+        "type": "uint256",
+        "name": "requestedValue"
+      },
+      {
+        "type": "uint256",
+        "name": "msgValue"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "ERC2771UntrustfulTarget",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "target"
+      },
+      {
+        "type": "address",
+        "name": "forwarder"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "FailedInnerCall",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "InvalidAccountNonce",
+    "inputs": [
+      {
+        "type": "address",
+        "name": "account"
+      },
+      {
+        "type": "uint256",
+        "name": "currentNonce"
+      }
+    ]
+  },
+  {
+    "type": "error",
+    "name": "InvalidShortString",
+    "inputs": []
+  },
+  {
+    "type": "error",
+    "name": "StringTooLong",
+    "inputs": [
+      {
+        "type": "string",
+        "name": "str"
+      }
+    ]
   }
 ]
diff --git a/1-main/AllErrors.readable.json b/1-main/AllErrors.readable.json
@@ -52,8 +52,6 @@
   "error InsufficientMarketCollateralWithdrawable(uint128 marketId, address collateralType, uint256 tokenAmountToWithdraw)",
   "error IncorrectMarketInterface(address market)",
   "error NotEnoughLiquidity(uint128 marketId, uint256 amount)",
-  "error DeniedMulticallTarget(address)",
-  "error RecursiveMulticall(address)",
   "error CapacityLocked(uint256 marketId)",
   "error MinDelegationTimeoutPending(uint128 poolId, uint32 timeRemaining)",
   "error PoolAlreadyExists(uint128 poolId)",
@@ -62,6 +60,7 @@
   "error OverflowUint64ToInt64()",
   "error RewardDistributorNotFound()",
   "error RewardUnavailable(address distributor)",
+  "error InsufficientAccountCollateral(uint256 requestedAmount)",
   "error InsufficientDelegation(uint256 minDelegation)",
   "error InvalidCollateralAmount()",
   "error InvalidLeverage(uint256 leverage)",
@@ -79,10 +78,20 @@
   "error InvalidNodeDefinition(tuple(uint8 nodeType, bytes parameters, bytes32[] parents) nodeType)",
   "error InvalidPrice(int256 price)",
   "error NodeNotRegistered(bytes32 nodeId)",
+  "error OracleDataRequired(address oracleContract, bytes oracleQuery)",
   "error OverflowInt56ToInt24()",
   "error OverflowUint256ToUint160()",
   "error OverflowUint56ToInt56()",
   "error StalenessToleranceExceeded()",
   "error UnprocessableNode(bytes32 nodeId)",
-  "error UnsupportedOperation(uint8 operation)"
+  "error UnsupportedOperation(uint8 operation)",
+  "error AddressInsufficientBalance(address account)",
+  "error ERC2771ForwarderExpiredRequest(uint48 deadline)",
+  "error ERC2771ForwarderInvalidSigner(address signer, address from)",
+  "error ERC2771ForwarderMismatchedValue(uint256 requestedValue, uint256 msgValue)",
+  "error ERC2771UntrustfulTarget(address target, address forwarder)",
+  "error FailedInnerCall()",
+  "error InvalidAccountNonce(address account, uint256 currentNonce)",
+  "error InvalidShortString()",
+  "error StringTooLong(string str)"
 ]