feat: multi hop claiming (#74)

* fezt: multi hop claiming * fix: renamings * fix: revert deployment
AngleProtocol · Jun 20, 2024 · 4ce7788 · 4ce7788
1 parent ea7ba31
commit 4ce7788
Show file tree

Hide file tree

Showing 16 changed files with 5,890 additions and 42 deletions.
diff --git a/contracts/Distributor.sol b/contracts/Distributor.sol
@@ -184,7 +184,7 @@ contract Distributor is UUPSHelper {
             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));

diff --git a/contracts/tokenWrappers/RadiantTokenWrapper.sol b/contracts/tokenWrappers/RadiantTokenWrapper.sol
@@ -24,7 +24,7 @@ contract RadiantMerklTokenWrapper is BaseMerklTokenWrapper {
 
     // ================================= CONSTANTS =================================
 
-    IVesting public constant VESTING = IVesting(0x76ba3eC5f5adBf1C58c91e86502232317EeA72dE);
+    IVesting public constant VESTING = IVesting(0x28E395a54a64284DBA39652921Cd99924f4e3797);
     address internal immutable _UNDERLYING = VESTING.rdntToken();
 
     // ================================= FUNCTIONS =================================

diff --git a/deploy/0_distributor.ts b/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('');

diff --git a/deploy/coupon.ts → deploy/mtw.ts b/deploy/coupon.ts → deploy/mtw.ts