Minor fixes to token contract (#1614)

Author: rcatalan98

claim_contracts/Makefile

@@ -12,9 +12,12 @@ PRIVATE_KEY?=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
 deploy-all: ## 🚀 Deploy all contracts
 	cd script && forge script DeployAll.s.sol --private-key $(PRIVATE_KEY) --rpc-url $(RPC_URL) --broadcast
 
+CONFIG?=example
 deploy-token: ## 🚀 Deploy the token contract
 	cd script && \
 	forge script DeployAlignedToken.s.sol \
+	--sig "run(string)" \
+	$(CONFIG) \
 	--private-key $(PRIVATE_KEY) \
 	--rpc-url $(RPC_URL) \
 	--broadcast

claim_contracts/script/DeployAlignedToken.s.sol

@@ -9,9 +9,14 @@ import "forge-std/Script.sol";
 import {Utils} from "./Utils.sol";
 
 contract DeployAlignedToken is Script {
-    function run() public {
+    function run(string memory config) public {
         string memory root = vm.projectRoot();
-        string memory path = string.concat(root, "/script-config/config.json");
+        string memory path = string.concat(
+            root,
+            "/script-config/config.",
+            config,
+            ".json"
+        );
         string memory config_json = vm.readFile(path);
 
         address _safe = stdJson.readAddress(config_json, ".safe");
@@ -36,7 +41,6 @@ contract DeployAlignedToken is Script {
             address(_proxyAdmin),
             _salt,
             _deployer,
-            _safe,
             _foundation,
             _claimSupplier
         );
@@ -51,6 +55,10 @@ contract DeployAlignedToken is Script {
                 vm.toString(_safe)
             )
         );
+
+        console.log(
+            "Remember that the foundation must accept the ownership of the contract after deployment in another transaction."
+        );
     }
 
     function deployProxyAdmin(
@@ -74,7 +82,6 @@ contract DeployAlignedToken is Script {
         address _proxyAdmin,
         bytes32 _salt,
         address _deployer,
-        address _owner,
         address _foundation,
         address _claim
     ) internal returns (TransparentUpgradeableProxy) {
@@ -85,7 +92,6 @@ contract DeployAlignedToken is Script {
             .alignedTokenProxyDeploymentData(
                 _proxyAdmin,
                 address(_token),
-                _owner,
                 _foundation,
                 _claim
             );

claim_contracts/script/Utils.sol

@@ -7,7 +7,6 @@ import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.so
 import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
 import "../src/AlignedToken.sol";
 import "../src/ClaimableAirdrop.sol";
-import "../src/ClaimableAirdropV2.sol";
 
 library Utils {
     // Cheatcodes address, 0x7109709ECfa91a80626fF3989D68f67F5b1DD12D.
@@ -86,7 +85,6 @@ library Utils {
     function alignedTokenProxyDeploymentData(
         address _proxyAdmin,
         address _implementation,
-        address _owner,
         address _foundation,
         address _claim
     ) internal pure returns (bytes memory) {
@@ -96,26 +94,20 @@ library Utils {
                 abi.encode(
                     _implementation,
                     _proxyAdmin,
-                    alignedTokenInitData(
-                        _implementation,
-                        _owner,
-                        _foundation,
-                        _claim
-                    )
+                    alignedTokenInitData(_implementation, _foundation, _claim)
                 )
             );
     }
 
     function alignedTokenInitData(
         address _implementation,
-        address _owner,
         address _foundation,
         address _claim
     ) internal pure returns (bytes memory) {
         return
             abi.encodeCall(
                 AlignedToken(_implementation).initialize,
-                (_owner, _foundation, _claim)
+                (_foundation, _claim)
             );
     }
 
@@ -175,24 +167,6 @@ library Utils {
             );
     }
 
-    function claimableAirdropUpgradeData(
-        address _proxy,
-        address _newImplementation
-    ) internal pure returns (bytes memory) {
-        return
-            abi.encodeCall(
-                ProxyAdmin(_newImplementation).upgradeAndCall,
-                (
-                    ITransparentUpgradeableProxy(_proxy),
-                    _newImplementation,
-                    abi.encodeCall(
-                        ClaimableAirdropV2(_newImplementation).reinitialize,
-                        ()
-                    )
-                )
-            );
-    }
-
     // ProxyAdmin utils
 
     function deployProxyAdmin(address _safe) internal returns (address) {

claim_contracts/src/AlignedToken.sol

@@ -32,27 +32,25 @@ contract AlignedToken is
 
     /// @notice Initializes the contract.
     /// @dev This initializer should be called only once.
-    /// @param _owner address of the owner of the token.
+    /// @dev The _foundation must accept the ownership of the contract
+    /// after deployment in another transaction.
     /// @param _foundation address of the foundation.
-    /// @param _claim address of the claim.
+    /// @param _claimSupplier address of the claim supplier.
     function initialize(
-        address _owner,
         address _foundation,
-        address _claim
+        address _claimSupplier
     ) public initializer {
         require(
-            _foundation != address(0) &&
-                _claim != address(0) &&
-                _owner != address(0),
-            "Invalid _foundation or _claim or _owner"
+            _foundation != address(0) && _claimSupplier != address(0),
+            "Invalid _foundation or _claim"
         );
         __ERC20_init(NAME, SYMBOL);
         __EIP712_init(NAME, VERSION);
         __ERC20Permit_init(NAME);
         __Ownable2Step_init(); // default is msg.sender
-        _transferOwnership(_owner);
+        _transferOwnership(_foundation);
         _mint(_foundation, 7_300_000_000e18); // 7.3 billion
-        _mint(_claim, 2_700_000_000e18); // 2.7 billion
+        _mint(_claimSupplier, 2_700_000_000e18); // 2.7 billion
     }
 
     /// @notice Prevents the owner from renouncing ownership.