feat: multi hop claiming

contracts/Distributor.sol

@@ -39,7 +39,7 @@
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 import "./utils/UUPSHelper.sol";
 
 struct MerkleTree {
     // Root of a Merkle tree which leaves are `(address user, address token, uint amount)`
@@ -184,7 +184,7 @@
             uint256 amount = amounts[i];
 
             // Only approved operator can claim for `user`
-            if (msg.sender != user && operators[user][msg.sender] == 0) revert NotWhitelisted();
+            if (msg.sender != user && tx.origin != user && operators[user][msg.sender] == 0) revert NotWhitelisted();
 
             // Verifying proof
             bytes32 leaf = keccak256(abi.encode(user, token, amount));

contracts/tokenWrappers/RadiantTokenWrapper.sol

@@ -10,7 +10,7 @@
 
 interface IVesting {
     function rdntToken() external view returns (address);
     function vestTokens(address, uint256, bool) external;
 }
 
 /// @title Radiant MTW
@@ -24,7 +24,7 @@
 
     // ================================= CONSTANTS =================================
 
-    IVesting public constant VESTING = IVesting(0x76ba3eC5f5adBf1C58c91e86502232317EeA72dE);
+    IVesting public constant VESTING = IVesting(0x28E395a54a64284DBA39652921Cd99924f4e3797);
     address internal immutable _UNDERLYING = VESTING.rdntToken();
 
     // ================================= FUNCTIONS =================================

deploy/0_distributor.ts

@@ -39,13 +39,13 @@ const func: DeployFunction = async ({ deployments, ethers, network }) => {
   console.log('Now deploying Distributor');
   console.log('Starting with the implementation');
 
-  await deploy('Distributor_Implementation_V2_1', {
+  await deploy('Distributor_Implementation_V2_2', {
     contract: 'Distributor',
     from: deployer.address,
     log: !argv.ci,
   });
 
-  const implementationAddress = (await ethers.getContract('Distributor_Implementation_V2_1')).address;
+  const implementationAddress = (await ethers.getContract('Distributor_Implementation_V2_2')).address;
 
   console.log(`Successfully deployed the implementation for Distributor at ${implementationAddress}`);
   console.log('');