Phecda-release-v2.96.0-alpha

.circleci/config.yml

@@ -1,7 +1,7 @@
 # DO NOT EDIT MANUALLY! instead run `npm run build:ci`
 # autogenerated by `.circleci/pack.js` from contents of `jobs` .yml files
 version: 2.1
-orbs:
+orbs: 
   rust: circleci/[email protected]
 commands:
   cmd-wait-for-port:
@@ -35,21 +35,30 @@ jobs:
       image: ubuntu-2204:2022.04.1
       docker_layer_caching: true
     environment:
-      foundry_locked_commit: "232f66f9"
+      foundry_cache_version: "1"
     steps:
       - restore_cache:
           keys:
-            - foundry-bin-${foundry_locked_commit}-12
+            - foundry-bin-latest-${foundry_cache_version}
       - rust/install: {}
-      - run: |
-          if [ ! -d ~/.foundry ]; then
-            curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup
-            ./foundryup -C $foundry_locked_commit
-          fi
-          rm -rf *
-          echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV
+      - run: 
+            name: "Install Foundry"
+            working_directory: ~/
+            environment:
+              SHELL: /bin/bash
+            command: |-
+                export PATH="$PATH:$HOME/.foundry/bin"
+                echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV
+                if command -v anvil; then
+                  echo "Anvil already installed"
+                  anvil --version
+                else
+                  curl -L https://foundry.paradigm.xyz | bash
+                  foundryup
+                fi
+                rm -rf *
       - save_cache:
-          key: foundry-bin-${foundry_locked_commit}-12
+          key: foundry-bin-latest-${foundry_cache_version}
           paths:
             - ~/.foundry/bin
       - checkout
@@ -125,22 +134,31 @@ jobs:
       image: ubuntu-2204:2022.04.1
       docker_layer_caching: true
     environment:
-      foundry_locked_commit: "232f66f9"
+      foundry_cache_version: "1"
     resource_class: large
     steps:
       - restore_cache:
           keys:
-            - foundry-bin-${foundry_locked_commit}-12
+            - foundry-bin-latest-${foundry_cache_version}
       - rust/install: {}
-      - run: |
-          if [ ! -d ~/.foundry ]; then
-            curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup
-            ./foundryup -C $foundry_locked_commit
-          fi
-          rm -rf *
-          echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV
+      - run: 
+            name: "Install Foundry"
+            working_directory: ~/
+            environment:
+              SHELL: /bin/bash
+            command: |-
+                export PATH="$PATH:$HOME/.foundry/bin"
+                echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV
+                if command -v anvil; then
+                  echo "Anvil already installed"
+                  anvil --version
+                else
+                  curl -L https://foundry.paradigm.xyz | bash
+                  foundryup
+                fi
+                rm -rf *
       - save_cache:
-          key: foundry-bin-${foundry_locked_commit}-12
+          key: foundry-bin-latest-${foundry_cache_version}
           paths:
             - ~/.foundry/bin
       - checkout
@@ -288,7 +306,7 @@ jobs:
       image: ubuntu-2204:2022.04.1
       docker_layer_caching: true
     environment:
-      foundry_locked_commit: "232f66f9"
+      foundry_cache_version: "1"
     resource_class: large
     steps:
       - restore_cache:

.circleci/src/jobs/job-cannon.yml

@@ -4,18 +4,28 @@ steps:
   # get foundry
   - restore_cache:
       keys:
-        - foundry-bin-${foundry_locked_commit}-12
+        - foundry-bin-latest-${foundry_cache_version}
   - rust/install: {}
-  - run: |
-      if [ ! -d ~/.foundry ]; then
-        curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup
-        ./foundryup -C $foundry_locked_commit
-      fi
-      rm -rf *
-      echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV
+  - run: 
+        name: "Install Foundry"
+        working_directory: ~/
+        environment:
+          SHELL: /bin/bash
+        command: |-
+            export PATH="$PATH:$HOME/.foundry/bin"
+            echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV
+
+            if command -v anvil; then
+              echo "Anvil already installed"
+              anvil --version
+            else
+              curl -L https://foundry.paradigm.xyz | bash
+              foundryup
+            fi
+            rm -rf *
 
   - save_cache:
-      key: foundry-bin-${foundry_locked_commit}-12
+      key: foundry-bin-latest-${foundry_cache_version}
       paths:
         - ~/.foundry/bin
 

.circleci/src/jobs/job-integration-tests.yml

@@ -8,18 +8,28 @@ steps:
   # get foundry
   - restore_cache:
       keys:
-        - foundry-bin-${foundry_locked_commit}-12
+        - foundry-bin-latest-${foundry_cache_version}
   - rust/install: {}
-  - run: |
-      if [ ! -d ~/.foundry ]; then
-        curl -O https://raw.githubusercontent.com/foundry-rs/foundry/master/foundryup/foundryup && chmod +x ./foundryup
-        ./foundryup -C $foundry_locked_commit
-      fi
-      rm -rf *
-      echo 'export PATH="$PATH:$HOME/.foundry/bin"' >> $BASH_ENV
+  - run: 
+        name: "Install Foundry"
+        working_directory: ~/
+        environment:
+          SHELL: /bin/bash
+        command: |-
+            export PATH="$PATH:$HOME/.foundry/bin"
+            echo 'export PATH=$PATH:$HOME/.foundry/bin' >> $BASH_ENV
+
+            if command -v anvil; then
+              echo "Anvil already installed"
+              anvil --version
+            else
+              curl -L https://foundry.paradigm.xyz | bash
+              foundryup
+            fi
+            rm -rf *
 
   - save_cache:
-      key: foundry-bin-${foundry_locked_commit}-12
+      key: foundry-bin-latest-${foundry_cache_version}
       paths:
         - ~/.foundry/bin
 

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

@@ -3,4 +3,4 @@ machine:
   image: ubuntu-2204:2022.04.1
   docker_layer_caching: true
 environment:
-  foundry_locked_commit: "232f66f9"
+  foundry_cache_version: "1"

contracts/RewardsDistribution.sol

@@ -156,7 +156,7 @@ contract RewardsDistribution is Owned, IRewardsDistribution {
 
         // Iterate the array of distributions sending the configured amounts
         for (uint i = 0; i < distributions.length; i++) {
-            if (distributions[i].destination != address(0) || distributions[i].amount != 0) {
+            if (distributions[i].destination != address(0) && distributions[i].amount != 0) {
                 remainder = remainder.sub(distributions[i].amount);
 
                 // Transfer the SNX
@@ -166,10 +166,14 @@ contract RewardsDistribution is Owned, IRewardsDistribution {
                 bytes memory payload = abi.encodeWithSignature("notifyRewardAmount(uint256)", distributions[i].amount);
 
                 // solhint-disable avoid-low-level-calls
-                (bool success, ) = distributions[i].destination.call(payload);
+                (bool success, bytes memory result) = distributions[i].destination.call(payload);
 
                 if (!success) {
-                    // Note: we're ignoring the return value as it will fail for contracts that do not implement RewardsDistributionRecipient.sol
+                    // if the error was emitted by the destination contract, bubble
+                    uint len = result.length;
+                    assembly {
+                        revert(add(result, 0x20), len)
+                    }
                 }
             }
         }

contracts/TradingRewards.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.5.16;
 import "./Pausable.sol";
 import "./MixinResolver.sol";
 import "./Owned.sol";
+import "./RewardsDistributionRecipient.sol";
 
 // External dependencies.
 import "openzeppelin-solidity-2.3.0/contracts/token/ERC20/SafeERC20.sol";
@@ -17,7 +18,7 @@ import "./interfaces/ITradingRewards.sol";
 import "./interfaces/IExchanger.sol";
 
 // https://docs.synthetix.io/contracts/source/contracts/tradingrewards
-contract TradingRewards is ITradingRewards, ReentrancyGuard, Owned, Pausable, MixinResolver {
+contract TradingRewards is ITradingRewards, ReentrancyGuard, Owned, Pausable, MixinResolver, RewardsDistributionRecipient {
     using SafeMath for uint;
     using SafeDecimalMath for uint;
     using SafeERC20 for IERC20;
@@ -256,6 +257,8 @@ contract TradingRewards is ITradingRewards, ReentrancyGuard, Owned, Pausable, Mi
         emit AssignedRewardTokensRecovered(recoverAddress, amount, periodID);
     }
 
+    function notifyRewardAmount(uint256 reward) external {}
+
     function _validateRecoverAddress(address recoverAddress) internal view {
         if (recoverAddress == address(0) || recoverAddress == address(this)) {
             revert("Invalid recover address");

publish/deployed/goerli-ovm/feeds.json

@@ -176,8 +176,7 @@
 		"feed": "0x6db19664922b194C59FE972f28CFCAD9667e5dDf"
 	},
 	"STETHETH": {
-		"fakeFeed": true,
-		"feed": "0x57241A37733983F97C4Ab06448F244A1E0Ca0ba8"
+		"feed": "0x93A0D1B1cdF50b6bC83bc89bb59fA3Aa7A93B3e3"
 	},
 	"MAV": {
 		"asset": "MAV",