Merge remote-tracking branch 'origin/add_w3_rpc_class' into add_w3_rp…

…c_class
BalancerMaxis · Jul 19, 2024 · 26c85cf · 26c85cf
2 parents 3900670 + b2d5942
commit 26c85cf
Show file tree

Hide file tree

Showing 38 changed files with 526 additions and 191 deletions.
diff --git a/extras/arbitrum.json b/extras/arbitrum.json
@@ -53,6 +53,11 @@
             "paraswapSwapper": "0x95676AaEcD59B19C5B79008F86d3A291628b0947"
         }
     },
+    "hidden_hand2": {
+        "bribe_vault": "0x8d89593c199Cb763bDEF04529F978f82503E4669",
+        "aura_briber": "0x928b06229a3f4Bc7806d80Fe54e48E777BB74536"
+    },
+
     "maxiVestingContracts": {
         "factory": "0x7BBAc709a9535464690A435ca7361256496f13Ce",
         "Tritium": "0x2b03b15E4A26D858DD594649988255eCEb832787",

diff --git a/extras/mainnet.json b/extras/mainnet.json
@@ -51,6 +51,13 @@
         "ENS": "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72",
         "RETH": "0xae78736Cd615f374D3085123A210448E74Fc6393",
         "SAFE": "0x5aFE3855358E112B5647B952709E6165e1c1eEEe",
+        "INV": "0x41D5D79431A913C4aE7d69a668ecdfE5fF9DFB68",
+        "T": "0xCdF7028ceAB81fA0C6971208e83fa7872994beE5",
+        "stETH": "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+        "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
+        "sETH2": "0xFe2e637202056d30016725477c5da089Ab0A043A",
+        "SWISE": "0x48C3399719B582dD63eB5AADf12A40B4C3f52FA2",
+        "rETH2": "0x20BC832ca081b91433ff6c17f85701B6e92486c5",
         "GEAR": "0xBa3335588D9403515223F109EdC4eB7269a9Ab5D"
     },
     "helpers": {
@@ -158,6 +165,10 @@
     "safe": {
         "token_locker": "0x0a7CB434f96f65972D46A5c1A64a9654dC9959b2"
     },
+    "karpatkey": {
+        "roles_v1": "0xd8dd9164E765bEF903E429c9462E51F0Ea8514F9",
+        "roles_v2": "0x13c61a25DB73e7a94a244bD2205aDba8b4a60F4a"
+    },
     "paladin": {
         "QuestBoardLatest": "0xfEb352930cA196a80B708CDD5dcb4eCA94805daB",
         "QuestBoardV2": "0xf0CeABf99Ddd591BbCC962596B228007eD4624Ae",

diff --git a/extras/optimism.json b/extras/optimism.json
@@ -1,16 +1,24 @@
 {
     "zero": {"zero": "0x0000000000000000000000000000000000000000"},
-    "tokens": {},
+    "tokens": {
+        "OP": "0x4200000000000000000000000000000000000042"
+    },
     "chainlink": {
         "keeper_registry": "0x75c0530885F385721fddA23C539AF3701d6183D4"
     },
     "mimic": {
         "smartvault": "0x94Dd9C6152a2A0BBcB52d3297b723A6F01D5F9f7",
+        "smartVaultV3": "0x9e5D6427D2cdaDC68870197b099C2Df535Ec3c97",
         "claimer": "0xdF818E63341767d5F5A9827088f1892e9C604A2D",
         "bptSwapper": "0x6030331C9225Ee5ae3F3D08FBD19e8bF053dF498",
         "oneinchSwapper": "0xd712A863766dE7e7cA13289A97997E01832A6571",
         "paraswapSwapper": "0x95676AaEcD59B19C5B79008F86d3A291628b0947"
     },
+    "hidden_hand2": {
+        "bribe_vault": "0xa9b08B4CeEC1EF29EdEC7F9C94583270337D6416",
+        "balancer_briber": "0xeA1aaC67b6Ad9005E1551A4085FfFE5aeF0F3f09",
+        "aura_briber": "0x679c5C5828367db9005FdEa80faA45AE7B881791"
+    },
     "maxiKeepers": {
         "gaugeRewardsInjectors": {
               "op": "0x34a265e1EBCb31586293eb2D2f94c6ff2f920340"

diff --git a/extras/signers.json b/extras/signers.json
@@ -29,14 +29,13 @@
     "juani": "0x9098b50ee2d9E4c3C69928A691DA3b192b4C9673"
   },
   "emergency": {
-    "solarcurve": "0x512fce9B07Ce64590849115EE6B32fd40eC0f5F3",
     "mikeb": "0xF01Cc7154e255D20489E091a5aEA10Bc136696a8",
-    "zekraken": "0xafFC70b81D54F229A5F50ec07e2c76D2AAAD07Ae",
     "zendragon": "0x7c2eA10D3e5922ba3bBBafa39Dc0677353D2AF17",
-    "Markus": "0x6bB4720473d4D7133f944785e5EE1A650C07f34e",
-    "Fernando": "0xbbF0Ae5195444264364CA7eb7E3BB1971B4c3eCb",
     "juani": "0xB5485e0F543eE6e01e221A57e58ED95268215Ac9",
-    "hypernative": "0x202B1AA0d702898CA474aB6ED31d53BA309308D9"
+    "hypernative": "0x202B1AA0d702898CA474aB6ED31d53BA309308D9",
+    "franz": "0x89c7D6ABA9Cd18D8A93571E583EEAc58Da75acE6",
+    "danielmk": "0x606681E47afC7869482660eCD61bd45B53523D83",
+    "xeonus": "0x7019Be4E4eB74cA5F61224FeAf687d2b43998516"
   },
   "dao": {
     "AlexLangeVC": "0x3ABDc84Dd15b0058B281D7e26CCc3932cfb268aA",
@@ -56,15 +55,15 @@
   },
   "keepers": {
     "old_oz_relayer_v1": "0xe9735f7D85a57BFb860c1E2c1c7B4F587BA0F6e7",
-    "oz_relayer_v2" : "0xfb7d0D001BC8D0bC998071C762BfF53EE31b725F",
+    "oz_relayer_v2": "0xfb7d0D001BC8D0bC998071C762BfF53EE31b725F",
     "github_actions_poker": "0x737760C760FfEc370F84861E4Be4AFF7093Ffa3f"
   },
   "emeritus": {
     "solarcurve_signer": "0x512fce9B07Ce64590849115EE6B32fd40eC0f5F3",
     "solarcurve_deployer": "0x6409C2C1aC1B26aaaEF982572efd38412075586D",
     "shakotan_deployer": "0x28A6714B06B1241D1F339F9280553F115eCC285B",
-    "nico_emergency": "0x815d654E930E840D0E0Ee1B18FFc8Fb4ddA4c6B3"
-
+    "nico_emergency": "0x815d654E930E840D0E0Ee1B18FFc8Fb4ddA4c6B3",
+    "Markus_emergency": "0x6bB4720473d4D7133f944785e5EE1A650C07f34e "
   },
   "kyc": {
     "Arbitrum": {

diff --git a/generate_current_permissions.py b/generate_current_permissions.py
@@ -18,7 +18,11 @@
 class W3_RPC:
     def __init__(self, chain, DRPC_KEY):
         drpc_chain = DRPC_NAME_OVERRIDES.get(chain, chain)
-        self.w3 = Web3(Web3.HTTPProvider(f"https://lb.drpc.org/ogrpc?network={drpc_chain}&dkey={DRPC_KEY}"))
+        self.w3 = Web3(
+            Web3.HTTPProvider(
+                f"https://lb.drpc.org/ogrpc?network={drpc_chain}&dkey={DRPC_KEY}"
+            )
+        )
 
     def __getattr__(self, name):
         return getattr(self.w3, name)
@@ -44,7 +48,9 @@ def __delitem__(self, chain):
 def build_chain_permissions_list(chain_name):
     a = AddrBook(chain_name)
     results = {}
-    action_ids_list = f"{GITHUB_DEPLOYMENTS_RAW}/action-ids/{chain_name}/action-ids.json"
+    action_ids_list = (
+        f"{GITHUB_DEPLOYMENTS_RAW}/action-ids/{chain_name}/action-ids.json"
+    )
     w3 = W3_RPC(chain_name, os.getenv("DRPC_KEY"))
 
     try:
@@ -71,7 +77,9 @@ def build_chain_permissions_list(chain_name):
                 if numMembers > 0:
                     memberAddressList = []
                     for i in range(0, numMembers, 1):
-                        caller = str(authorizer.functions.getRoleMember(action_id, i).call())
+                        caller = str(
+                            authorizer.functions.getRoleMember(action_id, i).call()
+                        )
                         memberAddressList.append(caller)
 
                     results[action_id] = memberAddressList