From db49f64236f78b97b09ad0ad6369625241528c45 Mon Sep 17 00:00:00 2001
From: Shriya Tyagi <shriya243@gmail.com>
Date: Tue, 21 May 2024 13:41:07 +0530
Subject: [PATCH] feat: add rewards claimed

---
 .../connectors/merkleDistributor/events.sol   |  8 +-
 .../connectors/merkleDistributor/main.sol     | 87 ++++++++++++++-----
 2 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/contracts/mainnet/connectors/merkleDistributor/events.sol b/contracts/mainnet/connectors/merkleDistributor/events.sol
index 4f985bc..a8a64a1 100644
--- a/contracts/mainnet/connectors/merkleDistributor/events.sol
+++ b/contracts/mainnet/connectors/merkleDistributor/events.sol
@@ -7,7 +7,8 @@ contract Events {
         address fToken,
         uint256 cycle,
         bytes32[] merkleProof,
-        uint256 getId
+        uint256 rewardsClaimed,
+        uint256 setId
     );
 
     event LogClaimOnBehalf(
@@ -16,6 +17,7 @@ contract Events {
         address fToken,
         uint256 cycle,
         bytes32[] merkleProof,
-        uint256 getId
+        uint256 rewardsClaimed,
+        uint256 setId
     );
-}
\ No newline at end of file
+}
diff --git a/contracts/mainnet/connectors/merkleDistributor/main.sol b/contracts/mainnet/connectors/merkleDistributor/main.sol
index e00e2cb..f0defb6 100644
--- a/contracts/mainnet/connectors/merkleDistributor/main.sol
+++ b/contracts/mainnet/connectors/merkleDistributor/main.sol
@@ -1,37 +1,59 @@
 //SPDX-License-Identifier: MIT
 pragma solidity ^0.8.2;
 
-import { Basic } from "../../common/basic.sol";
-import { Events } from "./events.sol";
-import { IFluidMerkleDistributor } from "./interface.sol";
+import {Basic} from "../../common/basic.sol";
+import {Events} from "./events.sol";
+import {IFluidMerkleDistributor} from "./interface.sol";
+import {TokenInterface} from "../../common/interfaces.sol";
 
 abstract contract FluidMerkle is Basic, Events {
+    IFluidMerkleDistributor internal constant MERKLE_DISTRIBUTOR =
+        IFluidMerkleDistributor(address(0));
+
+    TokenInterface internal constant TOKEN =
+        TokenInterface(0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb);
 
-    address private constant MERKLE_DISTRIBUTOR = address(0);
-    
     /**
      * @dev Claims rewards from Fluid merkle distributor contract
      * @param cumulativeAmount_ Total reward cumulated since reward inception.
      * @param fToken_ Address of fToken on which rewards are being distributed.
      * @param cycle_ Current epoch cycle.
      * @param merkleProof_ Merkle proof that validates this claim.
-     * @param getId_ Id to get the cumulative amount.
+     * @param setId_ Id to set the rewards received.
      */
     function claim(
         uint256 cumulativeAmount_,
         address fToken_,
         uint256 cycle_,
         bytes32[] calldata merkleProof_,
-        uint256 getId_
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
-        uint256 _amt = getUint(getId_, cumulativeAmount_);
+        uint256 setId_
+    )
+        external
+        payable
+        returns (string memory _eventName, bytes memory _eventParam)
+    {
+        uint256 rewardsBeforeBal_ = TOKEN.balanceOf(address(this));
 
-        IFluidMerkleDistributor distributorContract_ = IFluidMerkleDistributor(MERKLE_DISTRIBUTOR);
+        MERKLE_DISTRIBUTOR.claim(
+            address(this),
+            cumulativeAmount_,
+            fToken_,
+            cycle_,
+            merkleProof_
+        );
 
-        distributorContract_.claim(address(this), _amt, fToken_, cycle_, merkleProof_);
+        uint256 rewardsClaimed_ = TOKEN.balanceOf(address(this)) -
+            rewardsBeforeBal_;
 
-        _eventName = "LogClaim(uint256,address,uint256,bytes32[],uint256)";
-        _eventParam = abi.encode(_amt, fToken_, cycle_, merkleProof_, getId_);
+        _eventName = "LogClaim(uint256,address,uint256,bytes32[],uint256,uint256)";
+        _eventParam = abi.encode(
+            cumulativeAmount_,
+            fToken_,
+            cycle_,
+            merkleProof_,
+            rewardsClaimed_,
+            setId_
+        );
     }
 
     /**
@@ -40,27 +62,46 @@ abstract contract FluidMerkle is Basic, Events {
      * @param fToken_ Address of fToken on which rewards are being distributed.
      * @param cycle_ Current epoch cycle.
      * @param merkleProof_ Merkle proof that validates this claim.
-     * @param getId_ Id to get the cumulative amount.
-    */
+     * @param setId_ Id to set the rewards received.
+     */
     function claimOnBehalf(
         address recipient_,
         uint256 cumulativeAmount_,
         address fToken_,
         uint256 cycle_,
         bytes32[] calldata merkleProof_,
-        uint256 getId_
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
-        uint256 _amt = getUint(getId_, cumulativeAmount_);
+        uint256 setId_
+    )
+        external
+        payable
+        returns (string memory _eventName, bytes memory _eventParam)
+    {
+        uint256 rewardsBeforeBal_ = TOKEN.balanceOf(recipient_);
 
-        IFluidMerkleDistributor distributorContract_ = IFluidMerkleDistributor(MERKLE_DISTRIBUTOR);
+        MERKLE_DISTRIBUTOR.claim(
+            recipient_,
+            cumulativeAmount_,
+            fToken_,
+            cycle_,
+            merkleProof_
+        );
 
-        distributorContract_.claim(recipient_, _amt, fToken_, cycle_, merkleProof_);
+        uint256 rewardsClaimed_ = TOKEN.balanceOf(recipient_) -
+            rewardsBeforeBal_;
 
-        _eventName = "LogClaimOnBehalf(address,uint256,address,uint256,bytes32[],uint256)";
-        _eventParam = abi.encode(recipient_, _amt, fToken_, cycle_, merkleProof_, getId_);
+        _eventName = "LogClaimOnBehalf(address,uint256,address,uint256,bytes32[],uint256,uint256)";
+        _eventParam = abi.encode(
+            recipient_,
+            cumulativeAmount_,
+            fToken_,
+            cycle_,
+            merkleProof_,
+            rewardsClaimed_,
+            setId_
+        );
     }
 }
 
 contract ConnectV2FluidMerkleClaim is FluidMerkle {
     string public constant name = "Fluid-Merkle-v1.0";
-}
\ No newline at end of file
+}