From 6eab891da6ba331792948e16bac82f671b547116 Mon Sep 17 00:00:00 2001
From: portuu3 <61605646+portuu3@users.noreply.github.com>
Date: Fri, 26 May 2023 13:43:03 +0200
Subject: [PATCH] fix addReward event and improve contracts CD (#507)

---
 .github/workflows/cd-deploy-contracts.yaml    | 24 +++++++++++++++----
 .../core/.openzeppelin/polygon-mumbai.json    | 22 ++++++++---------
 packages/core/contracts/RewardPool.sol        |  7 +-----
 .../core/contracts/interfaces/IRewardPool.sol |  1 -
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/cd-deploy-contracts.yaml b/.github/workflows/cd-deploy-contracts.yaml
index 8fee7e99d6..f8e15e2cca 100644
--- a/.github/workflows/cd-deploy-contracts.yaml
+++ b/.github/workflows/cd-deploy-contracts.yaml
@@ -121,19 +121,31 @@ jobs:
           REWARD_POOL_ADDRESS: ${{ steps.networks.outputs.reward_pool }}
 
       - name: Verify Escrow Factory Proxy
-        if: github.event.inputs.escrowFactory == 'true'
+        if: always() && github.event.inputs.escrowFactory == 'true'
         run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.escrow_factory }}
         working-directory: ./packages/core
       - name: Verify Staking Proxy
-        if: github.event.inputs.staking == 'true'
+        if: always() && github.event.inputs.staking == 'true'
         run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.staking }}
         working-directory: ./packages/core
       - name: Verify Reward Pool Proxy
-        if: github.event.inputs.rewardPool== 'true'
+        if: always() && github.event.inputs.rewardPool== 'true'
         run: npx hardhat verify --network ${{ github.event.inputs.network }} ${{ steps.networks.outputs.reward_pool }}
         working-directory: ./packages/core
+      - name: Check for Changes
+        if: always()
+        id: check_changes
+        run: |
+          git fetch
+          if [[ -n "$(git diff --name-only)" ]]; then
+            echo "Changes detected."
+            echo "::set-output name=changes::true"
+          else
+            echo "No changes detected."
+            echo "::set-output name=changes::false"
+          fi
       - name: Commit changes
-        if: ${{ success() }}
+        if: always() && steps.check_changes.outputs.changes == 'true'
         uses: EndBug/add-and-commit@v9
         with:
           add: "['./packages/core/.openzeppelin', './packages/sdk/typescript/subgraph/config']"
@@ -141,15 +153,17 @@ jobs:
           default_author: github_actions
           tag_push: '--force'
       - name: Checkout develop
+        if: always() && steps.check_changes.outputs.changes == 'true'
         uses: actions/checkout@v3
         with:
           ref: develop
       - name: Rebase develop
+        if: always() && steps.check_changes.outputs.changes == 'true'
         run: |
           git fetch
           git rebase origin/main
           git push --force
-      - name: Trigger Another Workflow
+      - name: Trigger Subgraph Workflow
         uses: benc-uk/workflow-dispatch@v1
         with:
           workflow: Subgraph deployment
diff --git a/packages/core/.openzeppelin/polygon-mumbai.json b/packages/core/.openzeppelin/polygon-mumbai.json
index cf716cb746..e37f6bbea9 100644
--- a/packages/core/.openzeppelin/polygon-mumbai.json
+++ b/packages/core/.openzeppelin/polygon-mumbai.json
@@ -252,7 +252,7 @@
             "label": "stakes",
             "offset": 0,
             "slot": "205",
-            "type": "t_mapping(t_address,t_struct(Staker)6260_storage)",
+            "type": "t_mapping(t_address,t_struct(Staker)3453_storage)",
             "contract": "Staking",
             "src": "contracts/Staking.sol:38"
           },
@@ -268,7 +268,7 @@
             "label": "allocations",
             "offset": 0,
             "slot": "207",
-            "type": "t_mapping(t_address,t_struct(Allocation)6120_storage)",
+            "type": "t_mapping(t_address,t_struct(Allocation)3313_storage)",
             "contract": "Staking",
             "src": "contracts/Staking.sol:44"
           },
@@ -306,15 +306,15 @@
             "label": "bool",
             "numberOfBytes": "1"
           },
-          "t_mapping(t_address,t_struct(Allocation)6120_storage)": {
+          "t_mapping(t_address,t_struct(Allocation)3313_storage)": {
             "label": "mapping(address => struct IStaking.Allocation)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(Staker)6260_storage)": {
+          "t_mapping(t_address,t_struct(Staker)3453_storage)": {
             "label": "mapping(address => struct Stakes.Staker)",
             "numberOfBytes": "32"
           },
-          "t_struct(Allocation)6120_storage": {
+          "t_struct(Allocation)3313_storage": {
             "label": "struct IStaking.Allocation",
             "members": [
               {
@@ -350,7 +350,7 @@
             ],
             "numberOfBytes": "160"
           },
-          "t_struct(Staker)6260_storage": {
+          "t_struct(Staker)3453_storage": {
             "label": "struct Stakes.Staker",
             "members": [
               {
@@ -485,7 +485,7 @@
             "label": "rewards",
             "offset": 0,
             "slot": "204",
-            "type": "t_mapping(t_address,t_array(t_struct(Reward)6066_storage)dyn_storage)",
+            "type": "t_mapping(t_address,t_array(t_struct(Reward)3259_storage)dyn_storage)",
             "contract": "RewardPool",
             "src": "contracts/RewardPool.sol:30"
           },
@@ -503,7 +503,7 @@
             "slot": "206",
             "type": "t_array(t_uint256)45_storage",
             "contract": "RewardPool",
-            "src": "contracts/RewardPool.sol:146"
+            "src": "contracts/RewardPool.sol:150"
           }
         ],
         "types": {
@@ -511,7 +511,7 @@
             "label": "address",
             "numberOfBytes": "20"
           },
-          "t_array(t_struct(Reward)6066_storage)dyn_storage": {
+          "t_array(t_struct(Reward)3259_storage)dyn_storage": {
             "label": "struct IRewardPool.Reward[]",
             "numberOfBytes": "32"
           },
@@ -531,11 +531,11 @@
             "label": "bool",
             "numberOfBytes": "1"
           },
-          "t_mapping(t_address,t_array(t_struct(Reward)6066_storage)dyn_storage)": {
+          "t_mapping(t_address,t_array(t_struct(Reward)3259_storage)dyn_storage)": {
             "label": "mapping(address => struct IRewardPool.Reward[])",
             "numberOfBytes": "32"
           },
-          "t_struct(Reward)6066_storage": {
+          "t_struct(Reward)3259_storage": {
             "label": "struct IRewardPool.Reward",
             "members": [
               {
diff --git a/packages/core/contracts/RewardPool.sol b/packages/core/contracts/RewardPool.sol
index 1bc3188100..c63f6508e2 100644
--- a/packages/core/contracts/RewardPool.sol
+++ b/packages/core/contracts/RewardPool.sol
@@ -87,12 +87,7 @@ contract RewardPool is IRewardPool, OwnableUpgradeable, UUPSUpgradeable {
         totalFee = totalFee + fees;
 
         // Add reward record
-        Reward memory reward = Reward(
-            _escrowAddress,
-            _staker,
-            _slasher,
-            rewardAfterFee
-        );
+        Reward memory reward = Reward(_escrowAddress, _slasher, rewardAfterFee);
         rewards[_escrowAddress].push(reward);
 
         emit RewardAdded(_escrowAddress, _staker, _slasher, rewardAfterFee);
diff --git a/packages/core/contracts/interfaces/IRewardPool.sol b/packages/core/contracts/interfaces/IRewardPool.sol
index 5861899b6d..96963e1f23 100644
--- a/packages/core/contracts/interfaces/IRewardPool.sol
+++ b/packages/core/contracts/interfaces/IRewardPool.sol
@@ -8,7 +8,6 @@ interface IRewardPool {
      */
     struct Reward {
         address escrowAddress;
-        address staker;
         address slasher;
         uint256 tokens; // Tokens allocated to a escrowAddress
     }