Rename contracts

Author: ilitteri

claim_contracts/script/DeployAll.s.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../src/AlignedTokenV1.sol";
-import "../src/ClaimableAirdropV1.sol";
+import "../src/AlignedToken.sol";
+import "../src/ClaimableAirdrop.sol";
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import "forge-std/Script.sol";
@@ -113,7 +113,7 @@ contract DeployAll is Script {
         uint256 _mintAmount
     ) internal returns (TransparentUpgradeableProxy) {
         vm.broadcast();
-        AlignedTokenV1 _token = new AlignedTokenV1();
+        AlignedToken _token = new AlignedToken();
 
         bytes memory _alignedTokenDeploymentData = Utils
             .alignedTokenProxyDeploymentData(
@@ -157,7 +157,7 @@ contract DeployAll is Script {
         bytes32 _claimMerkleRoot
     ) internal returns (TransparentUpgradeableProxy) {
         vm.broadcast();
-        ClaimableAirdropV1 _airdrop = new ClaimableAirdropV1();
+        ClaimableAirdrop _airdrop = new ClaimableAirdrop();
 
         bytes memory _airdropDeploymentData = Utils
             .claimableAirdropProxyDeploymentData(
@@ -176,7 +176,7 @@ contract DeployAll is Script {
         );
 
         console.log(
-            "ClaimableAirdropV1 proxy deployed with address:",
+            "ClaimableAirdrop proxy deployed with address:",
             _airdropProxy,
             "and admin:",
             _proxyAdmin

claim_contracts/script/Utils.sol

@@ -5,8 +5,8 @@ import {Vm} from "forge-std/Vm.sol";
 import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
-import "../src/AlignedTokenV1.sol";
-import "../src/ClaimableAirdropV1.sol";
+import "../src/AlignedToken.sol";
+import "../src/ClaimableAirdrop.sol";
 
 library Utils {
     // Cheatcodes address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
@@ -78,7 +78,7 @@ library Utils {
 
     function deployAlignedTokenImplementation() internal returns (address) {
         vm.broadcast();
-        AlignedTokenV1 _implementation = new AlignedTokenV1();
+        AlignedToken _implementation = new AlignedToken();
         return address(_implementation);
     }
 
@@ -116,7 +116,7 @@ library Utils {
     ) internal pure returns (bytes memory) {
         return
             abi.encodeCall(
-                AlignedTokenV1(_implementation).initialize,
+                AlignedToken(_implementation).initialize,
                 (
                     _beneficiary1,
                     _mintAmount,
@@ -158,7 +158,7 @@ library Utils {
 
     function deployClaimableAirdropImplementation() internal returns (address) {
         vm.broadcast();
-        ClaimableAirdropV1 _implementation = new ClaimableAirdropV1();
+        ClaimableAirdrop _implementation = new ClaimableAirdrop();
         return address(_implementation);
     }
 
@@ -199,7 +199,7 @@ library Utils {
     ) internal pure returns (bytes memory) {
         return
             abi.encodeCall(
-                ClaimableAirdropV1(_implementation).initialize,
+                ClaimableAirdrop(_implementation).initialize,
                 (
                     _owner,
                     _tokenContractAddress,

claim_contracts/script/aligned_token/AlignedTokenCreate2.s.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../../src/AlignedTokenV1.sol";
+import "../../src/AlignedToken.sol";
 import "forge-std/Script.sol";
 import {Utils} from "../Utils.sol";
 
 contract AlignedTokenCreate2 is Script {
     function run(bytes32 _salt, address _deployer) public {
         address _create2Address = vm.computeCreate2Address(
             _salt,
-            keccak256(type(AlignedTokenV1).creationCode),
+            keccak256(type(AlignedToken).creationCode),
             _deployer
         );
         console.logAddress(_create2Address);

claim_contracts/script/aligned_token/DeployAlignedTokenImplementation.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../../src/AlignedTokenV1.sol";
+import "../../src/AlignedToken.sol";
 import "forge-std/Script.sol";
 import {Utils} from "../Utils.sol";
 
@@ -21,7 +21,7 @@ contract DeployTokenImplementation is Script {
         string memory _out = vm.serializeBytes(
             "implementation",
             "deploymentData",
-            type(AlignedTokenV1).creationCode
+            type(AlignedToken).creationCode
         );
 
         string memory _path = string.concat(

claim_contracts/script/aligned_token/UpgradeAlignedTokenImplementation.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../../src/AlignedTokenV1.sol";
+import "../../src/AlignedToken.sol";
 import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import "forge-std/Script.sol";
 import {Utils} from "../Utils.sol";

claim_contracts/script/claimable_airdrop/ClaimableAirdropCreate2.s.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../../src/ClaimableAirdropV1.sol";
+import "../../src/ClaimableAirdrop.sol";
 import "forge-std/Script.sol";
 import {Utils} from "../Utils.sol";
 
 contract ClaimableAirdropCreate2 is Script {
     function run(bytes32 _salt, address _deployer) public {
         address _create2Address = vm.computeCreate2Address(
             _salt,
-            keccak256(type(ClaimableAirdropV1).creationCode),
+            keccak256(type(ClaimableAirdrop).creationCode),
             _deployer
         );
 

claim_contracts/script/claimable_airdrop/DeployClaimableAirdropImplementation.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import "../../src/ClaimableAirdropV1.sol";
+import "../../src/ClaimableAirdrop.sol";
 import "forge-std/Script.sol";
 import {Utils} from "../Utils.sol";
 
@@ -24,7 +24,7 @@ contract DeployTokenImplementation is Script {
         string memory _out = vm.serializeBytes(
             "implementation",
             "deploymentData",
-            type(ClaimableAirdropV1).creationCode
+            type(ClaimableAirdrop).creationCode
         );
 
         string memory _path = string.concat(

claim_contracts/src/AlignedTokenV1.sol claim_contracts/src/AlignedToken.solclaim_contracts/src/AlignedTokenV1.sol renamed to claim_contracts/src/AlignedToken.sol

@@ -3,9 +3,8 @@ pragma solidity ^0.8.19;
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
-import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
-contract AlignedTokenV1 is Initializable, ERC20Upgradeable, ReentrancyGuard {
+contract AlignedToken is Initializable, ERC20Upgradeable {
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
@@ -18,8 +17,8 @@ contract AlignedTokenV1 is Initializable, ERC20Upgradeable, ReentrancyGuard {
         uint256 _beneficiary2Part,
         address _beneficiary3,
         uint256 _beneficiary3Part
-    ) public initializer nonReentrant {
-        __ERC20_init("AlignedTokenV1", "ALI");
+    ) public initializer {
+        __ERC20_init("AlignedToken", "ALI");
         _mint(_beneficiary1, _beneficiary1Part);
         _mint(_beneficiary2, _beneficiary2Part);
         _mint(_beneficiary3, _beneficiary3Part);

…aim_contracts/src/ClaimableAirdropV1.sol claim_contracts/src/ClaimableAirdrop.solclaim_contracts/src/ClaimableAirdropV1.sol renamed to claim_contracts/src/ClaimableAirdrop.sol claim_contracts/src/ClaimableAirdropV1.sol renamed to claim_contracts/src/ClaimableAirdrop.sol

@@ -8,7 +8,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-contract ClaimableAirdropV1 is
+contract ClaimableAirdrop is
     ReentrancyGuard,
     Initializable,
     PausableUpgradeable,
@@ -29,13 +29,27 @@ contract ClaimableAirdropV1 is
     }
 
     function initialize(
-        address _initialOwner,
+        address _multisig,
         address _tokenContractAddress,
         address _tokenOwnerAddress,
         uint256 _limitTimestampToClaim,
         bytes32 _claimMerkleRoot
-    ) public initializer nonReentrant {
-        __Ownable_init(_initialOwner);
+    ) public initializer {
+        __Ownable_init(_multisig);
+        __Pausable_init();
+
+        require(_multisig != address(0), "Invalid multisig address");
+        require(
+            _tokenContractAddress != address(0),
+            "Invalid token contract address"
+        );
+        require(
+            _tokenOwnerAddress != address(0),
+            "Invalid token owner address"
+        );
+        require(_limitTimestampToClaim > block.timestamp, "Invalid timestamp");
+        require(_claimMerkleRoot != 0, "Invalid Merkle root");
+
         tokenContractAddress = _tokenContractAddress;
         tokenOwnerAddress = _tokenOwnerAddress;
         limitTimestampToClaim = _limitTimestampToClaim;
@@ -45,7 +59,7 @@ contract ClaimableAirdropV1 is
     function claim(
         uint256 amount,
         bytes32[] calldata merkleProof
-    ) public nonReentrant {
+    ) public nonReentrant whenNotPaused {
         require(
             !hasClaimed[msg.sender],
             "Account has already claimed the drop"
@@ -62,7 +76,13 @@ contract ClaimableAirdropV1 is
 
         require(verifies, "Invalid Merkle proof");
 
-        hasClaimed[msg.sender] = true;
+        require(
+            IERC20(tokenContractAddress).allowance(
+                tokenOwnerAddress,
+                address(this)
+            ) >= amount,
+            "Insufficient token allowance"
+        );
 
         bool success = IERC20(tokenContractAddress).transferFrom(
             tokenOwnerAddress,
@@ -72,6 +92,8 @@ contract ClaimableAirdropV1 is
 
         require(success, "Failed to transfer funds");
 
+        hasClaimed[msg.sender] = true;
+
         emit TokenClaimed(msg.sender, amount);
     }