Remove safe

Author: ilitteri

claim_contracts/script-config/config.example.json

@@ -1,5 +1,4 @@
 {
-  "safe": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
   "salt": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "deployer": "0x4e59b44847b379578588920cA78FbF26c0B4956C",
   "foundation": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",

claim_contracts/script/DeployAlignedToken.s.sol

@@ -20,7 +20,6 @@ contract DeployAlignedToken is Script {
         );
         string memory config_json = vm.readFile(path);
 
-        address _safe = stdJson.readAddress(config_json, ".safe");
         bytes32 _salt = stdJson.readBytes32(config_json, ".salt");
         address _deployer = stdJson.readAddress(config_json, ".deployer");
         address _foundation = stdJson.readAddress(config_json, ".foundation");
@@ -30,7 +29,7 @@ contract DeployAlignedToken is Script {
         );
 
         TransparentUpgradeableProxy _tokenProxy = deployAlignedTokenProxy(
-            _safe,
+            _foundation,
             _salt,
             _deployer,
             _foundation,
@@ -44,13 +43,13 @@ contract DeployAlignedToken is Script {
                 " with proxy admin: ",
                 vm.toString(Utils.getAdminAddress(address(_tokenProxy))),
                 " and owner: ",
-                vm.toString(_safe)
+                vm.toString(_foundation)
             )
         );
     }
 
     function deployAlignedTokenProxy(
-        address _proxyAdmin,
+        address _proxyAdminOwner,
         bytes32 _salt,
         address _deployer,
         address _foundation,
@@ -61,7 +60,7 @@ contract DeployAlignedToken is Script {
 
         bytes memory _alignedTokenDeploymentData = Utils
             .alignedTokenProxyDeploymentData(
-                _proxyAdmin,
+                _proxyAdminOwner,
                 address(_token),
                 _foundation,
                 _claim

claim_contracts/script/Utils.sol

@@ -14,7 +14,7 @@ library Utils {
         address(uint160(uint256(keccak256("hevm cheat code"))));
     Vm internal constant vm = Vm(VM_ADDRESS);
 
-    function getAdminAddress(address proxy) internal view returns (address) {        
+    function getAdminAddress(address proxy) internal view returns (address) {
         bytes32 adminSlot = vm.load(proxy, ERC1967Utils.ADMIN_SLOT);
         return address(uint160(uint256(adminSlot)));
     }
@@ -88,7 +88,7 @@ library Utils {
     }
 
     function alignedTokenProxyDeploymentData(
-        address _proxyAdmin,
+        address _proxyAdminOwner,
         address _implementation,
         address _foundation,
         address _claim
@@ -98,7 +98,7 @@ library Utils {
                 type(TransparentUpgradeableProxy).creationCode,
                 abi.encode(
                     _implementation,
-                    _proxyAdmin,
+                    _proxyAdminOwner,
                     alignedTokenInitData(_implementation, _foundation, _claim)
                 )
             );