From ce27ee6fb12c06fa21b54e3d3d0dfd433b38a443 Mon Sep 17 00:00:00 2001 From: Ed Zynda Date: Wed, 4 Dec 2024 15:50:08 +0300 Subject: [PATCH] Deploy GasZip and update logs --- config/gaszip.json | 1 + deployments/_deployments_log_file.json | 43 ++++--- deployments/lisk.diamond.json | 154 +++++++++++++------------ deployments/lisk.json | 50 ++++---- script/deploy/_targetState.json | 131 ++++++++++++--------- script/deploy/safe/propose-to-safe.ts | 11 +- 6 files changed, 220 insertions(+), 170 deletions(-) diff --git a/config/gaszip.json b/config/gaszip.json index 3b3ce4dac..b1e5312f6 100644 --- a/config/gaszip.json +++ b/config/gaszip.json @@ -11,6 +11,7 @@ "gnosis": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", "gravity": "0x6Efc6Ead40786bD87A884382b6EA4BcA3C985e99", "linea": "0xA60768b03eB14d940F6c9a8553329B7F9037C91b", + "lisk": "0xA60768b03eB14d940F6c9a8553329B7F9037C91b", "mantle": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", "metis": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", "mode": "0x2a37D63EAdFe4b4682a3c28C1c2cD4F109Cc2762", diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json index 80bb5cd2a..ac7767f5a 100644 --- a/deployments/_deployments_log_file.json +++ b/deployments/_deployments_log_file.json @@ -24161,20 +24161,6 @@ ] } }, - "worldchain": { - "production": { - "1.0.0": [ - { - "ADDRESS": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54", - "OPTIMIZER_RUNS": "1000000", - "TIMESTAMP": "2024-12-02T07:45:33.459Z", - "CONSTRUCTOR_ARGS": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000d38743b48d26743c0ec6898d699394fbc94657ee", - "SALT": "", - "VERIFIED": true - } - ] - } - }, "lisk": { "production": { "1.0.0": [ @@ -25789,6 +25775,20 @@ } ] } + }, + "lisk": { + "production": { + "2.0.0": [ + { + "ADDRESS": "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-12-04T12:47:31.763Z", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000a60768b03eb14d940f6c9a8553329b7f9037c91b", + "SALT": "", + "VERIFIED": true + } + ] + } } }, "GasZipPeriphery": { @@ -26069,5 +26069,20 @@ } ] } + }, + "lisk": { + "production": { + "1.0.0": [ + { + "ADDRESS": "0x76aE215b11797b32397d878e6f3E65081ff58b13", + "OPTIMIZER_RUNS": "1000000", + "TIMESTAMP": "2024-12-04T12:47:32.171Z", + "CONSTRUCTOR_ARGS": "0x000000000000000000000000a60768b03eb14d940f6c9a8553329b7f9037c91b0000000000000000000000002321f1a63a683a1f3634dbe1cba0d657d5f56d5400000000000000000000000086e02d7383d6a045848b0a1a842996ac9e943113", + "SALT": "", + "VERIFIED": true + } + ] + } } } +} \ No newline at end of file diff --git a/deployments/lisk.diamond.json b/deployments/lisk.diamond.json index 6eaea8776..dbce21a66 100644 --- a/deployments/lisk.diamond.json +++ b/deployments/lisk.diamond.json @@ -1,76 +1,84 @@ { - "LiFiDiamond": { - "Facets": { - "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d": { - "Name": "DiamondCutFacet", - "Version": "1.0.0" - }, - "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f": { - "Name": "DiamondLoupeFacet", - "Version": "1.0.0" - }, - "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455": { - "Name": "OwnershipFacet", - "Version": "1.0.0" - }, - "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1": { - "Name": "WithdrawFacet", - "Version": "1.0.0" - }, - "0xE154389c1bAE241F220661131b7AfDc1514C55c7": { - "Name": "DexManagerFacet", - "Version": "1.0.0" - }, - "0x314E1E760316050B0D6338bCf3d689b8D301F593": { - "Name": "AccessManagerFacet", - "Version": "1.0.0" - }, - "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453": { - "Name": "PeripheryRegistryFacet", - "Version": "1.0.0" - }, - "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713": { - "Name": "LIFuelFacet", - "Version": "1.0.0" - }, - "0xd2B3b3605e630232c13111458Ae3a97d13c8F477": { - "Name": "GenericSwapFacet", - "Version": "1.0.0" - }, - "0xBa713B18c806EcdEEE49FAec623dE2D872192872": { - "Name": "GenericSwapFacetV3", - "Version": "1.0.0" - }, - "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E": { - "Name": "StandardizedCallFacet", - "Version": "1.0.0" - }, - "0x1feB868BF64AdC552E051fB7387681F78b988a81": { - "Name": "CalldataVerificationFacet", - "Version": "1.0.0" - }, - "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844": { - "Name": "EmergencyPauseFacet", - "Version": "1.0.0" - }, - "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92": { - "Name": "AcrossFacetV3", - "Version": "1.0.0" - }, - "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57": { - "Name": "AcrossFacetPackedV3", - "Version": "1.0.0" - } - }, - "Periphery": { - "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0", - "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B", - "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155", - "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd", - "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1", - "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a", - "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54", - "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb" - } + "LiFiDiamond": { + "Facets": { + "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d": { + "Name": "DiamondCutFacet", + "Version": "2.0.0" + }, + "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f": { + "Name": "DiamondLoupeFacet", + "Version": "1.0.0" + }, + "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455": { + "Name": "OwnershipFacet", + "Version": "1.0.0" + }, + "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1": { + "Name": "WithdrawFacet", + "Version": "1.0.0" + }, + "0xE154389c1bAE241F220661131b7AfDc1514C55c7": { + "Name": "DexManagerFacet", + "Version": "1.0.1" + }, + "0x314E1E760316050B0D6338bCf3d689b8D301F593": { + "Name": "AccessManagerFacet", + "Version": "1.0.0" + }, + "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453": { + "Name": "PeripheryRegistryFacet", + "Version": "1.0.0" + }, + "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713": { + "Name": "LIFuelFacet", + "Version": "1.0.1" + }, + "0xd2B3b3605e630232c13111458Ae3a97d13c8F477": { + "Name": "GenericSwapFacet", + "Version": "1.0.0" + }, + "0xBa713B18c806EcdEEE49FAec623dE2D872192872": { + "Name": "GenericSwapFacetV3", + "Version": "1.0.1" + }, + "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E": { + "Name": "StandardizedCallFacet", + "Version": "1.1.0" + }, + "0x1feB868BF64AdC552E051fB7387681F78b988a81": { + "Name": "CalldataVerificationFacet", + "Version": "1.1.2" + }, + "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844": { + "Name": "EmergencyPauseFacet", + "Version": "1.0.1" + }, + "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92": { + "Name": "AcrossFacetV3", + "Version": "1.0.0" + }, + "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57": { + "Name": "AcrossFacetPackedV3", + "Version": "1.0.0" + }, + "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19": { + "Name": "GasZipFacet", + "Version": "2.0.0" + } + }, + "Periphery": { + "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0", + "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B", + "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155", + "GasZipPeriphery": "0x76aE215b11797b32397d878e6f3E65081ff58b13", + "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54", + "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1", + "Permit2Proxy": "", + "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb", + "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd", + "ReceiverStargateV2": "", + "RelayerCelerIM": "", + "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a" } + } } \ No newline at end of file diff --git a/deployments/lisk.json b/deployments/lisk.json index dad00b938..ee8533b6e 100644 --- a/deployments/lisk.json +++ b/deployments/lisk.json @@ -1,26 +1,28 @@ { - "DiamondCutFacet": "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d", - "DiamondLoupeFacet": "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f", - "GenericSwapFacetV3": "0xBa713B18c806EcdEEE49FAec623dE2D872192872", - "OwnershipFacet": "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455", - "DexManagerFacet": "0xE154389c1bAE241F220661131b7AfDc1514C55c7", - "AccessManagerFacet": "0x314E1E760316050B0D6338bCf3d689b8D301F593", - "WithdrawFacet": "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1", - "PeripheryRegistryFacet": "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453", - "GenericSwapFacet": "0xd2B3b3605e630232c13111458Ae3a97d13c8F477", - "LIFuelFacet": "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713", - "CalldataVerificationFacet": "0x1feB868BF64AdC552E051fB7387681F78b988a81", - "StandardizedCallFacet": "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E", - "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE", - "EmergencyPauseFacet": "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844", - "AcrossFacetV3": "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92", - "AcrossFacetPackedV3": "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57", - "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0", - "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B", - "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155", - "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd", - "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1", - "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a", - "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54", - "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb" + "DiamondCutFacet": "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d", + "DiamondLoupeFacet": "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f", + "GenericSwapFacetV3": "0xBa713B18c806EcdEEE49FAec623dE2D872192872", + "OwnershipFacet": "0x81Ae738700D8f1e5BB2A200584174cDf17Fb5455", + "DexManagerFacet": "0xE154389c1bAE241F220661131b7AfDc1514C55c7", + "AccessManagerFacet": "0x314E1E760316050B0D6338bCf3d689b8D301F593", + "WithdrawFacet": "0xfA009cd56d35AE3BbdF975135b0BAE9b403c7da1", + "PeripheryRegistryFacet": "0x54ECfbAaeb49c864a9c45C70B785ca6C70c66453", + "GenericSwapFacet": "0xd2B3b3605e630232c13111458Ae3a97d13c8F477", + "LIFuelFacet": "0x14Dd70456Bfe4Cd8b605f7A0d24b3A74aCe99713", + "CalldataVerificationFacet": "0x1feB868BF64AdC552E051fB7387681F78b988a81", + "StandardizedCallFacet": "0xe6C6A35684308f2DaadbeeA50B62CFEaAFaa407E", + "LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE", + "EmergencyPauseFacet": "0xF6Eff8df65Fc4a4c1528761Aa727b5471956A844", + "AcrossFacetV3": "0xB5dD83183fD7CCF859b227CA83663a034d5B2f92", + "AcrossFacetPackedV3": "0x90ADbFc03002aaA3d9FEdf2517D593CfD93e6c57", + "ERC20Proxy": "0x98750e70Cf1313D9702f0f57D399DD0bA05d16E0", + "Executor": "0xd9318fFE1EbbfA71049A443e623Be566067C9D6B", + "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155", + "Receiver": "0xD9e3837E42198aaFc13cb51536d7c31f590aD6Fd", + "LiFuelFeeCollector": "0x8f023b4193a6b18C227B4a755f8e28B3D30Ef9a1", + "TokenWrapper": "0x603a538477d44064eA5A5d8C345b4Ff6fca1142a", + "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54", + "ReceiverAcrossV3": "0xD263a23453CB9A77860ed6393A2B9a55AF70EFAb", + "GasZipFacet": "0xb40044Bf27c2448e05e1f34ED83Ca4A3DfA54D19", + "GasZipPeriphery": "0x76aE215b11797b32397d878e6f3E65081ff58b13" } \ No newline at end of file diff --git a/script/deploy/_targetState.json b/script/deploy/_targetState.json index 9664da4b1..cb50b4b72 100644 --- a/script/deploy/_targetState.json +++ b/script/deploy/_targetState.json @@ -24,6 +24,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -38,6 +39,7 @@ "CelerCircleBridgeFacet": "1.0.1", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "GnosisBridgeFacet": "1.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", @@ -51,8 +53,7 @@ "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", "SymbiosisFacet": "1.0.0", - "ThorSwapFacet": "1.2.0", - "GasZipPeriphery": "1.0.0" + "ThorSwapFacet": "1.2.0" } } }, @@ -81,6 +82,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -94,6 +96,7 @@ "CelerCircleBridgeFacet": "1.0.1", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", "HopFacetOptimized": "2.0.0", @@ -102,13 +105,12 @@ "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, "bsc": { - "production": { + "staging": { "LiFiDiamond": { "DiamondCutFacet": "1.0.0", "DiamondLoupeFacet": "1.0.0", @@ -120,9 +122,8 @@ "GenericSwapFacet": "1.0.0", "GenericSwapFacetV3": "1.0.1", "LIFuelFacet": "1.0.1", - "CalldataVerificationFacet": "1.1.2", + "CalldataVerificationFacet": "1.1.1", "StandardizedCallFacet": "1.1.0", - "EmergencyPauseFacet": "1.0.1", "LiFiDiamond": "1.0.0", "ERC20Proxy": "1.0.0", "Executor": "2.0.0", @@ -131,7 +132,6 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", - "Permit2Proxy": "1.0.0", "AllBridgeFacet": "2.0.0", "AmarokFacet": "3.0.0", "AmarokFacetPacked": "1.0.0", @@ -139,6 +139,7 @@ "CBridgeFacetPacked": "1.0.3", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "HyphenFacet": "1.0.0", "MayanFacet": "1.0.0", "SquidFacet": "1.0.0", "StargateFacet": "2.2.0", @@ -147,10 +148,8 @@ "SymbiosisFacet": "1.0.0", "ThorSwapFacet": "1.2.0", "GasZipPeriphery": "1.0.0" - } - }, - "staging": { - "LiFiDiamond": { + }, + "LiFiDiamondImmutable": { "DiamondCutFacet": "1.0.0", "DiamondLoupeFacet": "1.0.0", "OwnershipFacet": "1.0.0", @@ -163,7 +162,7 @@ "LIFuelFacet": "1.0.1", "CalldataVerificationFacet": "1.1.1", "StandardizedCallFacet": "1.1.0", - "LiFiDiamond": "1.0.0", + "LiFiDiamondImmutable": "1.0.0", "ERC20Proxy": "1.0.0", "Executor": "2.0.0", "FeeCollector": "1.0.0", @@ -177,7 +176,7 @@ "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", "RelayerCelerIM": "2.0.0", - "CelerIMFacetMutable": "2.0.0", + "CelerIMFacetImmutable": "2.0.0", "HyphenFacet": "1.0.0", "MayanFacet": "1.0.0", "SquidFacet": "1.0.0", @@ -185,10 +184,11 @@ "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", "SymbiosisFacet": "1.0.0", - "ThorSwapFacet": "1.2.0", - "GasZipPeriphery": "1.0.0" - }, - "LiFiDiamondImmutable": { + "ThorSwapFacet": "1.2.0" + } + }, + "production": { + "LiFiDiamond": { "DiamondCutFacet": "1.0.0", "DiamondLoupeFacet": "1.0.0", "OwnershipFacet": "1.0.0", @@ -199,9 +199,10 @@ "GenericSwapFacet": "1.0.0", "GenericSwapFacetV3": "1.0.1", "LIFuelFacet": "1.0.1", - "CalldataVerificationFacet": "1.1.1", + "CalldataVerificationFacet": "1.1.2", "StandardizedCallFacet": "1.1.0", - "LiFiDiamondImmutable": "1.0.0", + "EmergencyPauseFacet": "1.0.1", + "LiFiDiamond": "1.0.0", "ERC20Proxy": "1.0.0", "Executor": "2.0.0", "FeeCollector": "1.0.0", @@ -209,14 +210,16 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AllBridgeFacet": "2.0.0", "AmarokFacet": "3.0.0", "AmarokFacetPacked": "1.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", "RelayerCelerIM": "2.0.0", - "CelerIMFacetImmutable": "2.0.0", - "HyphenFacet": "1.0.0", + "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "MayanFacet": "1.0.0", "SquidFacet": "1.0.0", "StargateFacet": "2.2.0", @@ -251,14 +254,15 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AmarokFacet": "3.0.0", "AmarokFacetPacked": "1.0.0", "CBridgeFacet": "1.0.0", + "GasZipFacet": "2.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", "HopFacetOptimized": "2.0.0", - "OmniBridgeFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "OmniBridgeFacet": "1.0.0" } } }, @@ -286,12 +290,13 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "CBridgeFacet": "1.0.0", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "SquidFacet": "1.0.0", - "StargateFacet": "2.2.0", - "GasZipPeriphery": "1.0.0" + "StargateFacet": "2.2.0" } } }, @@ -321,20 +326,21 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AllBridgeFacet": "2.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", "CelerCircleBridgeFacet": "1.0.1", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "MayanFacet": "1.0.0", "SquidFacet": "1.0.0", "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", "SymbiosisFacet": "1.0.0", - "ThorSwapFacet": "1.2.0", - "GasZipPeriphery": "1.0.0" + "ThorSwapFacet": "1.2.0" } } }, @@ -363,6 +369,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -376,6 +383,7 @@ "CelerCircleBridgeFacet": "1.0.1", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", "HopFacetOptimized": "2.0.0", @@ -384,8 +392,7 @@ "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -414,6 +421,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -427,14 +435,14 @@ "CelerCircleBridgeFacet": "1.0.1", "RelayerCelerIM": "2.0.0", "CelerIMFacetMutable": "2.0.0", + "GasZipFacet": "2.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", "HopFacetOptimized": "2.0.0", "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -614,6 +622,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -622,8 +631,8 @@ "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", "CelerIMFacetMutable": "2.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "GasZipFacet": "2.0.0", + "SymbiosisFacet": "1.0.0" } } }, @@ -684,17 +693,18 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AmarokFacet": "3.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", + "GasZipFacet": "2.0.0", "HopFacet": "2.0.0", "HopFacetPacked": "1.0.6", "HopFacetOptimized": "2.0.0", "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -739,8 +749,7 @@ "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -795,12 +804,13 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AmarokFacet": "3.0.0", + "GasZipFacet": "2.0.0", "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -828,6 +838,7 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -835,11 +846,11 @@ "ReceiverAcrossV3": "1.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", + "GasZipFacet": "2.0.0", "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -867,14 +878,15 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", "AcrossFacetPackedV3": "1.0.0", "ReceiverAcrossV3": "1.0.0", "AmarokFacet": "3.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "GasZipFacet": "2.0.0", + "SymbiosisFacet": "1.0.0" } } }, @@ -906,8 +918,7 @@ "StargateFacet": "2.2.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -966,6 +977,7 @@ "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", "Permit2Proxy": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacet": "2.0.0", "AcrossFacetPacked": "1.0.0", "AcrossFacetV3": "1.0.0", @@ -973,9 +985,9 @@ "ReceiverAcrossV3": "1.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", + "GasZipFacet": "2.0.0", "SquidFacet": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -1062,10 +1074,11 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", + "GasZipFacet": "2.0.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -1093,13 +1106,14 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", "RelayerCelerIM": "2.0.0", + "GasZipFacet": "2.0.0", "StargateFacetV2": "1.0.1", "ReceiverStargateV2": "1.0.0", - "SymbiosisFacet": "1.0.0", - "GasZipPeriphery": "1.0.0" + "SymbiosisFacet": "1.0.0" } } }, @@ -1329,9 +1343,10 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "CBridgeFacet": "1.0.0", "CBridgeFacetPacked": "1.0.3", - "GasZipPeriphery": "1.0.0" + "GasZipFacet": "2.0.0" } } }, @@ -1412,9 +1427,11 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacetV3": "1.0.0", "AcrossFacetPackedV3": "1.0.0", - "ReceiverAcrossV3": "1.0.0" + "ReceiverAcrossV3": "1.0.0", + "GasZipFacet": "2.0.0" } } }, @@ -1442,9 +1459,11 @@ "LiFuelFeeCollector": "1.0.1", "TokenWrapper": "1.0.0", "LiFiDEXAggregator": "1.0.0", + "GasZipPeriphery": "1.0.0", "AcrossFacetV3": "1.0.0", "AcrossFacetPackedV3": "1.0.0", - "ReceiverAcrossV3": "1.0.0" + "ReceiverAcrossV3": "1.0.0", + "GasZipFacet": "2.0.0" } } }, @@ -1509,4 +1528,4 @@ } } } -} \ No newline at end of file +} diff --git a/script/deploy/safe/propose-to-safe.ts b/script/deploy/safe/propose-to-safe.ts index 6a3239a02..e6331a02d 100644 --- a/script/deploy/safe/propose-to-safe.ts +++ b/script/deploy/safe/propose-to-safe.ts @@ -10,7 +10,12 @@ import { } from '@safe-global/safe-core-sdk-types' import * as chains from 'viem/chains' import { getSafeUtilityContracts, safeAddresses, safeApiUrls } from './config' -import { getViemChainForNetworkName } from '../../utils/viemScriptHelpers' +import { + NetworksObject, + getViemChainForNetworkName, +} from '../../utils/viemScriptHelpers' +import data from '../../../config/networks.json' +const networks: NetworksObject = data as NetworksObject import consola from 'consola' const retry = async (func: () => Promise, retries = 3): Promise => { @@ -69,12 +74,12 @@ const main = defineCommand({ const config: SafeApiKitConfig = { chainId: BigInt(chain.id), - txServiceUrl: safeApiUrls[args.network.toLowerCase()], + txServiceUrl: networks[args.network.toLowerCase()].safeApiUrl, } const safeService = new SafeApiKit(config) - const safeAddress = safeAddresses[args.network.toLowerCase()] + const safeAddress = networks[args.network.toLowerCase()].safeAddress const rpcUrl = args.rpcUrl || chain.rpcUrls.default.http[0] const provider = new ethers.JsonRpcProvider(rpcUrl)