Algol release 2.74.1

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
   job-audit:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-sec-tools:16.14-ubuntu
+      - image: synthetixio/docker-sec-tools:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -33,7 +33,7 @@ jobs:
   job-compile:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -45,7 +45,7 @@ jobs:
   job-fork-tests-ovm:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -74,7 +74,7 @@ jobs:
   job-fork-tests:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -152,7 +152,7 @@ jobs:
   job-lint:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -164,7 +164,7 @@ jobs:
   job-pack-browser:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -178,7 +178,7 @@ jobs:
   job-prepare:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -208,7 +208,7 @@ jobs:
   job-simulate-release:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -235,7 +235,7 @@ jobs:
   job-static-analysis:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -255,7 +255,7 @@ jobs:
   job-test-deploy-script:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -281,7 +281,7 @@ jobs:
   job-unit-tests-coverage-report:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-sec-tools:16.14-ubuntu
+      - image: synthetixio/docker-sec-tools:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -297,7 +297,7 @@ jobs:
   job-unit-tests-coverage:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -327,7 +327,7 @@ jobs:
   job-unit-tests-gas-report:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -348,7 +348,7 @@ jobs:
   job-unit-tests:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -384,7 +384,7 @@ jobs:
   job-validate-deployments:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN
@@ -403,7 +403,7 @@ jobs:
   job-validate-etherscan:
     working_directory: ~/repo
     docker:
-      - image: synthetixio/docker-node:16.14-ubuntu
+      - image: synthetixio/docker-node:16.15-ubuntu
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_TOKEN

.circleci/src/snippets/job-header-node.yml

@@ -1,6 +1,6 @@
 working_directory: ~/repo
 docker:
-  - image: synthetixio/docker-node:16.14-ubuntu
+  - image: synthetixio/docker-node:16.15-ubuntu
     auth:
       username: $DOCKERHUB_USERNAME
       password: $DOCKERHUB_TOKEN

.circleci/src/snippets/job-header-sec-tools.yml

@@ -1,6 +1,6 @@
 working_directory: ~/repo
 docker:
-  - image: synthetixio/docker-sec-tools:16.14-ubuntu
+  - image: synthetixio/docker-sec-tools:16.15-ubuntu
     auth:
       username: $DOCKERHUB_USERNAME
       password: $DOCKERHUB_TOKEN

.github/workflows/slither-analysis.yml

@@ -14,28 +14,32 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/synthetixio/docker-sec-tools/ubuntu:16.14
+      image: ghcr.io/synthetixio/docker-sec-tools/ubuntu:16.15
       credentials:
         username: synthetixio
         password: ${{ secrets.GH_PACKAGES_READ_ONLY }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # pin@v2
+        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # pin@v3.0.2
 
       - name: Set npm cache directory
         run: npm config set cache .npm-cache --global
-        continue-on-error: true
 
-      - uses: actions/cache@136d96b4aee02b1f0de3ba493b1d47135042d9c0 # pin@v3
+      - name: Get npm cache directory
+        id: npm-cache-dir
+        run: echo "::set-output name=dir::$(npm config get cache)"
+
+      - name: Get node version
+        id: node-version
+        run: echo "::set-output name=version::$(node --version)"
+
+      - uses: actions/cache@c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # pin@v3.0.4
         with:
-          path: |
-            .npm-cache
-            node_modules
-          key: ${{ runner.os }}-ubuntu-${{ hashFiles('**/package-lock.json') }}
+          path: ${{ steps.npm-cache-dir.outputs.dir }}
+          key: ${{ runner.os }}-ubuntu-${{ steps.node-version.outputs.version }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-ubuntu-
-        continue-on-error: true
+            ${{ runner.os }}-ubuntu-${{ steps.node-version.outputs.version }}-
 
       - name: Install dependencies
         run: npm ci --prefer-offline

contracts/Issuer.sol

@@ -702,7 +702,7 @@ contract Issuer is Owned, MixinSystemSettings, IIssuer {
         require(liquidator().isLiquidationOpen(account, isSelfLiquidation), "Not open for liquidation");
 
         // Get the penalty for the liquidation type
-        uint penalty = isSelfLiquidation ? getSelfLiquidationPenalty() : getLiquidationPenalty();
+        uint penalty = isSelfLiquidation ? getSelfLiquidationPenalty() : getSnxLiquidationPenalty();
 
         // Get the account's debt balance
         (uint debtBalance, , bool anyRateIsInvalid) =

contracts/MixinSystemSettings.sol

@@ -19,6 +19,7 @@ contract MixinSystemSettings is MixinResolver {
     bytes32 internal constant SETTING_LIQUIDATION_RATIO = "liquidationRatio";
     bytes32 internal constant SETTING_LIQUIDATION_ESCROW_DURATION = "liquidationEscrowDuration";
     bytes32 internal constant SETTING_LIQUIDATION_PENALTY = "liquidationPenalty";
+    bytes32 internal constant SETTING_SNX_LIQUIDATION_PENALTY = "snxLiquidationPenalty";
     bytes32 internal constant SETTING_SELF_LIQUIDATION_PENALTY = "selfLiquidationPenalty";
     bytes32 internal constant SETTING_FLAG_REWARD = "flagReward";
     bytes32 internal constant SETTING_LIQUIDATE_REWARD = "liquidateReward";
@@ -144,6 +145,10 @@ contract MixinSystemSettings is MixinResolver {
         return flexibleStorage().getUIntValue(SETTING_CONTRACT_NAME, SETTING_LIQUIDATION_PENALTY);
     }
 
+    function getSnxLiquidationPenalty() internal view returns (uint) {
+        return flexibleStorage().getUIntValue(SETTING_CONTRACT_NAME, SETTING_SNX_LIQUIDATION_PENALTY);
+    }
+
     function getSelfLiquidationPenalty() internal view returns (uint) {
         return flexibleStorage().getUIntValue(SETTING_CONTRACT_NAME, SETTING_SELF_LIQUIDATION_PENALTY);
     }

contracts/SystemSettings.sol

@@ -72,12 +72,18 @@ contract SystemSettings is Owned, MixinSystemSettings, ISystemSettings {
         return getLiquidationRatio();
     }
 
-    // SIP-15 Liquidations
-    // penalty taken away from target of liquidation (with 18 decimals). E.g. 10% is 0.1e18
+    // SIP-97 Liquidations
+    // penalty taken away from target of Collateral liquidation (with 18 decimals). E.g. 10% is 0.1e18
     function liquidationPenalty() external view returns (uint) {
         return getLiquidationPenalty();
     }
 
+    // SIP-251 Differentiate Liquidation Penalties
+    // penalty taken away from target of SNX liquidation (with 18 decimals). E.g. 30% is 0.3e18
+    function snxLiquidationPenalty() external view returns (uint) {
+        return getSnxLiquidationPenalty();
+    }
+
     /* ========== SIP-148: Upgrade Liquidation Mechanism ========== */
 
     /// @notice Get the escrow duration for liquidation rewards
@@ -311,7 +317,7 @@ contract SystemSettings is Owned, MixinSystemSettings, ISystemSettings {
         flexibleStorage().setLiquidationRatio(
             SETTING_LIQUIDATION_RATIO,
             _liquidationRatio,
-            getLiquidationPenalty(),
+            getSnxLiquidationPenalty(),
             getIssuanceRatio()
         );
         emit LiquidationRatioUpdated(_liquidationRatio);
@@ -322,6 +328,11 @@ contract SystemSettings is Owned, MixinSystemSettings, ISystemSettings {
         emit LiquidationEscrowDurationUpdated(duration);
     }
 
+    function setSnxLiquidationPenalty(uint penalty) external onlyOwner {
+        flexibleStorage().setSnxLiquidationPenalty(SETTING_SNX_LIQUIDATION_PENALTY, penalty);
+        emit SnxLiquidationPenaltyUpdated(penalty);
+    }
+
     function setLiquidationPenalty(uint penalty) external onlyOwner {
         flexibleStorage().setLiquidationPenalty(SETTING_LIQUIDATION_PENALTY, penalty);
         emit LiquidationPenaltyUpdated(penalty);
@@ -530,6 +541,7 @@ contract SystemSettings is Owned, MixinSystemSettings, ISystemSettings {
     event LiquidationRatioUpdated(uint newRatio);
     event LiquidationEscrowDurationUpdated(uint newDuration);
     event LiquidationPenaltyUpdated(uint newPenalty);
+    event SnxLiquidationPenaltyUpdated(uint newPenalty);
     event SelfLiquidationPenaltyUpdated(uint newPenalty);
     event FlagRewardUpdated(uint newReward);
     event LiquidateRewardUpdated(uint newReward);

contracts/SystemSettingsLib.sol

@@ -28,7 +28,7 @@ library SystemSettingsLib {
     uint public constant MAX_LIQUIDATION_RATIO = 1e18; // 100% issuance ratio
     uint public constant RATIO_FROM_TARGET_BUFFER = 2e18; // 200% - mininimum buffer between issuance ratio and liquidation ratio
 
-    uint public constant MAX_LIQUIDATION_PENALTY = 3e18 / 10; // Max 30% liquidation penalty / bonus
+    uint public constant MAX_LIQUIDATION_PENALTY = 9e18 / 10; // Max 90% liquidation penalty / bonus
 
     uint public constant MAX_LIQUIDATION_DELAY = 3 days;
     uint public constant MIN_LIQUIDATION_DELAY = 300; // 5 min
@@ -145,11 +145,11 @@ library SystemSettingsLib {
         IFlexibleStorage flexibleStorage,
         bytes32 settingName,
         uint _liquidationRatio,
-        uint getLiquidationPenalty,
+        uint getSnxLiquidationPenalty,
         uint getIssuanceRatio
     ) external {
         require(
-            _liquidationRatio <= MAX_LIQUIDATION_RATIO.divideDecimal(SafeDecimalMath.unit().add(getLiquidationPenalty)),
+            _liquidationRatio <= MAX_LIQUIDATION_RATIO.divideDecimal(SafeDecimalMath.unit().add(getSnxLiquidationPenalty)),
             "liquidationRatio > MAX_LIQUIDATION_RATIO / (1 + penalty)"
         );
 
@@ -169,11 +169,12 @@ library SystemSettingsLib {
         flexibleStorage.setUIntValue(SETTINGS_CONTRACT_NAME, settingName, duration);
     }
 
-    function setLiquidationPenalty(
+    function setSnxLiquidationPenalty(
         IFlexibleStorage flexibleStorage,
         bytes32 settingName,
         uint penalty
     ) external {
+        // MAX_LIQUIDATION_PENALTY is enforced on both Collateral and SNX liquidations
         require(penalty <= MAX_LIQUIDATION_PENALTY, "penalty > MAX_LIQUIDATION_PENALTY");
 
         flexibleStorage.setUIntValue(SETTINGS_CONTRACT_NAME, settingName, penalty);
@@ -189,6 +190,16 @@ library SystemSettingsLib {
         flexibleStorage.setUIntValue(SETTINGS_CONTRACT_NAME, settingName, penalty);
     }
 
+    function setLiquidationPenalty(
+        IFlexibleStorage flexibleStorage,
+        bytes32 settingName,
+        uint penalty
+    ) external {
+        require(penalty <= MAX_LIQUIDATION_PENALTY, "penalty > MAX_LIQUIDATION_PENALTY");
+
+        flexibleStorage.setUIntValue(SETTINGS_CONTRACT_NAME, settingName, penalty);
+    }
+
     function setFlagReward(
         IFlexibleStorage flexibleStorage,
         bytes32 settingName,

contracts/interfaces/ISystemSettings.sol

@@ -21,6 +21,8 @@ interface ISystemSettings {
 
     function liquidationPenalty() external view returns (uint);
 
+    function snxLiquidationPenalty() external view returns (uint);
+
     function selfLiquidationPenalty() external view returns (uint);
 
     function flagReward() external view returns (uint);