Merge branch 'staging' into s/turn-immutable

.github/workflows/lint-solidity.yaml

@@ -1,31 +1,30 @@
-name: Overlay V1 Core Lint Solidity
+name: Overlay V1 Core Format Solidity
 
 on:
   push:
     branches:
       - main
+      - staging
   pull_request:
     branches:
       - main
+      - staging
 
 jobs:
-  solidity-lint:
+  solidity-format:
     runs-on: ubuntu-latest
-    name: Solidity Lint
+    name: Solidity Format
     steps:
-      - name: Check out source repository
-        uses: actions/checkout@v2
-
-      - name: Setup node.js
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
         with:
-          node-version: '17.x'
-
-      - name: Install node.js dependencies
-        run: npm install
+          submodules: recursive
 
-      - name: Run formater check on *.sol and *.json
-        run: npm run format:check
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
 
-      - name: run linter check on *.sol file
-        run: npm run hint
+      - name: Run Forge fmt
+        run: |
+          forge fmt --check
+        id: format

contracts/OverlayV1Deployer.sol

@@ -21,15 +21,7 @@ contract OverlayV1Deployer is IOverlayV1Deployer {
         ov = _ov;
     }
 
-    function parameters()
-        external
-        view
-        returns (
-            address ov_,
-            address feed_,
-            address factory_
-        )
-    {
+    function parameters() external view returns (address ov_, address feed_, address factory_) {
         ov_ = ov;
         feed_ = feed;
         factory_ = factory;

contracts/OverlayV1Factory.sol

@@ -53,10 +53,7 @@ contract OverlayV1Factory is IOverlayV1Factory {
 
     // event for risk param updates
     event ParamUpdated(
-        address indexed user,
-        address indexed market,
-        Risk.Parameters name,
-        uint256 value
+        address indexed user, address indexed market, Risk.Parameters name, uint256 value
     );
 
     // event for emergency shutdown
@@ -131,11 +128,11 @@ contract OverlayV1Factory is IOverlayV1Factory {
 
     /// @dev deploys a new market contract
     /// @return market_ address of the new market
-    function deployMarket(
-        address feedFactory,
-        address feed,
-        uint256[15] calldata params
-    ) external onlyGovernor returns (address market_) {
+    function deployMarket(address feedFactory, address feed, uint256[15] calldata params)
+        external
+        onlyGovernor
+        returns (address market_)
+    {
         // check feed and feed factory are available for a new market
         _checkFeed(feedFactory, feed);
 
@@ -167,26 +164,25 @@ contract OverlayV1Factory is IOverlayV1Factory {
     }
 
     /// @notice Checks all risk params are within acceptable bounds
-    function _checkRiskParams(uint256[15] calldata params) private view{
+    function _checkRiskParams(uint256[15] calldata params) private view {
         uint256 length = params.length;
         for (uint256 i = 0; i < length; i++) {
             _checkRiskParam(Risk.Parameters(i), params[i]);
         }
     }
 
     /// @notice Checks risk param is within acceptable bounds
-    function _checkRiskParam(Risk.Parameters name, uint256 value) private view{
+    function _checkRiskParam(Risk.Parameters name, uint256 value) private view {
         uint256 minValue = PARAMS_MIN.get(name);
         uint256 maxValue = PARAMS_MAX.get(name);
         require(value >= minValue && value <= maxValue, "OVV1: param out of bounds");
     }
 
     /// @notice Setter for per-market risk parameters adjustable by governance
-    function setRiskParam(
-        address feed,
-        Risk.Parameters name,
-        uint256 value
-    ) external onlyGovernor {
+    function setRiskParam(address feed, Risk.Parameters name, uint256 value)
+        external
+        onlyGovernor
+    {
         _checkRiskParam(name, value);
         OverlayV1Market market = OverlayV1Market(getMarket[feed]);
         market.setRiskParam(name, value);