From e97a727654dc7237a4f30ec4af8241351e95f49a Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Fri, 13 Sep 2024 11:52:46 -0500 Subject: [PATCH 01/15] use new core pool model --- bal_addresses/requirements.txt | 2 +- gen_core_pools.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bal_addresses/requirements.txt b/bal_addresses/requirements.txt index 09bc4e4..ba47e4c 100644 --- a/bal_addresses/requirements.txt +++ b/bal_addresses/requirements.txt @@ -1,5 +1,5 @@ pathlib>=1.0 -git+https://github.com/BalancerMaxis/bal_tools@v0.1.7 +git+https://github.com/BalancerMaxis/bal_tools@v0.1.8 requests pandas web3 diff --git a/gen_core_pools.py b/gen_core_pools.py index 1c98e46..b4349cc 100644 --- a/gen_core_pools.py +++ b/gen_core_pools.py @@ -9,7 +9,7 @@ def main(): chains = json.load(f) for chain in chains["BALANCER_PRODUCTION_CHAINS"]: gauge_info = BalPoolsGauges(chain) - core_pools[chain] = gauge_info.build_core_pools() + core_pools[chain] = gauge_info.build_core_pools().pools # dump the collected dict to json file with open("outputs/core_pools.json", "w") as f: From 33f2f91894f06ee16df7a5753a900f460b2d36fe Mon Sep 17 00:00:00 2001 From: jalbrekt85 Date: Tue, 24 Sep 2024 18:47:53 -0500 Subject: [PATCH 02/15] revert using .pools --- gen_core_pools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen_core_pools.py b/gen_core_pools.py index b4349cc..1c98e46 100644 --- a/gen_core_pools.py +++ b/gen_core_pools.py @@ -9,7 +9,7 @@ def main(): chains = json.load(f) for chain in chains["BALANCER_PRODUCTION_CHAINS"]: gauge_info = BalPoolsGauges(chain) - core_pools[chain] = gauge_info.build_core_pools().pools + core_pools[chain] = gauge_info.build_core_pools() # dump the collected dict to json file with open("outputs/core_pools.json", "w") as f: From 609d3b9f6a29aa187fce019b981c43bd017a608a Mon Sep 17 00:00:00 2001 From: gosuto-inzasheru <2835259+gosuto-inzasheru@users.noreply.github.com> Date: Wed, 25 Sep 2024 01:45:02 +0000 Subject: [PATCH 03/15] Scheduled update from changes to monorepo --- outputs/permissions/active/gnosis.json | 3 +++ outputs/permissions/active/mainnet.json | 3 +++ outputs/permissions/active/polygon.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/outputs/permissions/active/gnosis.json b/outputs/permissions/active/gnosis.json index bc4a1e1..5972403 100644 --- a/outputs/permissions/active/gnosis.json +++ b/outputs/permissions/active/gnosis.json @@ -162,6 +162,9 @@ "0xf139842955587e7816c90b6d72792f2b7e6014d560464517094450df28164bc8": [ "0x955556b002d05c7B31a9394c10897c1DA19eAEab" ], + "0x9d575f62420250ec382e1e8e262ddae46d0d6817fab9fde48f9c6efd068e5844": [ + "0x14969B55a675d13a1700F71A37511bc22D90155a" + ], "0x1ff8dca7a9af725b8fde69703b657ae58c04e9a7153ef1025379deb0dda4f926": [ "0x14969B55a675d13a1700F71A37511bc22D90155a" ], diff --git a/outputs/permissions/active/mainnet.json b/outputs/permissions/active/mainnet.json index c5e0124..a0b8e64 100644 --- a/outputs/permissions/active/mainnet.json +++ b/outputs/permissions/active/mainnet.json @@ -146,6 +146,9 @@ "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f", "0xA29F61256e948F3FB707b4b3B138C5cCb9EF9888" ], + "0xd0090a09f425bba74e6c801fba7c6d15b44147ab0bd319e40076ce07e95168b6": [ + "0xc38c5f97B34E175FFd35407fc91a937300E33860" + ], "0xac0fcdc4520d7bde1c58bbefd7c8dd39aaf382a20c27991134c14fe63d2c96f3": [ "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f" ], diff --git a/outputs/permissions/active/polygon.json b/outputs/permissions/active/polygon.json index 2e0e656..3246545 100644 --- a/outputs/permissions/active/polygon.json +++ b/outputs/permissions/active/polygon.json @@ -92,6 +92,9 @@ "0xf51a91e622462fd20895f082afda26cd4c20640d7492e8ce2840c1e7ee1b437f": [ "0xf9D6BdE5c2eef334AC88204CB2eEc07111DCBA97" ], + "0x363cf2bd771efe16bd206d33a549d4698c4ad202ea6b5bf693722fbe151140a6": [ + "0xc38c5f97B34E175FFd35407fc91a937300E33860" + ], "0xde944634152f598012cd1450bbe9e21e2e88a57fc7e578a54e47cbc6ccdf1c54": [ "0x3c58668054c299bE836a0bBB028Bee3aD4724846" ], From c8da9fb6c1bf3780d209c894dcc103f969233240 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Wed, 25 Sep 2024 13:14:30 +0200 Subject: [PATCH 04/15] chore: add cow airdrop merkle distributor --- extras/mainnet.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extras/mainnet.json b/extras/mainnet.json index f17e7ff..6c9b4d3 100644 --- a/extras/mainnet.json +++ b/extras/mainnet.json @@ -75,7 +75,8 @@ }, "cow": { "vault_relayer": "0xC92E8bdf79f0507f65a392b0ab4667716BFE0110", - "settlement": "0x9008D19f58AAbD9eD0D60971565AA8510560ab41" + "settlement": "0x9008D19f58AAbD9eD0D60971565AA8510560ab41", + "airdrop_merkle_distributor": "0x64646f112FfD6F1B7533359CFaAF7998F23C8c40" }, "one_inch":{ "settlement": "0xad3b67bca8935cb510c8d18bd45f0b94f54a968f" From b61d9c7d7c7af1c0a81930cf021d5993b13ba768 Mon Sep 17 00:00:00 2001 From: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Date: Wed, 25 Sep 2024 18:46:13 -0400 Subject: [PATCH 05/15] Adding-Stakewise-SWISE-Distributor-Gnosis Double checking with Stakewise team; but for now we have this request calling out this address. --- extras/gnosis.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extras/gnosis.json b/extras/gnosis.json index 9ff7427..304d240 100644 --- a/extras/gnosis.json +++ b/extras/gnosis.json @@ -24,5 +24,8 @@ "gaugeRewardsInjectors": { "usdc_rewards_injector": "0x87c921be1fd8ee7E5eda4394aDB849DB72847aE9" } - } + }, + "stakewise": { + "SWISE_Distributor_EOA": "0x2685C0e39EEAAd383fB71ec3F493991d532A87ae" + } } From 93dbd024c25b333b185496e8e24dd880b5f66f65 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 11:59:51 +0200 Subject: [PATCH 06/15] chore: add json-fix dep --- bal_addresses/requirements.txt | 3 ++- setup.py | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bal_addresses/requirements.txt b/bal_addresses/requirements.txt index ba47e4c..61f4e1e 100644 --- a/bal_addresses/requirements.txt +++ b/bal_addresses/requirements.txt @@ -1,8 +1,9 @@ pathlib>=1.0 -git+https://github.com/BalancerMaxis/bal_tools@v0.1.8 +git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.8 requests pandas web3 dotmap munch==4.0.0 gql[requests] +json-fix diff --git a/setup.py b/setup.py index 36a5b1f..10da909 100644 --- a/setup.py +++ b/setup.py @@ -19,11 +19,15 @@ install_requires=[ "setuptools>=42", "wheel", - "munch==4.0.0", + "pathlib>=1.0", + "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.8", + "requests", + "pandas", "web3", + "dotmap", + "munch==4.0.0", "gql[requests]", - "requests", - "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools@v0.1.7", + "json-fix" ], keywords=["python", "first package"], classifiers=[ From f8ce299308018c1a7c45c3a881a4e0b8bf344e76 Mon Sep 17 00:00:00 2001 From: gosuto-inzasheru Date: Thu, 26 Sep 2024 10:00:15 +0000 Subject: [PATCH 07/15] style: ci lint with `black` --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 10da909..4fa34e0 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ "dotmap", "munch==4.0.0", "gql[requests]", - "json-fix" + "json-fix", ], keywords=["python", "first package"], classifiers=[ From 5a842604af58b0822695cace8390701fe3ff772a Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 12:02:43 +0200 Subject: [PATCH 08/15] chore: add black linter to dev env --- bal_addresses/requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/bal_addresses/requirements-dev.txt b/bal_addresses/requirements-dev.txt index c3b82fe..5c5b7ab 100644 --- a/bal_addresses/requirements-dev.txt +++ b/bal_addresses/requirements-dev.txt @@ -2,3 +2,4 @@ pytest-mock responses pytest-cov pytest==7.4.0 +black==22.10 From 2d6892204541cf90e5d0aea4862a7a33577e1122 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 12:12:48 +0200 Subject: [PATCH 09/15] docs: add status badges for cron jobs --- README.md | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 14e52f0..a9b437f 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,25 @@ +[![Generate Addressbooks Deployments](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_addressbooks.yaml/badge.svg)](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_addressbooks.yaml) +[![Generate Core Pools JSON](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_core_pools.yaml/badge.svg)](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_core_pools.yaml) +[![Generate Active Permissions](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_permissions.yaml/badge.svg)](https://github.com/BalancerMaxis/bal_addresses/actions/workflows/generate_permissions.yaml) + # Monorepo Addresses This repo is setup to make it easy to find up to date addresses at balancer. ## Outputs - structured data + The [outputs](./outputs) directory has a number of different address books that you can use in code or with your eyeballs. -### [chain].json Files -Have keys of deployment/contract as well as some other extra stuff all with / notation. It includes multisigs and signers known to the maxis as well as other addresses we have touched sorted by protocol. +### [chain].json Files + +Have keys of deployment/contract as well as some other extra stuff all with / notation. It includes multisigs and signers known to the maxis as well as other addresses we have touched sorted by protocol. ### addressbook.json -Has all the addresses sorted into 2 dicts (active, and old). Each dict is then mapped like `{chain:{deployment:{contract: address}}}` +Has all the addresses sorted into 2 dicts (active, and old). Each dict is then mapped like `{chain:{deployment:{contract: address}}}` ## Python helpers + You can import this into python scripts by adding the following into your requirements.txt `git+https://github.com/BalancerMaxis/bal_addresses`. once imported like `from bal_addresses import AddrBook`. @@ -22,21 +29,24 @@ Then you can invoke the Address Book on a chain like so `a = AddrBook(chain_name)` where chain_name is one of the chains listed in `AddrBook.CHAIN_IDS_BY_NAME.keys()` Then you can do this with the flatbook: + ``` >>> a.flatbook["20230320-composable-stable-pool-v4/ComposableStablePoolFactory"] '0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76' >>> a.flatbook["multisigs/lm"] '0xc38c5f97B34E175FFd35407fc91a937300E33860' ->>> +>>> ``` This with the reversebook: + ```text >>> a.reversebook["0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76"] '20230320-composable-stable-pool-v4/ComposableStablePoolFactory' ``` You can also use the structured data as follows + ``` >>> r = a.dotmap >>> r.multisigs @@ -45,13 +55,13 @@ DotMap(lm='0xc38c5f97B34E175FFd35407fc91a937300E33860', dao='0x10A19e7eE7d7F8a52 '0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f' ``` -Note that for the deployments the dotmap has a problem with digit starting members. For this reason you have to use it like this +Note that for the deployments the dotmap has a problem with digit starting members. For this reason you have to use it like this + ```text >>> r["20230320-composable-stable-pool-v4"]["ComposableStablePoolFactory"] '0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76' ``` - As you can see from the examples above, the dotmap works like a dict, so you can easily loop over any part of the structure. ```python @@ -61,13 +71,16 @@ r = a.dotmap for contract, address in r["20230320-composable-stable-pool-v4"].items(): print(f"{contract} has {address}") ``` + Returns + ```text ComposableStablePoolFactory has 0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76 MockComposableStablePool has 0x5537f945D8c3FCFDc1b8DECEEBD220FAD26aFdA8 ``` There is also search and lookup commands + ```text >>> a.search_many("Composable") {'20230320-composable-stable-pool-v4/ComposableStablePoolFactory': '0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76', '20230320-composable-stable-pool-v4/MockComposableStablePool': '0x5537f945D8c3FCFDc1b8DECEEBD220FAD26aFdA8', '20230206-composable-stable-pool-v3/ComposableStablePoolFactory': '0xdba127fBc23fb20F5929C546af220A991b5C6e01', '20230206-composable-stable-pool-v3/MockComposableStablePool': '0x222bc81C6F3C17e9e9Aba47a12f55a1Dea42f163', '20220906-composable-stable-pool/ComposableStablePoolFactory': '0xf9ac7B9dF2b3454E841110CcE5550bD5AC6f875F', '20221122-composable-stable-pool-v2/ComposableStablePoolFactory': '0x85a80afee867aDf27B50BdB7b76DA70f1E853062', '20221122-composable-stable-pool-v2/MockComposableStablePool': '0x373b347bc87998b151A5E9B6bB6ca692b766648a'} @@ -79,16 +92,19 @@ There is also search and lookup commands '0xBA12222222228d8Ba445958a75a0704d566BF2C8' >>> a.reversebook[a.latest_contract("ComposableStablePoolFactory")] '20230320-composable-stable-pool-v4/ComposableStablePoolFactory' ->>> +>>> ``` -Most of the other functions are used by a github action which regenerates files read in by those 2 functions on a weekly basis. You can explore them if you would like. + +Most of the other functions are used by a github action which regenerates files read in by those 2 functions on a weekly basis. You can explore them if you would like. ## Using deployments: + `.deployments` attribute is an object that is lazy loaded on first access. It has first class support in IDEs, so you can use it as a normal object. To use deployments information you can do the following: + ```python from bal_addresses.addresses import AddrBook @@ -98,6 +114,7 @@ a.deployments ``` Now you can extract information: + ``` >>> a.deployments.vault.contracts.Vault.address '0xBA12222222228d8Ba445958a75a0704d566BF2C8' From 3455a3fe0393dc53cc2afa747ac2197783599de7 Mon Sep 17 00:00:00 2001 From: gosuto-inzasheru <2835259+gosuto-inzasheru@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:16:05 +0000 Subject: [PATCH 10/15] Scheduled updates to Core Pools list --- outputs/core_pools.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/outputs/core_pools.json b/outputs/core_pools.json index 74d6e22..531a1ee 100644 --- a/outputs/core_pools.json +++ b/outputs/core_pools.json @@ -13,6 +13,7 @@ "0x47a4f5440ab097cf3ec7abeedf1afecc5749a4e200000000000000000000068d": "aETH/wstETH", "0x49cbd67651fbabce12d1df18499896ec87bef46f00000000000000000000064a": "sDAI/3Pool", "0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659": "ezETH-WETH-BPT", + "0x5f1f4e50ba51d723f12385a8a9606afc3a0555f5000200000000000000000465": "50wstETH-50LDO", "0x63e0d47a6964ad1565345da9bfa66659f4983f02000000000000000000000681": "pufETH/wstETH", "0x740a691bd31c4176bcb6b8a7a40f1a723537d99d0000000000000000000006b6": "cdcETH/wstETH", "0x7761b6e0daa04e70637d81f1da7d186c205c2ade00000000000000000000065d": "rsETH / ETHx", @@ -20,16 +21,12 @@ "0x8d93b853849b9884e2bb413444ec23eb5366ee910002000000000000000006b3": "ECLP-sUSDe-GYD", "0x93d199263632a4ef4bb438f1feb99e57b4b5f0bd0000000000000000000005c2": "wstETH-WETH-BPT", "0x9f9d900462492d4c21e9523ca95a7cd86142f298000200000000000000000462": "50rETH-50RPL", - "0xabc7d08ef73fe3fb67efd900f4471cca788b089900000000000000000000069d": "B-baoETH-rETH-BPT", - "0xb08885e6026bab4333a80024ec25a1a3e1ff2b8a000200000000000000000445": "B-staFiETH-WETH-Stable", "0xb3b675a9a3cb0df8f66caf08549371bfb76a9867000200000000000000000611": "ECLP-mevETH-wETH", "0xb819feef8f0fcdc268afe14162983a69f6bf179e000000000000000000000689": "sUSDe/USDC", "0xb91159aa527d4769cb9faf3e4adb760c7e8c8ea700000000000000000000067c": "ETHx/wstETH", - "0xdb1f2e1655477d08fb0992f82eede0053b8cd3820000000000000000000006ae": "shezETH/wstETH", "0xdd59f89b5b07b7844d72996fc9d83d81acc8219600000000000000000000059e": "uniETH-WETH", "0xdfe6e7e18f6cc65fa13c8d8966013d4fda74b6ba000000000000000000000558": "ankrETH/wstETH", "0xe7e2c68d3b13d905bbb636709cf4dfd21076b9d20000000000000000000005ca": "swETH-WETH-BPT", - "0xed0df9cd16d806e8a523805e53cf0c56e6db4d1d000000000000000000000687": "ShezUSD/sDAI", "0xf01b0684c98cd7ada480bfdf6e43876422fa1fc10002000000000000000005de": "ECLP-wstETH-wETH", "0xf7a826d47c8e02835d94fb0aa40f0cc9505cb1340002000000000000000005e0": "ECLP-wstETH-cbETH", "0xf16aee6a71af1a9bc8f56975a4c2705ca7a782bc0002000000000000000004bb": "20WETH-80ALCX", @@ -45,25 +42,24 @@ }, "arbitrum": { "0x125bc5a031b2db6733bfa35d914ffa428095978b000200000000000000000514": "ECLP-AUSDC-AUSDT", + "0x14abd18d1fa335e9f630a658a2799b33208763fa00020000000000000000051f": "2CLP-AUSDT-USDT", "0x2ce4457acac29da4736ae6f5cd9f583a6b335c270000000000000000000004dc": "sFRAX/4POOL", "0x2d6ced12420a9af5a83765a8c48be2afcd1a8feb000000000000000000000500": "cbETH/rETH/wstETH", "0x315dd595e82bdc0c194f3a38a08fde480d7e5d2100020000000000000000056a": "ECLP-wUSDM-GYD", "0x36c2f879f446c3b6533f9703745c0504f3a84885000200000000000000000591": "ECLP-sFRAX-aFRAX", "0x3fd4954a851ead144c2ff72b1f5a38ea5976bd54000000000000000000000480": "ankrETH/wstETH-BPT", + "0x451b0afd69ace11ec0ac339033d54d2543b088a80000000000000000000004d5": "plsRDNT-Stable", "0x46472cba35e6800012aa9fcc7939ff07478c473e00020000000000000000056c": "ECLP-GHO-AUSDC", "0x59743f1812bb85db83e9e4ee061d124aaa64290000000000000000000000052b": "sUSDe/sFRAX", "0x69d9bc07a19caad9ae4ca40af18d5a688839a29900020000000000000000058e": "ECLP-gUSDC-AUSDC", "0x6e822c64c00393b2078f2a5bb75c575ab505b55c000200000000000000000548": "ECLP-GYD-AUSDC", - "0x71c64ac8ec1da03f8a05c3cfeb6493e6dad54a6f000200000000000000000592": "ECLP-wUSDM-USDC-rh", "0x7272163a931dac5bbe1cb5fefaf959bb65f7346f000200000000000000000549": "ECLP-GYD-AUSDT", "0x7967fa58b9501600d96bd843173b9334983ee6e600020000000000000000056e": "ECLP-wstETH-WETH", "0x7b54c44fbe6db6d97fd22b8756f89c0af16202cc00000000000000000000053c": "ETHx/wstETH", - "0x8d58755ca11d2c7273fed72aeb637e38a66c228c00000000000000000000058c": "sUSX/USDC", "0x90e6cb5249f5e1572afbf8a96d8a1ca6acffd73900000000000000000000055c": "rsETH/wETH", "0x9791d590788598535278552eecd4b211bfc790cb000000000000000000000498": "wstETH-WETH-BPT", "0xa899c63ba9ff275d6bfc83e43ee8e58ff6987584000200000000000000000594": "ECLP-rETH-wstETH", "0xb61371ab661b1acec81c699854d2f911070c059e000000000000000000000516": "ezETH/wstETH", - "0xb8cb384e65096386c1edaaf784e842c957fa3645000000000000000000000571": "inETH/wstETH", "0xc2598280bfea1fe18dfcabd21c7165c40c6859d30000000000000000000004f3": "wstETH/sfrxETH", "0xcdcef9765d369954a4a936064535710f7235110a000200000000000000000558": "ECLP-weETH-wstETH", "0xd0ec47c54ca5e20aaae4616c25c825c7f48d40690000000000000000000004ef": "rETH/wETH BPT", From 2795e31a5b4841c79a30ecd8cb1d2f6258ee6169 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 12:46:39 +0200 Subject: [PATCH 11/15] chore: add env vars to `.env` template --- .env.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.template b/.env.template index 772f70a..d1759bc 100644 --- a/.env.template +++ b/.env.template @@ -1,3 +1,5 @@ DEPLOYMENTS_REPO_ROOT_URL=./balancer-deployments ALCHEMY_KEY= INFURA_KEY= +DRPC_KEY= +GRAPH_API_KEY= From a528b9c3b55005a85453d2c9b8226193029840ff Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 14:04:35 +0200 Subject: [PATCH 12/15] chore: bump to v0.1.9 --- bal_addresses/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bal_addresses/requirements.txt b/bal_addresses/requirements.txt index 61f4e1e..baebdc4 100644 --- a/bal_addresses/requirements.txt +++ b/bal_addresses/requirements.txt @@ -1,5 +1,5 @@ pathlib>=1.0 -git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.8 +git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.9 requests pandas web3 diff --git a/setup.py b/setup.py index 4fa34e0..1c81956 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "setuptools>=42", "wheel", "pathlib>=1.0", - "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.8", + "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.9", "requests", "pandas", "web3", From dcd63965f9916a2e0f0c4fcd5f534ea6161e4884 Mon Sep 17 00:00:00 2001 From: Gosuto Inzasheru Date: Thu, 26 Sep 2024 15:55:20 +0200 Subject: [PATCH 13/15] chore: bump to latest bal tools release --- bal_addresses/requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bal_addresses/requirements.txt b/bal_addresses/requirements.txt index baebdc4..6a7b58a 100644 --- a/bal_addresses/requirements.txt +++ b/bal_addresses/requirements.txt @@ -1,5 +1,5 @@ pathlib>=1.0 -git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.9 +git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.10 requests pandas web3 diff --git a/setup.py b/setup.py index 1c81956..306e4fb 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ "setuptools>=42", "wheel", "pathlib>=1.0", - "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.9", + "bal_tools @ git+https://github.com/BalancerMaxis/bal_tools.git@v0.1.10", "requests", "pandas", "web3", From 311a937a0155797c6df7bf4996ec8a32f0546a8c Mon Sep 17 00:00:00 2001 From: "gosuto.eth" Date: Thu, 26 Sep 2024 07:57:04 -0600 Subject: [PATCH 14/15] Revert "Scheduled updates to Core Pools list" --- outputs/core_pools.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/outputs/core_pools.json b/outputs/core_pools.json index 531a1ee..74d6e22 100644 --- a/outputs/core_pools.json +++ b/outputs/core_pools.json @@ -13,7 +13,6 @@ "0x47a4f5440ab097cf3ec7abeedf1afecc5749a4e200000000000000000000068d": "aETH/wstETH", "0x49cbd67651fbabce12d1df18499896ec87bef46f00000000000000000000064a": "sDAI/3Pool", "0x596192bb6e41802428ac943d2f1476c1af25cc0e000000000000000000000659": "ezETH-WETH-BPT", - "0x5f1f4e50ba51d723f12385a8a9606afc3a0555f5000200000000000000000465": "50wstETH-50LDO", "0x63e0d47a6964ad1565345da9bfa66659f4983f02000000000000000000000681": "pufETH/wstETH", "0x740a691bd31c4176bcb6b8a7a40f1a723537d99d0000000000000000000006b6": "cdcETH/wstETH", "0x7761b6e0daa04e70637d81f1da7d186c205c2ade00000000000000000000065d": "rsETH / ETHx", @@ -21,12 +20,16 @@ "0x8d93b853849b9884e2bb413444ec23eb5366ee910002000000000000000006b3": "ECLP-sUSDe-GYD", "0x93d199263632a4ef4bb438f1feb99e57b4b5f0bd0000000000000000000005c2": "wstETH-WETH-BPT", "0x9f9d900462492d4c21e9523ca95a7cd86142f298000200000000000000000462": "50rETH-50RPL", + "0xabc7d08ef73fe3fb67efd900f4471cca788b089900000000000000000000069d": "B-baoETH-rETH-BPT", + "0xb08885e6026bab4333a80024ec25a1a3e1ff2b8a000200000000000000000445": "B-staFiETH-WETH-Stable", "0xb3b675a9a3cb0df8f66caf08549371bfb76a9867000200000000000000000611": "ECLP-mevETH-wETH", "0xb819feef8f0fcdc268afe14162983a69f6bf179e000000000000000000000689": "sUSDe/USDC", "0xb91159aa527d4769cb9faf3e4adb760c7e8c8ea700000000000000000000067c": "ETHx/wstETH", + "0xdb1f2e1655477d08fb0992f82eede0053b8cd3820000000000000000000006ae": "shezETH/wstETH", "0xdd59f89b5b07b7844d72996fc9d83d81acc8219600000000000000000000059e": "uniETH-WETH", "0xdfe6e7e18f6cc65fa13c8d8966013d4fda74b6ba000000000000000000000558": "ankrETH/wstETH", "0xe7e2c68d3b13d905bbb636709cf4dfd21076b9d20000000000000000000005ca": "swETH-WETH-BPT", + "0xed0df9cd16d806e8a523805e53cf0c56e6db4d1d000000000000000000000687": "ShezUSD/sDAI", "0xf01b0684c98cd7ada480bfdf6e43876422fa1fc10002000000000000000005de": "ECLP-wstETH-wETH", "0xf7a826d47c8e02835d94fb0aa40f0cc9505cb1340002000000000000000005e0": "ECLP-wstETH-cbETH", "0xf16aee6a71af1a9bc8f56975a4c2705ca7a782bc0002000000000000000004bb": "20WETH-80ALCX", @@ -42,24 +45,25 @@ }, "arbitrum": { "0x125bc5a031b2db6733bfa35d914ffa428095978b000200000000000000000514": "ECLP-AUSDC-AUSDT", - "0x14abd18d1fa335e9f630a658a2799b33208763fa00020000000000000000051f": "2CLP-AUSDT-USDT", "0x2ce4457acac29da4736ae6f5cd9f583a6b335c270000000000000000000004dc": "sFRAX/4POOL", "0x2d6ced12420a9af5a83765a8c48be2afcd1a8feb000000000000000000000500": "cbETH/rETH/wstETH", "0x315dd595e82bdc0c194f3a38a08fde480d7e5d2100020000000000000000056a": "ECLP-wUSDM-GYD", "0x36c2f879f446c3b6533f9703745c0504f3a84885000200000000000000000591": "ECLP-sFRAX-aFRAX", "0x3fd4954a851ead144c2ff72b1f5a38ea5976bd54000000000000000000000480": "ankrETH/wstETH-BPT", - "0x451b0afd69ace11ec0ac339033d54d2543b088a80000000000000000000004d5": "plsRDNT-Stable", "0x46472cba35e6800012aa9fcc7939ff07478c473e00020000000000000000056c": "ECLP-GHO-AUSDC", "0x59743f1812bb85db83e9e4ee061d124aaa64290000000000000000000000052b": "sUSDe/sFRAX", "0x69d9bc07a19caad9ae4ca40af18d5a688839a29900020000000000000000058e": "ECLP-gUSDC-AUSDC", "0x6e822c64c00393b2078f2a5bb75c575ab505b55c000200000000000000000548": "ECLP-GYD-AUSDC", + "0x71c64ac8ec1da03f8a05c3cfeb6493e6dad54a6f000200000000000000000592": "ECLP-wUSDM-USDC-rh", "0x7272163a931dac5bbe1cb5fefaf959bb65f7346f000200000000000000000549": "ECLP-GYD-AUSDT", "0x7967fa58b9501600d96bd843173b9334983ee6e600020000000000000000056e": "ECLP-wstETH-WETH", "0x7b54c44fbe6db6d97fd22b8756f89c0af16202cc00000000000000000000053c": "ETHx/wstETH", + "0x8d58755ca11d2c7273fed72aeb637e38a66c228c00000000000000000000058c": "sUSX/USDC", "0x90e6cb5249f5e1572afbf8a96d8a1ca6acffd73900000000000000000000055c": "rsETH/wETH", "0x9791d590788598535278552eecd4b211bfc790cb000000000000000000000498": "wstETH-WETH-BPT", "0xa899c63ba9ff275d6bfc83e43ee8e58ff6987584000200000000000000000594": "ECLP-rETH-wstETH", "0xb61371ab661b1acec81c699854d2f911070c059e000000000000000000000516": "ezETH/wstETH", + "0xb8cb384e65096386c1edaaf784e842c957fa3645000000000000000000000571": "inETH/wstETH", "0xc2598280bfea1fe18dfcabd21c7165c40c6859d30000000000000000000004f3": "wstETH/sfrxETH", "0xcdcef9765d369954a4a936064535710f7235110a000200000000000000000558": "ECLP-weETH-wstETH", "0xd0ec47c54ca5e20aaae4616c25c825c7f48d40690000000000000000000004ef": "rETH/wETH BPT", From d30fe6c819129496caed396406d62af1d4267db2 Mon Sep 17 00:00:00 2001 From: Zen-Maxi <85650601+Zen-Maxi@users.noreply.github.com> Date: Thu, 26 Sep 2024 09:57:16 -0400 Subject: [PATCH 15/15] Update to new Safe stakewise 0x5d1acdd0867d6F1FBe11ad8F1f48C87f19C0801E --- extras/gnosis.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/gnosis.json b/extras/gnosis.json index 304d240..3432e4d 100644 --- a/extras/gnosis.json +++ b/extras/gnosis.json @@ -26,6 +26,6 @@ } }, "stakewise": { - "SWISE_Distributor_EOA": "0x2685C0e39EEAAd383fB71ec3F493991d532A87ae" + "SWISE_Distributor_SAFE": "0x5d1acdd0867d6F1FBe11ad8F1f48C87f19C0801E" } }