The foundation should be the contract's owner

Author: ilitteri

claim_contracts/script/DeployAlignedToken.s.sol

@@ -36,7 +36,6 @@ contract DeployAlignedToken is Script {
             address(_proxyAdmin),
             _salt,
             _deployer,
-            _safe,
             _foundation,
             _claimSupplier
         );
@@ -51,6 +50,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 +77,6 @@ contract DeployAlignedToken is Script {
         address _proxyAdmin,
         bytes32 _salt,
         address _deployer,
-        address _owner,
         address _foundation,
         address _claim
     ) internal returns (TransparentUpgradeableProxy) {
@@ -85,7 +87,6 @@ contract DeployAlignedToken is Script {
             .alignedTokenProxyDeploymentData(
                 _proxyAdmin,
                 address(_token),
-                _owner,
                 _foundation,
                 _claim
             );

claim_contracts/script/Utils.sol

@@ -86,7 +86,6 @@ library Utils {
     function alignedTokenProxyDeploymentData(
         address _proxyAdmin,
         address _implementation,
-        address _owner,
         address _foundation,
         address _claim
     ) internal pure returns (bytes memory) {
@@ -96,26 +95,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 +168,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,25 +32,23 @@ 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.
     function initialize(
-        address _owner,
         address _foundation,
         address _claim
     ) public initializer {
         require(
-            _foundation != address(0) &&
-                _claim != address(0) &&
-                _owner != address(0),
-            "Invalid _foundation or _claim or _owner"
+            _foundation != address(0) && _claim != 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
     }