Merge branch 'main' into add_other_addresses

# Conflicts: # bal_addresses/__init__.py # bal_addresses/addresses.py # bal_addresses/generate_current_permissions.py # bal_addresses/permissions.py
BalancerMaxis · Jul 27, 2023 · ac710b2 · ac710b2
2 parents 0764cc3 + 16726e4
commit ac710b2
Show file tree

Hide file tree

Showing 20 changed files with 761 additions and 12 deletions.
diff --git a/.github/workflows/generate_permissions.yaml b/.github/workflows/generate_permissions.yaml
@@ -6,9 +6,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  refersh_books:
+  refresh_active_perms:
     runs-on: ubuntu-latest
-
+    env:
+         INFURA_KEY: ${{ secrets.INFURA_KEY }}
     steps:
 
     - name: Checkout code

diff --git a/bal_addresses/addresses.py b/bal_addresses/addresses.py
@@ -36,10 +36,10 @@ class NoResultError(Exception):
 class AddrBook:
 
     fullbook = requests.get(f"{GITHUB_RAW_OUTPUTS}/addressbook.json").json()
-    chains = DotMap(requests.get(
+    chains = Munch.fromDict(requests.get(
         "https://raw.githubusercontent.com/BalancerMaxis/bal_addresses/main/extras/chains.json"
     ).json())
-    fx_description_by_name = DotMap(requests.get(
+    fx_description_by_name = Munch.fromDict(requests.get(
         "https://raw.githubusercontent.com/BalancerMaxis/bal_addresses/main/extras/func_desc_by_name.json"
     ).json())
     chain_ids_by_name = chains.CHAIN_IDS_BY_NAME

diff --git a/...addresses/generate_currnet_permissions.py → ...addresses/generate_current_permissions.py b/...addresses/generate_currnet_permissions.py → ...addresses/generate_current_permissions.py
@@ -2,13 +2,15 @@
 import json
 import pandas as pd
 import os
-from bal_addresses import AddrBook, GITHUB_DEPLOYMENTS_RAW
+from addresses import AddrBook, GITHUB_DEPLOYMENTS_RAW
+from permissions import BalPermissions
 from web3 import Web3
 import datetime
 
-INFURA_KEY = os.getenv('WEB3_INFURA_PROJECT_ID')
+INFURA_KEY = os.getenv('INFURA_KEY')
 
 w3_by_chain = {
+    "base": Web3(Web3.HTTPProvider("https://developer-access-mainnet.base.org")),
     "gnosis": Web3(Web3.HTTPProvider(f"https://gnosischain-rpc.gateway.pokt.network")),
     "zkevm": Web3(Web3.HTTPProvider(f"https://zkevm-rpc.com")),
     "avalanche": Web3(Web3.HTTPProvider(f"https://api.avax.network/ext/bc/C/rpc")),

diff --git a/bal_addresses/permissions.py b/bal_addresses/permissions.py
@@ -18,10 +18,6 @@ class NoResultError(Exception):
 
 ### Main class
 class BalPermissions:
-    ## TODO switch back to main branch
-    #GITHUB_RAW_OUTPUTS = "https://raw.githubusercontent.com/BalancerMaxis/bal_addresses/main/outputs"
-
-
     ### Errors
     class MultipleMatchesError(Exception):
         pass

diff --git a/extras/base.json b/extras/base.json
@@ -0,0 +1,4 @@
+{
+    "zero": {"zero": "0x0000000000000000000000000000000000000000"},
+    "tokens": {}
+}
diff --git a/extras/chains.json b/extras/chains.json
@@ -8,7 +8,8 @@
     "zkevm": 1101,
     "goerli": 42,
     "sepolia": 11155111,
-    "avalanche": 43114
+    "avalanche": 43114,
+    "base": 8453
   },
   "SCANNERS_BY_CHAIN": {
     "mainnet": "https://etherscan.io",
@@ -19,6 +20,7 @@
     "zkevm": "https://zkevm.polygonscan.com/",
     "goerli": "https://goerli.etherscan.io/",
     "sepolia": "https://sepolia.etherscan.io/",
-    "avalanche": "https://snowtrace.io/"
+    "avalanche": "https://snowtrace.io/",
+    "base": "https://basescan.org/"
   }
 }
diff --git a/extras/multisigs.json b/extras/multisigs.json
@@ -62,5 +62,10 @@
     "maxi_ops": "0x040E995520F92F96142d1a76c16D4af21A2eFDE7",
     "lm": "0x040E995520F92F96142d1a76c16D4af21A2eFDE7",
     "blab_ops": "0x040E995520F92F96142d1a76c16D4af21A2eFDE7"
+  },
+  "base": {
+    "dao": "0xC40DCFB13651e64C8551007aa57F9260827B6462",
+    "lm": "0x65226673F3D202E0f897C862590d7e1A992B2048",
+    "emergency": "0x183C55A0dc7A7Da0f3581997e764D85Fd9E9f63a"
   }
 }
diff --git a/outputs/addressbook.json b/outputs/addressbook.json
@@ -1301,6 +1301,180 @@
             }
          }
       },
+      "base": {
+         "zero": {
+            "zero": "0x0000000000000000000000000000000000000000"
+         },
+         "tokens": {},
+         "20230411-managed-pool-v2": {
+            "ManagedPoolAddRemoveTokenLib": "0xb19382073c7A0aDdbb56Ac6AF1808Fa49e377B75",
+            "CircuitBreakerLib": "0xEF454a7B3f965D3f6723E462405246f8Cd865425",
+            "ManagedPoolAmmLib": "0x7d2248F194755DCa9A1887099394F39476d28C9a",
+            "ExternalWeightedMath": "0x7920BFa1b2041911b354747CA7A6cDD2dfC50Cfd",
+            "RecoveryModeHelper": "0x313a8D36b1d90a4cba3A505fDc3480C3870bE053",
+            "ManagedPoolFactory": "0x9a62C91626d39D0216b3959112f9D4678E20134d",
+            "MockManagedPool": "0xE50AD96Af9370D05D3C1cE85F17C31557B29C4Ee"
+         },
+         "20220721-balancer-queries": {
+            "BalancerQueries": "0x300Ab2038EAc391f26D9F895dc61F8F66a548833"
+         },
+         "00000000-tokens": {
+            "BAL": "0x7c6b91D9Be155A6Db01f749217d76fF02A7227F2",
+            "WETH": "0x4200000000000000000000000000000000000006"
+         },
+         "20230410-aave-linear-pool-v5": {
+            "AaveLinearPoolFactory": "0x687b8C9b41E01Be8B591725fac5d5f52D0564d79",
+            "MockAaveLendingPool": "0x88ED12A90142fDBFe2a28f7d5b48927254C7e760",
+            "MockStaticAToken": "0x698CaED853bE9cEA96C268f565e2b61D3b2BcDA4",
+            "MockAaveLinearPool": "0x712e23a9B91Aa30EE7997d1c7a1a285d4C7912D1"
+         },
+         "20230414-authorizer-wrapper": {
+            "AuthorizerWithAdaptorValidation": "0xA69E0Ccf150a29369D8Bbc0B3f510849dB7E8EEE"
+         },
+         "20230409-gearbox-linear-pool-v2": {
+            "GearboxLinearPoolFactory": "0x9Dd32684176638D977883448A4c914311c07bd62",
+            "MockGearboxVault": "0x79e435875cCee3Cd9e8da23fE34F9A011d05EA6C",
+            "MockGearboxDieselToken": "0xb521dD5C8e13fE202626CaC98873FEA2b7760cE4",
+            "MockGearboxLinearPool": "0x3c28a59356B473847AAa5e0b6F561636079213A6"
+         },
+         "20230717-chainlink-rate-provider-factory": {
+            "ChainlinkRateProviderFactory": "0x0A973B6DB16C2ded41dC91691Cc347BEb0e2442B"
+         },
+         "20211202-no-protocol-fee-lbp": {
+            "NoProtocolFeeLiquidityBootstrappingPoolFactory": "0x0c6052254551EAe3ECac77B01DFcf1025418828f",
+            "MockLiquidityBootstrappingPool": "0x71528afe250438e184b2deAF7947f0f45931DF3b"
+         },
+         "20230316-child-chain-gauge-factory-v2": {
+            "ChildChainGauge": "0x59562f93c447656F6E4799fC1FC7c3d977C3324F",
+            "ChildChainGaugeFactory": "0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95"
+         },
+         "20230404-l2-layer0-bridge-forwarder": {
+            "L2LayerZeroBridgeForwarder": "0x8eA89804145c007e7D226001A96955ad53836087"
+         },
+         "20230316-l2-ve-delegation-proxy": {
+            "NullVotingEscrow": "0x475D18169BE8a89357A9ee3Ab00ca386d20fA229",
+            "VotingEscrowDelegationProxy": "0xD87F44Df0159DC78029AB9CA7D7e57E7249F5ACD"
+         },
+         "20230613-balancer-pool-data-queries": {
+            "BalancerPoolDataQueries": "0x6B1Da720Be2D11d95177ccFc40A917c2688f396c"
+         },
+         "20230320-weighted-pool-v4": {
+            "WeightedPoolFactory": "0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4",
+            "MockWeightedPool": "0xd9dbbfAA703f3C33838365aE00fE4EB22CdF8d46"
+         },
+         "20210418-vault": {
+            "Vault": "0xBA12222222228d8Ba445958a75a0704d566BF2C8",
+            "ProtocolFeesCollector": "0xce88686553686DA562CE7Cea497CE749DA109f9F",
+            "BalancerHelpers": "0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9"
+         },
+         "20230711-composable-stable-pool-v5": {
+            "ComposableStablePoolFactory": "0x8df317a729fcaA260306d7de28888932cb579b88",
+            "MockComposableStablePool": "0x7F6E9d6a4093Af9d09bAE92d24bfE42Fc5369aE6"
+         },
+         "20230223-protocol-id-registry": {
+            "ProtocolIdRegistry": "0x682f0dDBFd41D1272982f64a499Fb62d80e27589"
+         },
+         "20230409-erc4626-linear-pool-v4": {
+            "ERC4626LinearPoolFactory": "0x161f4014C27773840ccb4EC1957113e6DD028846",
+            "MockERC4626Token": "0x4638ab64022927C9bD5947607459D13f57f1551C",
+            "MockERC4626LinearPool": "0x1CC2E10C486Ffb7228810B9c7C183d0CD92cdF44"
+         },
+         "20220325-authorizer-adaptor": {
+            "AuthorizerAdaptor": "0x6CaD2ea22BFA7F4C14Aae92E47F510Cd5C509bc7"
+         },
+         "20230526-gauge-working-balance-helper": {
+            "GaugeWorkingBalanceHelper": "0xa7d524046ef89de9F8e4f2d7B029f66cCB738d48"
+         },
+         "20221123-pool-recovery-helper": {
+            "PoolRecoveryHelper": "0x03F3Fb107e74F2EAC9358862E91ad3c692712054"
+         },
+         "20220517-protocol-fee-withdrawer": {
+            "ProtocolFeesWithdrawer": "0xAcf05BE5134d64d150d153818F8C67EE36996650"
+         },
+         "20220725-protocol-fee-percentages-provider": {
+            "ProtocolFeePercentagesProvider": "0xDEd7Fef7D8eCdcB74F22f0169e1A9EC696e6695d"
+         },
+         "20230409-yearn-linear-pool-v2": {
+            "YearnLinearPoolFactory": "0x44d33798dddCdAbc93Fe6a40C80588033Dc502d3",
+            "MockYearnTokenVault": "0xDBf7B9F1d2Bfba14e42709f84dda3187eE410e38",
+            "MockYearnLinearPool": "0x369877467FC3B6774DE4E11E0c0AbBdE70Eb40FD"
+         },
+         "20230316-l2-balancer-pseudo-minter": {
+            "L2BalancerPseudoMinter": "0xc7E5ED1054A24Ef31D827E6F86caA58B3Bc168d7"
+         },
+         "20210418-authorizer": {
+            "Authorizer": "0x809B79b53F18E9bc08A961ED4678B901aC93213a"
+         },
+         "20230314-batch-relayer-v5": {
+            "BatchRelayerLibrary": "0xDF9B5B00Ef9bca66e9902Bd813dB14e4343Be025",
+            "BalancerRelayer": "0x76f7204B62f554b79d444588EDac9dfA7032c71a"
+         },
+         "20221124-authorizer-adaptor-entrypoint": {
+            "AuthorizerAdaptorEntrypoint": "0x9129E834e15eA19b6069e8f08a8EcFc13686B8dC"
+         },
+         "20220325-test-balancer-token": {
+            "TestBalancerToken": "0xA1Fa945425eD2e08Acb932E000bCc2f21B21588A"
+         },
+         "20230712-child-chain-gauge-checkpointer": {
+            "BatchRelayerLibrary": "0xaf779e58dafb4307b998C7b3C9D3f788DFc80632",
+            "BalancerRelayer": "0x7B25d5712fB49627534012327E46455b3fF7b26C"
+         },
+         "multisigs": {
+            "dao": "0xC40DCFB13651e64C8551007aa57F9260827B6462",
+            "lm": "0x65226673F3D202E0f897C862590d7e1A992B2048",
+            "emergency": "0x183C55A0dc7A7Da0f3581997e764D85Fd9E9f63a"
+         },
+         "EOA": {
+            "maxis": {
+               "solarcurve": "0x512fce9B07Ce64590849115EE6B32fd40eC0f5F3",
+               "zendragon": "0x7c2eA10D3e5922ba3bBBafa39Dc0677353D2AF17",
+               "zekraken": "0xafFC70b81D54F229A5F50ec07e2c76D2AAAD07Ae",
+               "mikeb": "0xc4591c41e01a7a654B5427f39Bbd1dEe5bD45D1D",
+               "xeonus": "0x7019Be4E4eB74cA5F61224FeAf687d2b43998516",
+               "danko": "0x200550cAD164E8e0Cb544A9c7Dc5c833122C1438",
+               "tritium": "0xcf4fF1e03830D692F52EB094c52A5A6A2181Ab3F"
+            },
+            "blabs_ops": {
+               "Jeff": "0xBEf33200077A2A2AC3613aB92488b41FFc39AcE2",
+               "Markus": "0xCae6f77a6cf4C952BF36793D91519fb4Ae86C264",
+               "Mike": "0x91f4Df13350083eDb30515019cF527C6b0490c54",
+               "Nico": "0x815d654E930E840D0E0Ee1B18FFc8Fb4ddA4c6B3",
+               "Fernando": "0xbbF0Ae5195444264364CA7eb7E3BB1971B4c3eCb",
+               "EmergencyPauser": "0x170027069fd114BFF2f57B0FC796df93290C02a6"
+            },
+            "maxi_deployers": {
+               "solarcurve": "0x6409C2C1aC1B26aaaEF982572efd38412075586D",
+               "zendragon": "0x854B004700885A61107B458f11eCC169A019b764",
+               "mikeb": "0xc4591c41e01a7a654B5427f39Bbd1dEe5bD45D1D",
+               "tritium": "0x53a806789BBfd366d9dEB9Cbe5d622089e845fdb"
+            },
+            "emergency": {
+               "solarcurve": "0x512fce9B07Ce64590849115EE6B32fd40eC0f5F3",
+               "mikeb": "0xF01Cc7154e255D20489E091a5aEA10Bc136696a8",
+               "zekraken": "0xafFC70b81D54F229A5F50ec07e2c76D2AAAD07Ae",
+               "zendragon": "0x7c2eA10D3e5922ba3bBBafa39Dc0677353D2AF17",
+               "Markus": "0x6bB4720473d4D7133f944785e5EE1A650C07f34e",
+               "Fernando": "0xbbF0Ae5195444264364CA7eb7E3BB1971B4c3eCb",
+               "Nico": "0x815d654E930E840D0E0Ee1B18FFc8Fb4ddA4c6B3"
+            },
+            "dao": {
+               "AlexLangeVC": "0x3ABDc84Dd15b0058B281D7e26CCc3932cfb268aA",
+               "0xMaki": "0x285b7EEa81a5B66B62e7276a24c1e0F83F7409c1",
+               "tritium": "0xcf4fF1e03830D692F52EB094c52A5A6A2181Ab3F",
+               "0xSausageDoge": "0x59693BA1A5764e087CE166ac0E0085Fc071B9ea7",
+               "eboadom": "0xA39a62304d8d43B35114ad7bd1258B0E50e139b3",
+               "mounibec": "0x0951FF0835302929d6c0162b3d2495A85e38ec3A",
+               "trentmc0": "0x478eC43c6867c2884f87B21c164f1fD1308bD9a3",
+               "StefanDGeorge": "0x9F7dfAb2222A473284205cdDF08a677726d786A0",
+               "bonustrack87": "0x9BE6ff2A1D5139Eda96339E2644dC1F05d803600",
+               "nanexcool": "0x823DF0278e4998cD0D06FB857fBD51e85b18A250",
+               "davgarai": "0xAc1aA53108712d7f38093A67d380aD54B562a650"
+            },
+            "ozDefender": {
+               "checkpointer": "0xe9735f7D85a57BFb860c1E2c1c7B4F587BA0F6e7"
+            }
+         }
+      },
       "avalanche": {
          "zero": {
             "zero": "0x0000000000000000000000000000000000000000"