From 224f4b00c7b17b479d647416cd8a918ffc72be6c Mon Sep 17 00:00:00 2001 From: Artyom Veremeenko Date: Sat, 8 Jun 2024 18:56:56 +0300 Subject: [PATCH 1/4] feat: addresses for 2nd Mellow-related contracts deployment --- config_samples/mellow/common_config.json | 20 ++++++++-------- config_samples/mellow/mevcap_config.json | 8 +++---- config_samples/mellow/mevcap_oz_config.json | 5 ++-- config_samples/mellow/p2p_config.json | 23 +++++++++++++++++++ config_samples/mellow/p2p_oz_config.json | 22 ++++++++++++++++++ config_samples/mellow/re7_config.json | 8 +++---- config_samples/mellow/re7_oz_config.json | 5 ++-- config_samples/mellow/steakhouse_config.json | 8 +++---- .../mellow/steakhouse_oz_config.json | 5 ++-- config_samples/mellow/symbioticfi_config.json | 2 +- .../mellow/symbioticifi_oz_config.json | 2 +- 11 files changed, 75 insertions(+), 33 deletions(-) create mode 100644 config_samples/mellow/p2p_config.json create mode 100644 config_samples/mellow/p2p_oz_config.json diff --git a/config_samples/mellow/common_config.json b/config_samples/mellow/common_config.json index 2991db9..801a0f1 100644 --- a/config_samples/mellow/common_config.json +++ b/config_samples/mellow/common_config.json @@ -1,15 +1,15 @@ { "contracts": { - "0x0c3E4E9Ab10DfB52c52171F66eb5C7E05708F77F": "Vault", - "0x8f06BEB555D57F0D20dB817FF138671451084e24": "Initializer", - "0xCA60f449867c9101Ec80F8C611eaB39afE7bD638": "ERC20TvlModule", - "0x48f758bd51555765EBeD4FD01c85554bD0B3c03B": "DefaultBondTvlModule", - "0x204043f4bda61F719Ad232b4196E1bc4131a3096": "DefaultBondModule", - "0x1437DCcA4e1442f20285Fb7C11805E7a965681e2": "ManagedRatiosOracle", - "0xA5046e9379B168AFA154504Cf16853B6a7728436": "ChainlinkOracle", - "0x3C1418499aa69A08DfBCed4243BBA7EB90dE3D09": "ConstantAggregatorV3", - "0x773ae8ca45D5701131CA84C58821a39DdAdC709c": "WStethRatiosAggregatorV3", - "0x538459eeA06A06018C70bf9794e1c7b298694828": "DefaultProxyImplementation" + "0xaf108ae0AD8700ac41346aCb620e828c03BB8848": "Vault", + "0x1EB0e946D7d757d7b085b779a146427e40ABBCf8": "ERC20TvlModule", + "0x39c62c6308bed7b0832cafc2bea0c0edc7f2060c": "Initializer", + "0x1E1d1eD64e4F5119F60BF38B322Da7ea5A395429": "DefaultBondTvlModule", + "0xD8619769fed318714d362BfF01CA98ac938Bdf9b": "DefaultBondModule", + "0x955Ff4Cc738cDC009d2903196d1c94C8Cfb4D55d": "ManagedRatiosOracle", + "0x1Dc89c28e59d142688D65Bd7b22C4Fd40C2cC06d": "ChainlinkOracle", + "0x6A8d8033de46c68956CCeBA28Ba1766437FF840F": "ConstantAggregatorV3", + "0x94336dF517036f2Bf5c620a1BC75a73A37b7bb16": "WStethRatiosAggregatorV3", + "0x02BB349832c58E892a20178b9696e2b93A3a9b0f": "DefaultProxyImplementation" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/mevcap_config.json b/config_samples/mellow/mevcap_config.json index aaed6fd..b298dac 100644 --- a/config_samples/mellow/mevcap_config.json +++ b/config_samples/mellow/mevcap_config.json @@ -1,9 +1,9 @@ { "contracts": { - "0x63B844b3b0E6774403812652A0c4f65f9Dd8CdEc": "VaultConfigurator", - "0x819ed5ff31bAc8388C32182115517da660Cd7049": "ManagedValidator", - "0xEA872051b66C72136d07b8c53ed03539fCB6C3d6": "DefaultBondStrategy", - "0x33757bE32998e524bbA895F2eA53D2e3Dc65cdf0": "DepositWrapper" + "0x2dEc4fDC225C1f71161Ea481E23D66fEaAAE2391": "VaultConfigurator", + "0xD2635fa0635126bAfdD430b9614c0280d37a76CA": "ManagedValidator", + "0xc3A149b5Ca3f4A5F17F5d865c14AA9DBb570F10A": "DefaultBondStrategy", + "0xdC1741f9bD33DD791942CC9435A90B0983DE8665": "DepositWrapper" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/mevcap_oz_config.json b/config_samples/mellow/mevcap_oz_config.json index ce5c6b9..3f8d6be 100644 --- a/config_samples/mellow/mevcap_oz_config.json +++ b/config_samples/mellow/mevcap_oz_config.json @@ -1,8 +1,7 @@ { "contracts": { - "0xbF0311DF31aF8b027A12051c00d02aA85A322594": "TransparentUpgradeableProxy", - "0x219e27E646db8a51348e6c87d2814d715664CE3c": "TimelockController", - "0xad09f49e43237f02ad8b037805243ffb635da796": "ProxyAdmin" + "0x5fD13359Ba15A84B76f7F87568309040176167cd": "TransparentUpgradeableProxy", + "0xc24891B75ef55fedC377c5e6Ec59A850b12E23ac": "ProxyAdmin" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/p2p_config.json b/config_samples/mellow/p2p_config.json new file mode 100644 index 0000000..c535715 --- /dev/null +++ b/config_samples/mellow/p2p_config.json @@ -0,0 +1,23 @@ +{ + "contracts": { + "0x84b240E99d4C473b5E3dF1256300E2871412dDfe": "VaultConfigurator", + "0x6AB116ac709c89D90Cc1F8cD0323617A9996bA7c": "ManagedValidator", + "0xA0ea6d4fe369104eD4cc18951B95C3a43573C0F6": "DefaultBondStrategy", + "0x41A1FBEa7Ace3C3a6B66a73e96E5ED07CDB2A34d": "DepositWrapper" + }, + "explorer_hostname": "api.etherscan.io", + "explorer_token_env_var": "ETHERSCAN_TOKEN", + "github_repo": { + "url": "https://github.com/mellow-finance/mellow-lrt", + "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "relative_root": "" + }, + "dependencies": { + "lib/openzeppelin-contracts/contracts": { + "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", + "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", + "relative_root": "contracts", + "//": "version 5.0.2" + } + } +} diff --git a/config_samples/mellow/p2p_oz_config.json b/config_samples/mellow/p2p_oz_config.json new file mode 100644 index 0000000..485177f --- /dev/null +++ b/config_samples/mellow/p2p_oz_config.json @@ -0,0 +1,22 @@ +{ + "contracts": { + "0x7a4EffD87C2f3C55CA251080b1343b605f327E3a": "TransparentUpgradeableProxy", + "0x17AC6A90eD880F9cE54bB63DAb071F2BD3FE3772": "ProxyAdmin" + }, + "explorer_hostname": "api.etherscan.io", + "explorer_token_env_var": "ETHERSCAN_TOKEN", + "github_repo": { + "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", + "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", + "relative_root": "contracts", + "//": "version 5.0.2" + }, + "dependencies": { + "src/tmp/oz": { + "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", + "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", + "relative_root": "contracts", + "//": "version 5.0.2" + } + } +} diff --git a/config_samples/mellow/re7_config.json b/config_samples/mellow/re7_config.json index f32ab85..11c7438 100644 --- a/config_samples/mellow/re7_config.json +++ b/config_samples/mellow/re7_config.json @@ -1,9 +1,9 @@ { "contracts": { - "0x3492407B9b8e0619d4fF423265F1cA5BE5198dd8": "VaultConfigurator", - "0xa064e9D2599b7029Bb5d4896812D339ac1aAa111": "ManagedValidator", - "0x6c4Aa164e733292586Fd09b92d86f3e5fa8E0772": "DefaultBondStrategy", - "0x9d9d932Ff608F505EAd156E79C87A98Eb0527A1c": "DepositWrapper" + "0x214d66d110060dA2848038CA0F7573486363cAe4": "VaultConfigurator", + "0x0483B89F632596B24426703E540e373083928a6A": "ManagedValidator", + "0xcE3A8820265AD186E8C1CeAED16ae97176D020bA": "DefaultBondStrategy", + "0x70cD3464A41B6692413a1Ba563b9D53955D5DE0d": "DepositWrapper" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/re7_oz_config.json b/config_samples/mellow/re7_oz_config.json index 43985d8..9354a50 100644 --- a/config_samples/mellow/re7_oz_config.json +++ b/config_samples/mellow/re7_oz_config.json @@ -1,8 +1,7 @@ { "contracts": { - "0x20eF170856B8A746Df78406bfC2535b36F35774F": "TransparentUpgradeableProxy", - "0xF84Bf03bcd79e09796E69134C2a6Ba6b60aC4eAB": "TimelockController", - "0x3c6b61a0cfee415f1ebc11b095090b9fb21facc6": "ProxyAdmin" + "0x84631c0d0081FDe56DeB72F6DE77abBbF6A9f93a": "TransparentUpgradeableProxy", + "0xF076CF343DCfD01BBA57dFEB5C74F7B015951fcF": "ProxyAdmin" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/steakhouse_config.json b/config_samples/mellow/steakhouse_config.json index f290dbb..477e628 100644 --- a/config_samples/mellow/steakhouse_config.json +++ b/config_samples/mellow/steakhouse_config.json @@ -1,9 +1,9 @@ { "contracts": { - "0x7dB7dA79AF0Fe678634A51e1f57a091Fd485f7f8": "VaultConfigurator", - "0xd1928e2675a9be18f08d9aCe1A8008aaDEa3d813": "ManagedValidator", - "0x378F3AD5F48524bb2cD9A0f88B6AA525BaB2cB62": "DefaultBondStrategy", - "0x9CaA80709b4F9a72b70efc7Db4bE0150Bf362126": "DepositWrapper" + "0xe6180599432767081beA7deB76057Ce5883e73Be": "VaultConfigurator", + "0xdB66693845a3f72e932631080Efb1A86536D0EA7": "ManagedValidator", + "0x7a14b34a9a8EA235C66528dc3bF3aeFC36DFc268": "DefaultBondStrategy", + "0x24fee15BC11fF617c042283B58A3Bda6441Da145": "DepositWrapper" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/steakhouse_oz_config.json b/config_samples/mellow/steakhouse_oz_config.json index 88ad014..4525eb2 100644 --- a/config_samples/mellow/steakhouse_oz_config.json +++ b/config_samples/mellow/steakhouse_oz_config.json @@ -1,8 +1,7 @@ { "contracts": { - "0xa77a8D25cEB4B9F38A711850751edAc70d7b91b0": "TransparentUpgradeableProxy", - "0xF1504311dB8df3e02D56Ef6a2278188969cC2EDA": "TimelockController", - "0x638113B8941327E4B0213Eefcb1319EC664DFD16": "ProxyAdmin" + "0xBEEF69Ac7870777598A04B2bd4771c71212E6aBc": "TransparentUpgradeableProxy", + "0xed792a3fDEB9044C70c951260AaAe974Fb3dB38F": "ProxyAdmin" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/symbioticfi_config.json b/config_samples/mellow/symbioticfi_config.json index 9c16d43..ed49aee 100644 --- a/config_samples/mellow/symbioticfi_config.json +++ b/config_samples/mellow/symbioticfi_config.json @@ -1,6 +1,6 @@ { "contracts": { - "0xB56dA788Aa93Ed50F50e0d38641519FfB3C3D1Eb": "DefaultCollateral" + "0xC329400492c6ff2438472D4651Ad17389fCb843a": "DefaultCollateral" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", diff --git a/config_samples/mellow/symbioticifi_oz_config.json b/config_samples/mellow/symbioticifi_oz_config.json index a2ff1b4..f42089f 100644 --- a/config_samples/mellow/symbioticifi_oz_config.json +++ b/config_samples/mellow/symbioticifi_oz_config.json @@ -1,6 +1,6 @@ { "contracts": { - "0x3F95a719260ce6ec9622bC549c9adCff9edf16D9": "TransparentUpgradeableProxy" + "0x1BC8FCFbE6Aa17e4A7610F51B888f34583D202Ec": "TransparentUpgradeableProxy" }, "explorer_hostname": "api.etherscan.io", "explorer_token_env_var": "ETHERSCAN_TOKEN", From 44ed46e02c11dedeb438d374bc9eac9147891e8f Mon Sep 17 00:00:00 2001 From: Artyom Veremeenko Date: Sat, 8 Jun 2024 19:24:55 +0300 Subject: [PATCH 2/4] update mellow-lrt commit to 60e9a8 (deploy one) --- config_samples/mellow/common_config.json | 2 +- config_samples/mellow/mevcap_config.json | 2 +- config_samples/mellow/p2p_config.json | 2 +- config_samples/mellow/re7_config.json | 2 +- config_samples/mellow/steakhouse_config.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config_samples/mellow/common_config.json b/config_samples/mellow/common_config.json index 801a0f1..c75814e 100644 --- a/config_samples/mellow/common_config.json +++ b/config_samples/mellow/common_config.json @@ -15,7 +15,7 @@ "explorer_token_env_var": "ETHERSCAN_TOKEN", "github_repo": { "url": "https://github.com/mellow-finance/mellow-lrt", - "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "commit": "60e9a87eb970be5ee1d4f1f14ccc9919b2b2fbcc", "relative_root": "" }, "dependencies": { diff --git a/config_samples/mellow/mevcap_config.json b/config_samples/mellow/mevcap_config.json index b298dac..95a5f5e 100644 --- a/config_samples/mellow/mevcap_config.json +++ b/config_samples/mellow/mevcap_config.json @@ -9,7 +9,7 @@ "explorer_token_env_var": "ETHERSCAN_TOKEN", "github_repo": { "url": "https://github.com/mellow-finance/mellow-lrt", - "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "commit": "60e9a87eb970be5ee1d4f1f14ccc9919b2b2fbcc", "relative_root": "" }, "dependencies": { diff --git a/config_samples/mellow/p2p_config.json b/config_samples/mellow/p2p_config.json index c535715..3858056 100644 --- a/config_samples/mellow/p2p_config.json +++ b/config_samples/mellow/p2p_config.json @@ -9,7 +9,7 @@ "explorer_token_env_var": "ETHERSCAN_TOKEN", "github_repo": { "url": "https://github.com/mellow-finance/mellow-lrt", - "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "commit": "60e9a87eb970be5ee1d4f1f14ccc9919b2b2fbcc", "relative_root": "" }, "dependencies": { diff --git a/config_samples/mellow/re7_config.json b/config_samples/mellow/re7_config.json index 11c7438..b2c9ddc 100644 --- a/config_samples/mellow/re7_config.json +++ b/config_samples/mellow/re7_config.json @@ -9,7 +9,7 @@ "explorer_token_env_var": "ETHERSCAN_TOKEN", "github_repo": { "url": "https://github.com/mellow-finance/mellow-lrt", - "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "commit": "60e9a87eb970be5ee1d4f1f14ccc9919b2b2fbcc", "relative_root": "" }, "dependencies": { diff --git a/config_samples/mellow/steakhouse_config.json b/config_samples/mellow/steakhouse_config.json index 477e628..43997f0 100644 --- a/config_samples/mellow/steakhouse_config.json +++ b/config_samples/mellow/steakhouse_config.json @@ -9,7 +9,7 @@ "explorer_token_env_var": "ETHERSCAN_TOKEN", "github_repo": { "url": "https://github.com/mellow-finance/mellow-lrt", - "commit": "efcbc9e5db9d74e39fe52b3f8729abacbc5d1180", + "commit": "60e9a87eb970be5ee1d4f1f14ccc9919b2b2fbcc", "relative_root": "" }, "dependencies": { From 54b689fa32d753b46f75d0d11183838e18e2eeb6 Mon Sep 17 00:00:00 2001 From: Artyom Veremeenko Date: Sat, 8 Jun 2024 22:32:51 +0300 Subject: [PATCH 3/4] update oz dependency: no src/tmp/oz anymore --- config_samples/mellow/mevcap_oz_config.json | 2 +- config_samples/mellow/p2p_oz_config.json | 2 +- config_samples/mellow/re7_oz_config.json | 2 +- config_samples/mellow/steakhouse_oz_config.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config_samples/mellow/mevcap_oz_config.json b/config_samples/mellow/mevcap_oz_config.json index 3f8d6be..1f11656 100644 --- a/config_samples/mellow/mevcap_oz_config.json +++ b/config_samples/mellow/mevcap_oz_config.json @@ -12,7 +12,7 @@ "//": "version 5.0.2" }, "dependencies": { - "src/tmp/oz": { + "lib/openzeppelin-contracts/contracts": { "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", "relative_root": "contracts", diff --git a/config_samples/mellow/p2p_oz_config.json b/config_samples/mellow/p2p_oz_config.json index 485177f..848e088 100644 --- a/config_samples/mellow/p2p_oz_config.json +++ b/config_samples/mellow/p2p_oz_config.json @@ -12,7 +12,7 @@ "//": "version 5.0.2" }, "dependencies": { - "src/tmp/oz": { + "lib/openzeppelin-contracts/contracts": { "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", "relative_root": "contracts", diff --git a/config_samples/mellow/re7_oz_config.json b/config_samples/mellow/re7_oz_config.json index 9354a50..eca0b17 100644 --- a/config_samples/mellow/re7_oz_config.json +++ b/config_samples/mellow/re7_oz_config.json @@ -12,7 +12,7 @@ "//": "version 5.0.2" }, "dependencies": { - "src/tmp/oz": { + "lib/openzeppelin-contracts/contracts": { "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", "relative_root": "contracts", diff --git a/config_samples/mellow/steakhouse_oz_config.json b/config_samples/mellow/steakhouse_oz_config.json index 4525eb2..572c491 100644 --- a/config_samples/mellow/steakhouse_oz_config.json +++ b/config_samples/mellow/steakhouse_oz_config.json @@ -12,7 +12,7 @@ "//": "version 5.0.2" }, "dependencies": { - "src/tmp/oz": { + "lib/openzeppelin-contracts/contracts": { "url": "https://github.com/OpenZeppelin/openzeppelin-contracts", "commit": "dbb6104ce834628e473d2173bbc9d47f81a9eec3", "relative_root": "contracts", From bee4ffed14dbe541e078080ecc1b9a339d4ffad7 Mon Sep 17 00:00:00 2001 From: Artyom Veremeenko Date: Mon, 10 Jun 2024 10:56:36 +0300 Subject: [PATCH 4/4] feat: log error and exit if config path not found --- main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.py b/main.py index 544a3eb..291408d 100644 --- a/main.py +++ b/main.py @@ -188,6 +188,9 @@ def main(): config_path = os.path.join(args.path, filename) if os.path.isfile(config_path): process_config(config_path, args.support_brownie, args.prettify) + else: + logger.error(f"Specified config path {args.path} not found") + sys.exit(1) execution_time = time.time() - START_TIME