From 2159e095deecaf5fafc2f5dbc335c8abf60097e9 Mon Sep 17 00:00:00 2001 From: bout3fiddy <11488427+bout3fiddy@users.noreply.github.com> Date: Mon, 25 Mar 2024 11:34:07 +0100 Subject: [PATCH] deployment in progress ... --- contracts/main/CurveStableSwapNGViews.vy | 2 +- contracts/main/MetaZapNG.vy | 1 + scripts/deploy_infra.py | 84 ++++++++++++++++-------- 3 files changed, 59 insertions(+), 28 deletions(-) diff --git a/contracts/main/CurveStableSwapNGViews.vy b/contracts/main/CurveStableSwapNGViews.vy index c49e7270..6bab1b8a 100644 --- a/contracts/main/CurveStableSwapNGViews.vy +++ b/contracts/main/CurveStableSwapNGViews.vy @@ -1,5 +1,5 @@ # pragma version 0.3.10 -# pragma evm-version shanghai +# pragma evm-version paris """ @title CurveStableSwapNGViews @author Curve.Fi diff --git a/contracts/main/MetaZapNG.vy b/contracts/main/MetaZapNG.vy index f3202b78..6bf60d4c 100644 --- a/contracts/main/MetaZapNG.vy +++ b/contracts/main/MetaZapNG.vy @@ -1,4 +1,5 @@ # pragma version 0.3.10 +# pragma evm-version paris """ @title MetaZapNG @author Curve.Fi diff --git a/scripts/deploy_infra.py b/scripts/deploy_infra.py index 419ec5cf..613dcd05 100644 --- a/scripts/deploy_infra.py +++ b/scripts/deploy_infra.py @@ -14,7 +14,8 @@ # Ethereum "ethereum:mainnet": { "math": "0xc9CBC565A9F4120a2740ec6f64CC24AeB2bB3E5E", - "views": "0xe0B15824862f3222fdFeD99FeBD0f7e0EC26E1FA", + # "views_old": "0xe0B15824862f3222fdFeD99FeBD0f7e0EC26E1FA", + "views": "0x13526206545e2DC7CcfBaF28dC88F440ce7AD3e0", "plain_amm": "0xDCc91f930b42619377C200BA05b7513f2958b202", "meta_amm": "0xede71F77d7c900dCA5892720E76316C6E575F0F7", "factory": "0x6A8cbed756804B16E05E741eDaBd5cB544AE21bf", @@ -23,7 +24,8 @@ }, "ethereum:sepolia": { "math": "0x2cad7b3e78e10bcbf2cc443ddd69ca8bcc09a758", - "views": "0x9d3975070768580f755D405527862ee126d0eA08", + # "views": "0x9d3975070768580f755D405527862ee126d0eA08", + "views": "", "plain_amm": "0xE12374F193f91f71CE40D53E0db102eBaA9098D5", "meta_amm": "0xB00E89EaBD59cD3254c88E390103Cf17E914f678", "factory": "0xfb37b8D939FFa77114005e61CFc2e543d6F49A81", @@ -32,7 +34,8 @@ # Layer 2 "arbitrum:mainnet": { "math": "0xD4a8bd4d59d65869E99f20b642023a5015619B34", - "views": "0x9293f068912bae932843a1bA01806c54f416019D", + # "views_old": "0x9293f068912bae932843a1bA01806c54f416019D", + "views": "0xDD7EBB1C49780519dD9755B8B1A23a6f42CE099E", "plain_amm": "0xf6841C27fe35ED7069189aFD5b81513578AFD7FF", "meta_amm": "0xFf02cBD91F57A778Bab7218DA562594a680B8B61", "factory": "0x9AF14D26075f142eb3F292D5065EB3faa646167b", @@ -40,7 +43,8 @@ }, "optimism:mainnet": { "math": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", - "views": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", + # "views_old": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", + "views": "0xf6841C27fe35ED7069189aFD5b81513578AFD7FF", "plain_amm": "0x635742dCC8313DCf8c904206037d962c042EAfBd", "meta_amm": "0x5702BDB1Ec244704E3cBBaAE11a0275aE5b07499", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", @@ -48,7 +52,8 @@ }, "base:mainnet": { "math": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", - "views": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", + # "views_old": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", + "views": "0xC1b393EfEF38140662b91441C6710Aa704973228", "plain_amm": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", "meta_amm": "0x635742dCC8313DCf8c904206037d962c042EAfBd", "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712", @@ -56,7 +61,8 @@ }, "linea:mainnet": { "math": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", - "views": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + # "views_old": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + "views": "0x3E3B5F27bbf5CC967E074b70E9f4046e31663181", "plain_amm": "0xa7b9d886a9a374a1c86dc52d2ba585c5cdfdac26", "meta_amm": "0xf3a6aa40cf048a3960e9664847e9a7be025a390a", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", @@ -64,7 +70,8 @@ }, "scroll:mainnet": { "math": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", - "views": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + # "views_old": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + "views": "0x20D1c021525C85D9617Ccc64D8f547d5f730118A", "plain_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "meta_amm": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", @@ -72,7 +79,8 @@ }, "pzkevm:mainnet": { "math": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", - "views": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", + # "views": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", + "views": "", "plain_amm": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", "meta_amm": "0x635742dCC8313DCf8c904206037d962c042EAfBd", "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712", @@ -81,7 +89,8 @@ # Layer 1 "gnosis:mainnet": { "math": "0xFAbC421e3368D158d802684A217a83c083c94CeB", - "views": "0x0c59d36b23f809f8b6C7cb4c8C590a0AC103baEf", + # "views_old": "0x0c59d36b23f809f8b6C7cb4c8C590a0AC103baEf", + "views": "0x33e72383472f77B0C6d8F791D1613C75aE2C5915", "plain_amm": "0x3d6cb2f6dcf47cdd9c13e4e3beae9af041d8796a", "meta_amm": "0xC1b393EfEF38140662b91441C6710Aa704973228", "factory": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", @@ -89,7 +98,8 @@ }, "polygon:mainnet": { "math": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", - "views": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + # "views_old": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + "views": "0x20D1c021525C85D9617Ccc64D8f547d5f730118A", "plain_amm": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", "meta_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", @@ -97,7 +107,8 @@ }, "avax:mainnet": { "math": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", - "views": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + # "views_old": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + "views": "0x8F7632122125699da7E22d465fa16EdE4f687Fa4", "plain_amm": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", "meta_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", @@ -105,7 +116,8 @@ }, "ftm:mainnet": { "math": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", - "views": "0x635742dCC8313DCf8c904206037d962c042EAfBd", + # "views_old": "0x635742dCC8313DCf8c904206037d962c042EAfBd", + "views": "0x6A8cbed756804B16E05E741eDaBd5cB544AE21bf", "plain_amm": "0x5702BDB1Ec244704E3cBBaAE11a0275aE5b07499", "meta_amm": "0x046207cB759F527b6c10C2D61DBaca45513685CC", "factory": "0xe61Fb97Ef6eBFBa12B36Ffd7be785c1F5A2DE66b", @@ -113,7 +125,8 @@ }, "bsc:mainnet": { "math": "0x166c4084Ad2434E8F2425C64dabFE6875A0D45c5", - "views": "0x5Ea9DD3b6f042A34Df818C6c1324BC5A7c61427a", + # "views_old": "0x5Ea9DD3b6f042A34Df818C6c1324BC5A7c61427a", + "views": "0xFf02cBD91F57A778Bab7218DA562594a680B8B61", "plain_amm": "0x505d666E4DD174DcDD7FA090ed95554486d2Be44", "meta_amm": "0x5a8C93EE12a8Df4455BA111647AdA41f29D5CfcC", "factory": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", @@ -121,7 +134,8 @@ }, "celo:mainnet": { "math": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", - "views": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + # "views_old": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + "views": "0x8F7632122125699da7E22d465fa16EdE4f687Fa4", "plain_amm": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", "meta_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", @@ -129,7 +143,8 @@ }, "kava:mainnet": { "math": "0xd7E72f3615aa65b92A4DBdC211E296a35512988B", - "views": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + # "views_old": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", + "views": "0x20D1c021525C85D9617Ccc64D8f547d5f730118A", "plain_amm": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", "meta_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "factory": "0x1764ee18e8B3ccA4787249Ceb249356192594585", @@ -137,7 +152,8 @@ }, "aurora:mainnet": { "math": "0xbC0797015fcFc47d9C1856639CaE50D0e69FbEE8", - "views": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + # "views_old": "0xe265FC390E9129b7E337Da23cD42E00C34Da2CE3", + "views": "0x20D1c021525C85D9617Ccc64D8f547d5f730118A", "plain_amm": "0xa7b9d886A9a374A1C86DC52d2BA585c5CDFdac26", "meta_amm": "0xf3A6aa40cf048a3960E9664847E9a7be025a390a", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", @@ -145,7 +161,8 @@ }, "fraxtal:mainnet": { "math": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", - "views": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + # "views_old": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", + "views": "0xFAbC421e3368D158d802684A217a83c083c94CeB", "plain_amm": "0x1764ee18e8B3ccA4787249Ceb249356192594585", "meta_amm": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", "factory": "0xd2002373543Ce3527023C75e7518C274A51ce712", @@ -153,7 +170,8 @@ }, "mantle:mainnet": { "math": "0x8b3EFBEfa6eD222077455d6f0DCdA3bF4f3F57A6", - "views": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + # "views_old": "0x506F594ceb4E33F5161139bAe3Ee911014df9f7f", + "views": "0x166c4084Ad2434E8F2425C64dabFE6875A0D45c5", "plain_amm": "0x87FE17697D0f14A222e8bEf386a0860eCffDD617", "meta_amm": "0x1764ee18e8B3ccA4787249Ceb249356192594585", "factory": "0x5eeE3091f747E60a045a2E715a4c71e600e31F6E", @@ -228,7 +246,6 @@ def deploy_infra(network, url, account, fork=False): views_contract_obj = set_evm_version("./contracts/main/CurveStableSwapNGViews.vy", network) plain_contract_obj = set_evm_version("./contracts/main/CurveStableSwapNG.vy", network) meta_contract_obj = set_evm_version("./contracts/main/CurveStableSwapMetaNG.vy", network) - zap_contract_obj = set_evm_version("./contracts/main/MetaZapNG.vy", network) # deploy non-blueprint contracts: math_contract = check_and_deploy(math_contract_obj, "math", network) @@ -244,22 +261,31 @@ def deploy_infra(network, url, account, fork=False): factory = check_and_deploy(factory_contract_obj, "factory", network, False, args) # zap: - check_and_deploy(zap_contract_obj, "zap", network) + # zap_contract_obj = set_evm_version("./contracts/main/MetaZapNG.vy", network) + # check_and_deploy(zap_contract_obj, "zap", network) - # Set up AMM implementations: - if not factory.views_implementation() == views_contract.address: + # Set up AMM implementations:รท + current_views_impl = factory.views_implementation() + if not current_views_impl == views_contract.address: + logger.log(f"Current views implementation: {current_views_impl}") factory.set_views_implementation(views_contract.address) logger.log(f"Set views implementation to: {views_contract.address}") - if not factory.math_implementation() == math_contract.address: + current_math_impl = factory.math_implementation() + if not current_math_impl == math_contract.address: + logger.log(f"Current math implementation: {current_math_impl}") factory.set_math_implementation(math_contract.address) logger.log(f"Set math implementation to: {math_contract.address}") - if not factory.pool_implementations(0) == plain_blueprint.address: + current_pool_impl = factory.pool_implementations(0) + if not current_pool_impl == plain_blueprint.address: + logger.log(f"Curent 'plain' pool impl at index 0: {current_pool_impl}") factory.set_pool_implementations(0, plain_blueprint.address) - logger.log(f"Set plain amm implementation to: {plain_blueprint.address}") + logger.log(f"Set plain amm implementation at index 0 to: {plain_blueprint.address}") - if not factory.metapool_implementations(0) == meta_blueprint.address: + current_metapool_impl = factory.metapool_implementations(0) + if not current_metapool_impl == meta_blueprint.address: + logger.log(f"Current metapool impl at index 0: {current_metapool_impl}") factory.set_metapool_implementations(0, meta_blueprint.address) logger.log(f"Set meta amm implementation to: {meta_blueprint.address}") @@ -276,7 +302,11 @@ def deploy_infra(network, url, account, fork=False): def main(): - deploy_infra(":mainnet", os.environ["RPC_"], "", fork=False) + deployer = "FIDDYDEPLOYER" + fork = False + network = "pzkevm" + rpc = f"https://lb.drpc.org/ogrpc?network=polygon-zkevm&dkey={os.environ['drpc_key']}" + deploy_infra(f"{network}:mainnet", rpc, deployer, fork=fork) if __name__ == "__main__":