From 1fbdc3a37a358adec12aa60594b4a7d328085db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Thu, 3 Oct 2024 12:51:41 +0700 Subject: [PATCH 1/6] updates dexs.json with LiFiDEXAggregator addresses --- config/dexs.json | 54 ++++-- deployments/_deployments_log_file.json | 250 +++++++++++++++++++++++++ deployments/arbitrum.json | 3 +- deployments/avalanche.json | 3 +- deployments/base.json | 3 +- deployments/blast.json | 3 +- deployments/boba.json | 5 +- deployments/bsc.json | 3 +- deployments/fantom.json | 3 +- deployments/fuse.json | 3 +- deployments/gnosis.json | 3 +- deployments/linea.json | 3 +- deployments/mainnet.json | 3 +- deployments/metis.json | 5 +- deployments/mode.json | 3 +- deployments/moonbeam.json | 3 +- deployments/moonriver.json | 3 +- deployments/optimism.json | 3 +- deployments/polygon.json | 104 +++++----- deployments/polygonzkevm.json | 3 +- deployments/scroll.json | 3 +- 21 files changed, 376 insertions(+), 90 deletions(-) diff --git a/config/dexs.json b/config/dexs.json index 0d6da1384..b5cb63a83 100644 --- a/config/dexs.json +++ b/config/dexs.json @@ -36,7 +36,8 @@ "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0xe43ca1Dee3F0fc1e2df73A0745674545F11A59F5", "0x111111125421ca6dc452d289314280a0f8842a65", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "arbitrum": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -75,7 +76,8 @@ "0xdef171fe48cf0115b1d80b88dc8eab59176fee57", "0x6a000f20005980200259b80c5102003040001068", "0x216b4b4ba9f3e719726886d34a177484278bfcae", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "aurora": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -133,7 +135,8 @@ "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0xCdBCd51a5E8728E0AF4895ce5771b7d17fF71959", "0x111111125421ca6dc452d289314280a0f8842a65", - "0x0000000000005e88410ccdfade4a5efae4b49562" + "0x0000000000005e88410ccdfade4a5efae4b49562", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "base": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -155,7 +158,8 @@ "0x59c7c832e96d2568bea6db468c1aadcbbda08a52", "0x6a000f20005980200259b80c5102003040001068", "0x93aaae79a53759cd164340e4c8766e4db5331cd7", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "blast": [ "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64", @@ -166,7 +170,8 @@ "0x6131b5fae19ea4f9d964eac0408e4408b66337b5", "0x549FEB8c9bd4c12Ad2AB27022dA12492aC452B66", "0xcdbcd51a5e8728e0af4895ce5771b7d17ff71959", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "boba": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -186,7 +191,8 @@ "0x64842A3EbC09bB69429c1a34ae181375fea5f17F", "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "0xB45e53277a7e0F1D35f2a77160e91e25507f1763" + "0xB45e53277a7e0F1D35f2a77160e91e25507f1763", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "bsc": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -224,7 +230,8 @@ "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0x33d91116e0370970444B0281AB117e161fEbFcdD", "0x111111125421ca6dc452d289314280a0f8842a65", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "celo": [ "0xC85c2B19958D116d79C654ecE73b359c08802A76", @@ -306,7 +313,8 @@ "0x6131b5fae19ea4f9d964eac0408e4408b66337b5", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0x46b3fdf7b5cde91ac049936bf0bdb12c5d22202e", - "0x111111125421ca6dc452d289314280a0f8842a65" + "0x111111125421ca6dc452d289314280a0f8842a65", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "fuse": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -322,7 +330,8 @@ "0xE3F85aAd0c8DD7337427B9dF5d0fB741d65EEEB5", "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "0x46B3fDF7b5CDe91Ac049936bF0bDb12c5d22202e" + "0x46B3fDF7b5CDe91Ac049936bF0bDb12c5d22202e", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "gnosis": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -348,7 +357,8 @@ "0x80eba3855878739f4710233a8a19d89bdd2ffb8e", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0x46b3fdf7b5cde91ac049936bf0bdb12c5d22202e", - "0x111111125421ca6dc452d289314280a0f8842a65" + "0x111111125421ca6dc452d289314280a0f8842a65", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "gravity": [ "0x79540403cdE176Ca5f1fb95bE84A7ec91fFDEF76", @@ -420,7 +430,8 @@ ], "metis": [ "0x6352a56caadc4f1e25cd6c75970fa768a3304e64", - "0x27f0e36dE6B1BA8232f6c2e87E00A50731048C6B" + "0x27f0e36dE6B1BA8232f6c2e87E00A50731048C6B", + "0x9E4c63c9a0EDE2Ca2e772ee48C819Ca5CB4529AC" ], "mode": [ "0x7E15EB462cdc67Cf92Af1f7102465a8F8c784874", @@ -429,7 +440,8 @@ "0x346b1F1896f2772ffee205e34246ac7adc55B43D", "0x5215E9fd223BC909083fbdB2860213873046e45d", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64" + "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "moonbeam": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -445,7 +457,8 @@ "0xd0a01ec574d1fc6652edf79cb2f880fd47d34ab1", "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "0xB45e53277a7e0F1D35f2a77160e91e25507f1763" + "0xB45e53277a7e0F1D35f2a77160e91e25507f1763", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "moonriver": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -466,7 +479,8 @@ "0x003B18357460e789e711849749A793c430d14f97", "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "0x46B3fDF7b5CDe91Ac049936bF0bDb12c5d22202e" + "0x46B3fDF7b5CDe91Ac049936bF0bDb12c5d22202e", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "nova": [ "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6", @@ -532,7 +546,8 @@ "0xdef171fe48cf0115b1d80b88dc8eab59176fee57", "0x6a000f20005980200259b80c5102003040001068", "0x216b4b4ba9f3e719726886d34a177484278bfcae", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "polygon": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -576,7 +591,8 @@ "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0x46B3fDF7b5CDe91Ac049936bF0bDb12c5d22202e", "0x111111125421ca6dc452d289314280a0f8842a65", - "0x0000000000001ff3684f28c67538d4d072c22734" + "0x0000000000001ff3684f28c67538d4d072c22734", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "polygonzkevm": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", @@ -595,7 +611,8 @@ "0x57bfFa72db682f7eb6C132DAE03FF36bBEB0c459", "0xb83b554730d29ce4cb55bb42206c3e2c03e4a40a", "0x6a000f20005980200259b80c5102003040001068", - "0xc8a21fcd5a100c3ecc037c97e2f9c53a8d3a02a1" + "0xc8a21fcd5a100c3ecc037c97e2f9c53a8d3a02a1", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "rootstock": [ "0x6352A56caaDc4F1e25cd6c75970fA768A3304E64", @@ -620,7 +637,8 @@ "0x5215E9fd223BC909083fbdB2860213873046e45d", "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "0xbfe03c9e20a9fc0b37de01a172f207004935e0b1", - "0x0000000000005e88410ccdfade4a5efae4b49562" + "0x0000000000005e88410ccdfade4a5efae4b49562", + "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], "taiko": [ "0xDd8A081efC90DFFD79940948a1528C51793C4B03", diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index ca5cf3b77..3112e72c5 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -22919,6 +22919,18 @@ "VERIFIED": "true" } ] + }, + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:48:33", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] } }, "taiko": { @@ -23074,6 +23086,244 @@ } ] } + }, + "mainnet": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:36:19", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "arbitrum": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:36:59", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "avalanche": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:37:40", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "base": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:38:26", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "blast": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:39:04", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "fantom": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:49:24", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "gnosis": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:51:10", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "false" + } + ] + } + }, + "linea": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0xcaA342e4f781d63EF41E220D7622B97E66BAEcF3", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:51:42", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "mode": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:57:29", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "optimism": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 08:59:28", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "polygon": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:00:11", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "polygonzkevm": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:01:10", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "scroll": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:01:51", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "metis": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x9E4c63c9a0EDE2Ca2e772ee48C819Ca5CB4529AC", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:01:51", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "moonbeam": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:35:02", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "moonriver": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:36:45", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } + }, + "fuse": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:37:41", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } } } } diff --git a/deployments/arbitrum.json b/deployments/arbitrum.json index e4f00ccfa..1efb31630 100644 --- a/deployments/arbitrum.json +++ b/deployments/arbitrum.json @@ -46,5 +46,6 @@ "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/avalanche.json b/deployments/avalanche.json index a3eaf45a4..2a5f57046 100644 --- a/deployments/avalanche.json +++ b/deployments/avalanche.json @@ -43,5 +43,6 @@ "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/base.json b/deployments/base.json index c7bc7ba43..58346d9c3 100644 --- a/deployments/base.json +++ b/deployments/base.json @@ -36,5 +36,6 @@ "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/blast.json b/deployments/blast.json index 4c184875f..a4fa9b5d4 100644 --- a/deployments/blast.json +++ b/deployments/blast.json @@ -23,5 +23,6 @@ "TokenWrapper": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "AcrossFacet": "0x9535A1AFd986FA9a2D324657116F02C364edebFf", - "AcrossFacetPacked": "0xFd796bf7Ff74d414b99CacF6F216eAC24bF3aC8E" + "AcrossFacetPacked": "0xFd796bf7Ff74d414b99CacF6F216eAC24bF3aC8E", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/boba.json b/deployments/boba.json index b13a5309a..6bbf75355 100644 --- a/deployments/boba.json +++ b/deployments/boba.json @@ -24,5 +24,6 @@ "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", "SymbiosisFacet": "0xb8C5408ED5f40ca8df929A50DD36b252B6b39f76", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" -} \ No newline at end of file + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" +} diff --git a/deployments/bsc.json b/deployments/bsc.json index 17d09cbc0..3801b9462 100644 --- a/deployments/bsc.json +++ b/deployments/bsc.json @@ -44,5 +44,6 @@ "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", - "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61" + "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/fantom.json b/deployments/fantom.json index 29ac0c9eb..2fa7637ea 100644 --- a/deployments/fantom.json +++ b/deployments/fantom.json @@ -33,5 +33,6 @@ "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", "SquidFacet": "0x5C2C3F56e33F45389aa4e1DA4D3a807A532a910c", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/fuse.json b/deployments/fuse.json index ff7f0fdc2..f3f15de0d 100644 --- a/deployments/fuse.json +++ b/deployments/fuse.json @@ -21,5 +21,6 @@ "CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0", "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/gnosis.json b/deployments/gnosis.json index adf0eaf46..17b7688fc 100644 --- a/deployments/gnosis.json +++ b/deployments/gnosis.json @@ -29,5 +29,6 @@ "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "AmarokFacetPacked": "0xF18A285f4e6f720Eb9b4e05df71f88b9552E6ADB", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/linea.json b/deployments/linea.json index 934a4826d..b92ce0e99 100644 --- a/deployments/linea.json +++ b/deployments/linea.json @@ -33,5 +33,6 @@ "SquidFacet": "0xEa8EF3E532db49915FDbDdB29244a83E76768111", "GenericSwapFacetV3": "0xf4E73E2A9cDF1F94579cda3da07aD04031359CB5", "StargateFacetV2": "0x113E97921874646413572F2C43562463c378b6f5", - "ReceiverStargateV2": "0x6CA57d9846f9a1fd48368762b743a047eC4f81A6" + "ReceiverStargateV2": "0x6CA57d9846f9a1fd48368762b743a047eC4f81A6", + "LiFiDEXAggregator": "0xcaA342e4f781d63EF41E220D7622B97E66BAEcF3" } \ No newline at end of file diff --git a/deployments/mainnet.json b/deployments/mainnet.json index 15d33e56e..2ec937267 100644 --- a/deployments/mainnet.json +++ b/deployments/mainnet.json @@ -54,5 +54,6 @@ "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/metis.json b/deployments/metis.json index d0bf3b5eb..c52524cf1 100644 --- a/deployments/metis.json +++ b/deployments/metis.json @@ -23,5 +23,6 @@ "SymbiosisFacet": "0xA66abf226CC230eDBDeFf85C1874Ac7A9A637072", "GenericSwapFacetV3": "0xECb6035CD0393ebE016821EAE28bA9c57efBd5c6", "StargateFacetV2": "0xCb667deA2894ab64e8e75EACB0d5d027AC672e25", - "ReceiverStargateV2": "0xe7392Fc0f61503dB53C70789c6F2c34C0675C929" -} \ No newline at end of file + "ReceiverStargateV2": "0xe7392Fc0f61503dB53C70789c6F2c34C0675C929", + "LiFiDEXAggregator": "0x9E4c63c9a0EDE2Ca2e772ee48C819Ca5CB4529AC" +} diff --git a/deployments/mode.json b/deployments/mode.json index 5d4df1619..116492305 100644 --- a/deployments/mode.json +++ b/deployments/mode.json @@ -23,5 +23,6 @@ "AmarokFacetPacked": "0xF18A285f4e6f720Eb9b4e05df71f88b9552E6ADB", "AcrossFacet": "0x4D67951397bc8162111BC45F973Ae7576Fd814F0", "AcrossFacetPacked": "0x54910b7b4723a775708aFd88f31b6572e168aF66", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/moonbeam.json b/deployments/moonbeam.json index c433e774b..f4d10064c 100644 --- a/deployments/moonbeam.json +++ b/deployments/moonbeam.json @@ -27,5 +27,6 @@ "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", "SquidFacet": "0x5C2C3F56e33F45389aa4e1DA4D3a807A532a910c", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/moonriver.json b/deployments/moonriver.json index 776ebd165..a81fa1e3e 100644 --- a/deployments/moonriver.json +++ b/deployments/moonriver.json @@ -27,5 +27,6 @@ "CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0", "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/optimism.json b/deployments/optimism.json index a167685fe..7c1178f29 100644 --- a/deployments/optimism.json +++ b/deployments/optimism.json @@ -45,5 +45,6 @@ "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/polygon.json b/deployments/polygon.json index 88457e455..3e166b7e3 100644 --- a/deployments/polygon.json +++ b/deployments/polygon.json @@ -1,54 +1,54 @@ { - "DiamondCutFacet": "0x085DA8977767c1F2767f6fdD1CE7F9A5C565db72", - "DiamondLoupeFacet": "0xDb670AB7C837389Eb69C5Cc16d54AB2533D3250D", - "OwnershipFacet": "0x708A978951F95048701bD2A6f9598A95a70a22A8", - "DexManagerFacet": "0x03632D069D7C796Ee8F0F549ccF00A05a1BA81eA", - "AccessManagerFacet": "0x6530fe65e04FD08602782913536aa68baaF5CA0A", - "WithdrawFacet": "0xFBfF1651A47aC43e45E5F03361d5C5cd3c3940f3", - "LiFiDiamond": "0x30779778ea1735429b0d424757D8583eA2FA0D0B", - "HopFacet": "0x2A2a2A6b31585F39579Cbf5eD5E8a3aF5Ac9214a", - "AcrossFacet": "0x2d7eBD552EC66250cB523216ec8B0258b54d6090", - "CBridgeFacet": "0xd2E93ebafeb398735D1d369D6527937E19f92403", - "AxelarFacet": "0x55c51beF79d16F5f0875E11207B17E885c21c13d", - "GenericSwapFacet": "0x6c8d5E7a3A0D71E192D5B4089B928D9e40275f0f", - "HyphenFacet": "0x3C5200505def68C53dfA4BFF6D93f891C3336C85", - "MultichainFacet": "0x02063A0d7a222c16D5b63213262596B83b07150c", - "NXTPFacet": "0x238502aDc8ca550723CBE78543c8B757599A21cC", - "StargateFacet": "0x181f5B2b2f0DFa10cd67628b939f4f60365B81D0", - "PeripheryRegistryFacet": "0x09dE46f590E8589B77C246Ed0F4b0D11eA18CCf3", - "ERC20Proxy": "0x32a1DF6bcd0aafD34F0AF23bBd5863E96B590fe1", - "AxelarExecutor": "0x8aD0B427864f072B9416dcD06B2f653895cFE03C", - "Executor": "0x6b2D9a1B106f226F491ffa671321aa74B4ffB3b8", - "Receiver": "0x88AaAFa65D2198D17258a1C4Bd174C16074f7318", - "FeeCollector": "0xc86e99BAA1729329c82C7D1c319843871b70E32A", - "HopFacetOptimized": "0xF88512343bea9981C221eF5151019B2587e2Df7C", - "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", - "LIFuelFacet": "0x09e64f611CA3EB62636e0A088BBEB2ABa8cbA5D3", - "HopFacetPacked": "0x4E123c97aD810B5C5781358a0DFAcfEc2fC4Cc04", - "AmarokFacet": "0xFBb86ff4de3F15BE6A256FD4B1B80851BFdC9c70", - "PackedEncoderDecoderFacet": "0x73d2d674449B3D8ad549cc3b04F8104C444FD34D", - "CBridgeFacetPacked": "0x1b4cf0A32646Faf0dF33A6CC4a95d4ab2f75e9e1", - "LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF", - "AllBridgeFacet": "0xb5AAe4d25bC81f7969C3D4bd417cAFd2d73C7D5E", - "ArbitrumBridgeFacet": "0x987f67811Ef841da0466746E10B4139Daff95053", - "RelayerCelerIMImmutable": "0x7b6d852f58C783BA3b1138C535ff57dDa4c826E0", - "CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE", - "RelayerCelerIMMutable": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", - "CelerIMFacetMutable": "0xC8a59eAC93aa8f526dfA7E8C8f2899079FAed89C", - "WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50", - "RelayerCelerIM": "0x0Cb748F1e406FD32802C3f6Cb73a9A250c2bf6b7", - "StandardizedCallFacet": "0x898504305E0c187F1628B305ad39E8d252D02faC", - "CalldataVerificationFacet": "0xc3292e8155C32e9119c77F6C5308F3E6330996bE", - "LiFuelFeeCollector": "0x3C8C5062CbC7A6b9672bDd007da86eEE397cb4Cd", - "CelerCircleBridgeFacet": "0x4A9Ae261f40DE66E3fb542eC92eA2978cF383685", - "AcrossFacetPacked": "0x4b7692322D6bA92994128aA57457F22a397954C8", - "AmarokFacetPacked": "0xa9e7Dd55495D66508057522840a20f574F6c3987", - "SymbiosisFacet": "0x8670EBC689F35c441113D629A32e2d07F9d81dD7", - "TokenWrapper": "0xa593947304DcDd6F351DCE7E4b76dd76e2D698c3", - "SquidFacet": "0x2933F844337ccA96F5882865340A9F107E015E16", - "MayanFacet": "0x297aF81049744284874A7e5E90A907bAF6ACbbb5", - "GenericSwapFacetV3": "0x6EC2dEb47DA37DE972b47569b9ea9178EAF4156A", - "StargateFacetV2": "0xadd0645F855098c75BF1F83B66a8e3C696E88EFB", - "ReceiverStargateV2": "0x41A2a10eD14f240cB51D9Bc42E039817d2cDa894", - "LiFiDEXAggregator": "0x3B2E58fF65ee8c43622c0a40e984A1278f7D578D" + "DiamondCutFacet": "0x085DA8977767c1F2767f6fdD1CE7F9A5C565db72", + "DiamondLoupeFacet": "0xDb670AB7C837389Eb69C5Cc16d54AB2533D3250D", + "OwnershipFacet": "0x708A978951F95048701bD2A6f9598A95a70a22A8", + "DexManagerFacet": "0x03632D069D7C796Ee8F0F549ccF00A05a1BA81eA", + "AccessManagerFacet": "0x6530fe65e04FD08602782913536aa68baaF5CA0A", + "WithdrawFacet": "0xFBfF1651A47aC43e45E5F03361d5C5cd3c3940f3", + "LiFiDiamond": "0x30779778ea1735429b0d424757D8583eA2FA0D0B", + "HopFacet": "0x2A2a2A6b31585F39579Cbf5eD5E8a3aF5Ac9214a", + "AcrossFacet": "0x2d7eBD552EC66250cB523216ec8B0258b54d6090", + "CBridgeFacet": "0xd2E93ebafeb398735D1d369D6527937E19f92403", + "AxelarFacet": "0x55c51beF79d16F5f0875E11207B17E885c21c13d", + "GenericSwapFacet": "0x6c8d5E7a3A0D71E192D5B4089B928D9e40275f0f", + "HyphenFacet": "0x3C5200505def68C53dfA4BFF6D93f891C3336C85", + "MultichainFacet": "0x02063A0d7a222c16D5b63213262596B83b07150c", + "NXTPFacet": "0x238502aDc8ca550723CBE78543c8B757599A21cC", + "StargateFacet": "0x181f5B2b2f0DFa10cd67628b939f4f60365B81D0", + "PeripheryRegistryFacet": "0x09dE46f590E8589B77C246Ed0F4b0D11eA18CCf3", + "ERC20Proxy": "0x32a1DF6bcd0aafD34F0AF23bBd5863E96B590fe1", + "AxelarExecutor": "0x8aD0B427864f072B9416dcD06B2f653895cFE03C", + "Executor": "0x6b2D9a1B106f226F491ffa671321aa74B4ffB3b8", + "Receiver": "0x88AaAFa65D2198D17258a1C4Bd174C16074f7318", + "FeeCollector": "0xc86e99BAA1729329c82C7D1c319843871b70E32A", + "HopFacetOptimized": "0xF88512343bea9981C221eF5151019B2587e2Df7C", + "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", + "LIFuelFacet": "0x09e64f611CA3EB62636e0A088BBEB2ABa8cbA5D3", + "HopFacetPacked": "0x4E123c97aD810B5C5781358a0DFAcfEc2fC4Cc04", + "AmarokFacet": "0xFBb86ff4de3F15BE6A256FD4B1B80851BFdC9c70", + "PackedEncoderDecoderFacet": "0x73d2d674449B3D8ad549cc3b04F8104C444FD34D", + "CBridgeFacetPacked": "0x1b4cf0A32646Faf0dF33A6CC4a95d4ab2f75e9e1", + "LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF", + "AllBridgeFacet": "0xb5AAe4d25bC81f7969C3D4bd417cAFd2d73C7D5E", + "ArbitrumBridgeFacet": "0x987f67811Ef841da0466746E10B4139Daff95053", + "RelayerCelerIMImmutable": "0x7b6d852f58C783BA3b1138C535ff57dDa4c826E0", + "CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE", + "RelayerCelerIMMutable": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", + "CelerIMFacetMutable": "0xC8a59eAC93aa8f526dfA7E8C8f2899079FAed89C", + "WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50", + "RelayerCelerIM": "0x0Cb748F1e406FD32802C3f6Cb73a9A250c2bf6b7", + "StandardizedCallFacet": "0x898504305E0c187F1628B305ad39E8d252D02faC", + "CalldataVerificationFacet": "0xc3292e8155C32e9119c77F6C5308F3E6330996bE", + "LiFuelFeeCollector": "0x3C8C5062CbC7A6b9672bDd007da86eEE397cb4Cd", + "CelerCircleBridgeFacet": "0x4A9Ae261f40DE66E3fb542eC92eA2978cF383685", + "AcrossFacetPacked": "0x4b7692322D6bA92994128aA57457F22a397954C8", + "AmarokFacetPacked": "0xa9e7Dd55495D66508057522840a20f574F6c3987", + "SymbiosisFacet": "0x8670EBC689F35c441113D629A32e2d07F9d81dD7", + "TokenWrapper": "0xa593947304DcDd6F351DCE7E4b76dd76e2D698c3", + "SquidFacet": "0x2933F844337ccA96F5882865340A9F107E015E16", + "MayanFacet": "0x297aF81049744284874A7e5E90A907bAF6ACbbb5", + "GenericSwapFacetV3": "0x6EC2dEb47DA37DE972b47569b9ea9178EAF4156A", + "StargateFacetV2": "0xadd0645F855098c75BF1F83B66a8e3C696E88EFB", + "ReceiverStargateV2": "0x41A2a10eD14f240cB51D9Bc42E039817d2cDa894", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/polygonzkevm.json b/deployments/polygonzkevm.json index 3e7db61dd..e9e7ce103 100644 --- a/deployments/polygonzkevm.json +++ b/deployments/polygonzkevm.json @@ -29,5 +29,6 @@ "HopFacetPacked": "0xF5271b13a73a2443DA2fE50F0a8c13850072Cf0C", "SymbiosisFacet": "0x0107859E4Ee0Fc2b8f3c2A602264D95184cd297F", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", - "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F" + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file diff --git a/deployments/scroll.json b/deployments/scroll.json index e67abeb50..87972264f 100644 --- a/deployments/scroll.json +++ b/deployments/scroll.json @@ -27,5 +27,6 @@ "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", "AcrossFacet": "0x9535A1AFd986FA9a2D324657116F02C364edebFf", - "AcrossFacetPacked": "0xFd796bf7Ff74d414b99CacF6F216eAC24bF3aC8E" + "AcrossFacetPacked": "0xFd796bf7Ff74d414b99CacF6F216eAC24bF3aC8E", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } \ No newline at end of file From e9f3b3e1a7f2ed8f30410473ac0d3a37e63f4051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Thu, 3 Oct 2024 13:03:50 +0700 Subject: [PATCH 2/6] reinstates polygon deploy logfile (was accidentally overwritten in previous PR --- config/dexs.json | 31 ++++++++-------- deployments/polygon.json | 80 ++++++++++++++++++++-------------------- 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/config/dexs.json b/config/dexs.json index b5cb63a83..f85b9e7c3 100644 --- a/config/dexs.json +++ b/config/dexs.json @@ -417,6 +417,22 @@ "0xE275759e85e5497A1B07EA65529187FD7E987509", "0x111111125421ca6dc452d289314280a0f8842a65" ], + "linea": [ + "0xf6C9605c6E231C1547b7a6545d93e7233f97322a", + "0x74EAb1C1304375C4ed56e283C03B74AAd3ac45bb", + "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb", + "0x2205ebb740c7c98eD52cf7F0FC302EB8a4afD5a4", + "0x6131b5fae19ea4f9d964eac0408e4408b66337b5", + "0x6CC48E94C1148A0787D7F137745af58e3Eb47780", + "0x6352a56caadc4f1e25cd6c75970fa768a3304e64", + "0x2d8879046f1559E53eb052E949e9544bCB72f414", + "0xA4A24BdD4608D7dFC496950850f9763B674F0DB2", + "0xA8Fe73F7b3a825fF51f2200af12c16B3BA95394d", + "0x68B21d21509446Bf5449B6F5F8aBD4b3cfcbc3f8", + "0x46b3fdf7b5cde91ac049936bf0bdb12c5d22202e", + "0x000000000000175a8b9bc6d539b3708eed92ea6c", + "0xcaA342e4f781d63EF41E220D7622B97E66BAEcF3" + ], "mantle": [ "0xD9F4e85489aDCD0bAF0Cd63b4231c6af58c26745", "0x6352a56caadC4F1E25CD6c75970Fa768A3304e64", @@ -695,21 +711,6 @@ "avalancheFujiTestnet": [], "bscTestnet": ["0x1b02da8cb0d097eb8d57a175b88c7d8b47997506"], "localanvil": [], - "linea": [ - "0xf6C9605c6E231C1547b7a6545d93e7233f97322a", - "0x74EAb1C1304375C4ed56e283C03B74AAd3ac45bb", - "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb", - "0x2205ebb740c7c98eD52cf7F0FC302EB8a4afD5a4", - "0x6131b5fae19ea4f9d964eac0408e4408b66337b5", - "0x6CC48E94C1148A0787D7F137745af58e3Eb47780", - "0x6352a56caadc4f1e25cd6c75970fa768a3304e64", - "0x2d8879046f1559E53eb052E949e9544bCB72f414", - "0xA4A24BdD4608D7dFC496950850f9763B674F0DB2", - "0xA8Fe73F7b3a825fF51f2200af12c16B3BA95394d", - "0x68B21d21509446Bf5449B6F5F8aBD4b3cfcbc3f8", - "0x46b3fdf7b5cde91ac049936bf0bdb12c5d22202e", - "0x000000000000175a8b9bc6d539b3708eed92ea6c" - ], "mumbai": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6", diff --git a/deployments/polygon.json b/deployments/polygon.json index 3e166b7e3..3ccfa25ca 100644 --- a/deployments/polygon.json +++ b/deployments/polygon.json @@ -1,54 +1,54 @@ { - "DiamondCutFacet": "0x085DA8977767c1F2767f6fdD1CE7F9A5C565db72", - "DiamondLoupeFacet": "0xDb670AB7C837389Eb69C5Cc16d54AB2533D3250D", - "OwnershipFacet": "0x708A978951F95048701bD2A6f9598A95a70a22A8", - "DexManagerFacet": "0x03632D069D7C796Ee8F0F549ccF00A05a1BA81eA", - "AccessManagerFacet": "0x6530fe65e04FD08602782913536aa68baaF5CA0A", - "WithdrawFacet": "0xFBfF1651A47aC43e45E5F03361d5C5cd3c3940f3", - "LiFiDiamond": "0x30779778ea1735429b0d424757D8583eA2FA0D0B", - "HopFacet": "0x2A2a2A6b31585F39579Cbf5eD5E8a3aF5Ac9214a", - "AcrossFacet": "0x2d7eBD552EC66250cB523216ec8B0258b54d6090", - "CBridgeFacet": "0xd2E93ebafeb398735D1d369D6527937E19f92403", + "DiamondCutFacet": "0xaD50118509eB4c8e3E39a370151B0fD5D5957013", + "DiamondLoupeFacet": "0xc21a00a346d5b29955449Ca912343a3bB4c5552f", + "OwnershipFacet": "0x6faA6906b9e4A59020e673910105567e809789E0", + "DexManagerFacet": "0x22B31a1a81d5e594315c866616db793E799556c5", + "AccessManagerFacet": "0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc", + "WithdrawFacet": "0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B", + "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE", + "HopFacet": "0xd84d9A8Bf830496C4DEc917bC27D22E09E01cB8A", + "AcrossFacet": "0xBeE13d99dD633fEAa2a0935f00CbC859F8305FA7", + "CBridgeFacet": "0x3b70Eb33948Fbfdc3f2F2491b96DFB1Aa18054E0", "AxelarFacet": "0x55c51beF79d16F5f0875E11207B17E885c21c13d", - "GenericSwapFacet": "0x6c8d5E7a3A0D71E192D5B4089B928D9e40275f0f", - "HyphenFacet": "0x3C5200505def68C53dfA4BFF6D93f891C3336C85", + "GenericSwapFacet": "0xE0c5e721b40D54f2aA09418B1237db9d88220C73", + "HyphenFacet": "0xF2c63815eBD0c4E048eF216C77E2c80aa4ecD59c", "MultichainFacet": "0x02063A0d7a222c16D5b63213262596B83b07150c", "NXTPFacet": "0x238502aDc8ca550723CBE78543c8B757599A21cC", - "StargateFacet": "0x181f5B2b2f0DFa10cd67628b939f4f60365B81D0", - "PeripheryRegistryFacet": "0x09dE46f590E8589B77C246Ed0F4b0D11eA18CCf3", - "ERC20Proxy": "0x32a1DF6bcd0aafD34F0AF23bBd5863E96B590fe1", + "StargateFacet": "0x7D1940fDfF0B37c137B105ce7967B3B86DB42648", + "PeripheryRegistryFacet": "0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15", + "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", "AxelarExecutor": "0x8aD0B427864f072B9416dcD06B2f653895cFE03C", - "Executor": "0x6b2D9a1B106f226F491ffa671321aa74B4ffB3b8", - "Receiver": "0x88AaAFa65D2198D17258a1C4Bd174C16074f7318", - "FeeCollector": "0xc86e99BAA1729329c82C7D1c319843871b70E32A", - "HopFacetOptimized": "0xF88512343bea9981C221eF5151019B2587e2Df7C", + "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", + "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", + "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9", + "HopFacetOptimized": "0x7D507e6E89C52aE610b8D0151c8cb24c24e43bdb", "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", - "LIFuelFacet": "0x09e64f611CA3EB62636e0A088BBEB2ABa8cbA5D3", - "HopFacetPacked": "0x4E123c97aD810B5C5781358a0DFAcfEc2fC4Cc04", - "AmarokFacet": "0xFBb86ff4de3F15BE6A256FD4B1B80851BFdC9c70", + "LIFuelFacet": "0x66861f292099cAF644F4A8b6091De49BEC5E8a15", + "HopFacetPacked": "0x6eF81a18E1E432C289DC0d1a670B78E8bbF9AA35", + "AmarokFacet": "0x3F95b05a77FDC6D82162D86A72b156b55030627f", "PackedEncoderDecoderFacet": "0x73d2d674449B3D8ad549cc3b04F8104C444FD34D", - "CBridgeFacetPacked": "0x1b4cf0A32646Faf0dF33A6CC4a95d4ab2f75e9e1", + "CBridgeFacetPacked": "0xE7Bf43C55551B1036e796E7Fd3b125d1F9903e2E", "LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF", - "AllBridgeFacet": "0xb5AAe4d25bC81f7969C3D4bd417cAFd2d73C7D5E", + "AllBridgeFacet": "0xC0c42d148241c5b5BB38e974d40Fc9087f7F9ecD", "ArbitrumBridgeFacet": "0x987f67811Ef841da0466746E10B4139Daff95053", "RelayerCelerIMImmutable": "0x7b6d852f58C783BA3b1138C535ff57dDa4c826E0", "CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE", "RelayerCelerIMMutable": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", - "CelerIMFacetMutable": "0xC8a59eAC93aa8f526dfA7E8C8f2899079FAed89C", + "CelerIMFacetMutable": "0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64", "WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50", - "RelayerCelerIM": "0x0Cb748F1e406FD32802C3f6Cb73a9A250c2bf6b7", - "StandardizedCallFacet": "0x898504305E0c187F1628B305ad39E8d252D02faC", - "CalldataVerificationFacet": "0xc3292e8155C32e9119c77F6C5308F3E6330996bE", - "LiFuelFeeCollector": "0x3C8C5062CbC7A6b9672bDd007da86eEE397cb4Cd", - "CelerCircleBridgeFacet": "0x4A9Ae261f40DE66E3fb542eC92eA2978cF383685", - "AcrossFacetPacked": "0x4b7692322D6bA92994128aA57457F22a397954C8", - "AmarokFacetPacked": "0xa9e7Dd55495D66508057522840a20f574F6c3987", - "SymbiosisFacet": "0x8670EBC689F35c441113D629A32e2d07F9d81dD7", - "TokenWrapper": "0xa593947304DcDd6F351DCE7E4b76dd76e2D698c3", - "SquidFacet": "0x2933F844337ccA96F5882865340A9F107E015E16", - "MayanFacet": "0x297aF81049744284874A7e5E90A907bAF6ACbbb5", - "GenericSwapFacetV3": "0x6EC2dEb47DA37DE972b47569b9ea9178EAF4156A", - "StargateFacetV2": "0xadd0645F855098c75BF1F83B66a8e3C696E88EFB", - "ReceiverStargateV2": "0x41A2a10eD14f240cB51D9Bc42E039817d2cDa894", + "RelayerCelerIM": "0x1C97BE47f6Da4d2e09B3A11B0A17C513dfD0e896", + "StandardizedCallFacet": "0x175E7799DA0CD40E641352EaB90D8e39e02a4Ca9", + "CalldataVerificationFacet": "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0", + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "CelerCircleBridgeFacet": "0x6731C946747bA54c78e7a65d416Cde39E478ECeb", + "AcrossFacetPacked": "0xE397c4883ec89ed4Fc9D258F00C689708b2799c9", + "AmarokFacetPacked": "0xF18A285f4e6f720Eb9b4e05df71f88b9552E6ADB", + "SymbiosisFacet": "0xe12b2488c71432F9a116E9ac244D3Ef4c2386d3a", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "SquidFacet": "0x5C2C3F56e33F45389aa4e1DA4D3a807A532a910c", + "MayanFacet": "0x4682d79DD4D0e7555415841b5151933AF50594A8", + "GenericSwapFacetV3": "0x31a9b1835864706Af10103b31Ea2b79bdb995F5F", + "StargateFacetV2": "0x6e378C84e657C57b2a8d183CFf30ee5CC8989b61", + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" -} \ No newline at end of file +} From 2994bc6e0fdbba4e10aeab21df355faf7ddd86f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Thu, 3 Oct 2024 13:15:42 +0700 Subject: [PATCH 3/6] some smaller script fixes --- deployments/_deployments_log_file.json | 14 ++++++++++++++ script/deploy/safe/propose-to-safe.ts | 2 +- script/helperFunctions.sh | 2 +- script/tasks/diamondSyncDEXs.sh | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index 3112e72c5..ea218ea12 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -23324,6 +23324,20 @@ } ] } + }, + "boba": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-10-03 09:37:41", + "CONSTRUCTOR_ARGS": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000100000000000000000000000029dacdf7ccadf4ee67c923b4c22255a4b2494ed7", + "SALT": "", + "VERIFIED": "true" + } + ] + } } } } diff --git a/script/deploy/safe/propose-to-safe.ts b/script/deploy/safe/propose-to-safe.ts index 75248faeb..e592d1cc8 100644 --- a/script/deploy/safe/propose-to-safe.ts +++ b/script/deploy/safe/propose-to-safe.ts @@ -9,8 +9,8 @@ import { type SafeTransactionDataPartial, } from '@safe-global/safe-core-sdk-types' import * as chains from 'viem/chains' -import { getViemChainForNetworkName } from '../../../utils/network' import { getSafeUtilityContracts, safeAddresses, safeApiUrls } from './config' +import { getViemChainForNetworkName } from '../../utils/viemScriptHelpers' const chainMap: Record = {} for (const [k, v] of Object.entries(chains)) { diff --git a/script/helperFunctions.sh b/script/helperFunctions.sh index 50c7fa0c6..21dc02712 100755 --- a/script/helperFunctions.sh +++ b/script/helperFunctions.sh @@ -2116,7 +2116,7 @@ function checkFailure() { # >>>>> output to console function echoDebug() { # read function arguments into variables - MESSAGE=$1 + MESSAGE="$1" # write message to console if debug flag is set to true if [[ $DEBUG == "true" ]]; then diff --git a/script/tasks/diamondSyncDEXs.sh b/script/tasks/diamondSyncDEXs.sh index 909f01fb8..55cca535e 100755 --- a/script/tasks/diamondSyncDEXs.sh +++ b/script/tasks/diamondSyncDEXs.sh @@ -93,7 +93,7 @@ function diamondSyncDEXs { if [ ${#DEXS[@]} -eq 0 ]; then echoDebug "0 approved DEXs found on diamond $DIAMOND_ADDRESS" else - echoDebug "${#DEXS[@]} approved DEXs found on diamond $DIAMOND_ADDRESS: $DEXS ${DEXS[@]}" + echoDebug "${#DEXS[@]} approved DEXs found on diamond $DIAMOND_ADDRESS: [${DEXS[*]}]" fi # Loop through all DEX addresses from config and check if they are already known by the diamond From c3c78480d4b33cdc7f0801313c949af9917f2448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Thu, 3 Oct 2024 14:47:02 +0700 Subject: [PATCH 4/6] diamond logs updated --- config/dexs.json | 1 + deployments/arbitrum.diamond.json | 9 +- deployments/avalanche.diamond.json | 9 +- deployments/base.diamond.json | 6 +- deployments/blast.diamond.json | 6 +- deployments/boba.diamond.json | 9 +- deployments/bsc.diamond.json | 9 +- deployments/fantom.diamond.json | 9 +- deployments/fuse.diamond.json | 6 +- deployments/gnosis.diamond.json | 9 +- deployments/linea.diamond.json | 4 +- deployments/mainnet.diamond.json | 2 +- deployments/metis.diamond.json | 4 +- deployments/mode.diamond.json | 6 +- deployments/moonbeam.diamond.json | 9 +- deployments/moonriver.diamond.json | 7 +- deployments/opbnb.diamond.json | 5 +- deployments/opbnb.json | 3 +- deployments/optimism.diamond.json | 4 +- deployments/polygon.diamond.json | 314 ++++++++++++------------- deployments/polygonzkevm.diamond.json | 9 +- deployments/scroll.diamond.json | 4 +- foundry.toml | 1 + networks | 1 + script/deploy/safe/propose-to-safe.ts | 2 +- script/tasks/diamondUpdatePeriphery.sh | 44 +++- 26 files changed, 280 insertions(+), 212 deletions(-) diff --git a/config/dexs.json b/config/dexs.json index f85b9e7c3..600e1469b 100644 --- a/config/dexs.json +++ b/config/dexs.json @@ -565,6 +565,7 @@ "0x0000000000001ff3684f28c67538d4d072c22734", "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" ], + "opbnb": ["0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc"], "polygon": [ "0x5215E9fd223BC909083fbdB2860213873046e45d", "0xdFC2983401614118E1F2D5A5FD93C17Fecf8BdC6", diff --git a/deployments/arbitrum.diamond.json b/deployments/arbitrum.diamond.json index 84bf3ed61..eba3af0fc 100644 --- a/deployments/arbitrum.diamond.json +++ b/deployments/arbitrum.diamond.json @@ -133,8 +133,11 @@ "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" } } -} \ No newline at end of file +} diff --git a/deployments/avalanche.diamond.json b/deployments/avalanche.diamond.json index 5635573e7..ddad2d5c4 100644 --- a/deployments/avalanche.diamond.json +++ b/deployments/avalanche.diamond.json @@ -102,11 +102,14 @@ "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", "FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" } } -} \ No newline at end of file +} diff --git a/deployments/base.diamond.json b/deployments/base.diamond.json index 6799fb07e..3a281843b 100644 --- a/deployments/base.diamond.json +++ b/deployments/base.diamond.json @@ -120,8 +120,10 @@ "FeeCollector": "0x0A6d96E7f4D7b96CFE42185DF61E64d255c12DFf", "Receiver": "0xeC03B65CbDc5f8858b02F44EBa54C90664249fb1", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc" } } } diff --git a/deployments/blast.diamond.json b/deployments/blast.diamond.json index 0d8bf62c3..6372867c3 100644 --- a/deployments/blast.diamond.json +++ b/deployments/blast.diamond.json @@ -71,7 +71,9 @@ "Receiver": "0x0561fFe9855541C02D17951c93405A4407Df74BC", "RelayerCelerIM": "", "ServiceFeeCollector": "0xf3552b98BB4234B47674700A99a0308D74B40F51", - "TokenWrapper": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD" + "TokenWrapper": "0xF2ee649caB7a0edEdED7a27821B0aCDF77778aeD", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/boba.diamond.json b/deployments/boba.diamond.json index 75fb2cd29..ec5ae9389 100644 --- a/deployments/boba.diamond.json +++ b/deployments/boba.diamond.json @@ -61,8 +61,11 @@ "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", "RelayerCelerIM": "", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/bsc.diamond.json b/deployments/bsc.diamond.json index c595eb28e..82b594b1e 100644 --- a/deployments/bsc.diamond.json +++ b/deployments/bsc.diamond.json @@ -109,8 +109,11 @@ "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A" } } -} \ No newline at end of file +} diff --git a/deployments/fantom.diamond.json b/deployments/fantom.diamond.json index d595f3076..e8aa9ec86 100644 --- a/deployments/fantom.diamond.json +++ b/deployments/fantom.diamond.json @@ -73,8 +73,11 @@ "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/fuse.diamond.json b/deployments/fuse.diamond.json index c757aa194..5e51b783c 100644 --- a/deployments/fuse.diamond.json +++ b/deployments/fuse.diamond.json @@ -55,7 +55,9 @@ "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", "RelayerCelerIM": "", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/gnosis.diamond.json b/deployments/gnosis.diamond.json index a55361c91..14317ff8d 100644 --- a/deployments/gnosis.diamond.json +++ b/deployments/gnosis.diamond.json @@ -85,8 +85,11 @@ "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", "RelayerCelerIM": "", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/linea.diamond.json b/deployments/linea.diamond.json index 17e316527..fd0844a52 100644 --- a/deployments/linea.diamond.json +++ b/deployments/linea.diamond.json @@ -111,7 +111,7 @@ "Executor": "0x2a202Ed587F0BC7dfa80ea1DD943d8470492Dd0F", "FeeCollector": "0xA4A24BdD4608D7dFC496950850f9763B674F0DB2", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0xcaA342e4f781d63EF41E220D7622B97E66BAEcF3", "LiFuelFeeCollector": "0x68B21d21509446Bf5449B6F5F8aBD4b3cfcbc3f8", "Receiver": "0xdcBEcDE898c067cA58ABD01a7de51660bBD5A897", "ReceiverStargateV2": "0x6CA57d9846f9a1fd48368762b743a047eC4f81A6", @@ -120,4 +120,4 @@ "TokenWrapper": "0xf6C9605c6E231C1547b7a6545d93e7233f97322a" } } -} \ No newline at end of file +} diff --git a/deployments/mainnet.diamond.json b/deployments/mainnet.diamond.json index af698d53e..986467a6a 100644 --- a/deployments/mainnet.diamond.json +++ b/deployments/mainnet.diamond.json @@ -163,7 +163,7 @@ "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", diff --git a/deployments/metis.diamond.json b/deployments/metis.diamond.json index 584b356d7..4e584ad34 100644 --- a/deployments/metis.diamond.json +++ b/deployments/metis.diamond.json @@ -75,7 +75,7 @@ "Executor": "0x6696F031C099dE6089427ceBFb38258feA6fdaFE", "FeeCollector": "0x27f0e36dE6B1BA8232f6c2e87E00A50731048C6B", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0x9E4c63c9a0EDE2Ca2e772ee48C819Ca5CB4529AC", "LiFuelFeeCollector": "0x851450e3b624ea4b068c3E8cFBcf79cD03D31C54", "Receiver": "0x0a4D7f27e8d24625eCb8d29d6445934a440A05E0", "ReceiverStargateV2": "0xe7392Fc0f61503dB53C70789c6F2c34C0675C929", @@ -84,4 +84,4 @@ "TokenWrapper": "0x01bDf46A673FC3c081ddBD21cb51fBA4972d00aC" } } -} \ No newline at end of file +} diff --git a/deployments/mode.diamond.json b/deployments/mode.diamond.json index 66fc152f9..19bb3425b 100644 --- a/deployments/mode.diamond.json +++ b/deployments/mode.diamond.json @@ -79,7 +79,9 @@ "Receiver": "0x0561fFe9855541C02D17951c93405A4407Df74BC", "RelayerCelerIM": "", "ServiceFeeCollector": "0x346b1F1896f2772ffee205e34246ac7adc55B43D", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/moonbeam.diamond.json b/deployments/moonbeam.diamond.json index 5a564d11e..e67b9ff69 100644 --- a/deployments/moonbeam.diamond.json +++ b/deployments/moonbeam.diamond.json @@ -61,8 +61,11 @@ "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", "RelayerCelerIM": "", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/moonriver.diamond.json b/deployments/moonriver.diamond.json index 20b463461..7f0d9031b 100644 --- a/deployments/moonriver.diamond.json +++ b/deployments/moonriver.diamond.json @@ -61,8 +61,11 @@ "Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "", + "ReceiverStargateV2": "" } } } \ No newline at end of file diff --git a/deployments/opbnb.diamond.json b/deployments/opbnb.diamond.json index 02b6bd7bc..0e09c48cc 100644 --- a/deployments/opbnb.diamond.json +++ b/deployments/opbnb.diamond.json @@ -47,13 +47,14 @@ } }, "Periphery": { - "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", + "ERC20Proxy": "0x5741A7FfE7.c39Ca175546a54985fA79211290b51", "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", "FeeCollector": "0x44Ff747185C9Df233D07536E08341ff624896164", "Receiver": "0xddc22EAaa960e052946D842cEC61eb91bbE06eeD", "RelayerCelerIM": "", "ServiceFeeCollector": "0xC85c2B19958D116d79C654ecE73b359c08802A76", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE" } } -} \ No newline at end of file +} diff --git a/deployments/opbnb.json b/deployments/opbnb.json index f7f4de34a..80a3feb4f 100644 --- a/deployments/opbnb.json +++ b/deployments/opbnb.json @@ -16,5 +16,6 @@ "FeeCollector": "0x44Ff747185C9Df233D07536E08341ff624896164", "Receiver": "0xddc22EAaa960e052946D842cEC61eb91bbE06eeD", "ServiceFeeCollector": "0xC85c2B19958D116d79C654ecE73b359c08802A76", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE" -} \ No newline at end of file +} diff --git a/deployments/optimism.diamond.json b/deployments/optimism.diamond.json index f1ae60a66..9b30dc1ff 100644 --- a/deployments/optimism.diamond.json +++ b/deployments/optimism.diamond.json @@ -139,7 +139,7 @@ "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", @@ -148,4 +148,4 @@ "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" } } -} \ No newline at end of file +} diff --git a/deployments/polygon.diamond.json b/deployments/polygon.diamond.json index 023ae9d71..819e958e0 100644 --- a/deployments/polygon.diamond.json +++ b/deployments/polygon.diamond.json @@ -1,159 +1,159 @@ { - "LiFiDiamond": { - "Facets": { - "0xf7993A8df974AD022647E63402d6315137c58ABf": { - "Name": "", - "Version": "" - }, - "0xF5ba8Db6fEA7aF820De35C8D0c294e17DBC1b9D2": { - "Name": "", - "Version": "" - }, - "0x708A978951F95048701bD2A6f9598A95a70a22A8": { - "Name": "OwnershipFacet", - "Version": "1.0.0" - }, - "0x4b7692322D6bA92994128aA57457F22a397954C8": { - "Name": "AcrossFacetPacked", - "Version": "1.0.0" - }, - "0x03632D069D7C796Ee8F0F549ccF00A05a1BA81eA": { - "Name": "DexManagerFacet", - "Version": "1.0.0" - }, - "0x6530fe65e04FD08602782913536aa68baaF5CA0A": { - "Name": "AccessManagerFacet", - "Version": "1.0.0" - }, - "0x4E123c97aD810B5C5781358a0DFAcfEc2fC4Cc04": { - "Name": "HopFacetPacked", - "Version": "1.0.0" - }, - "0xd2E93ebafeb398735D1d369D6527937E19f92403": { - "Name": "CBridgeFacet", - "Version": "1.0.0" - }, - "0x1b4cf0A32646Faf0dF33A6CC4a95d4ab2f75e9e1": { - "Name": "CBridgeFacetPacked", - "Version": "1.0.0" - }, - "0x6c8d5E7a3A0D71E192D5B4089B928D9e40275f0f": { - "Name": "GenericSwapFacet", - "Version": "1.0.0" - }, - "0x3a60730cbcD91715E31830f125bB3eF1FA0a2c66": { - "Name": "", - "Version": "" - }, - "0x3C5200505def68C53dfA4BFF6D93f891C3336C85": { - "Name": "HyphenFacet", - "Version": "1.0.0" - }, - "0x02063A0d7a222c16D5b63213262596B83b07150c": { - "Name": "MultichainFacet", - "Version": "1.0.1" - }, - "0xFBb86ff4de3F15BE6A256FD4B1B80851BFdC9c70": { - "Name": "AmarokFacet", - "Version": "1.0.0" - }, - "0x09dE46f590E8589B77C246Ed0F4b0D11eA18CCf3": { - "Name": "PeripheryRegistryFacet", - "Version": "1.0.0" - }, - "0xc3292e8155C32e9119c77F6C5308F3E6330996bE": { - "Name": "CalldataVerificationFacet", - "Version": "1.0.0" - }, - "0x2A2a2A6b31585F39579Cbf5eD5E8a3aF5Ac9214a": { - "Name": "HopFacet", - "Version": "1.0.0" - }, - "0xb5AAe4d25bC81f7969C3D4bd417cAFd2d73C7D5E": { - "Name": "AllBridgeFacet", - "Version": "1.0.0" - }, - "0xC8a59eAC93aa8f526dfA7E8C8f2899079FAed89C": { - "Name": "CelerIMFacetMutable", - "Version": "1.0.0" - }, - "0xF88512343bea9981C221eF5151019B2587e2Df7C": { - "Name": "HopFacetOptimized", - "Version": "1.0.0" - }, - "0x09e64f611CA3EB62636e0A088BBEB2ABa8cbA5D3": { - "Name": "LIFuelFacet", - "Version": "1.0.0" - }, - "0x2d7eBD552EC66250cB523216ec8B0258b54d6090": { - "Name": "AcrossFacet", - "Version": "1.0.0" - }, - "0x898504305E0c187F1628B305ad39E8d252D02faC": { - "Name": "StandardizedCallFacet", - "Version": "1.0.0" - }, - "0x181f5B2b2f0DFa10cd67628b939f4f60365B81D0": { - "Name": "StargateFacet", - "Version": "1.0.0" - }, - "0x9558CacEAC173Bdf32fb4cd7067e9e3c3b4c155e": { - "Name": "", - "Version": "" - }, - "0x4A9Ae261f40DE66E3fb542eC92eA2978cF383685": { - "Name": "CelerCircleBridgeFacet", - "Version": "1.0.0" - }, - "0xFBfF1651A47aC43e45E5F03361d5C5cd3c3940f3": { - "Name": "WithdrawFacet", - "Version": "1.0.0" - }, - "0xa9e7Dd55495D66508057522840a20f574F6c3987": { - "Name": "AmarokFacetPacked", - "Version": "1.0.0" - }, - "0x8670EBC689F35c441113D629A32e2d07F9d81dD7": { - "Name": "SymbiosisFacet", - "Version": "1.0.0" - }, - "0x2933F844337ccA96F5882865340A9F107E015E16": { - "Name": "SquidFacet", - "Version": "1.0.0" - }, - "0x297aF81049744284874A7e5E90A907bAF6ACbbb5": { - "Name": "MayanFacet", - "Version": "1.0.0" - }, - "0x6EC2dEb47DA37DE972b47569b9ea9178EAF4156A": { - "Name": "GenericSwapFacetV3", - "Version": "1.0.0" - }, - "0xadd0645F855098c75BF1F83B66a8e3C696E88EFB": { - "Name": "StargateFacetV2", - "Version": "1.0.0" - }, - "0x085DA8977767c1F2767f6fdD1CE7F9A5C565db72": { - "Name": "DiamondCutFacet", - "Version": "1.0.0" - }, - "0xDb670AB7C837389Eb69C5Cc16d54AB2533D3250D": { - "Name": "DiamondLoupeFacet", - "Version": "1.0.0" - } - }, - "Periphery": { - "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", - "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", - "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9", - "GasRebateDistributor": "", - "LiFiDEXAggregator": "", - "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", - "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", - "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", - "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", - "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" - } + "LiFiDiamond": { + "Facets": { + "0xf7993A8df974AD022647E63402d6315137c58ABf": { + "Name": "", + "Version": "" + }, + "0xF5ba8Db6fEA7aF820De35C8D0c294e17DBC1b9D2": { + "Name": "", + "Version": "" + }, + "0x708A978951F95048701bD2A6f9598A95a70a22A8": { + "Name": "OwnershipFacet", + "Version": "1.0.0" + }, + "0x4b7692322D6bA92994128aA57457F22a397954C8": { + "Name": "AcrossFacetPacked", + "Version": "1.0.0" + }, + "0x03632D069D7C796Ee8F0F549ccF00A05a1BA81eA": { + "Name": "DexManagerFacet", + "Version": "1.0.0" + }, + "0x6530fe65e04FD08602782913536aa68baaF5CA0A": { + "Name": "AccessManagerFacet", + "Version": "1.0.0" + }, + "0x4E123c97aD810B5C5781358a0DFAcfEc2fC4Cc04": { + "Name": "HopFacetPacked", + "Version": "1.0.0" + }, + "0xd2E93ebafeb398735D1d369D6527937E19f92403": { + "Name": "CBridgeFacet", + "Version": "1.0.0" + }, + "0x1b4cf0A32646Faf0dF33A6CC4a95d4ab2f75e9e1": { + "Name": "CBridgeFacetPacked", + "Version": "1.0.0" + }, + "0x6c8d5E7a3A0D71E192D5B4089B928D9e40275f0f": { + "Name": "GenericSwapFacet", + "Version": "1.0.0" + }, + "0x3a60730cbcD91715E31830f125bB3eF1FA0a2c66": { + "Name": "", + "Version": "" + }, + "0x3C5200505def68C53dfA4BFF6D93f891C3336C85": { + "Name": "HyphenFacet", + "Version": "1.0.0" + }, + "0x02063A0d7a222c16D5b63213262596B83b07150c": { + "Name": "MultichainFacet", + "Version": "1.0.1" + }, + "0xFBb86ff4de3F15BE6A256FD4B1B80851BFdC9c70": { + "Name": "AmarokFacet", + "Version": "1.0.0" + }, + "0x09dE46f590E8589B77C246Ed0F4b0D11eA18CCf3": { + "Name": "PeripheryRegistryFacet", + "Version": "1.0.0" + }, + "0xc3292e8155C32e9119c77F6C5308F3E6330996bE": { + "Name": "CalldataVerificationFacet", + "Version": "1.0.0" + }, + "0x2A2a2A6b31585F39579Cbf5eD5E8a3aF5Ac9214a": { + "Name": "HopFacet", + "Version": "1.0.0" + }, + "0xb5AAe4d25bC81f7969C3D4bd417cAFd2d73C7D5E": { + "Name": "AllBridgeFacet", + "Version": "1.0.0" + }, + "0xC8a59eAC93aa8f526dfA7E8C8f2899079FAed89C": { + "Name": "CelerIMFacetMutable", + "Version": "1.0.0" + }, + "0xF88512343bea9981C221eF5151019B2587e2Df7C": { + "Name": "HopFacetOptimized", + "Version": "1.0.0" + }, + "0x09e64f611CA3EB62636e0A088BBEB2ABa8cbA5D3": { + "Name": "LIFuelFacet", + "Version": "1.0.0" + }, + "0x2d7eBD552EC66250cB523216ec8B0258b54d6090": { + "Name": "AcrossFacet", + "Version": "1.0.0" + }, + "0x898504305E0c187F1628B305ad39E8d252D02faC": { + "Name": "StandardizedCallFacet", + "Version": "1.0.0" + }, + "0x181f5B2b2f0DFa10cd67628b939f4f60365B81D0": { + "Name": "StargateFacet", + "Version": "1.0.0" + }, + "0x9558CacEAC173Bdf32fb4cd7067e9e3c3b4c155e": { + "Name": "", + "Version": "" + }, + "0x4A9Ae261f40DE66E3fb542eC92eA2978cF383685": { + "Name": "CelerCircleBridgeFacet", + "Version": "1.0.0" + }, + "0xFBfF1651A47aC43e45E5F03361d5C5cd3c3940f3": { + "Name": "WithdrawFacet", + "Version": "1.0.0" + }, + "0xa9e7Dd55495D66508057522840a20f574F6c3987": { + "Name": "AmarokFacetPacked", + "Version": "1.0.0" + }, + "0x8670EBC689F35c441113D629A32e2d07F9d81dD7": { + "Name": "SymbiosisFacet", + "Version": "1.0.0" + }, + "0x2933F844337ccA96F5882865340A9F107E015E16": { + "Name": "SquidFacet", + "Version": "1.0.0" + }, + "0x297aF81049744284874A7e5E90A907bAF6ACbbb5": { + "Name": "MayanFacet", + "Version": "1.0.0" + }, + "0x6EC2dEb47DA37DE972b47569b9ea9178EAF4156A": { + "Name": "GenericSwapFacetV3", + "Version": "1.0.0" + }, + "0xadd0645F855098c75BF1F83B66a8e3C696E88EFB": { + "Name": "StargateFacetV2", + "Version": "1.0.0" + }, + "0x085DA8977767c1F2767f6fdD1CE7F9A5C565db72": { + "Name": "DiamondCutFacet", + "Version": "1.0.0" + }, + "0xDb670AB7C837389Eb69C5Cc16d54AB2533D3250D": { + "Name": "DiamondLoupeFacet", + "Version": "1.0.0" + } + }, + "Periphery": { + "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", + "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", + "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "Receiver": "0x050e198E36A73a1e32F15C3afC58C4506d82f657", + "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", + "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", + "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" } -} \ No newline at end of file + } +} diff --git a/deployments/polygonzkevm.diamond.json b/deployments/polygonzkevm.diamond.json index 7aae840e9..dc8c22daa 100644 --- a/deployments/polygonzkevm.diamond.json +++ b/deployments/polygonzkevm.diamond.json @@ -81,8 +81,11 @@ "Receiver": "0xC850013FC01A264018D58D112000E32835D15fBC", "RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97", "ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D", - "LiFuelFeeCollector": "0xc4f7A34b8d283f66925eF0f5CCdFC2AF3030DeaE", - "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" + "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", + "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", + "GasRebateDistributor": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", + "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/scroll.diamond.json b/deployments/scroll.diamond.json index a8865f701..6167c6c95 100644 --- a/deployments/scroll.diamond.json +++ b/deployments/scroll.diamond.json @@ -79,7 +79,7 @@ "Executor": "0x7078d1DE45C7D3e87f71D5DA663db2a8Ee1dfEbe", "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "Receiver": "0x0561fFe9855541C02D17951c93405A4407Df74BC", "ReceiverStargateV2": "0x1493e7B8d4DfADe0a178dAD9335470337A3a219A", @@ -88,4 +88,4 @@ "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d" } } -} \ No newline at end of file +} diff --git a/foundry.toml b/foundry.toml index 747865f73..178564553 100644 --- a/foundry.toml +++ b/foundry.toml @@ -88,6 +88,7 @@ mode = { key = "${MODE_ETHERSCAN_API_KEY}", url = "https://api.routescan.io/v2/n moonbeam = { key = "${MOONBEAM_ETHERSCAN_API_KEY}", url = "https://api-moonbeam.moonscan.io/api", chain = "1284" } moonriver = { key = "${MOONRIVER_ETHERSCAN_API_KEY}", url = "https://api-moonriver.moonscan.io/api", chain = "1285" } optimism = { key = "${OPTIMISM_ETHERSCAN_API_KEY}", url = "https://api-optimistic.etherscan.io/api", chain = "10" } +opbnb = { key = "${OPBNB_ETHERSCAN_API_KEY}", url = "https://open-platform.nodereal.io/2462d1f4552043fba279ef0cee4661d9/op-bnb-mainnet/contract/", chain = "204" } polygon = { key = "${POLYGON_ETHERSCAN_API_KEY}", url = "https://api.polygonscan.com/api", chain = "137" } polygonzkevm = { key = "${POLYGONZKEVM_ETHERSCAN_API_KEY}", url = "https://api-zkevm.polygonscan.com/api", chain = "1101" } scroll = { key = "${SCROLL_ETHERSCAN_API_KEY}", url = "https://api.scrollscan.com/api", chain = "534352" } diff --git a/networks b/networks index 612abe91b..8a1ef0ac2 100644 --- a/networks +++ b/networks @@ -21,6 +21,7 @@ mode moonbeam moonriver optimism +opbnb polygon polygonzkevm rootstock diff --git a/script/deploy/safe/propose-to-safe.ts b/script/deploy/safe/propose-to-safe.ts index e592d1cc8..58def0d61 100644 --- a/script/deploy/safe/propose-to-safe.ts +++ b/script/deploy/safe/propose-to-safe.ts @@ -96,7 +96,7 @@ const main = defineCommand({ console.info('Signer Address', senderAddress) console.info('Safe Address', safeAddress) console.info('Network', chain.name) - console.info('Proosing transaction to', args.to) + console.info('Proposing transaction to', args.to) // Propose transaction to the service await safeService.proposeTransaction({ diff --git a/script/tasks/diamondUpdatePeriphery.sh b/script/tasks/diamondUpdatePeriphery.sh index 393b63e00..369f6caa7 100755 --- a/script/tasks/diamondUpdatePeriphery.sh +++ b/script/tasks/diamondUpdatePeriphery.sh @@ -149,11 +149,11 @@ function diamondUpdatePeriphery() { } register() { - local NETWORK=$(tr '[:lower:]-' '[:upper:]_' <<<$1) + local NETWORK="$1" local DIAMOND=$2 local CONTRACT_NAME=$3 local ADDR=$4 - local RPC="ETH_NODE_URI_$NETWORK" + local RPC_URL=$(getRPCUrl $NETWORK) local ENVIRONMENT=$5 # register periphery contract @@ -165,12 +165,12 @@ register() { echoDebug "DIAMOND=$DIAMOND" echoDebug "CONTRACT_NAME=$CONTRACT_NAME" echoDebug "ADDR=$ADDR" - echoDebug "RPC=${!RPC}" + echoDebug "RPC_URL=$RPC_URL" echoDebug "ENVIRONMENT=$ENVIRONMENT" echo "" # check that the contract is actually deployed - local CODE_SIZE=$(cast codesize "$ADDR" --rpc-url "${!RPC}") + local CODE_SIZE=$(cast codesize "$ADDR" --rpc-url "$RPC_URL") if [ $CODE_SIZE -eq 0 ]; then error "contract $CONTRACT_NAME is not deployed on network $NETWORK - exiting script now" return 1 @@ -179,17 +179,45 @@ register() { while [ $ATTEMPTS -le "$MAX_ATTEMPTS_PER_SCRIPT_EXECUTION" ]; do # try to execute call if [[ "$DEBUG" == *"true"* ]]; then + # print output to console echoDebug "trying to register periphery contract $CONTRACT_NAME in diamond on network $NETWORK now - attempt ${ATTEMPTS} (max attempts: $MAX_ATTEMPTS_PER_SCRIPT_EXECUTION) " # ensure that gas price is below maximum threshold (for mainnet only) doNotContinueUnlessGasIsBelowThreshold "$NETWORK" - # print output to console - cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "${!RPC}" --legacy - # cast send 0xd37c412F1a782332a91d183052427a5336438cD3 'registerPeripheryContract(string,address)' "Executor" "0x68895782994F1d7eE13AD210b63B66c81ec7F772" --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" --rpc-url "${!RPC}" --legacy + if [[ "$ENVIRONMENT" == "production" ]]; then + # propose registerPeripheryContract transaction to multisig safe + local CALLDATA=$(cast calldata "registerPeripheryContract(string,address)" "$CONTRACT_NAME" "$ADDR") + + DIAMOND_ADDRESS=$(getContractAddressFromDeploymentLogs "$NETWORK" "$ENVIRONMENT" "$DIAMOND_CONTRACT_NAME") + + echo "Now proposing registerPeripheryContract("$CONTRACT_NAME","$ADDR") to diamond "$DIAMOND_ADDRESS" with calldata $CALLDATA" + ts-node script/deploy/safe/propose-to-safe.ts --to "$DIAMOND_ADDRESS" --calldata "$CALLDATA" --network "$NETWORK" --rpcUrl "$RPC_URL" --privateKey "$SAFE_SIGNER_PRIVATE_KEY" + + else + # just register the diamond (no multisig required) + cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "$RPC_URL" --legacy + fi + + # cast send 0xd37c412F1a782332a91d183052427a5336438cD3 'registerPeripheryContract(string,address)' "Executor" "0x68895782994F1d7eE13AD210b63B66c81ec7F772" --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" --rpc-url $RPC_URL" --legacy else # do not print output to console - cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "${!RPC}" --legacy >/dev/null 2>&1 + if [[ "$ENVIRONMENT" == "production" ]]; then + # propose registerPeripheryContract transaction to multisig safe + local CALLDATA=$(cast calldata "registerPeripheryContract(string,address)" "$CONTRACT_NAME" "$ADDR") + echoDebug "Calldata: $CALLDATA" + + DIAMOND_ADDRESS=$(getContractAddressFromDeploymentLogs "$NETWORK" "$ENVIRONMENT" "$DIAMOND_CONTRACT_NAME") + echoDebug "DIAMOND_ADDRESS: $DIAMOND_ADDRESS" + echoDebug "NETWORK: $NETWORK" + + echo "Now proposing registerPeripheryContract("$CONTRACT_NAME","$ADDR") to diamond "$DIAMOND_ADDRESS" with calldata $CALLDATA" + $(ts-node script/deploy/safe/propose-to-safe.ts --to "$DIAMOND_ADDRESS" --calldata "$CALLDATA" --network "$NETWORK" --rpcUrl "$RPC_URL" --privateKey "$SAFE_SIGNER_PRIVATE_KEY") + + else + # just register the diamond (no multisig required) + cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "$RPC_URL" --legacy >/dev/null 2>&1 + fi fi # check the return code the last call From 683cd5761f17e06adaeb6288ef6d351f832189e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Thu, 3 Oct 2024 14:53:40 +0700 Subject: [PATCH 5/6] deployed GenericSwapFacetV3 to opBNB --- config/global.json | 1 + deployments/opbnb.json | 1 + 2 files changed, 2 insertions(+) diff --git a/config/global.json b/config/global.json index 61639c7f8..1e714645a 100644 --- a/config/global.json +++ b/config/global.json @@ -134,6 +134,7 @@ "moonbeam": "0x0000000000000000000000000000000000000000", "moonriver": "0x0000000000000000000000000000000000000000", "optimism": "0x0000000000000000000000000000000000000000", + "opbnb": "0x0000000000000000000000000000000000000000", "polygon": "0x0000000000000000000000000000000000000000", "polygonzkevm": "0x0000000000000000000000000000000000000000", "rootstock": "0x0000000000000000000000000000000000000000", diff --git a/deployments/opbnb.json b/deployments/opbnb.json index 80a3feb4f..2a44283eb 100644 --- a/deployments/opbnb.json +++ b/deployments/opbnb.json @@ -8,6 +8,7 @@ "PeripheryRegistryFacet": "0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15", "LIFuelFacet": "0x51709aF40dE8feEbD9d694F26826F29ce915DcbF", "GenericSwapFacet": "0xE0c5e721b40D54f2aA09418B1237db9d88220C73", + "GenericSwapFacetV3": "0x4E1D2308e11C06c93700FfFdD5b658D2d35a1e15", "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE", "StandardizedCallFacet": "0x2E61751366B7e006f8D53becB4b697890B30144F", "CalldataVerificationFacet": "0xaE77c9aD4af61fAec96f04bD6723F6F6A804a567", From f4bd158bc704b98d3bd5d21b0f743323a5656bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Bl=C3=A4cker?= Date: Fri, 4 Oct 2024 16:22:27 +0700 Subject: [PATCH 6/6] minor fixes from coderabbit reviews --- deployments/moonriver.diamond.json | 4 ++-- deployments/opbnb.diamond.json | 2 +- script/tasks/diamondSyncSigs.ts | 2 +- script/tasks/diamondUpdatePeriphery.sh | 7 +++---- script/tasks/fundNewWalletOnAllChains.ts | 3 ++- script/utils/network.ts | 8 -------- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/deployments/moonriver.diamond.json b/deployments/moonriver.diamond.json index 7f0d9031b..eeb1049a3 100644 --- a/deployments/moonriver.diamond.json +++ b/deployments/moonriver.diamond.json @@ -64,8 +64,8 @@ "LiFuelFeeCollector": "0xc02FFcdD914DbA646704439c6090BAbaD521d04C", "TokenWrapper": "0x5215E9fd223BC909083fbdB2860213873046e45d", "GasRebateDistributor": "", - "LiFiDEXAggregator": "", + "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc", "ReceiverStargateV2": "" } } -} \ No newline at end of file +} diff --git a/deployments/opbnb.diamond.json b/deployments/opbnb.diamond.json index 0e09c48cc..181a8861a 100644 --- a/deployments/opbnb.diamond.json +++ b/deployments/opbnb.diamond.json @@ -47,7 +47,7 @@ } }, "Periphery": { - "ERC20Proxy": "0x5741A7FfE7.c39Ca175546a54985fA79211290b51", + "ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51", "Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D", "FeeCollector": "0x44Ff747185C9Df233D07536E08341ff624896164", "Receiver": "0xddc22EAaa960e052946D842cEC61eb91bbE06eeD", diff --git a/script/tasks/diamondSyncSigs.ts b/script/tasks/diamondSyncSigs.ts index 281520a5b..b055cd7e7 100644 --- a/script/tasks/diamondSyncSigs.ts +++ b/script/tasks/diamondSyncSigs.ts @@ -11,7 +11,7 @@ import { import { ethers } from 'ethers6' import * as chains from 'viem/chains' import { privateKeyToAccount } from 'viem/accounts' -import { getViemChainForNetworkName } from '../../utils/viemScriptHelpers' +import { getViemChainForNetworkName } from '../utils/viemScriptHelpers' export const chainNameMappings: Record = { zksync: 'zkSync', diff --git a/script/tasks/diamondUpdatePeriphery.sh b/script/tasks/diamondUpdatePeriphery.sh index 369f6caa7..56391f034 100755 --- a/script/tasks/diamondUpdatePeriphery.sh +++ b/script/tasks/diamondUpdatePeriphery.sh @@ -196,7 +196,7 @@ register() { else # just register the diamond (no multisig required) - cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "$RPC_URL" --legacy + cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key "$(getPrivateKey "$NETWORK" "$ENVIRONMENT")" --rpc-url "$RPC_URL" --legacy fi # cast send 0xd37c412F1a782332a91d183052427a5336438cD3 'registerPeripheryContract(string,address)' "Executor" "0x68895782994F1d7eE13AD210b63B66c81ec7F772" --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" --rpc-url $RPC_URL" --legacy @@ -212,11 +212,10 @@ register() { echoDebug "NETWORK: $NETWORK" echo "Now proposing registerPeripheryContract("$CONTRACT_NAME","$ADDR") to diamond "$DIAMOND_ADDRESS" with calldata $CALLDATA" - $(ts-node script/deploy/safe/propose-to-safe.ts --to "$DIAMOND_ADDRESS" --calldata "$CALLDATA" --network "$NETWORK" --rpcUrl "$RPC_URL" --privateKey "$SAFE_SIGNER_PRIVATE_KEY") - + ts-node script/deploy/safe/propose-to-safe.ts --to "$DIAMOND_ADDRESS" --calldata "$CALLDATA" --network "$NETWORK" --rpcUrl "$RPC_URL" --privateKey "$SAFE_SIGNER_PRIVATE_KEY" else # just register the diamond (no multisig required) - cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key $(getPrivateKey "$NETWORK" "$ENVIRONMENT") --rpc-url "$RPC_URL" --legacy >/dev/null 2>&1 + cast send "$DIAMOND" 'registerPeripheryContract(string,address)' "$CONTRACT_NAME" "$ADDR" --private-key "$(getPrivateKey "$NETWORK" "$ENVIRONMENT")" --rpc-url "$RPC_URL" --legacy >/dev/null 2>&1 fi fi diff --git a/script/tasks/fundNewWalletOnAllChains.ts b/script/tasks/fundNewWalletOnAllChains.ts index 0413ef286..189a6c666 100644 --- a/script/tasks/fundNewWalletOnAllChains.ts +++ b/script/tasks/fundNewWalletOnAllChains.ts @@ -2,12 +2,13 @@ import { defineCommand, runMain } from 'citty' import { createPublicClient, createWalletClient, http, parseAbi } from 'viem' import { privateKeyToAccount } from 'viem/accounts' -import { getAllNetworks, getViemChainForNetworkName } from '../../utils/network' +import { getAllNetworks } from '../utils/network' import gasZipChainIds from '../resources/gasZipChainIds.json' import { BigNumber, BigNumberish } from 'ethers' import axios from 'axios' import { mainnet } from 'viem/chains' import { network } from 'hardhat' +import { getViemChainForNetworkName } from '../utils/viemScriptHelpers' const GAS_ZIP_ROUTER_MAINNET = '0x9e22ebec84c7e4c4bd6d4ae7ff6f4d436d6d8390' const testnets = [ diff --git a/script/utils/network.ts b/script/utils/network.ts index b9ab4bd46..0fede796d 100644 --- a/script/utils/network.ts +++ b/script/utils/network.ts @@ -84,11 +84,3 @@ for (const [k, v] of Object.entries(chains)) { // @ts-ignore chainMap[k] = v } - -export const getViemChainForNetworkName = (network: string): Chain => { - const chainName = chainNameMappings[network] || network - const chain: Chain = chainMap[chainName] - - if (!chain) throw new Error(`Viem chain not found for network ${network}`) - return chain -}