From 018344559993512d094314e58da65560be741cf7 Mon Sep 17 00:00:00 2001
From: Le Yu <6251863+ltyu@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:37:07 -0500
Subject: [PATCH] Re-add proxyAdmins

---
 .../configGetters/getRenzoEZETHWarpConfig.ts  | 58 ++++++++++++++++++-
 .../configGetters/getRenzoPZETHWarpConfig.ts  | 17 ++++--
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoEZETHWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoEZETHWarpConfig.ts
index 6be2c0c372..10690fc8f4 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoEZETHWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoEZETHWarpConfig.ts
@@ -4,6 +4,7 @@ import { Mailbox__factory } from '@hyperlane-xyz/core';
 import {
   ChainMap,
   ChainName,
+  HookConfig,
   HookType,
   HypTokenRouterConfig,
   IsmType,
@@ -39,7 +40,10 @@ export function getProtocolFee(chain: ChainName) {
   return (0.5 / Number(tokenPrices[chain])).toFixed(10).toString(); // ~$0.50 USD
 }
 
-export function getRenzoHook(defaultHook: Address, chain: ChainName) {
+export function getRenzoHook(
+  defaultHook: Address,
+  chain: ChainName,
+): HookConfig {
   return {
     type: HookType.AGGREGATION,
     hooks: [
@@ -224,6 +228,57 @@ export const ezEthSafes: Record<string, string> = {
   swell: '0x435E8c9652Da151292F3981bbf663EBEB6668501',
 };
 
+const existingProxyAdmins: ChainMap<{ address: string; owner: string }> = {
+  arbitrum: {
+    address: '0xdcB558d5C0F9A35C53Fa343c77eD0d346576e2Cf',
+    owner: ezEthSafes.arbitrum,
+  },
+  optimism: {
+    address: '0xa50910ae66Df6A5F8e85dac032FD45BC2b7be6fF',
+    owner: ezEthSafes.optimism,
+  },
+  base: {
+    address: '0xec1DdF05ff85D2B22B7d27E5b5E0B82961B7D889',
+    owner: ezEthSafes.base,
+  },
+  blast: {
+    address: '0xA26F8cE2E21A503bf9e18c213965d7BC14997F48',
+    owner: ezEthSafes.blast,
+  },
+  bsc: {
+    address: '0x486b39378f99f073A3043C6Aabe8666876A8F3C5',
+    owner: ezEthSafes.bsc,
+  },
+  mode: {
+    address: '0x2F78F22a1D7491500C9ED9352b8239fbAbcDd84E',
+    owner: ezEthSafes.mode,
+  },
+  fraxtal: {
+    address: '0x8bB69721B4E9b9df08bEdaeaA193008C7317Db59',
+    owner: ezEthSafes.fraxtal,
+  },
+  linea: {
+    address: '0x2F78F22a1D7491500C9ED9352b8239fbAbcDd84E',
+    owner: ezEthSafes.linea,
+  },
+  ethereum: {
+    address: '0x2F78F22a1D7491500C9ED9352b8239fbAbcDd84E',
+    owner: ezEthSafes.ethereum,
+  },
+  zircuit: {
+    address: '0xec1DdF05ff85D2B22B7d27E5b5E0B82961B7D889',
+    owner: ezEthSafes.zircuit,
+  },
+  sei: {
+    address: '0x33219fEF24C198d979F05d692a17507E41a0A73e',
+    owner: ezEthSafes.sei,
+  },
+  taiko: {
+    address: '0xA3666f8a327AADB666F1906A38B17937e5F11f92',
+    owner: ezEthSafes.taiko,
+  },
+};
+
 export const getRenzoEZETHWarpConfig = async (): Promise<
   ChainMap<HypTokenRouterConfig>
 > => {
@@ -307,6 +362,7 @@ export const getRenzoEZETHWarpConfig = async (): Promise<
                 ],
               },
               hook: getRenzoHook(defaultHook, chain),
+              proxyAdmin: existingProxyAdmins[chain],
             },
           ];
 
diff --git a/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoPZETHWarpConfig.ts b/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoPZETHWarpConfig.ts
index 01e0200bb2..fdaa085b1e 100644
--- a/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoPZETHWarpConfig.ts
+++ b/typescript/infra/config/environments/mainnet3/warp/configGetters/getRenzoPZETHWarpConfig.ts
@@ -1,9 +1,6 @@
-import { parseEther } from 'ethers/lib/utils.js';
-
 import { Mailbox__factory } from '@hyperlane-xyz/core';
 import {
   ChainMap,
-  HookType,
   HypTokenRouterConfig,
   IsmType,
   TokenType,
@@ -15,10 +12,8 @@ import { getEnvironmentConfig } from '../../../../../scripts/core-utils.js';
 import { getRegistry as getMainnet3Registry } from '../../chains.js';
 
 import {
-  MAX_PROTOCOL_FEE,
   ezEthSafes,
   ezEthValidators,
-  getProtocolFee,
   getRenzoHook,
 } from './getRenzoEZETHWarpConfig.js';
 
@@ -42,6 +37,17 @@ const pzEthSafes: Record<string, string> = {
   swell: ezEthSafes.swell,
 };
 
+const existingProxyAdmins: ChainMap<{ address: string; owner: string }> = {
+  ethereum: {
+    address: '0x4f4671Ce69c9af15e33eB7Cf6D1358d1B39Af3bF',
+    owner: '0xD1e6626310fD54Eceb5b9a51dA2eC329D6D4B68A',
+  },
+  zircuit: {
+    address: '0x8b789B4A56675240c9f0985B467752b870c75711',
+    owner: '0x8410927C286A38883BC23721e640F31D3E3E79F8',
+  },
+};
+
 export const getRenzoPZETHWarpConfig = async (): Promise<
   ChainMap<HypTokenRouterConfig>
 > => {
@@ -114,6 +120,7 @@ export const getRenzoPZETHWarpConfig = async (): Promise<
                 ],
               },
               hook: getRenzoHook(defaultHook, chain),
+              proxyAdmin: existingProxyAdmins[chain],
             },
           ];