fix: yarn & foundry config

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+# Description
+
+*What does this PR: do, how, why?*
+
+## Limitations & risks
+
+*Are there any trade-off or new vulnarbility surface based on theses changes?*
+
+# Check-list
+- [ ] Tests are covering the new feature
+- [ ] Code is [natspec'd](https://docs.soliditylang.org/en/v0.8.17/natspec-format.html)
+- [ ] Code is [linted and formatted](https://docs.soliditylang.org/en/v0.8.17/style-guide.html)
+- [ ] I have run the test locally (and they pass)
+- [ ] I have rebased to the latest main commit (and tests still pass)
+
+# Interactions
+These changes will impact the following contracts:
+- Directly:
+
+- Indirectly:

.github/workflows/publish.yml → .github/workflows/lint.yml

@@ -1,13 +1,18 @@
-name: juice-contracts-publish
+name: juice-contracts-template-lint
 on:
+  pull_request:
+    branches:
+      - main
   push:
     branches:
       - main
 jobs:
-  publish:
+  forge-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
       - uses: actions/setup-node@v1
         with:
           node-version: 14
@@ -32,14 +37,9 @@ jobs:
           key: ${{ runner.os }}-${{ steps.nvm.outputs.NVMRC }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ steps.nvm.outputs.NVMRC }}-nodemodules-
-      - name: Install JS dependencies
-        if: |
-          steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
-          steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile --prefer-offline
-      # Publish deploy artifacts NPM packages. This will only run if there are new deploys.
-      - name: Publish NPM package
-        uses: JS-DevTools/npm-publish@v1
+      - name: Install Foundry
+        uses: onbjerg/foundry-toolchain@v1
         with:
-          token: ${{ secrets.NPM_TOKEN }}
-          access: "public"
+          version: nightly
+      - name: Check linting
+        run: forge fmt --check

.github/workflows/system-test.yml

@@ -1,56 +1,29 @@
-name: juice-contracts-system-tests
+name: juice-contracts-template-tests
 on:
   pull_request:
     branches:
       - main
-      - test/system-tests
   push:
     branches:
       - main
-      - test/system-tests
 jobs:
   forge-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Restore cached yarn cache
-        uses: actions/cache@v2
-        id: cache-yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Restore cached node_modules
-        id: cache-node-modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            ./node_modules
-            ./packages/hardhat/node_modules
-          key: ${{ runner.os }}-${{ steps.nvm.outputs.NVMRC }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.nvm.outputs.NVMRC }}-nodemodules-
+          node-version: 16
+      - uses: bahmutov/npm-install@v1
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
         with:
           version: nightly
-      - name: Install JS dependencies
-        if: |
-          steps.cache-yarn-cache.outputs.cache-hit != 'true' ||
-          steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn install --frozen-lockfile --prefer-offline
       - name: install libraries
         run: git submodule update --init
-      - name: Run system tests (JBControllerV3)
-        run: JBX_CONTROLLER_VERSION=3_0 forge build --sizes && forge test
-      - name: Run system tests (JBControllerV3_1)
-        run: JBX_CONTROLLER_VERSION=3_1 forge build --sizes && forge test
+      - name: Run tests
+        run: FOUNDRY_PROFILE=default forge snapshot # TODO: Change to fork once fork tests can be run
+      - name: Check contract sizes
+        run: forge build --sizes

.gitignore

@@ -2,6 +2,7 @@ node_modules
 .env
 *.txt
 !remappings.txt
+yarn-error.log
 
 # Foundry
 out
@@ -17,7 +18,10 @@ deployments/localhost/**
 # Code coverage reports
 coverage/
 coverage.json
+lcov.info
 
 # VSCode
 workspace.code-workspace
 .vscode/
+
+backup/

contracts/JBChainlinkV3PriceFeed.sol

@@ -1,63 +1,64 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.16;
 
-import {AggregatorV3Interface} from '@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol';
-import {IJBPriceFeed} from './interfaces/IJBPriceFeed.sol';
-import {JBFixedPointNumber} from './libraries/JBFixedPointNumber.sol';
+import {AggregatorV3Interface} from
+    "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol";
+import {IJBPriceFeed} from "./interfaces/IJBPriceFeed.sol";
+import {JBFixedPointNumber} from "./libraries/JBFixedPointNumber.sol";
 
 /// @notice A generalized price feed for the Chainlink AggregatorV3Interface.
 contract JBChainlinkV3PriceFeed is IJBPriceFeed {
-  // A library that provides utility for fixed point numbers.
-  using JBFixedPointNumber for uint256;
-
-  //*********************************************************************//
-  // --------------------------- custom errors ------------------------- //
-  //*********************************************************************//
-  error STALE_PRICE();
-  error INCOMPLETE_ROUND();
-  error NEGATIVE_PRICE();
-
-  //*********************************************************************//
-  // ---------------- public stored immutable properties --------------- //
-  //*********************************************************************//
-
-  /// @notice The feed that prices are reported from.
-  AggregatorV3Interface public immutable feed;
-
-  //*********************************************************************//
-  // ------------------------- external views -------------------------- //
-  //*********************************************************************//
-
-  /// @notice Gets the current price from the feed, normalized to the specified number of decimals.
-  /// @param _decimals The number of decimals the returned fixed point price should include.
-  /// @return The current price of the feed, as a fixed point number with the specified number of decimals.
-  function currentPrice(uint256 _decimals) external view override returns (uint256) {
-    // Get the latest round information.
-    (uint80 roundId, int256 _price, , uint256 updatedAt, uint80 answeredInRound) = feed
-      .latestRoundData();
-
-    // Make sure the price isn't stale.
-    if (answeredInRound < roundId) revert STALE_PRICE();
-
-    // Make sure the round is finished.
-    if (updatedAt == 0) revert INCOMPLETE_ROUND();
-
-    // Make sure the price is positive.
-    if (_price < 0) revert NEGATIVE_PRICE();
-
-    // Get a reference to the number of decimals the feed uses.
-    uint256 _feedDecimals = feed.decimals();
-
-    // Return the price, adjusted to the target decimals.
-    return uint256(_price).adjustDecimals(_feedDecimals, _decimals);
-  }
-
-  //*********************************************************************//
-  // -------------------------- constructor ---------------------------- //
-  //*********************************************************************//
-
-  /// @param _feed The feed to report prices from.
-  constructor(AggregatorV3Interface _feed) {
-    feed = _feed;
-  }
+    // A library that provides utility for fixed point numbers.
+    using JBFixedPointNumber for uint256;
+
+    //*********************************************************************//
+    // --------------------------- custom errors ------------------------- //
+    //*********************************************************************//
+    error STALE_PRICE();
+    error INCOMPLETE_ROUND();
+    error NEGATIVE_PRICE();
+
+    //*********************************************************************//
+    // ---------------- public stored immutable properties --------------- //
+    //*********************************************************************//
+
+    /// @notice The feed that prices are reported from.
+    AggregatorV3Interface public immutable feed;
+
+    //*********************************************************************//
+    // ------------------------- external views -------------------------- //
+    //*********************************************************************//
+
+    /// @notice Gets the current price from the feed, normalized to the specified number of decimals.
+    /// @param _decimals The number of decimals the returned fixed point price should include.
+    /// @return The current price of the feed, as a fixed point number with the specified number of decimals.
+    function currentPrice(uint256 _decimals) external view override returns (uint256) {
+        // Get the latest round information.
+        (uint80 roundId, int256 _price,, uint256 updatedAt, uint80 answeredInRound) =
+            feed.latestRoundData();
+
+        // Make sure the price isn't stale.
+        if (answeredInRound < roundId) revert STALE_PRICE();
+
+        // Make sure the round is finished.
+        if (updatedAt == 0) revert INCOMPLETE_ROUND();
+
+        // Make sure the price is positive.
+        if (_price < 0) revert NEGATIVE_PRICE();
+
+        // Get a reference to the number of decimals the feed uses.
+        uint256 _feedDecimals = feed.decimals();
+
+        // Return the price, adjusted to the target decimals.
+        return uint256(_price).adjustDecimals(_feedDecimals, _decimals);
+    }
+
+    //*********************************************************************//
+    // -------------------------- constructor ---------------------------- //
+    //*********************************************************************//
+
+    /// @param _feed The feed to report prices from.
+    constructor(AggregatorV3Interface _feed) {
+        feed = _feed;
+    }
 }