Updated Interfaces and Errors

aalavandhan · aalavandhan · commit 3a7eec8a371c · 2024-11-07T09:10:44.000-05:00
diff --git a/spot-vaults/contracts/_interfaces/ISpotPricingStrategy.sol b/spot-vaults/contracts/_interfaces/ISpotPricingStrategy.sol
diff --git a/spot-vaults/contracts/_interfaces/errors/BillBrokerErrors.sol b/spot-vaults/contracts/_interfaces/errors/BillBrokerErrors.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.24;
+
+/// @notice Expect AR lower bound to be under the upper bound.
+error InvalidARBound();
+
+/// @notice Expected pre and post swap AR delta to be non-increasing or non-decreasing.
+error UnexpectedARDelta();
diff --git a/spot-vaults/contracts/_interfaces/errors/CommonErrors.sol b/spot-vaults/contracts/_interfaces/errors/CommonErrors.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: BUSL-1.1
+/// SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.24;
 
 /// @notice Expected contract call to be triggered by authorized caller.
@@ -10,15 +10,6 @@ error UnexpectedDecimals();
 /// @notice Expected perc value to be at most (1 * 10**DECIMALS), i.e) 1.0 or 100%.
 error InvalidPerc();
 
-/// @notice Expected Senior CDR bound to be more than 1.0 or 100%.
-error InvalidSeniorCDRBound();
-
-/// @notice Expect AR lower bound to be under the upper bound.
-error InvalidARBound();
-
-/// @notice Expected pre and post swap AR delta to be non-increasing or non-decreasing.
-error UnexpectedARDelta();
-
 /// @notice Slippage higher than tolerance requested by user.
 error SlippageTooHigh();
 
diff --git a/spot-vaults/contracts/_interfaces/external/IAlphaProVault.sol b/spot-vaults/contracts/_interfaces/external/IAlphaProVault.sol
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-// solhint-disable-next-line compiler-version
-pragma solidity ^0.7.6;
+pragma solidity ^0.8.24;
 
 import { IUniswapV3Pool } from "@uniswap/v3-core/contracts/interfaces/IUniswapV3Pool.sol";
 
diff --git a/spot-vaults/contracts/_interfaces/external/IBondController.sol b/spot-vaults/contracts/_interfaces/external/IBondController.sol
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// solhint-disable-next-line compiler-version
+interface IBondController {
+    function collateralBalance() external view returns (uint256);
+}
diff --git a/spot-vaults/contracts/_interfaces/external/IERC20.sol b/spot-vaults/contracts/_interfaces/external/IERC20.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// solhint-disable-next-line compiler-version
+interface IERC20 {
+    function totalSupply() external view returns (uint256);
+    function balanceOf(address account) external view returns (uint256);
+    function transfer(address to, uint256 value) external returns (bool);
+    function allowance(address owner, address spender) external view returns (uint256);
+    function approve(address spender, uint256 value) external returns (bool);
+    function transferFrom(
+        address from,
+        address to,
+        uint256 value
+    ) external returns (bool);
+}
diff --git a/spot-vaults/contracts/_interfaces/external/IPerpFeePolicy.sol b/spot-vaults/contracts/_interfaces/external/IPerpFeePolicy.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// solhint-disable-next-line compiler-version
+interface IPerpFeePolicy {
+    function decimals() external returns (uint8);
+    function deviationRatio() external returns (uint256);
+    function computePerpRolloverFeePerc(uint256 dr) external returns (int256);
+}
diff --git a/spot-vaults/contracts/_interfaces/external/IPerpetualTranche.sol b/spot-vaults/contracts/_interfaces/external/IPerpetualTranche.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// solhint-disable-next-line compiler-version
+interface IPerpetualTranche {
+    function underlying() external view returns (address);
+    function getTVL() external returns (uint256);
+    function totalSupply() external returns (uint256);
+    function getReserveCount() external returns (uint256);
+    function getReserveAt(uint256 index) external returns (address);
+    function deviationRatio() external returns (uint256);
+    function getReserveTokenValue(address t) external returns (uint256);
+    function getReserveTokenBalance(address t) external returns (uint256);
+    function feePolicy() external returns (address);
+}
diff --git a/spot-vaults/contracts/_interfaces/external/ITranche.sol b/spot-vaults/contracts/_interfaces/external/ITranche.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+// solhint-disable-next-line compiler-version
+interface ITranche {
+    function bond() external view returns (address);
+    function totalSupply() external view returns (uint256);
+}
diff --git a/spot-vaults/contracts/_interfaces/external/IWAMPL.sol b/spot-vaults/contracts/_interfaces/external/IWAMPL.sol
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // solhint-disable-next-line compiler-version
-pragma solidity ^0.7.6;
-
 interface IWAMPL {
     function wrapperToUnderlying(uint256 wamples) external view returns (uint256);
 }
diff --git a/spot-vaults/contracts/_interfaces/types/BillBrokerTypes.sol b/spot-vaults/contracts/_interfaces/types/BillBrokerTypes.sol
@@ -1,25 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.24;
 
-/// @notice A data structure to define a geometric Line with two points.
-struct Line {
-    /// @notice x-coordinate of the first point.
-    uint256 x1;
-    /// @notice y-coordinate of the first point.
-    uint256 y1;
-    /// @notice x-coordinate of the second point.
-    uint256 x2;
-    /// @notice y-coordinate of the second point.
-    uint256 y2;
-}
-
-/// @notice A data structure to define a numeric Range.
-struct Range {
-    /// @notice Lower bound of the range.
-    uint256 lower;
-    /// @notice Upper bound of the range.
-    uint256 upper;
-}
+import { Range } from "./CommonTypes.sol";
 
 /// @notice A data structure to store various fees associated with BillBroker operations.
 struct BillBrokerFees {
diff --git a/spot-vaults/contracts/_interfaces/types/CommonTypes.sol b/spot-vaults/contracts/_interfaces/types/CommonTypes.sol
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.24;
+
+/// @notice A data structure to define a geometric Line with two points.
+struct Line {
+    // @dev x-coordinate of the first point.
+    uint256 x1;
+    // @dev y-coordinate of the first point.
+    uint256 y1;
+    // @dev x-coordinate of the second point.
+    uint256 x2;
+    // @dev y-coordinate of the second point.
+    uint256 y2;
+}
+
+/// @notice A data structure to define a numeric Range.
+struct Range {
+    // @dev Lower bound of the range.
+    uint256 lower;
+    // @dev Upper bound of the range.
+    uint256 upper;
+}
diff --git a/spot-vaults/contracts/charm/UsdcSpotManager.sol b/spot-vaults/contracts/charm/UsdcSpotManager.sol
diff --git a/spot-vaults/contracts/charm/WethWamplManager.sol b/spot-vaults/contracts/charm/WethWamplManager.sol

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`// SPDX-License-Identifier: GPL-3.0-or-later`
`2`	`2`	`// solhint-disable-next-line compiler-version`
`3`		`-pragma solidity ^0.7.6;`
`4`		`-`
`5`	`3`	`interface IWAMPL {`
`6`	`4`	`function wrapperToUnderlying(uint256 wamples) external view returns (uint256);`
`7`	`5`	`}`