feat: oracles with firewalls on mint and burn

.gitmodules

@@ -17,9 +17,11 @@
 [submodule "lib/openzeppelin-contracts-upgradeable"]
 	path = lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
+	version = v4.7.3
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	version = v4.7.3
 [submodule "lib/utils"]
 	path = lib/utils
 	url = https://github.com/AngleProtocol/utils

.solhint.json

@@ -1,8 +1,13 @@
 {
   "extends": "solhint:recommended",
-  "plugins": ["prettier"],
+  "plugins": [
+    "prettier"
+  ],
   "rules": {
-    "max-line-length": ["error", 120],
+    "max-line-length": [
+      "error",
+      120
+    ],
     "avoid-call-value": "warn",
     "avoid-low-level-calls": "off",
     "avoid-tx-origin": "warn",
@@ -22,7 +27,15 @@
     "no-inline-assembly": "off",
     "no-complex-fallback": "off",
     "reason-string": "off",
-    "func-visibility": ["warn", { "ignoreConstructors": true }],
-    "explicit-types": ["error","explicit"]
+    "func-visibility": [
+      "warn",
+      {
+        "ignoreConstructors": true
+      }
+    ],
+    "explicit-types": [
+      "error",
+      "explicit"
+    ]
   }
-}
+}

.vscode/settings.json

@@ -1,14 +1,12 @@
 {
-  "solidity.formatter": "prettier",
+  "solidity.formatter": "forge",
   "[typescript]": {
     "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
   },
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"
   },
-  "editor.codeActionsOnSave": {
-    "source.fixAll": true
-  },
+  "editor.formatOnSave": true,
   "workbench.colorCustomizations": {
     "diffEditor.insertedTextBackground": "#00bb0044",
     "diffEditor.removedTextBackground": "#ff000044"

contracts/interfaces/IGetters.sol

@@ -89,7 +89,8 @@ interface IGetters {
             OracleReadType oracleType,
             OracleReadType targetType,
             bytes memory oracleData,
-            bytes memory targetData
+            bytes memory targetData,
+            bytes memory hyperparameters
         );
 
     /// @notice Returns if the associated functionality is paused or not

contracts/interfaces/IOracle.sol

@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+
+pragma solidity >=0.5.0;
+
+/// @title IOracle
+/// @author Angle Labs, Inc.
+interface IOracle {
+    /// @notice Update oracle data for a given `collateral`
+    function updateOracle(address collateral) external;
+}

contracts/interfaces/ITransmuter.sol

@@ -39,6 +39,7 @@ import { IDiamondCut } from "./IDiamondCut.sol";
 import { IDiamondEtherscan } from "./IDiamondEtherscan.sol";
 import { IDiamondLoupe } from "./IDiamondLoupe.sol";
 import { IGetters } from "./IGetters.sol";
+import { IOracle } from "./IOracle.sol";
 import { IRedeemer } from "./IRedeemer.sol";
 import { IRewardHandler } from "./IRewardHandler.sol";
 import { ISettersGovernor, ISettersGuardian } from "./ISetters.sol";
@@ -51,6 +52,7 @@ interface ITransmuter is
     IDiamondEtherscan,
     IDiamondLoupe,
     IGetters,
+    IOracle,
     IRedeemer,
     IRewardHandler,
     ISettersGovernor,

contracts/interfaces/ITransmuterOracle.sol

@@ -15,4 +15,7 @@ interface ITransmuterOracle {
     /// @notice Reads the oracle value for asset to use in a burn transaction as well as the ratio
     /// between the current price and the target price for the asset
     function readBurn() external view returns (uint256 oracleValue, uint256 ratio);
+
+    /// @notice Reads the oracle value for asset
+    function read() external view returns (uint256);
 }

contracts/transmuter/Storage.sol

@@ -47,7 +47,8 @@ enum OracleReadType {
     CBETH,
     RETH,
     SFRXETH,
-    PYTH
+    PYTH,
+    MAX
 }
 
 enum OracleQuoteType {

contracts/transmuter/configs/FakeGnosis.sol

@@ -28,6 +28,7 @@
         address[] memory _collateralAddresses,
         address[] memory _oracleAddresses
     ) external {
+        uint256 BPS = 1e14;
         // Fee structure
 
         uint64[] memory xMintFee = new uint64[](4);
@@ -85,7 +86,8 @@
                 Storage.OracleReadType.CHAINLINK_FEEDS,
                 Storage.OracleReadType.STABLE,
                 readData,
-                targetData
+                targetData,
+                abi.encode(uint128(0), uint128(50 * BPS))
             );
             collaterals[i] = CollateralSetupProd(
                 _collateralAddresses[i],

contracts/transmuter/configs/Production.sol

@@ -6,15 +6,18 @@
 
 /// @dev This contract is used only once to initialize the diamond proxy.
 contract Production {
+    error WrongSetup();
+
     function initialize(
         IAccessControlManager _accessControlManager,
         address _agToken,
         address dummyImplementation
     ) external {
+        uint256 BPS = 1e14;
         address euroc = 0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c;
         address bc3m = 0x2F123cF3F37CE3328CC9B5b8415f9EC5109b45e7;
         require(address(_accessControlManager) == 0x5bc6BEf80DA563EBf6Df6D6913513fa9A7ec89BE);
         require(address(_agToken) == 0x1a7e4e63778B4f12a199C062f3eFdD288afCBce8);
 
         // Check this docs for simulations:
         // https://docs.google.com/spreadsheets/d/1UxS1m4sG8j2Lv02wONYJNkF4S7NDLv-5iyAzFAFTfXw/edit#gid=0
@@ -47,27 +50,31 @@
             bytes memory oracleConfig;
             {
                 // Pyth oracle for EUROC
-                bytes32[] memory feedIds = new bytes32[](2);
-                uint32[] memory stalePeriods = new uint32[](2);
-                uint8[] memory isMultiplied = new uint8[](2);
-                // pyth address
-                address pyth = 0x4305FB66699C3B2702D4d05CF36551390A4c69C6;
-                // EUROC/USD
-                feedIds[0] = 0x76fa85158bf14ede77087fe3ae472f66213f6ea2f5b411cb2de472794990fa5c;
-                // USD/EUR
-                feedIds[1] = 0xa995d00bb36a63cef7fd2c287dc105fc8f3d93779f062f09551b0af3e81ec30b;
-                stalePeriods[0] = 14 days;
-                stalePeriods[1] = 14 days;
-                isMultiplied[0] = 1;
-                isMultiplied[1] = 0;
-                OracleQuoteType quoteType = OracleQuoteType.UNIT;
-                bytes memory readData = abi.encode(pyth, feedIds, stalePeriods, isMultiplied, quoteType);
+                bytes memory readData;
+                {
+                    bytes32[] memory feedIds = new bytes32[](2);
+                    uint32[] memory stalePeriods = new uint32[](2);
+                    uint8[] memory isMultiplied = new uint8[](2);
+                    // pyth address
+                    address pyth = 0x4305FB66699C3B2702D4d05CF36551390A4c69C6;
+                    // EUROC/USD
+                    feedIds[0] = 0x76fa85158bf14ede77087fe3ae472f66213f6ea2f5b411cb2de472794990fa5c;
+                    // USD/EUR
+                    feedIds[1] = 0xa995d00bb36a63cef7fd2c287dc105fc8f3d93779f062f09551b0af3e81ec30b;
+                    stalePeriods[0] = 14 days;
+                    stalePeriods[1] = 14 days;
+                    isMultiplied[0] = 1;
+                    isMultiplied[1] = 0;
+                    OracleQuoteType quoteType = OracleQuoteType.UNIT;
+                    readData = abi.encode(pyth, feedIds, stalePeriods, isMultiplied, quoteType);
+                }
                 bytes memory targetData;
                 oracleConfig = abi.encode(
                     Storage.OracleReadType.PYTH,
                     Storage.OracleReadType.STABLE,
                     readData,
-                    targetData
+                    targetData,
+                    abi.encode(uint128(0), uint128(50 * BPS))
                 );
             }
             collaterals[0] = CollateralSetupProd(
@@ -102,41 +109,49 @@
             yBurnFeeC3M[1] = int64(uint64((5 * BASE_9) / 1000));
             yBurnFeeC3M[2] = int64(uint64(MAX_BURN_FEE));
 
-            AggregatorV3Interface[] memory circuitChainlink = new AggregatorV3Interface[](1);
-            uint32[] memory stalePeriods = new uint32[](1);
-            uint8[] memory circuitChainIsMultiplied = new uint8[](1);
-            uint8[] memory chainlinkDecimals = new uint8[](1);
-
-            // bC3M: Redstone as a current price (more accurate for redemptions), and Backed as a target
-
-            // Redstone C3M Oracle
-            circuitChainlink[0] = AggregatorV3Interface(0x6E27A25999B3C665E44D903B2139F5a4Be2B6C26);
-            stalePeriods[0] = 3 days;
-            circuitChainIsMultiplied[0] = 1;
-            chainlinkDecimals[0] = 8;
-            OracleQuoteType quoteType = OracleQuoteType.UNIT;
-            bytes memory readData = abi.encode(
-                circuitChainlink,
-                stalePeriods,
-                circuitChainIsMultiplied,
-                chainlinkDecimals,
-                quoteType
-            );
+            bytes memory readData;
+            {
+                AggregatorV3Interface[] memory circuitChainlink = new AggregatorV3Interface[](1);
+                uint32[] memory stalePeriods = new uint32[](1);
+                uint8[] memory circuitChainIsMultiplied = new uint8[](1);
+                uint8[] memory chainlinkDecimals = new uint8[](1);
+
+                // bC3M: Redstone as a current price (more accurate for redemptions), and Backed as a target
+
+                // Redstone C3M Oracle
+                circuitChainlink[0] = AggregatorV3Interface(0x6E27A25999B3C665E44D903B2139F5a4Be2B6C26);
+                stalePeriods[0] = 3 days;
+                circuitChainIsMultiplied[0] = 1;
+                chainlinkDecimals[0] = 8;
+                OracleQuoteType quoteType = OracleQuoteType.UNIT;
+                readData = abi.encode(
+                    circuitChainlink,
+                    stalePeriods,
+                    circuitChainIsMultiplied,
+                    chainlinkDecimals,
+                    quoteType
+                );
+            }
 
             // Backed C3M Oracle
-            circuitChainlink[0] = AggregatorV3Interface(0x83Ec02059F686E747392A22ddfED7833bA0d7cE3);
-            bytes memory targetData = abi.encode(
-                circuitChainlink,
-                stalePeriods,
-                circuitChainIsMultiplied,
-                chainlinkDecimals,
-                quoteType
-            );
+            bytes memory targetData;
+            {
+                uint256 initialValue;
+
+                {
+                    (, int256 ratio, , , ) = AggregatorV3Interface(0x83Ec02059F686E747392A22ddfED7833bA0d7cE3)
+                        .latestRoundData();
+                    if (ratio <= 0) revert WrongSetup();
+                    initialValue = (BASE_18 * uint256(ratio)) / 1e8;
+                }
+                targetData = abi.encode(initialValue, block.timestamp, 50 * BPS, 1 days);
+            }
             bytes memory oracleConfig = abi.encode(
                 Storage.OracleReadType.CHAINLINK_FEEDS,
-                Storage.OracleReadType.CHAINLINK_FEEDS,
+                Storage.OracleReadType.MAX,
                 readData,
-                targetData
+                targetData,
+                abi.encode(uint128(20000 * BPS), uint128(100 * BPS))
             );
 
             collaterals[1] = CollateralSetupProd(

contracts/transmuter/configs/ProductionUSD.sol

@@ -11,6 +11,7 @@ contract ProductionUSD {
         address _agToken,
         address dummyImplementation
     ) external {
+        uint256 BPS = 1e14;
         address usdc = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
         /*
         require(address(_accessControlManager) == 0x5bc6BEf80DA563EBf6Df6D6913513fa9A7ec89BE);
@@ -35,30 +36,34 @@ contract ProductionUSD {
 
             bytes memory oracleConfig;
             {
-                AggregatorV3Interface[] memory circuitChainlink = new AggregatorV3Interface[](1);
-                uint32[] memory stalePeriods = new uint32[](1);
-                uint8[] memory circuitChainIsMultiplied = new uint8[](1);
-                uint8[] memory chainlinkDecimals = new uint8[](1);
+                bytes memory readData;
+                {
+                    AggregatorV3Interface[] memory circuitChainlink = new AggregatorV3Interface[](1);
+                    uint32[] memory stalePeriods = new uint32[](1);
+                    uint8[] memory circuitChainIsMultiplied = new uint8[](1);
+                    uint8[] memory chainlinkDecimals = new uint8[](1);
 
-                // Chainlink USDC/USD oracle
-                circuitChainlink[0] = AggregatorV3Interface(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6);
-                stalePeriods[0] = 1 days;
-                circuitChainIsMultiplied[0] = 1;
-                chainlinkDecimals[0] = 8;
-                OracleQuoteType quoteType = OracleQuoteType.UNIT;
-                bytes memory readData = abi.encode(
-                    circuitChainlink,
-                    stalePeriods,
-                    circuitChainIsMultiplied,
-                    chainlinkDecimals,
-                    quoteType
-                );
+                    // Chainlink USDC/USD oracle
+                    circuitChainlink[0] = AggregatorV3Interface(0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6);
+                    stalePeriods[0] = 1 days;
+                    circuitChainIsMultiplied[0] = 1;
+                    chainlinkDecimals[0] = 8;
+                    OracleQuoteType quoteType = OracleQuoteType.UNIT;
+                    readData = abi.encode(
+                        circuitChainlink,
+                        stalePeriods,
+                        circuitChainIsMultiplied,
+                        chainlinkDecimals,
+                        quoteType
+                    );
+                }
                 bytes memory targetData;
                 oracleConfig = abi.encode(
                     Storage.OracleReadType.CHAINLINK_FEEDS,
                     Storage.OracleReadType.STABLE,
                     readData,
-                    targetData
+                    targetData,
+                    abi.encode(uint128(0), uint128(50 * BPS))
                 );
             }
             collaterals[0] = CollateralSetupProd(

contracts/transmuter/configs/Test.sol

@@ -53,7 +53,13 @@ contract Test {
         bytes memory targetData;
         LibSetters.setOracle(
             eurA.collateral,
-            abi.encode(OracleReadType.CHAINLINK_FEEDS, OracleReadType.STABLE, readData, targetData)
+            abi.encode(
+                OracleReadType.CHAINLINK_FEEDS,
+                OracleReadType.STABLE,
+                readData,
+                targetData,
+                abi.encode(uint128(0), uint128(0))
+            )
         );
 
         // Fees
@@ -103,7 +109,13 @@ contract Test {
         readData = abi.encode(circuitChainlink, stalePeriods, circuitChainIsMultiplied, chainlinkDecimals, quoteType);
         LibSetters.setOracle(
             eurB.collateral,
-            abi.encode(OracleReadType.CHAINLINK_FEEDS, OracleReadType.STABLE, readData, targetData)
+            abi.encode(
+                OracleReadType.CHAINLINK_FEEDS,
+                OracleReadType.STABLE,
+                readData,
+                targetData,
+                abi.encode(uint128(0), uint128(0))
+            )
         );
 
         // Fees
@@ -153,7 +165,13 @@ contract Test {
         readData = abi.encode(circuitChainlink, stalePeriods, circuitChainIsMultiplied, chainlinkDecimals, quoteType);
         LibSetters.setOracle(
             eurY.collateral,
-            abi.encode(OracleReadType.CHAINLINK_FEEDS, OracleReadType.STABLE, readData, targetData)
+            abi.encode(
+                OracleReadType.CHAINLINK_FEEDS,
+                OracleReadType.STABLE,
+                readData,
+                targetData,
+                abi.encode(uint128(0), uint128(0))
+            )
         );
 
         // Fees