From 531f94033b4efd613c05fd3f1a21e0450ff01156 Mon Sep 17 00:00:00 2001 From: Ed Zynda Date: Tue, 7 May 2024 18:38:19 +0700 Subject: [PATCH] Revive Celo (#641) * Revive celo * Deploy missing facets * Update verification and dex approvals --- config/dexs.json | 6 +- deployments/_deployments_log_file.json | 114 ++++++++++++++++++++++--- deployments/celo.diamond.json | 37 +++++--- deployments/celo.json | 26 +++--- foundry.toml | 2 +- networks | 1 + script/deploy/_targetState.json | 10 +++ 7 files changed, 157 insertions(+), 39 deletions(-) diff --git a/config/dexs.json b/config/dexs.json index 7165d5918..6738df959 100644 --- a/config/dexs.json +++ b/config/dexs.json @@ -185,7 +185,11 @@ "0xdef1c0ded9bec7f1a1670819833240f027b25eff", "0x1421bDe4B10e8dd459b3BCb598810B1337D56842", "0xE3D8bd6Aed4F159bc8000a9cD47CffDb95F96121", - "0x5Dc88340E1c5c6366864Ee415d6034cadd1A9897" + "0x5Dc88340E1c5c6366864Ee415d6034cadd1A9897", + "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5", + "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "0xf3552b98BB4234B47674700A99a0308D74B40F51", + "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD" ], "cronos": [ "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6", diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index fd5b75c27..4361a69dd 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -309,9 +309,9 @@ "production": { "1.0.0": [ { - "ADDRESS": "0xFcBDe557918061c46674fb3CAe38a3576913297d", + "ADDRESS": "0x1215791Ad4E823F36A71329c56e5999f8F320082", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:48:13", + "TIMESTAMP": "2024-05-06 13:42:57", "CONSTRUCTOR_ARGS": "0x", "SALT": "", "VERIFIED": "true" @@ -856,9 +856,9 @@ "production": { "1.0.0": [ { - "ADDRESS": "0xB87d648bd9aE07E59c80ACAbe21b9065DFE96b0F", + "ADDRESS": "0x519483eEC772BA34098af187Aee7b56C77927B1a", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:48:33", + "TIMESTAMP": "2024-05-06 13:26:29", "CONSTRUCTOR_ARGS": "0x", "SALT": "", "VERIFIED": "true" @@ -5061,9 +5061,9 @@ "production": { "1.0.0": [ { - "ADDRESS": "0x0708c608e53B25d4B323E21a07d7a183a90C1D1E", + "ADDRESS": "0xc31F4392EE89d81E7303e2c1CDE210414F39E2ea", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:52:50", + "TIMESTAMP": "2024-05-06 13:30:47", "CONSTRUCTOR_ARGS": "0x000000000000000000000000bb7684cc5408f4dd0921e5c2cadd547b8f1ad573", "SALT": "", "VERIFIED": "true" @@ -6646,6 +6646,16 @@ "SALT": "", "VERIFIED": "true" } + ], + "1.0.1": [ + { + "ADDRESS": "0x66861f292099cAF644F4A8b6091De49BEC5E8a15", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 13:42:06", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } ] } }, @@ -8412,10 +8422,10 @@ "production": { "1.0.0": [ { - "ADDRESS": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", + "ADDRESS": "0xA950Ac46b0b844c0564d18A54A9685e614B9086C", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:56:51", - "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f11121df7256c40339393b0fb045321022ce44", + "TIMESTAMP": "2024-05-06 12:30:23", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c", "SALT": "", "VERIFIED": "true" } @@ -9094,10 +9104,10 @@ ], "2.0.0": [ { - "ADDRESS": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", + "ADDRESS": "0x7078d1DE45C7D3e87f71D5DA663db2a8Ee1dfEbe", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:57:11", - "CONSTRUCTOR_ARGS": "0x0000000000000000000000005741a7ffe7c39ca175546a54985fa79211290b51", + "TIMESTAMP": "2024-05-06 12:31:07", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000a950ac46b0b844c0564d18a54a9685e614b9086c", "SALT": "", "VERIFIED": "true" } @@ -9626,9 +9636,9 @@ "production": { "1.0.0": [ { - "ADDRESS": "0x44Ff747185C9Df233D07536E08341ff624896164", + "ADDRESS": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5", "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2023-07-19 14:57:34", + "TIMESTAMP": "2024-05-06 13:44:18", "CONSTRUCTOR_ARGS": "0x00000000000000000000000008647cc950813966142a416d40c382e2c5db73bb", "SALT": "", "VERIFIED": "true" @@ -10404,6 +10414,16 @@ "SALT": "", "VERIFIED": "true" } + ], + "2.0.2": [ + { + "ADDRESS": "0x0561fFe9855541C02D17951c93405A4407Df74BC", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 12:36:46", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007078d1de45c7d3e87f71d5da663db2a8ee1dfebe00000000000000000000000000000000000000000000000000000000000186a0", + "SALT": "", + "VERIFIED": "true" + } ] } }, @@ -11319,6 +11339,16 @@ "SALT": "", "VERIFIED": "true" } + ], + "1.0.1": [ + { + "ADDRESS": "0xf3552b98BB4234B47674700A99a0308D74B40F51", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 12:38:47", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000008647cc950813966142a416d40c382e2c5db73bb", + "SALT": "", + "VERIFIED": "true" + } ] } }, @@ -15320,6 +15350,20 @@ } ] } + }, + "celo": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x9D4B9784fC46496926ee4784e490F14d106D83a8", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 13:38:11", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "CalldataVerificationFacet": { @@ -15796,6 +15840,20 @@ } ] } + }, + "celo": { + "production": { + "1.1.1": [ + { + "ADDRESS": "0x9157b6550D1C3209C20aCAd12A2dC57Df34Ca48b", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 13:34:50", + "CONSTRUCTOR_ARGS": "0x", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "LiFuelFeeCollector": { @@ -16455,6 +16513,20 @@ } ] } + }, + "celo": { + "production": { + "1.0.1": [ + { + "ADDRESS": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 12:44:17", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000c71284231a726a18ac85c94d75f9fe17a185beaf", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "AcrossFacetPacked": { @@ -17303,6 +17375,20 @@ } ] } + }, + "celo": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-05-06 12:47:38", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000471ece3750da237f93b8e339c536989b8978a438", + "SALT": "", + "VERIFIED": "true" + } + ] + } } }, "GasRebateDistributor": { diff --git a/deployments/celo.diamond.json b/deployments/celo.diamond.json index 4306c8e8a..bafb5c133 100644 --- a/deployments/celo.diamond.json +++ b/deployments/celo.diamond.json @@ -1,6 +1,14 @@ { "LiFiDiamond": { "Facets": { + "0x1215791Ad4E823F36A71329c56e5999f8F320082": { + "Name": "DiamondCutFacet", + "Version": "1.0.0" + }, + "0x519483eEC772BA34098af187Aee7b56C77927B1a": { + "Name": "DiamondLoupeFacet", + "Version": "1.0.0" + }, "0x43BCA3B49947fb553BB8CD5ff6de5753931672bB": { "Name": "OwnershipFacet", "Version": "1.0.0" @@ -17,7 +25,7 @@ "Name": "AccessManagerFacet", "Version": "1.0.0" }, - "0x0708c608e53B25d4B323E21a07d7a183a90C1D1E": { + "0xc31F4392EE89d81E7303e2c1CDE210414F39E2ea": { "Name": "CBridgeFacet", "Version": "1.0.0" }, @@ -25,26 +33,33 @@ "Name": "GenericSwapFacet", "Version": "1.0.0" }, - "0x02063A0d7a222c16D5b63213262596B83b07150c": { - "Name": "MultichainFacet", + "0x66861f292099cAF644F4A8b6091De49BEC5E8a15": { + "Name": "LIFuelFacet", "Version": "1.0.1" }, "0x6066f5B7566081DD1F0b216c9283A9888ba5688d": { "Name": "PeripheryRegistryFacet", "Version": "1.0.0" }, - "0x8269DCa8A7Ed9EE72ea19F27A950Cc10FDafFD8D": { - "Name": "LIFuelFacet", + "0x9157b6550D1C3209C20aCAd12A2dC57Df34Ca48b": { + "Name": "CalldataVerificationFacet", + "Version": "1.1.1" + }, + "0x9D4B9784fC46496926ee4784e490F14d106D83a8": { + "Name": "StandardizedCallFacet", "Version": "1.0.0" } }, "Periphery": { - "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", - "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", - "FeeCollector": "0x44Ff747185C9Df233D07536E08341ff624896164", - "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", + "ERC20Proxy": "0xA950Ac46b0b844c0564d18A54A9685e614B9086C", + "Executor": "0x7078d1DE45C7D3e87f71D5DA663db2a8Ee1dfEbe", + "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5", + "GasRebateDistributor": "", + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "Receiver": "0x0561fFe9855541C02D17951c93405A4407Df74BC", "RelayerCelerIM": "", - "ServiceFeeCollector": "0xC85c2B19958D116d79C654ecE73b359c08802A76" + "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", + "TokenWrapper": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD" } } -} +} \ No newline at end of file diff --git a/deployments/celo.json b/deployments/celo.json index 12ce2f5bf..5d1e87623 100644 --- a/deployments/celo.json +++ b/deployments/celo.json @@ -1,21 +1,23 @@ { - "DiamondCutFacet": "0xFcBDe557918061c46674fb3CAe38a3576913297d", - "DiamondLoupeFacet": "0xB87d648bd9aE07E59c80ACAbe21b9065DFE96b0F", + "DiamondCutFacet": "0x1215791Ad4E823F36A71329c56e5999f8F320082", + "DiamondLoupeFacet": "0x519483eEC772BA34098af187Aee7b56C77927B1a", "OwnershipFacet": "0x43BCA3B49947fb553BB8CD5ff6de5753931672bB", "DexManagerFacet": "0xE6007dA020680eC279Ac4F25F153689B75192fb4", "AccessManagerFacet": "0x354C19F0656AeC67e013De4fAEA10b7F9286b26b", "WithdrawFacet": "0xA633Df0Da77C863756428E900EC76Ba009E1Ea1C", "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE", - "CBridgeFacet": "0x0708c608e53B25d4B323E21a07d7a183a90C1D1E", + "CBridgeFacet": "0xc31F4392EE89d81E7303e2c1CDE210414F39E2ea", "GenericSwapFacet": "0x63fE6c5B4338116E4cC9BC536A8b61AA16003C50", - "MultichainFacet": "0x02063A0d7a222c16D5b63213262596B83b07150c", "PeripheryRegistryFacet": "0x6066f5B7566081DD1F0b216c9283A9888ba5688d", - "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", - "LIFuelFacet": "0x8269DCa8A7Ed9EE72ea19F27A950Cc10FDafFD8D", - "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", - "FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9", - "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", - "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", + "ERC20Proxy": "0xA950Ac46b0b844c0564d18A54A9685e614B9086C", + "LIFuelFacet": "0x66861f292099cAF644F4A8b6091De49BEC5E8a15", + "Executor": "0x7078d1DE45C7D3e87f71D5DA663db2a8Ee1dfEbe", + "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5", + "Receiver": "0x0561fFe9855541C02D17951c93405A4407Df74BC", + "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", "LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF", - "WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50" -} + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD", + "CalldataVerificationFacet": "0x9157b6550D1C3209C20aCAd12A2dC57Df34Ca48b", + "StandardizedCallFacet": "0x9D4B9784fC46496926ee4784e490F14d106D83a8" +} \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index ebc308ee1..2cd2fb475 100644 --- a/foundry.toml +++ b/foundry.toml @@ -59,7 +59,7 @@ aurora = { key = "${AURORA_ETHERSCAN_API_KEY}", url = "https://api.aurorascan.de avalanche = { key = "${AVALANCHE_ETHERSCAN_API_KEY}", url = "https://api.snowtrace.io/api" } boba = { key = "${BOBA_ETHERSCAN_API_KEY}", url = "https://api.bobascan.com/api" } bsc = { key = "${BSC_ETHERSCAN_API_KEY}", url = "https://api.bscscan.com/api" } -celo = { key = "${CELO_ETHERSCAN_API_KEY}", url = "https://explorer.celo.org/api" } +celo = { key = "${CELO_ETHERSCAN_API_KEY}", url = "https://api.celoscan.io/api" } cronos = { key = "${CRONOS_ETHERSCAN_API_KEY}", url = "https://api.cronoscan.com/api" } fantom = { key = "${FANTOM_ETHERSCAN_API_KEY}", url = "https://api.ftmscan.com/api" } fuse = { key = "${FUSE_ETHERSCAN_API_KEY}", url = "https://explorer.fuse.io/api" } diff --git a/networks b/networks index 883bb820d..af747e722 100644 --- a/networks +++ b/networks @@ -5,6 +5,7 @@ avalanche base boba bsc +celo fantom fuse gnosis diff --git a/script/deploy/_targetState.json b/script/deploy/_targetState.json index fc9c88532..6f2f32dc5 100644 --- a/script/deploy/_targetState.json +++ b/script/deploy/_targetState.json @@ -1246,6 +1246,14 @@ "LIFuelFacet": "1.0.0", "CalldataVerificationFacet": "1.1.1", "StandardizedCallFacet": "1.0.0", + "LiFiDiamond": "1.0.0", + "ERC20Proxy": "1.0.0", + "Executor": "2.0.0", + "FeeCollector": "1.0.0", + "Receiver": "2.0.2", + "ServiceFeeCollector": "1.0.1", + "LiFuelFeeCollector": "1.0.1", + "TokenWrapper": "1.0.0", "MultichainFacet": "1.0.1", "SquidFacet": "1.0.0" }, @@ -1267,6 +1275,8 @@ "FeeCollector": "1.0.0", "Receiver": "2.0.0", "ServiceFeeCollector": "1.0.0", + "LiFuelFeeCollector": "1.0.1", + "TokenWrapper": "1.0.0", "MultichainFacet": "1.0.1", "SquidFacet": "1.0.0" }