From eb1b6417fc628eaf56a736bb6705007a08b38a84 Mon Sep 17 00:00:00 2001 From: bout3fiddy <11488427+bout3fiddy@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:54:35 +0200 Subject: [PATCH] awaiting boa static fee integration --- scripts/deploy_infra.py | 212 ++++++++++------------------------ scripts/deploy_proxy_admin.py | 4 +- scripts/deployment_utils.py | 59 +++++----- 3 files changed, 95 insertions(+), 180 deletions(-) diff --git a/scripts/deploy_infra.py b/scripts/deploy_infra.py index b9d796ef..84baa337 100644 --- a/scripts/deploy_infra.py +++ b/scripts/deploy_infra.py @@ -11,6 +11,7 @@ logger = RichConsole(file=sys.stdout) deployments = { + # Ethereum "ethereum:sepolia": { "math": "0xbc7654d2dd901aaaa3be4cb5bc0f10dea9f96443", "views": "0x07920e98a66e462c2aa4c8fa6200bc68ca161ea0", @@ -19,13 +20,15 @@ "gauge": "0x64891ab20392a029c0f231656ff13c5ee64b730c", "factory": "0xfb37b8D939FFa77114005e61CFc2e543d6F49A81", }, - "gnosis:mainnet": { - "math": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", - "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", - "plain_amm": "0xd2002373543Ce3527023C75e7518C274A51ce712", - "meta_amm": "0xd3B17f862956464ae4403cCF829CE69199856e1e", - "factory": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + "ethereum:mainnet": { + "math": "", + "views": "", + "plain_amm": "", + "meta_amm": "", + "gauge": "", + "factory": "", }, + # Layer 2 "arbitrum:mainnet": { "math": "0x3d6cB2F6DcF47CDd9C13E4e3beAe9af041d8796a", "views": "0xC1b393EfEF38140662b91441C6710Aa704973228", @@ -40,13 +43,6 @@ "meta_amm": "0x1764ee18e8B3ccA4787249Ceb249356192594585", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", }, - "polygon:mainnet": { - "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", - "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", - "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", - "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", - }, "base:mainnet": { "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", "views": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", @@ -54,41 +50,63 @@ "meta_amm": "0x5eee3091f747e60a045a2e715a4c71e600e31f6e", "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712", }, - "avax:mainnet": { - "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", - "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", - "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", - "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", - }, - "ftm:mainnet": { + "linea:mainnet": { "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", - "plain_amm": "0xd2002373543Ce3527023C75e7518C274A51ce712", - "meta_amm": "0x686bdb3D24Bc6F3ED89ed3d3B659765c54aC78B4", - "factory": "0xe61Fb97Ef6eBFBa12B36Ffd7be785c1F5A2DE66b", + "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + "plain_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "meta_amm": "0x1764ee18e8b3cca4787249ceb249356192594585", + "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", }, - "kava:mainnet": { + "scroll:mainnet": { "math": "", "views": "", "plain_amm": "", "meta_amm": "", "factory": "", }, - "celo:mainnet": { - "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", - "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", - "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", - "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", + "zksync:mainnet": { + "math": "", + "views": "", + "plain_amm": "", + "meta_amm": "", + "factory": "", }, - "aurora:mainnet": { + "pzkevm:mainnet": { "math": "", "views": "", "plain_amm": "", "meta_amm": "", "factory": "", }, + # Layer 1 + "gnosis:mainnet": { + "math": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", + "plain_amm": "0xd2002373543Ce3527023C75e7518C274A51ce712", + "meta_amm": "0xd3B17f862956464ae4403cCF829CE69199856e1e", + "factory": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + }, + "polygon:mainnet": { + "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", + "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", + "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", + }, + "avax:mainnet": { + "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", + "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", + "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", + }, + "ftm:mainnet": { + "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", + "views": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", + "plain_amm": "0xd2002373543Ce3527023C75e7518C274A51ce712", + "meta_amm": "0x686bdb3D24Bc6F3ED89ed3d3B659765c54aC78B4", + "factory": "0xe61Fb97Ef6eBFBa12B36Ffd7be785c1F5A2DE66b", + }, "bsc:mainnet": { "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", "views": "0x1764ee18e8B3ccA4787249Ceb249356192594585", @@ -96,28 +114,28 @@ "meta_amm": "0x06452f9c013fc37169B57Eab8F50A7A48c9198A3", "factory": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", }, - "linea:mainnet": { - "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", - "plain_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", - "meta_amm": "0x1764ee18e8b3cca4787249ceb249356192594585", - "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", + "celo:mainnet": { + "math": "0xf3A431008396df8A8b2DF492C913706BDB0874ef", + "views": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", + "plain_amm": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + "meta_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", }, - "scroll:mainnet": { + "kava:mainnet": { "math": "", "views": "", "plain_amm": "", "meta_amm": "", "factory": "", }, - "zksync:mainnet": { + "aurora:mainnet": { "math": "", "views": "", "plain_amm": "", "meta_amm": "", "factory": "", }, - "pzkevm:mainnet": { + "tron:mainnet": { "math": "", "views": "", "plain_amm": "", @@ -241,118 +259,14 @@ def deploy_infra(network, url, account, fork=False): def main(): - # # gnosis - # deploy_infra( - # "gnosis:mainnet", - # os.environ["RPC_GNOSIS"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # ethereum sepolia - # deploy_infra( - # "ethereum:sepolia", - # os.environ["RPC_ETHEREUM_SEPOLIA"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # arbitrum - # deploy_infra( - # "arbitrum:mainnet", - # os.environ["RPC_ARBITRUM"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # optimism - # deploy_infra( - # "optimism:mainnet", - # os.environ["RPC_OPTIMISM"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # polygon - # deploy_infra( - # "polygon:mainnet", - # os.environ["RPC_POLYGON"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # base - # deploy_infra( - # "base:mainnet", - # os.environ["RPC_BASE"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # avax - # deploy_infra( - # "avax:mainnet", - # os.environ["RPC_AVAX"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # fantom - # deploy_infra( - # "ftm:mainnet", - # os.environ["RPC_FANTOM"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # kava - # deploy_infra( - # "kava:mainnet", - # os.environ["RPC_KAVA"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # celo - # deploy_infra( - # "celo:mainnet", - # os.environ["RPC_CELO"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # aurora - # deploy_infra( - # "aurora:mainnet", - # os.environ["RPC_AURORA"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # bsc - # deploy_infra( - # "bsc:mainnet", - # os.environ["RPC_BSC"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - - # # linea + # eth deploy_infra( - "linea:mainnet", - os.environ["RPC_LINEA"], + "ethereum:mainnet", + os.environ["RPC_ETHEREUM"], "FIDDYDEPLOYER", fork=False, ) - # # eth - # deploy_infra( - # "ethereum:mainnet", - # os.environ["RPC_ETHEREUM"], - # "FIDDYDEPLOYER", - # fork=False, - # ) - if __name__ == "__main__": main() diff --git a/scripts/deploy_proxy_admin.py b/scripts/deploy_proxy_admin.py index 631908df..69263731 100644 --- a/scripts/deploy_proxy_admin.py +++ b/scripts/deploy_proxy_admin.py @@ -35,8 +35,8 @@ def deploy_proxy_admin(network, url, account, fork=False): def main(): deploy_proxy_admin( - "linea:mainnet", - os.environ["RPC_LINEA"], + "pzkevm:mainnet", + os.environ["RPC_PZKEVM"], "FIDDYDEPLOYER", fork=False, ) diff --git a/scripts/deployment_utils.py b/scripts/deployment_utils.py index 7d709d3c..d7eb5e90 100644 --- a/scripts/deployment_utils.py +++ b/scripts/deployment_utils.py @@ -69,22 +69,18 @@ class CurveNetworkSettings: curve_dao_network_settings = { - "ethereum:mainnet": CurveNetworkSettings( - dao_ownership_contract="0x40907540d8a6C65c637785e8f8B742ae6b0b9968", - fee_receiver_address="0xeCb456EA5365865EbAb8a2661B0c503410e9B347", - metaregistry_address="0xF98B45FA17DE75FB1aD0e7aFD971b0ca00e379fC", - base_pool_registry_address="0xDE3eAD9B2145bBA2EB74007e58ED07308716B725", + # Ethereum + "ethereum:sepolia": CurveNetworkSettings( + dao_ownership_contract="0xE6DA683076b7eD6ce7eC972f21Eb8F91e9137a17", + fee_receiver_address="0xE6DA683076b7eD6ce7eC972f21Eb8F91e9137a17", ), - "ethereum:mainnet-fork": CurveNetworkSettings( + "ethereum:mainnet": CurveNetworkSettings( dao_ownership_contract="0x40907540d8a6C65c637785e8f8B742ae6b0b9968", fee_receiver_address="0xeCb456EA5365865EbAb8a2661B0c503410e9B347", metaregistry_address="0xF98B45FA17DE75FB1aD0e7aFD971b0ca00e379fC", base_pool_registry_address="0xDE3eAD9B2145bBA2EB74007e58ED07308716B725", ), - "ethereum:sepolia": CurveNetworkSettings( - dao_ownership_contract="0xE6DA683076b7eD6ce7eC972f21Eb8F91e9137a17", - fee_receiver_address="0xE6DA683076b7eD6ce7eC972f21Eb8F91e9137a17", - ), + # Layer 2 "arbitrum:mainnet": CurveNetworkSettings( dao_ownership_contract="0xb055ebbacc8eefc166c169e9ce2886d0406ab49b", # proxy fee_receiver_address="0xd4f94d0aaa640bbb72b5eec2d85f6d114d81a88e", @@ -93,14 +89,31 @@ class CurveNetworkSettings: dao_ownership_contract="0xB055EbbAcc8Eefc166c169e9Ce2886D0406aB49b", # proxy fee_receiver_address="0xbF7E49483881C76487b0989CD7d9A8239B20CA41", ), - "polygon:mainnet": CurveNetworkSettings( - dao_ownership_contract="0xB055EbbAcc8Eefc166c169e9Ce2886D0406aB49b", # proxy - fee_receiver_address="0x774D1Dba98cfBD1F2Bc3A1F59c494125e07C48F9", - ), "base:mainnet": CurveNetworkSettings( dao_ownership_contract="0xe8269B33E47761f552E1a3070119560d5fa8bBD6", # proxy fee_receiver_address="0xe8269B33E47761f552E1a3070119560d5fa8bBD6", # proxy ), + "linea:mainnet": CurveNetworkSettings( + dao_ownership_contract="0xf3A431008396df8A8b2DF492C913706BDB0874ef", + fee_receiver_address="0xf3A431008396df8A8b2DF492C913706BDB0874ef", + ), + "scroll:mainnet": CurveNetworkSettings( + dao_ownership_contract="", + fee_receiver_address="", + ), + "zksync:mainnet": CurveNetworkSettings( + dao_ownership_contract="", + fee_receiver_address="0x4920088D9a5e5De9c098FCA4960d0DA5f4caa4c1", + ), + "pzkevm:mainnet": CurveNetworkSettings( + dao_ownership_contract="", + fee_receiver_address="", + ), + # Layer 1 + "polygon:mainnet": CurveNetworkSettings( + dao_ownership_contract="0xB055EbbAcc8Eefc166c169e9Ce2886D0406aB49b", # proxy + fee_receiver_address="0x774D1Dba98cfBD1F2Bc3A1F59c494125e07C48F9", + ), "gnosis:mainnet": CurveNetworkSettings( dao_ownership_contract="0xB055EbbAcc8Eefc166c169e9Ce2886D0406aB49b", # proxy fee_receiver_address="0xB055EbbAcc8Eefc166c169e9Ce2886D0406aB49b", # proxy @@ -129,21 +142,9 @@ class CurveNetworkSettings: dao_ownership_contract="0x98B4029CaBEf7Fd525A36B0BF8555EC1d42ec0B6", fee_receiver_address="0x98B4029CaBEf7Fd525A36B0BF8555EC1d42ec0B6", ), - "linea:mainnet": CurveNetworkSettings( - dao_ownership_contract="0xf3A431008396df8A8b2DF492C913706BDB0874ef", - fee_receiver_address="0xf3A431008396df8A8b2DF492C913706BDB0874ef", - ), - "scroll:mainnet": CurveNetworkSettings( - dao_ownership_contract="", - fee_receiver_address="", - ), - "zksync:mainnet": CurveNetworkSettings( - dao_ownership_contract="", - fee_receiver_address="", - ), - "pzkevm:mainnet": CurveNetworkSettings( - dao_ownership_contract="", - fee_receiver_address="", + "tron:mainnet": CurveNetworkSettings( + dao_ownership_contract="0x98B4029CaBEf7Fd525A36B0BF8555EC1d42ec0B6", + fee_receiver_address="0x98B4029CaBEf7Fd525A36B0BF8555EC1d42ec0B6", ), }