make modifications for transferAllocation function

.github/workflows/slither.yml

@@ -4,38 +4,26 @@ on:
     branches:
       - main
   pull_request:
-
 env:
   FOUNDRY_PROFILE: ci
-
 jobs:
   analyze:
     name: Slither check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Install deps
-        run: |
-          forge --version
-          forge install
-
       - name: Run Slither
-        uses: crytic/slither-action@main
+        uses: crytic/slither-action@v0.3.1
         id: slither
-        continue-on-error: true
         with:
           sarif: results.sarif
-          target: 'contracts/'
+          target: "./"
+          fail-on: none
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ${{ steps.slither.outputs.sarif }}

contracts/TokenDistro.sol

@@ -41,6 +41,11 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
      */
     event GivBackPaid(address distributor);
 
+    /**
+     * @dev Emitted when the DISTRIBUTOR allocate an amount of praise rewards to a recipient
+     */
+    event PraiseRewardPaid(address distributor);
+
     /**
      * @dev Emitted when the duration is changed
      */
@@ -166,7 +171,6 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
      */
     function _allocate(address recipient, uint256 amount, bool claim) internal {
         require(!hasRole(DISTRIBUTOR_ROLE, recipient), 'TokenDistro::allocate: DISTRIBUTOR_NOT_VALID_RECIPIENT');
-
         balances[msg.sender].allocatedTokens = balances[msg.sender].allocatedTokens - amount;
 
         balances[recipient].allocatedTokens = balances[recipient].allocatedTokens + amount;
@@ -191,9 +195,10 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
      * Unlike allocate method it doesn't claim recipients available balance
      */
     function _allocateMany(address[] memory recipients, uint256[] memory amounts) internal onlyDistributor {
-        require(recipients.length == amounts.length, 'TokenDistro::allocateMany: INPUT_LENGTH_NOT_MATCH');
+        uint256 length = recipients.length;
+        require(length == amounts.length, 'TokenDistro::allocateMany: INPUT_LENGTH_NOT_MATCH');
 
-        for (uint256 i = 0; i < recipients.length; i++) {
+        for (uint256 i = 0; i < length; i++) {
             _allocate(recipients[i], amounts[i], false);
         }
     }
@@ -207,6 +212,11 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
         emit GivBackPaid(msg.sender);
     }
 
+    function sendPraiseRewards(address[] memory recipients, uint256[] memory amounts) external override {
+        _allocateMany(recipients, amounts);
+        emit PraiseRewardPaid(msg.sender);
+    }
+
     /**
      * Function that allows a recipient to change its address
      * @dev The change can only be made to an address that has not previously received an allocation &
@@ -216,23 +226,7 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
      *
      */
     function changeAddress(address newAddress) external override {
-        require(
-            balances[newAddress].allocatedTokens == 0 && balances[newAddress].claimed == 0,
-            'TokenDistro::changeAddress: ADDRESS_ALREADY_IN_USE'
-        );
-
-        require(
-            !hasRole(DISTRIBUTOR_ROLE, msg.sender) && !hasRole(DISTRIBUTOR_ROLE, newAddress),
-            'TokenDistro::changeAddress: DISTRIBUTOR_ROLE_NOT_A_VALID_ADDRESS'
-        );
-
-        balances[newAddress].allocatedTokens = balances[msg.sender].allocatedTokens;
-        balances[msg.sender].allocatedTokens = 0;
-
-        balances[newAddress].claimed = balances[msg.sender].claimed;
-        balances[msg.sender].claimed = 0;
-
-        emit ChangeAddress(msg.sender, newAddress);
+        _transferAllocation(msg.sender, newAddress);
     }
 
     /**
@@ -284,29 +278,13 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
      *
      * Emits a {ChangeAddress} event.
      *
+     * Formerly called cancelAllocation, this is an admin only function and should only be called manually
      */
-    function cancelAllocation(address prevRecipient, address newRecipient) external override {
-        require(cancelable, 'TokenDistro::cancelAllocation: NOT_CANCELABLE');
-
-        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), 'TokenDistro::cancelAllocation: ONLY_ADMIN_ROLE');
-
-        require(
-            balances[newRecipient].allocatedTokens == 0 && balances[newRecipient].claimed == 0,
-            'TokenDistro::cancelAllocation: ADDRESS_ALREADY_IN_USE'
-        );
-
-        require(
-            !hasRole(DISTRIBUTOR_ROLE, prevRecipient) && !hasRole(DISTRIBUTOR_ROLE, newRecipient),
-            'TokenDistro::cancelAllocation: DISTRIBUTOR_ROLE_NOT_A_VALID_ADDRESS'
-        );
-
-        balances[newRecipient].allocatedTokens = balances[prevRecipient].allocatedTokens;
-        balances[prevRecipient].allocatedTokens = 0;
+    function transferAllocation(address prevRecipient, address newRecipient) external override {
+        require(cancelable, 'TokenDistro::transferAllocation: NOT_CANCELABLE');
 
-        balances[newRecipient].claimed = balances[prevRecipient].claimed;
-        balances[prevRecipient].claimed = 0;
-
-        emit ChangeAddress(prevRecipient, newRecipient);
+        require(hasRole(DEFAULT_ADMIN_ROLE, msg.sender), 'TokenDistro::transferAllocation: ONLY_ADMIN_ROLE');
+        _transferAllocation(prevRecipient, newRecipient);
     }
 
     /**
@@ -339,4 +317,23 @@ contract TokenDistro is Initializable, IDistro, AccessControlEnumerableUpgradeab
 
         emit DurationChanged(newDuration);
     }
+
+    function _transferAllocation(address prevRecipient, address newRecipient) internal {
+        require(
+            balances[prevRecipient].allocatedTokens > 0, 'TokenDistro::transferAllocation: NO_ALLOCATION_TO_TRANSFER'
+        );
+        require(
+            !hasRole(DISTRIBUTOR_ROLE, prevRecipient) && !hasRole(DISTRIBUTOR_ROLE, newRecipient),
+            'TokenDistro::transferAllocation: DISTRIBUTOR_ROLE_NOT_A_VALID_ADDRESS'
+        );
+        // balance adds instead of overwrites
+        balances[newRecipient].allocatedTokens =
+            balances[prevRecipient].allocatedTokens + balances[newRecipient].allocatedTokens;
+        balances[prevRecipient].allocatedTokens = 0;
+
+        balances[newRecipient].claimed = balances[prevRecipient].claimed + balances[newRecipient].claimed;
+        balances[prevRecipient].claimed = 0;
+
+        emit ChangeAddress(prevRecipient, newRecipient);
+    }
 }

contracts/interfaces/IDistro.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0
 
-pragma solidity =0.8.10;
+pragma solidity ^0.8.10;
 
 interface IDistro {
     /**
@@ -98,5 +98,7 @@
      */
     function claimableNow(address recipient) external view returns (uint256);
 
-    function cancelAllocation(address prevRecipient, address newRecipient) external;
+    function transferAllocation(address prevRecipient, address newRecipient) external;
+
+    function sendPraiseRewards(address[] memory recipients, uint256[] memory amounts) external;
 }

contracts/tokens/UniswapV3RewardToken.sol

@@ -4,7 +4,7 @@ pragma solidity 0.8.10;
 
 import '@openzeppelin/contracts/token/ERC20/IERC20.sol';
 import '@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol';
-import '../Interfaces/IDistro.sol';
+import '../interfaces/IDistro.sol';
 
 contract UniswapV3RewardToken is IERC20, OwnableUpgradeable {
     uint256 public initialBalance;

script/deployRelayerOptimism.s.sol

@@ -44,7 +44,7 @@ contract deployRelayer is Script {
         tokenDistro.grantRole(keccak256('DISTRIBUTOR_ROLE'), address(givbacksRelayer));
         tokenDistro.assign(address(givbacksRelayer), 2500000 ether);
         tokenDistro.revokeRole(keccak256('DISTRIBUTOR_ROLE'), address(batcherApp));
-        tokenDistro.cancelAllocation(address(batcherApp), 0x0000000000000000000000000000000000000000);
+        tokenDistro.transferAllocation(address(batcherApp), 0x0000000000000000000000000000000000000000);
 
         console.log('proxy admin', address(givbacksRelayerProxyAdmin));
         console.log('givbacks relayer', address(givbacksRelayer));