Skip to content

Commit

Permalink
Update mutable diamond (#489)
Browse files Browse the repository at this point in the history 
* Begin updates

* Update more chains

* Deploy contracts to mainnet

* Verify contracts

* Deploy more mainnet contracts

* Finish mainnet deployment

* Verify contracts

* Use same fee collectors on mutable/immutable

* Update fee collectors

* Deploy HopFacetOptimized

* Update HopOptimized

* Fix logs

* Fix logs

* Update HopFacetOptimized

* Clean up logs

* Update verifications
  • Loading branch information
@ezynda3
ezynda3 authored Aug 9, 2023
1 parent 34338f9 commit b0c4183
Show file tree
Hide file tree
Showing 58 changed files with 4,367 additions and 3,627 deletions.
2,739 changes: 1,914 additions & 825 deletions deployments/_deployments_log_file.json
View file

Large diffs are not rendered by default.

152 changes: 66 additions & 86 deletions deployments/arbitrum.diamond.json
View file
Original file line number Diff line number Diff line change
@@ -1,121 +1,101 @@
{
"LiFiDiamond": {
"Facets": {
"0xf7993A8df974AD022647E63402d6315137c58ABf": {
"Name": "",
"Version": ""
},
"0xF5ba8Db6fEA7aF820De35C8D0c294e17DBC1b9D2": {
"Name": "",
"Version": ""
"0x7D507e6E89C52aE610b8D0151c8cb24c24e43bdb": {
"Name": "HopFacetOptimized",
"Version": "2.0.0"
},
"0x44beA2Ab010d1CedC4E60E97DA8F88b8840951B0": {
"0x6faA6906b9e4A59020e673910105567e809789E0": {
"Name": "OwnershipFacet",
"Version": "1.0.0"
},
"0x756061F9c646a755233c63f5bc6e7Ad0D3B54Fc3": {
"Name": "",
"Version": ""
},
"0x4f90dC98674a7bc597E70D1D4B8D72D75Be09732": {
"Name": "",
"Version": ""
},
"0x8F1f3113DbF717A53eDFDdf3a7E4168E45Fd62F5": {
"Name": "",
"Version": ""
},
"0x87Fd8d05a4364937E16d56442a259a440D6E165e": {
"Name": "",
"Version": ""
},
"0x3b2B473B2e390aAEB76FF00A4278045DA25e2Bfb": {
"Name": "",
"Version": ""
},
"0x7dB3E450d818cE91CeC519425385BCf8C4CFFda9": {
"Name": "",
"Version": ""
"0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B": {
"Name": "WithdrawFacet",
"Version": "1.0.0"
},
"0x8E4097eCfcc60F25fF2D7EE4d472ECa4A28a8425": {
"Name": "",
"Version": ""
"0x4bEAa5D26300e81cd17e0981fc15494Bb4B10959": {
"Name": "DexManagerFacet",
"Version": "1.0.0"
},
"0x2f7f1a1C392e58012B84cfA673df73101666314D": {
"Name": "",
"Version": ""
"0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc": {
"Name": "AccessManagerFacet",
"Version": "1.0.0"
},
"0x6444cC208FB4f9059813Ad795faD0c07dB8793a2": {
"Name": "",
"Version": ""
"0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15": {
"Name": "PeripheryRegistryFacet",
"Version": "1.0.0"
},
"0x26cDC2C58bDC2D3028A7a37F5D7e479eB7bf025C": {
"Name": "",
"Version": ""
"0x51709aF40dE8feEbD9d694F26826F29ce915DcbF": {
"Name": "LIFuelFacet",
"Version": "1.0.0"
},
"0x353268a8eb912BE2079876bc1faca109e89E5308": {
"Name": "",
"Version": ""
"0xE0c5e721b40D54f2aA09418B1237db9d88220C73": {
"Name": "GenericSwapFacet",
"Version": "1.0.0"
},
"0x0Cf028b3c8d4DFd8ddF59AB480d45C24BffBb8f2": {
"Name": "",
"Version": ""
"0xBeE13d99dD633fEAa2a0935f00CbC859F8305FA7": {
"Name": "AcrossFacet",
"Version": "2.0.0"
},
"0xa1531BaCEb6178fd05bD80795C9C75Ac02438E49": {
"Name": "CelerIMFacet",
"Version": "1.0.1"
"0xC0c42d148241c5b5BB38e974d40Fc9087f7F9ecD": {
"Name": "AllBridgeFacet",
"Version": "2.0.0"
},
"0x50b4cB2C152322760a8fA59105A46745CE2B7Eac": {
"Name": "",
"Version": ""
"0x411F81f16FF40984ac8a4546f2Ad19e22704693F": {
"Name": "AmarokFacet",
"Version": "2.0.0"
},
"0xbCe268B24155dF2a18982984e9716136278f38d6": {
"Name": "",
"Version": ""
"0xE7Bf43C55551B1036e796E7Fd3b125d1F9903e2E": {
"Name": "CBridgeFacetPacked",
"Version": "1.0.3"
},
"0x1D8f23CfFda7c259A1A5d2Dc776309Acb3AFDa59": {
"Name": "",
"Version": ""
"0x3b70Eb33948Fbfdc3f2F2491b96DFB1Aa18054E0": {
"Name": "CBridgeFacet",
"Version": "1.0.0"
},
"0xbd8D369470169f9976c5bCc60318955836843a71": {
"Name": "AmarokFacet",
"0x6731C946747bA54c78e7a65d416Cde39E478ECeb": {
"Name": "CelerCircleBridgeFacet",
"Version": "1.0.1"
},
"0x73d2d674449B3D8ad549cc3b04F8104C444FD34D": {
"Name": "PackedEncoderDecoderFacet",
"0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64": {
"Name": "CelerIMFacetMutable",
"Version": ""
},
"0x62dE2C0a71cd722bF3e6f9a8470887319b1c7B20": {
"Name": "",
"Version": ""
"0x6eF81a18E1E432C289DC0d1a670B78E8bbF9AA35": {
"Name": "HopFacetPacked",
"Version": "1.0.6"
},
"0xF156dc1077213AA92a3Ed6008a7FF8aEA2633186": {
"Name": "CBridgeFacetPacked",
"Version": ""
"0xd84d9A8Bf830496C4DEc917bC27D22E09E01cB8A": {
"Name": "HopFacet",
"Version": "2.0.0"
},
"0x5D3675D698A3DD53E3457951e1dEbEF717A29A72": {
"Name": "HopFacetPacked",
"Version": ""
"0xF2c63815eBD0c4E048eF216C77E2c80aa4ecD59c": {
"Name": "HyphenFacet",
"Version": "1.0.0"
},
"0x58FBa880b973edB5E4f6Aa4e2bD3b15c865b9B18": {
"Name": "",
"Version": ""
"0x02063A0d7a222c16D5b63213262596B83b07150c": {
"Name": "MultichainFacet",
"Version": "1.0.1"
},
"0x2A7568Fd6dffA6F7578cdF010398BffAa53cc7c0": {
"Name": "AcrossFacet",
"0x3d5F2cC1A2a05448C0d8Fcd628E2b53d93DC12e4": {
"Name": "StargateFacet",
"Version": "2.0.0"
},
"0xf72169Fb511739CeFea9eBEffc5d39Dba1b33cD3": {
"Name": "CelerCircleBridgeFacet",
"Version": "1.0.1"
"0x52a29e1f32DEd47B6FfF036e95667125921faE50": {
"Name": "WormholeFacet",
"Version": "1.0.0"
},
"0xc21a00a346d5b29955449Ca912343a3bB4c5552f": {
"Name": "DiamondLoupeFacet",
"Version": "1.0.0"
}
},
"Periphery": {
"ERC20Proxy": "0x856FF421D9b354ba1E909e26655E159F5Bd04F2E",
"Executor": "0xDD1305150D27aecc60C066630105DB419977e367",
"ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51",
"Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D",
"FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
"Receiver": "0x74674DAFd6f4495e7F63F7637E94b8B89B2f01dB",
"RelayerCelerIM": "0xB1Fe861ceae7BF4C40515cEEB851f2785d2A1008",
"Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c",
"RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97",
"ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D"
}
}
Expand Down
56 changes: 30 additions & 26 deletions deployments/arbitrum.json
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
{
"DiamondCutFacet": "0xF1d67E1dddc87E2858C87EBd5b19f99a4E297541",
"DiamondLoupeFacet": "0x49d195D3138D4E0E2b4ea88484C54AEE45B04B9F",
"OwnershipFacet": "0x44beA2Ab010d1CedC4E60E97DA8F88b8840951B0",
"DexManagerFacet": "0x64D41a7B52CA910f4995b1df33ea68471138374b",
"AccessManagerFacet": "0xfaA5f885a54D22C8571806fC001E53F0191f5Aff",
"WithdrawFacet": "0x428C4abf8BB3ECc893bD3E0Be12b0f363c6e81aA",
"DiamondCutFacet": "0xaD50118509eB4c8e3E39a370151B0fD5D5957013",
"DiamondLoupeFacet": "0xc21a00a346d5b29955449Ca912343a3bB4c5552f",
"OwnershipFacet": "0x6faA6906b9e4A59020e673910105567e809789E0",
"DexManagerFacet": "0x4bEAa5D26300e81cd17e0981fc15494Bb4B10959",
"AccessManagerFacet": "0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc",
"WithdrawFacet": "0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B",
"LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
"AcrossFacet": "0x2A7568Fd6dffA6F7578cdF010398BffAa53cc7c0",
"CBridgeFacet": "0xA1Edc2eD671Dfa77eD2dCD2ee012F82e4807A75a",
"GenericSwapFacet": "0x2fF4484bcaEf13e4a1Db84E6af882c9d66c97e3F",
"HopFacet": "0x4Dc509f0BB4db1faeba81f5F13583Ff3d95F938D",
"HyphenFacet": "0x416E2d3E39dF69bBc30244eC90477fD042812E6B",
"MultichainFacet": "0x4cf6c406F004b7B588ec8638fBd2cC2215D87C90",
"AcrossFacet": "0xBeE13d99dD633fEAa2a0935f00CbC859F8305FA7",
"CBridgeFacet": "0x3b70Eb33948Fbfdc3f2F2491b96DFB1Aa18054E0",
"GenericSwapFacet": "0xE0c5e721b40D54f2aA09418B1237db9d88220C73",
"HopFacet": "0xd84d9A8Bf830496C4DEc917bC27D22E09E01cB8A",
"HyphenFacet": "0xF2c63815eBD0c4E048eF216C77E2c80aa4ecD59c",
"MultichainFacet": "0x02063A0d7a222c16D5b63213262596B83b07150c",
"NXTPFacet": "0x238502aDc8ca550723CBE78543c8B757599A21cC",
"StargateFacet": "0x7E4A13BFe1200Fdc5E0FFa7eC65eFaBd8B17bc26",
"PeripheryRegistryFacet": "0x2EfC66F1ff37fc5277De5526Ab5CB7650f2DD518",
"ERC20Proxy": "0x0654EbA982ec082036A3D0f59964D302f1ba5cdA",
"Executor": "0xBe27F03C8e6a61E2a4B1EE7940dbcb9204744d1c",
"Receiver": "0xC850013FC01A264018D58D112000E32835D15fBC",
"FeeCollector": "0x9ca271A532392230EAe919Fb5460aEa9D9718424",
"HopFacetOptimized": "0xc673c3df4fff2C499009E5fCa94bc446f5B07772",
"StargateFacet": "0x3d5F2cC1A2a05448C0d8Fcd628E2b53d93DC12e4",
"PeripheryRegistryFacet": "0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15",
"ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51",
"Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D",
"Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c",
"FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
"HopFacetOptimized": "0x7D507e6E89C52aE610b8D0151c8cb24c24e43bdb",
"ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
"LIFuelFacet": "0x6e118Db5ab7018FcF195e1310074688B8A1912B3",
"HopFacetPacked": "0xed662c027c985B73A732975E3B4CeadC97AAF145",
"AmarokFacet": "0x8446a365f3F2eF6a050E5f9a568cf5A5Ca110886",
"LIFuelFacet": "0x51709aF40dE8feEbD9d694F26826F29ce915DcbF",
"HopFacetPacked": "0x6eF81a18E1E432C289DC0d1a670B78E8bbF9AA35",
"AmarokFacet": "0x411F81f16FF40984ac8a4546f2Ad19e22704693F",
"LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF",
"PackedEncoderDecoderFacet": "0x73d2d674449B3D8ad549cc3b04F8104C444FD34D",
"CBridgeFacetPacked": "0xa4eB2EF4064197De6517A53d36263e4591cD0B34",
"CBridgeFacetPacked": "0xE7Bf43C55551B1036e796E7Fd3b125d1F9903e2E",
"RelayerCelerIMImmutable": "0x7b6d852f58C783BA3b1138C535ff57dDa4c826E0",
"CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE",
"CelerCircleBridgeFacet": "0xf72169Fb511739CeFea9eBEffc5d39Dba1b33cD3",
"AllBridgeFacet": "0xB4e0Cfb32d77051BeB53404b94829D906d035B77"
}
"CelerCircleBridgeFacet": "0x6731C946747bA54c78e7a65d416Cde39E478ECeb",
"AllBridgeFacet": "0xC0c42d148241c5b5BB38e974d40Fc9087f7F9ecD",
"RelayerCelerIMMutable": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97",
"CelerIMFacetMutable": "0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64",
"WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50",
"RelayerCelerIM": "0x1C97BE47f6Da4d2e09B3A11B0A17C513dfD0e896"
}
78 changes: 34 additions & 44 deletions deployments/aurora.diamond.json
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,54 @@
{
"LiFiDiamond": {
"Facets": {
"0xf7993A8df974AD022647E63402d6315137c58ABf": {
"Name": "",
"Version": ""
},
"0xF5ba8Db6fEA7aF820De35C8D0c294e17DBC1b9D2": {
"Name": "",
"Version": ""
"0x6faA6906b9e4A59020e673910105567e809789E0": {
"Name": "OwnershipFacet",
"Version": "1.0.0"
},
"0x2327f3FBeC98B836012639545bE35e6e8F83892a": {
"Name": "",
"Version": ""
},
"0x756061F9c646a755233c63f5bc6e7Ad0D3B54Fc3": {
"Name": "",
"Version": ""
"0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B": {
"Name": "WithdrawFacet",
"Version": "1.0.0"
},
"0x4f90dC98674a7bc597E70D1D4B8D72D75Be09732": {
"Name": "",
"Version": ""
"0x4bEAa5D26300e81cd17e0981fc15494Bb4B10959": {
"Name": "DexManagerFacet",
"Version": "1.0.0"
},
"0x8F1f3113DbF717A53eDFDdf3a7E4168E45Fd62F5": {
"Name": "",
"Version": ""
"0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc": {
"Name": "AccessManagerFacet",
"Version": "1.0.0"
},
"0x3b2B473B2e390aAEB76FF00A4278045DA25e2Bfb": {
"Name": "",
"Version": ""
"0x3b70Eb33948Fbfdc3f2F2491b96DFB1Aa18054E0": {
"Name": "CBridgeFacet",
"Version": "1.0.0"
},
"0x7dB3E450d818cE91CeC519425385BCf8C4CFFda9": {
"Name": "",
"Version": ""
"0xE0c5e721b40D54f2aA09418B1237db9d88220C73": {
"Name": "GenericSwapFacet",
"Version": "1.0.0"
},
"0x8E4097eCfcc60F25fF2D7EE4d472ECa4A28a8425": {
"Name": "",
"Version": ""
"0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15": {
"Name": "PeripheryRegistryFacet",
"Version": "1.0.0"
},
"0x50b4cB2C152322760a8fA59105A46745CE2B7Eac": {
"Name": "",
"Version": ""
"0x51709aF40dE8feEbD9d694F26826F29ce915DcbF": {
"Name": "LIFuelFacet",
"Version": "1.0.0"
},
"0x1D8f23CfFda7c259A1A5d2Dc776309Acb3AFDa59": {
"Name": "",
"0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64": {
"Name": "CelerIMFacetMutable",
"Version": ""
},
"0xa1531BaCEb6178fd05bD80795C9C75Ac02438E49": {
"Name": "CelerIMFacet",
"Version": "1.0.1"
"0xc21a00a346d5b29955449Ca912343a3bB4c5552f": {
"Name": "DiamondLoupeFacet",
"Version": "1.0.0"
}
},
"Periphery": {
"AxelarExecutor": "",
"ERC20Proxy": "0x856FF421D9b354ba1E909e26655E159F5Bd04F2E",
"Executor": "0x4F6a9cACA8cd1e6025972Bcaf6BFD8504de69B52",
"ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51",
"Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D",
"FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
"FusePoolZap": "",
"Receiver": "0x74674DAFd6f4495e7F63F7637E94b8B89B2f01dB",
"RelayerCelerIM": "0xB1Fe861ceae7BF4C40515cEEB851f2785d2A1008",
"Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c",
"RelayerCelerIM": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97",
"ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D"
}
}
}
}
34 changes: 19 additions & 15 deletions deployments/aurora.json
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
{
"DiamondCutFacet": "0xF1d67E1dddc87E2858C87EBd5b19f99a4E297541",
"DiamondLoupeFacet": "0x49d195D3138D4E0E2b4ea88484C54AEE45B04B9F",
"OwnershipFacet": "0x44beA2Ab010d1CedC4E60E97DA8F88b8840951B0",
"DexManagerFacet": "0x64D41a7B52CA910f4995b1df33ea68471138374b",
"AccessManagerFacet": "0xfaA5f885a54D22C8571806fC001E53F0191f5Aff",
"WithdrawFacet": "0x428C4abf8BB3ECc893bD3E0Be12b0f363c6e81aA",
"DiamondCutFacet": "0xaD50118509eB4c8e3E39a370151B0fD5D5957013",
"DiamondLoupeFacet": "0xc21a00a346d5b29955449Ca912343a3bB4c5552f",
"OwnershipFacet": "0x6faA6906b9e4A59020e673910105567e809789E0",
"DexManagerFacet": "0x4bEAa5D26300e81cd17e0981fc15494Bb4B10959",
"AccessManagerFacet": "0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc",
"WithdrawFacet": "0x711e80A9c1eB906d9Ae9d37E5432E6E7aCeEdA0B",
"LiFiDiamond": "0x1231DEB6f5749EF6cE6943a275A1D3E7486F4EaE",
"CBridgeFacet": "0xA1Edc2eD671Dfa77eD2dCD2ee012F82e4807A75a",
"GenericSwapFacet": "0x2fF4484bcaEf13e4a1Db84E6af882c9d66c97e3F",
"PeripheryRegistryFacet": "0x2EfC66F1ff37fc5277De5526Ab5CB7650f2DD518",
"ERC20Proxy": "0x0654EbA982ec082036A3D0f59964D302f1ba5cdA",
"Executor": "0xBe27F03C8e6a61E2a4B1EE7940dbcb9204744d1c",
"FeeCollector": "0x9ca271A532392230EAe919Fb5460aEa9D9718424",
"CBridgeFacet": "0x3b70Eb33948Fbfdc3f2F2491b96DFB1Aa18054E0",
"GenericSwapFacet": "0xE0c5e721b40D54f2aA09418B1237db9d88220C73",
"PeripheryRegistryFacet": "0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15",
"ERC20Proxy": "0x5741A7FfE7c39Ca175546a54985fA79211290b51",
"Executor": "0x2dfaDAB8266483beD9Fd9A292Ce56596a2D1378D",
"FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
"ServiceFeeCollector": "0x894b3e1e30Be0727eb138d2cceb0A99d2Fc4C55D",
"LIFuelFacet": "0x6e118Db5ab7018FcF195e1310074688B8A1912B3",
"LIFuelFacet": "0x51709aF40dE8feEbD9d694F26826F29ce915DcbF",
"LiFiDiamondImmutable": "0x9b11bc9FAc17c058CAB6286b0c785bE6a65492EF",
"Receiver": "0xC850013FC01A264018D58D112000E32835D15fBC",
"Receiver": "0x5439f8ca43f832DD21a28C5BF038dad4c07ad02c",
"MultichainFacet": "0x07b7078D316AE023D19DB5AFeFe3f7EFE56F34B7",
"RelayerCelerIMImmutable": "0x7b6d852f58C783BA3b1138C535ff57dDa4c826E0",
"CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE"
"CelerIMFacetImmutable": "0x0d26d248D4e80377f1d794AB88090e76B0903EDE",
"RelayerCelerIMMutable": "0x6a8b11bF29C0546991DEcD6E0Db8cC7Fda22bA97",
"CelerIMFacetMutable": "0xF70A1Ed85EcC454a562A4B69ee40CBc6a4eB0b64",
"WormholeFacet": "0x52a29e1f32DEd47B6FfF036e95667125921faE50",
"RelayerCelerIM": "0x1C97BE47f6Da4d2e09B3A11B0A17C513dfD0e896"
}
Loading

0 comments on commit b0c4183

Please sign in to comment.