diff --git a/deployments/arbitrum.diamond.json b/deployments/arbitrum.diamond.json
index ac44cb840..a7179d0a1 100644
--- a/deployments/arbitrum.diamond.json
+++ b/deployments/arbitrum.diamond.json
@@ -168,6 +168,10 @@
       "0x0d0684aB8aBcA9da852630638462bf1F94e3828c": {
         "Name": "SupersetFacet",
         "Version": "1.0.0"
+      },
+      "0x7Babf9c78e5c040B1bBd8981189ea4d6E3Fc8344": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -176,8 +180,8 @@
       "FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/arbitrum.json b/deployments/arbitrum.json
index 479fc61ec..2c6e84169 100644
--- a/deployments/arbitrum.json
+++ b/deployments/arbitrum.json
@@ -66,5 +66,6 @@
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
   "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
-  "SupersetFacet": "0x0d0684aB8aBcA9da852630638462bf1F94e3828c"
+  "SupersetFacet": "0x0d0684aB8aBcA9da852630638462bf1F94e3828c",
+  "LayerSwapFacet": "0x7Babf9c78e5c040B1bBd8981189ea4d6E3Fc8344"
 }
diff --git a/deployments/arbitrumnova.diamond.json b/deployments/arbitrumnova.diamond.json
index 41d166303..75d64b011 100644
--- a/deployments/arbitrumnova.diamond.json
+++ b/deployments/arbitrumnova.diamond.json
@@ -56,6 +56,10 @@
       "0x8B8d40ae1E77b7Dc16AE9F1B29f7b50c1c3a808b": {
         "Name": "GasZipFacet",
         "Version": "2.0.5"
+      },
+      "0xBdD660fa7e8D31f0199E333B85a46aa43Bb3D69C": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -64,8 +68,8 @@
       "FeeCollector": "0x949343d563394016CE0c52bB6511DFE5aEec8e8a",
       "FeeForwarder": "0xD23FB66108971325f302bF0f209216D705adF987",
       "GasZipPeriphery": "0x2e6369861FA79bD1e6349513aEE19EF45E56179F",
-      "LiFiDEXAggregator": "0x3089b3b207E051b2c035c6163874732a18F28bbd",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x3089b3b207E051b2c035c6163874732a18F28bbd",
       "OutputValidator": "0xE6ca0479AE3849e393c5b4735c9D41D58CcCb8cb",
       "Patcher": "",
       "Permit2Proxy": "0x36C800D4472fBb888D034Aa74778f481aEE01FEc",
diff --git a/deployments/arbitrumnova.json b/deployments/arbitrumnova.json
index 6f1416eb9..8a5d7f7e7 100644
--- a/deployments/arbitrumnova.json
+++ b/deployments/arbitrumnova.json
@@ -23,5 +23,6 @@
   "LiFiTimelockController": "0xBBE888016df347C799de8e7787A239aa105F4ce8",
   "GasZipFacet": "0x8B8d40ae1E77b7Dc16AE9F1B29f7b50c1c3a808b",
   "GasZipPeriphery": "0x2e6369861FA79bD1e6349513aEE19EF45E56179F",
-  "OutputValidator": "0xE6ca0479AE3849e393c5b4735c9D41D58CcCb8cb"
+  "OutputValidator": "0xE6ca0479AE3849e393c5b4735c9D41D58CcCb8cb",
+  "LayerSwapFacet": "0xBdD660fa7e8D31f0199E333B85a46aa43Bb3D69C"
 }
diff --git a/deployments/avalanche.diamond.json b/deployments/avalanche.diamond.json
index 3a52e1710..3c2e26daf 100644
--- a/deployments/avalanche.diamond.json
+++ b/deployments/avalanche.diamond.json
@@ -104,6 +104,10 @@
       "0xaC5Ad28A8FA95ABD6eA3D9c82c931C87ae413e6A": {
         "Name": "MayanFacet",
         "Version": "1.3.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -112,8 +116,8 @@
       "FeeCollector": "0xB0210dE78E28e2633Ca200609D9f528c13c26cD9",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "0x98dE828723F8aC654B79b8A1BB8E1E5D737F4F42",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/avalanche.json b/deployments/avalanche.json
index a64cec2c1..98446f5b2 100644
--- a/deployments/avalanche.json
+++ b/deployments/avalanche.json
@@ -50,5 +50,6 @@
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "PolymerCCTPFacet": "0xC3A6F4A7FA4E9b79a7bBD2C7283C0c5e076590B8",
   "NEARIntentsFacet": "0x8FF9A6Ed7844a808E11d046de48B0259e79F86b1",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/base.diamond.json b/deployments/base.diamond.json
index dd8592dba..07b2a1ac5 100644
--- a/deployments/base.diamond.json
+++ b/deployments/base.diamond.json
@@ -164,6 +164,10 @@
       "0x0d0684aB8aBcA9da852630638462bf1F94e3828c": {
         "Name": "SupersetFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -172,8 +176,8 @@
       "FeeCollector": "0x0A6d96E7f4D7b96CFE42185DF61E64d255c12DFf",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "0x98dE828723F8aC654B79b8A1BB8E1E5D737F4F42",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/base.json b/deployments/base.json
index 10a69e4cb..0ec4bd1a8 100644
--- a/deployments/base.json
+++ b/deployments/base.json
@@ -58,5 +58,6 @@
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
   "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
-  "SupersetFacet": "0x0d0684aB8aBcA9da852630638462bf1F94e3828c"
+  "SupersetFacet": "0x0d0684aB8aBcA9da852630638462bf1F94e3828c",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/berachain.diamond.json b/deployments/berachain.diamond.json
index a1cc91603..776f3730a 100644
--- a/deployments/berachain.diamond.json
+++ b/deployments/berachain.diamond.json
@@ -72,6 +72,10 @@
       "0xc1fCF0Ea9949CC55fE8e82d444349ce25b1bE5E8": {
         "Name": "GlacisFacet",
         "Version": "1.2.0"
+      },
+      "0x3aAE6eb0a3C23406F28FC63541Fd44A57839479D": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -80,8 +84,8 @@
       "FeeCollector": "0x070EC43b4222E0f17EEcD2C839cb9D1D5adeF73c",
       "FeeForwarder": "0x135566E8702A377D3F7Ec9f0a2bD8009901E8693",
       "GasZipPeriphery": "0xb4a7493A203d10459F70Cfe73DfaBc2a739d60C3",
-      "LiFiDEXAggregator": "0x6295b30297C254108E0bF16C70D513d2043E3d45",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x6295b30297C254108E0bF16C70D513d2043E3d45",
       "OutputValidator": "0x3Ed2C6abfa00031664E879A648ed2A71BA45a4Cb",
       "Patcher": "",
       "Permit2Proxy": "0x66C8F3F645Bc61ed1740067D381830f7c7925d98",
diff --git a/deployments/berachain.json b/deployments/berachain.json
index 671be3c65..272e42a57 100644
--- a/deployments/berachain.json
+++ b/deployments/berachain.json
@@ -31,5 +31,6 @@
   "FeeForwarder": "0x135566E8702A377D3F7Ec9f0a2bD8009901E8693",
   "WhitelistManagerFacet": "0xF2a21389D7025e1C02e9C06f838C0189aFB7dAE4",
   "NEARIntentsFacet": "0xF76b26aaDF1450684f99F702CFc2807504cD96F7",
-  "OutputValidator": "0x3Ed2C6abfa00031664E879A648ed2A71BA45a4Cb"
+  "OutputValidator": "0x3Ed2C6abfa00031664E879A648ed2A71BA45a4Cb",
+  "LayerSwapFacet": "0x3aAE6eb0a3C23406F28FC63541Fd44A57839479D"
 }
diff --git a/deployments/blast.diamond.json b/deployments/blast.diamond.json
index b604e992d..55eca1659 100644
--- a/deployments/blast.diamond.json
+++ b/deployments/blast.diamond.json
@@ -96,6 +96,10 @@
       "0xAd3f1634a917924cBb54A0F76e43ca035D2B6BCd": {
         "Name": "AcrossFacetV4",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -104,8 +108,8 @@
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/blast.json b/deployments/blast.json
index 182817fba..1116db304 100644
--- a/deployments/blast.json
+++ b/deployments/blast.json
@@ -38,5 +38,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/bob.diamond.json b/deployments/bob.diamond.json
index 5fd3124be..e20d10463 100644
--- a/deployments/bob.diamond.json
+++ b/deployments/bob.diamond.json
@@ -60,6 +60,10 @@
       "0x73388a39CC5bb0fe45c12231727D33f2B2ef4DF7": {
         "Name": "GlacisFacet",
         "Version": "1.2.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -68,8 +72,8 @@
       "FeeCollector": "0x728f23859C718B9e1cA762f051C29Ea99119B92D",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x3FC68470A35072c3A49AC28187C2CC0D4aD1bc57",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x3FC68470A35072c3A49AC28187C2CC0D4aD1bc57",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x1BCd304fDAd1d1D66529159b1Bc8D13C9158D586",
diff --git a/deployments/bob.json b/deployments/bob.json
index 3a3d33d3e..e2324707c 100644
--- a/deployments/bob.json
+++ b/deployments/bob.json
@@ -24,5 +24,6 @@
   "RelayDepositoryFacet": "0xbd9e11d7E8a29f2568d98BE25B8f3237b140F647",
   "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
   "WhitelistManagerFacet": "0x746E5c2ea5b3C005368645544D4B532255177e5c",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/bsc.diamond.json b/deployments/bsc.diamond.json
index 61cb1c32b..d13d3f431 100644
--- a/deployments/bsc.diamond.json
+++ b/deployments/bsc.diamond.json
@@ -17,9 +17,9 @@
         "Name": "WithdrawFacet",
         "Version": "1.0.0"
       },
-      "0x22B31a1a81d5e594315c866616db793E799556c5": {
-        "Name": "DexManagerFacet",
-        "Version": "1.0.1"
+      "0x83C8F21F9Eab6DC2c8496C2c06eB7A352929a8Ca": {
+        "Name": "LiFiIntentEscrowFacet",
+        "Version": "1.1.2"
       },
       "0x77A13abB679A0DAFB4435D1Fa4cCC95D1ab51cfc": {
         "Name": "AccessManagerFacet",
@@ -37,37 +37,37 @@
         "Name": "GenericSwapFacet",
         "Version": "1.0.0"
       },
-      "0xF2c63815eBD0c4E048eF216C77E2c80aa4ecD59c": {
-        "Name": "HyphenFacet",
+      "0xaa7911Ce0bab34fd8D4DdfA161004CB7e4BE1958": {
+        "Name": "GardenFacet",
         "Version": "1.0.0"
       },
-      "0x02063A0d7a222c16D5b63213262596B83b07150c": {
-        "Name": "MultichainFacet",
-        "Version": "1.0.1"
+      "0x8CD89Ea14345F24d0299c2180Aec97a417Ca34E3": {
+        "Name": "AcrossFacetPackedV4",
+        "Version": "1.0.0"
       },
       "0x3C826D17B47DB69E1a9C1e32E10768d3709f1b9A": {
         "Name": "OmniBridgeFacet",
         "Version": "1.0.0"
       },
-      "0x7D1940fDfF0B37c137B105ce7967B3B86DB42648": {
-        "Name": "StargateFacet",
-        "Version": "2.2.0"
+      "0x5A1B851bC64f6AdaCaE8123aB52142b4A592B3aC": {
+        "Name": "AcrossFacetV3",
+        "Version": "1.1.0"
       },
       "0x69cb467EfD8044ac9eDB88F363309ab1cbFA0A15": {
         "Name": "PeripheryRegistryFacet",
         "Version": "1.0.0"
       },
-      "0x3a60730cbcD91715E31830f125bB3eF1FA0a2c66": {
-        "Name": "",
-        "Version": ""
+      "0x5Ba87C691637AfA9216Be198b87508429DfE975E": {
+        "Name": "EcoFacet",
+        "Version": "1.1.0"
       },
-      "0x66861f292099cAF644F4A8b6091De49BEC5E8a15": {
-        "Name": "LIFuelFacet",
-        "Version": "1.0.1"
+      "0xd69e5eA7458aBFF098e9240f81F733898535c7A0": {
+        "Name": "GlacisFacet",
+        "Version": "1.2.0"
       },
-      "0x3F95b05a77FDC6D82162D86A72b156b55030627f": {
-        "Name": "AmarokFacet",
-        "Version": "3.0.0"
+      "0xf8fA34D58A277060D07bCa7EC24D6B386d86a793": {
+        "Name": "NEARIntentsFacet",
+        "Version": "1.0.0"
       },
       "0x1D2Ff501e5c4Ff066e0Fdc4aBd10e17B228E16D1": {
         "Name": "AcrossFacetPackedV3",
@@ -77,9 +77,9 @@
         "Name": "CBridgeFacetPacked",
         "Version": "1.0.3"
       },
-      "0x175E7799DA0CD40E641352EaB90D8e39e02a4Ca9": {
-        "Name": "StandardizedCallFacet",
-        "Version": "1.1.0"
+      "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0": {
+        "Name": "RelayDepositoryFacet",
+        "Version": "1.0.0"
       },
       "0x7A5c119ec5dDbF9631cf40f6e5DB28f31d4332a0": {
         "Name": "CalldataVerificationFacet",
@@ -93,8 +93,8 @@
         "Name": "ThorSwapFacet",
         "Version": "1.2.0"
       },
-      "0xF18A285f4e6f720Eb9b4e05df71f88b9552E6ADB": {
-        "Name": "AmarokFacetPacked",
+      "0xb28Dd740D27853A91639795223AB409088A73E23": {
+        "Name": "WhitelistManagerFacet",
         "Version": "1.0.0"
       },
       "0xe12b2488c71432F9a116E9ac244D3Ef4c2386d3a": {
@@ -125,57 +125,21 @@
         "Name": "GasZipFacet",
         "Version": "2.0.4"
       },
-      "0x424BDbbaEda89732443fb1B737b6Dc194a6Ddbd5": {
-        "Name": "RelayFacet",
-        "Version": "1.0.0"
-      },
-      "0xdC49bca8314e7cd7C90EDb8652375a0b15EFe611": {
-        "Name": "GlacisFacet",
-        "Version": "1.0.0"
-      },
-      "0x5A1B851bC64f6AdaCaE8123aB52142b4A592B3aC": {
-        "Name": "AcrossFacetV3",
-        "Version": "1.1.0"
-      },
-      "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0": {
-        "Name": "RelayDepositoryFacet",
-        "Version": "1.0.0"
-      },
       "0xAd3f1634a917924cBb54A0F76e43ca035D2B6BCd": {
         "Name": "AcrossFacetV4",
         "Version": "1.0.0"
       },
-      "0x8CD89Ea14345F24d0299c2180Aec97a417Ca34E3": {
-        "Name": "AcrossFacetPackedV4",
-        "Version": "1.0.0"
-      },
-      "0xd69e5eA7458aBFF098e9240f81F733898535c7A0": {
-        "Name": "GlacisFacet",
-        "Version": "1.2.0"
-      },
-      "0xaa7911Ce0bab34fd8D4DdfA161004CB7e4BE1958": {
-        "Name": "GardenFacet",
-        "Version": "1.0.0"
-      },
-      "0xb28Dd740D27853A91639795223AB409088A73E23": {
-        "Name": "WhitelistManagerFacet",
+      "0x2beEf67989a236e9CA97E8F731050bf7E8039e90": {
+        "Name": "AcrossV4SwapFacet",
         "Version": "1.0.0"
       },
-      "0xf8fA34D58A277060D07bCa7EC24D6B386d86a793": {
-        "Name": "NEARIntentsFacet",
-        "Version": "1.0.0"
-      },
-      "0x5Ba87C691637AfA9216Be198b87508429DfE975E": {
-        "Name": "EcoFacet",
-        "Version": "1.1.0"
-      },
-      "0x83C8F21F9Eab6DC2c8496C2c06eB7A352929a8Ca": {
-        "Name": "LiFiIntentEscrowFacet",
-        "Version": "1.1.2"
-      },
       "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4": {
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -184,8 +148,8 @@
       "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/bsc.json b/deployments/bsc.json
index 0179174c7..85e697311 100644
--- a/deployments/bsc.json
+++ b/deployments/bsc.json
@@ -68,5 +68,6 @@
   "EcoFacet": "0x5Ba87C691637AfA9216Be198b87508429DfE975E",
   "LiFiIntentEscrowFacet": "0x83C8F21F9Eab6DC2c8496C2c06eB7A352929a8Ca",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
-  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4"
+  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/celo.diamond.json b/deployments/celo.diamond.json
index d7aafac21..45db79f66 100644
--- a/deployments/celo.diamond.json
+++ b/deployments/celo.diamond.json
@@ -72,6 +72,10 @@
       "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0": {
         "Name": "RelayDepositoryFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -80,8 +84,8 @@
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/celo.json b/deployments/celo.json
index 532aa0399..3d1dfeb92 100644
--- a/deployments/celo.json
+++ b/deployments/celo.json
@@ -31,5 +31,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/fraxtal.diamond.json b/deployments/fraxtal.diamond.json
index bb97dac36..be9651aea 100644
--- a/deployments/fraxtal.diamond.json
+++ b/deployments/fraxtal.diamond.json
@@ -60,6 +60,10 @@
       "0xce52856e4d95220389350A822C60779D0D921E30": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -68,8 +72,8 @@
       "FeeCollector": "0x7956280Ec4B4d651C4083Ca737a1fa808b5319D8",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0xE38621607316cB43367c134C65dca3f41B61250f",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xE38621607316cB43367c134C65dca3f41B61250f",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/fraxtal.json b/deployments/fraxtal.json
index 83c6f198c..78dd1c7b8 100644
--- a/deployments/fraxtal.json
+++ b/deployments/fraxtal.json
@@ -27,5 +27,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/gnosis.diamond.json b/deployments/gnosis.diamond.json
index d1bfd1eea..b00af8a87 100644
--- a/deployments/gnosis.diamond.json
+++ b/deployments/gnosis.diamond.json
@@ -92,6 +92,10 @@
       "0xce52856e4d95220389350A822C60779D0D921E30": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -100,8 +104,8 @@
       "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "0x98dE828723F8aC654B79b8A1BB8E1E5D737F4F42",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/gnosis.json b/deployments/gnosis.json
index fd1253754..867bc5da2 100644
--- a/deployments/gnosis.json
+++ b/deployments/gnosis.json
@@ -39,5 +39,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "NEARIntentsFacet": "0xf8fA34D58A277060D07bCa7EC24D6B386d86a793",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/gravity.diamond.json b/deployments/gravity.diamond.json
index f6ac1bb3e..dde720bf0 100644
--- a/deployments/gravity.diamond.json
+++ b/deployments/gravity.diamond.json
@@ -68,6 +68,10 @@
       "0x325DA62543447A48c7b044C5642B87CeA88B0fd3": {
         "Name": "CBridgeFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -76,8 +80,8 @@
       "FeeCollector": "0x79540403cdE176Ca5f1fb95bE84A7ec91fFDEF76",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/gravity.json b/deployments/gravity.json
index 971d63238..c9e2db81c 100644
--- a/deployments/gravity.json
+++ b/deployments/gravity.json
@@ -29,5 +29,6 @@
   "RelayDepositoryFacet": "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0",
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/immutablezkevm.diamond.json b/deployments/immutablezkevm.diamond.json
index 229e72df3..e5106f90b 100644
--- a/deployments/immutablezkevm.diamond.json
+++ b/deployments/immutablezkevm.diamond.json
@@ -52,6 +52,10 @@
       "0xB6faa3155683d6856ae196c4f3847D68D478E5eA": {
         "Name": "SquidFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -60,8 +64,8 @@
       "FeeCollector": "0x1a4E99aB56BBac95810C0A957F173054f6FA8fDc",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0xAcD913Ad6936Bb662395ac9a66D75bFc77c165fF",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xAcD913Ad6936Bb662395ac9a66D75bFc77c165fF",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/immutablezkevm.json b/deployments/immutablezkevm.json
index f88ff07ed..367a5f914 100644
--- a/deployments/immutablezkevm.json
+++ b/deployments/immutablezkevm.json
@@ -24,5 +24,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/ink.diamond.json b/deployments/ink.diamond.json
index 78349b9bd..e10c453d8 100644
--- a/deployments/ink.diamond.json
+++ b/deployments/ink.diamond.json
@@ -88,6 +88,10 @@
       "0xA338ac518a0aE28d75e0610BD78329241984d49A": {
         "Name": "EcoFacet",
         "Version": "1.1.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -96,8 +100,8 @@
       "FeeCollector": "0x8295805320853d6B28778fC8f5199327e62e3d87",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x625Dd0c4b003810E355f72B0a301616967e6C986",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x625Dd0c4b003810E355f72B0a301616967e6C986",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x1BCd304fDAd1d1D66529159b1Bc8D13C9158D586",
diff --git a/deployments/ink.json b/deployments/ink.json
index 6620574ab..4465dcc6b 100644
--- a/deployments/ink.json
+++ b/deployments/ink.json
@@ -34,5 +34,6 @@
   "WhitelistManagerFacet": "0x746E5c2ea5b3C005368645544D4B532255177e5c",
   "PolymerCCTPFacet": "0x64b48C3aAEaCf8981E75E26Ba6c52380B8669A05",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/kaia.diamond.json b/deployments/kaia.diamond.json
index 02500e58f..f8a5203f1 100644
--- a/deployments/kaia.diamond.json
+++ b/deployments/kaia.diamond.json
@@ -60,6 +60,10 @@
       "0xaFC4b6A093F2066c314922E92Fe2118d569C73aB": {
         "Name": "StargateFacetV2",
         "Version": "1.0.1"
+      },
+      "0xE2F2a8e1B4F8A5f5686421BbBB90Fd8cB45ef9d9": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -68,8 +72,8 @@
       "FeeCollector": "0x5e6525c873D6FD3D6BE0D9845018F6298583981d",
       "FeeForwarder": "0x92fd059cbA2a286B3fF7a12A7DFC93432fAe3C27",
       "GasZipPeriphery": "0x90Db26204afD5e127DDFe377462C1Fec1D22eef8",
-      "LiFiDEXAggregator": "0xE275759e85e5497A1B07EA65529187FD7E987509",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xE275759e85e5497A1B07EA65529187FD7E987509",
       "OutputValidator": "0xFbb5BDeCDA4916bEe4B8aB6Ab2F7B89E2aDA4E8d",
       "Patcher": "",
       "Permit2Proxy": "0x56E3B9Cf704991cc554902b16610255568A58B12",
diff --git a/deployments/kaia.json b/deployments/kaia.json
index 446a4d343..4890180e3 100644
--- a/deployments/kaia.json
+++ b/deployments/kaia.json
@@ -27,5 +27,6 @@
   "FeeForwarder": "0x92fd059cbA2a286B3fF7a12A7DFC93432fAe3C27",
   "WhitelistManagerFacet": "0x0A28554Eed38F37cB62EB0503957262aA930cA1D",
   "GasZipPeriphery": "0x90Db26204afD5e127DDFe377462C1Fec1D22eef8",
-  "OutputValidator": "0xFbb5BDeCDA4916bEe4B8aB6Ab2F7B89E2aDA4E8d"
+  "OutputValidator": "0xFbb5BDeCDA4916bEe4B8aB6Ab2F7B89E2aDA4E8d",
+  "LayerSwapFacet": "0xE2F2a8e1B4F8A5f5686421BbBB90Fd8cB45ef9d9"
 }
diff --git a/deployments/katana.diamond.json b/deployments/katana.diamond.json
index 7739096c2..aa8213e18 100644
--- a/deployments/katana.diamond.json
+++ b/deployments/katana.diamond.json
@@ -68,6 +68,10 @@
       "0x1aCec6E64f3A337ab0BDd7629E1170dD5081A0e9": {
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "1.0.0"
+      },
+      "0x828Cc8Dc04e22B63DFB7764cFb58Ddbc4C2A07c7": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -76,8 +80,8 @@
       "FeeCollector": "0xB7ea489dB36820f0d57F1A67353AA4f5d0890ce3",
       "FeeForwarder": "0x51586Ff93Ded33DbEb6D5fA68d046Fd036251D8A",
       "GasZipPeriphery": "0xA3cB8Ac8c250612FdA331F134EB60492b0d3bB10",
-      "LiFiDEXAggregator": "0x3ba2A1091b94CE230f05aC622EC9288b45Ca49D4",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x3ba2A1091b94CE230f05aC622EC9288b45Ca49D4",
       "OutputValidator": "0x70DF6cF7943416c76A7a10d47bf0901cFA28B418",
       "Patcher": "",
       "Permit2Proxy": "0x628d684D57c73A5D8cA77F455Fdf2CC8Bd503c16",
diff --git a/deployments/katana.json b/deployments/katana.json
index edc5d0c01..0183c4cdc 100644
--- a/deployments/katana.json
+++ b/deployments/katana.json
@@ -26,5 +26,6 @@
   "WhitelistManagerFacet": "0x36d7709C1AC38365cBE04374C929DC9173d84A83",
   "LiFiIntentEscrowFacet": "0xc6299f6b43a7A20a18Ef0A595e62C09fdd7AD5e3",
   "OutputValidator": "0x70DF6cF7943416c76A7a10d47bf0901cFA28B418",
-  "LiFiIntentEscrowFacetV2": "0x1aCec6E64f3A337ab0BDd7629E1170dD5081A0e9"
+  "LiFiIntentEscrowFacetV2": "0x1aCec6E64f3A337ab0BDd7629E1170dD5081A0e9",
+  "LayerSwapFacet": "0x828Cc8Dc04e22B63DFB7764cFb58Ddbc4C2A07c7"
 }
diff --git a/deployments/linea.diamond.json b/deployments/linea.diamond.json
index 6c4f3906d..d726bc426 100644
--- a/deployments/linea.diamond.json
+++ b/deployments/linea.diamond.json
@@ -132,6 +132,10 @@
       "0x0B1dcD1e7BA87E3ab9315f33b7661648b6669C7f": {
         "Name": "MayanFacet",
         "Version": "1.3.0"
+      },
+      "0x0Bb301cc98299d57Ab7d07381fF0C9E48177Fd50": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -140,8 +144,8 @@
       "FeeCollector": "0xA4A24BdD4608D7dFC496950850f9763B674F0DB2",
       "FeeForwarder": "0xD8b700cEd3e486c3c4FC31Fc0c3b3590e1a52D7e",
       "GasZipPeriphery": "0x645e8096781d98810226595B3e2411B5CcC4899E",
-      "LiFiDEXAggregator": "0x37A06533fbfad7060D4bA071f0AaF241937DbaC1",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x37A06533fbfad7060D4bA071f0AaF241937DbaC1",
       "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77",
       "Patcher": "",
       "Permit2Proxy": "0xE5A89411c7Ef1502123d84ec1F9Da9D8574F4293",
diff --git a/deployments/linea.json b/deployments/linea.json
index 8c8de7dcc..f0f7a3502 100644
--- a/deployments/linea.json
+++ b/deployments/linea.json
@@ -49,5 +49,6 @@
   "AllBridgeFacet": "0xb312fA96d1206998D815b4e243994DeE6E285d4C",
   "PolymerCCTPFacet": "0x9B73f333787892e241f2dc3f8A7A8C2411dC6432",
   "AcrossV4SwapFacet": "0x2d50a526Bb83F95B1b5d69f25e355f9a7eb5321D",
-  "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77"
+  "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77",
+  "LayerSwapFacet": "0x0Bb301cc98299d57Ab7d07381fF0C9E48177Fd50"
 }
diff --git a/deployments/lisk.diamond.json b/deployments/lisk.diamond.json
index 8ce1a43a3..061512fdf 100644
--- a/deployments/lisk.diamond.json
+++ b/deployments/lisk.diamond.json
@@ -3,7 +3,7 @@
     "Facets": {
       "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d": {
         "Name": "DiamondCutFacet",
-        "Version": "2.0.0"
+        "Version": "1.0.0"
       },
       "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f": {
         "Name": "DiamondLoupeFacet",
@@ -76,6 +76,10 @@
       "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0": {
         "Name": "RelayDepositoryFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -84,8 +88,8 @@
       "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x7347996d9c81035E3EA667Bf4240bB134a969B56",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x7347996d9c81035E3EA667Bf4240bB134a969B56",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/lisk.json b/deployments/lisk.json
index fe5370f74..5ef5f2971 100644
--- a/deployments/lisk.json
+++ b/deployments/lisk.json
@@ -32,5 +32,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/mainnet.diamond.json b/deployments/mainnet.diamond.json
index 70e8c17e1..4f7a93df7 100644
--- a/deployments/mainnet.diamond.json
+++ b/deployments/mainnet.diamond.json
@@ -188,6 +188,10 @@
       "0x5C47966EAAa5dbf30E20C1a01ED0acFCBCcF1349": {
         "Name": "PaxosTransitFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
diff --git a/deployments/mainnet.json b/deployments/mainnet.json
index 324b98f41..43723a345 100644
--- a/deployments/mainnet.json
+++ b/deployments/mainnet.json
@@ -84,5 +84,6 @@
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
   "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
-  "PaxosTransitFacet": "0x5C47966EAAa5dbf30E20C1a01ED0acFCBCcF1349"
+  "PaxosTransitFacet": "0x5C47966EAAa5dbf30E20C1a01ED0acFCBCcF1349",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/mantle.diamond.json b/deployments/mantle.diamond.json
index 462d141c4..ff7289d3f 100644
--- a/deployments/mantle.diamond.json
+++ b/deployments/mantle.diamond.json
@@ -68,6 +68,10 @@
       "0xce52856e4d95220389350A822C60779D0D921E30": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -76,8 +80,8 @@
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x77b86A0a71511D077aEA2b54eDF80f0916e27448",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x77b86A0a71511D077aEA2b54eDF80f0916e27448",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0xBDfF0c1C8B0b779581C4aC3bA1F29667C366C56e",
diff --git a/deployments/mantle.json b/deployments/mantle.json
index 01fcc90d3..ecfa868be 100644
--- a/deployments/mantle.json
+++ b/deployments/mantle.json
@@ -30,5 +30,6 @@
   "RelayDepositoryFacet": "0x88E0Dd83E6da24bF317323E5Ca06842406D57eD0",
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/megaeth.diamond.json b/deployments/megaeth.diamond.json
index 2d5ca1f45..987266e4e 100644
--- a/deployments/megaeth.diamond.json
+++ b/deployments/megaeth.diamond.json
@@ -80,6 +80,10 @@
       "0xa321de0216de08fe85039B4D021c788f9cad9582": {
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "1.0.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -88,8 +92,8 @@
       "FeeCollector": "0xF061930bc5154b72Bf90bA22840a6bEf20F4c83F",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0xa8800ABdD6771dA7aAab2d09a5b97F4B8b19B58a",
-      "LiFiDEXAggregator": "0x85E609B97AC5776AcDBa5fAabBcca64eB7a79185",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x85E609B97AC5776AcDBa5fAabBcca64eB7a79185",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x700f1874314A4dF3bb9A10f7B5eA187A39d8dE74",
diff --git a/deployments/megaeth.json b/deployments/megaeth.json
index 1856a406a..dc502a49b 100644
--- a/deployments/megaeth.json
+++ b/deployments/megaeth.json
@@ -30,5 +30,6 @@
   "GardenFacet": "0x8163C2Ca79046E4789DC978d82836EDBdaf71b4B",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
   "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
-  "LiFiIntentEscrowFacetV2": "0xa321de0216de08fe85039B4D021c788f9cad9582"
+  "LiFiIntentEscrowFacetV2": "0xa321de0216de08fe85039B4D021c788f9cad9582",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/mode.diamond.json b/deployments/mode.diamond.json
index e038868bc..06e2ded68 100644
--- a/deployments/mode.diamond.json
+++ b/deployments/mode.diamond.json
@@ -92,6 +92,10 @@
       "0x5052fc5c7486162deDf7458E1f7c6ABaFbcd6895": {
         "Name": "AcrossFacetV3",
         "Version": "1.1.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -100,8 +104,8 @@
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/mode.json b/deployments/mode.json
index aa793429e..405387ee7 100644
--- a/deployments/mode.json
+++ b/deployments/mode.json
@@ -36,5 +36,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/monad.diamond.json b/deployments/monad.diamond.json
index 0c66d60c2..9a23d2d32 100644
--- a/deployments/monad.diamond.json
+++ b/deployments/monad.diamond.json
@@ -84,6 +84,10 @@
       "0xb86FaE3FB05841d84377c2eD0f1606784300445e": {
         "Name": "NEARIntentsFacet",
         "Version": "1.0.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -92,8 +96,8 @@
       "FeeCollector": "0x954d55105CDF5371224268691FAf6178be5f62F5",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x588c00159AED9A9ab258850b33DEDfAC1c794fA1",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x588c00159AED9A9ab258850b33DEDfAC1c794fA1",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x3c6B2E0b7421254846C53c118e24c65d59eAe75e",
diff --git a/deployments/monad.json b/deployments/monad.json
index 40634a5d1..3f3c03d9f 100644
--- a/deployments/monad.json
+++ b/deployments/monad.json
@@ -33,5 +33,6 @@
   "NEARIntentsFacet": "0xb86FaE3FB05841d84377c2eD0f1606784300445e",
   "PolymerCCTPFacet": "0x64b48C3aAEaCf8981E75E26Ba6c52380B8669A05",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/morph.diamond.json b/deployments/morph.diamond.json
index 90711999f..21cdde745 100644
--- a/deployments/morph.diamond.json
+++ b/deployments/morph.diamond.json
@@ -60,6 +60,10 @@
       "0x10b8b5f45126f6e718A9eD5c6A8d6A5D66181450": {
         "Name": "PolymerCCTPFacet",
         "Version": "2.1.0"
+      },
+      "0x455B71D20a8b51E9757FeD649833f71355cFCe44": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
diff --git a/deployments/morph.json b/deployments/morph.json
index e689af9e9..de29ad8b7 100644
--- a/deployments/morph.json
+++ b/deployments/morph.json
@@ -24,5 +24,6 @@
   "RelayDepositoryFacet": "0xcFDe3d0c9d2Ced6cC5731439Ac8944De0E029Ce4",
   "SymbiosisFacet": "0xCDA650d97F35928f740544E9854f03a1e1c2b81E",
   "OutputValidator": "0x0B1f03b79367CFB04245E6999943C05F441fFfEF",
-  "PolymerCCTPFacet": "0x10b8b5f45126f6e718A9eD5c6A8d6A5D66181450"
+  "PolymerCCTPFacet": "0x10b8b5f45126f6e718A9eD5c6A8d6A5D66181450",
+  "LayerSwapFacet": "0x455B71D20a8b51E9757FeD649833f71355cFCe44"
 }
diff --git a/deployments/opbnb.diamond.json b/deployments/opbnb.diamond.json
index 2eb5633cf..916579a4f 100644
--- a/deployments/opbnb.diamond.json
+++ b/deployments/opbnb.diamond.json
@@ -52,6 +52,10 @@
       "0xce52856e4d95220389350A822C60779D0D921E30": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -60,8 +64,8 @@
       "FeeCollector": "0x6A2420650139854F17964b8C3Bb60248470aB57E",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x6140b987d6B51Fd75b66C3B07733Beb5167c42fc",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/opbnb.json b/deployments/opbnb.json
index e177b3647..954572830 100644
--- a/deployments/opbnb.json
+++ b/deployments/opbnb.json
@@ -25,5 +25,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/optimism.diamond.json b/deployments/optimism.diamond.json
index b4f7cd7f5..0fa2208c7 100644
--- a/deployments/optimism.diamond.json
+++ b/deployments/optimism.diamond.json
@@ -148,6 +148,10 @@
       "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4": {
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -156,8 +160,8 @@
       "FeeCollector": "0x271970eE66c03c9D62d8e8c718b9841f2Ea7D817",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0xdEE54e0fC8b28b6b80fdb11fC74B9329A4de5220",
       "LidoWrapper": "0x071e340577Ad1123cF72fe098BF0b5E62a7ae07E",
+      "LiFiDEXAggregator": "0xdEE54e0fC8b28b6b80fdb11fC74B9329A4de5220",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/optimism.json b/deployments/optimism.json
index 9c8cb2dcb..3bcad1d85 100644
--- a/deployments/optimism.json
+++ b/deployments/optimism.json
@@ -69,5 +69,6 @@
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
   "LiFiIntentEscrowFacet": "0x83C8F21F9Eab6DC2c8496C2c06eB7A352929a8Ca",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
-  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4"
+  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/plasma.diamond.json b/deployments/plasma.diamond.json
index d218a08a8..f81010a78 100644
--- a/deployments/plasma.diamond.json
+++ b/deployments/plasma.diamond.json
@@ -84,6 +84,10 @@
       "0x746E5c2ea5b3C005368645544D4B532255177e5c": {
         "Name": "WhitelistManagerFacet",
         "Version": "1.0.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -92,8 +96,8 @@
       "FeeCollector": "0x954d55105CDF5371224268691FAf6178be5f62F5",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x588c00159AED9A9ab258850b33DEDfAC1c794fA1",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x588c00159AED9A9ab258850b33DEDfAC1c794fA1",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x3c6B2E0b7421254846C53c118e24c65d59eAe75e",
diff --git a/deployments/plasma.json b/deployments/plasma.json
index cde74849a..aac26ef13 100644
--- a/deployments/plasma.json
+++ b/deployments/plasma.json
@@ -33,5 +33,6 @@
   "AcrossFacetPackedV4": "0x9B43Db66881128762B646576941C29059b13cbd6",
   "UnitFacet": "0xd6e617208E42153806cF2bf05Ab2cb3941d325Ec",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/polygon.diamond.json b/deployments/polygon.diamond.json
index d33884774..db13d1c6a 100644
--- a/deployments/polygon.diamond.json
+++ b/deployments/polygon.diamond.json
@@ -156,6 +156,10 @@
       "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4": {
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -164,8 +168,8 @@
       "FeeCollector": "0xbD6C7B0d2f68c2b7805d88388319cfB6EcB50eA9",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "0x98dE828723F8aC654B79b8A1BB8E1E5D737F4F42",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/polygon.json b/deployments/polygon.json
index d4663d767..38ba84ca1 100644
--- a/deployments/polygon.json
+++ b/deployments/polygon.json
@@ -65,5 +65,6 @@
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
   "LiFiIntentEscrowFacet": "0x83C8F21F9Eab6DC2c8496C2c06eB7A352929a8Ca",
   "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
-  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4"
+  "LiFiIntentEscrowFacetV2": "0x87E5b78C70989FC0Cb8a1B6777c2CE18BC8Fa3F4",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/ronin.diamond.json b/deployments/ronin.diamond.json
index 9f74d6ae5..25731b3eb 100644
--- a/deployments/ronin.diamond.json
+++ b/deployments/ronin.diamond.json
@@ -56,6 +56,10 @@
       "0xC7fF0661C9fF1Da5472e71e5ee6dAdB6afa87d02": {
         "Name": "GasZipFacet",
         "Version": "2.0.5"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -64,8 +68,8 @@
       "FeeCollector": "0xFEd2370437dF9c1302Fe4f0840A91fc0091DA1F2",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x312AA44DBc5dEB0a4bA2AD9BbA21094CD5E6362e",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x312AA44DBc5dEB0a4bA2AD9BbA21094CD5E6362e",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0xfeD71074954d4cb8f1D2A8ca317d72c75e3E0559",
diff --git a/deployments/ronin.json b/deployments/ronin.json
index b471fc5ae..ad37202ac 100644
--- a/deployments/ronin.json
+++ b/deployments/ronin.json
@@ -23,5 +23,6 @@
   "RelayDepositoryFacet": "0xbd9e11d7E8a29f2568d98BE25B8f3237b140F647",
   "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
   "WhitelistManagerFacet": "0x746E5c2ea5b3C005368645544D4B532255177e5c",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/scroll.diamond.json b/deployments/scroll.diamond.json
index f87a5f03c..16789a6f5 100644
--- a/deployments/scroll.diamond.json
+++ b/deployments/scroll.diamond.json
@@ -104,6 +104,10 @@
       "0xb28Dd740D27853A91639795223AB409088A73E23": {
         "Name": "WhitelistManagerFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -112,8 +116,8 @@
       "FeeCollector": "0xF048e5816B0C7951AC179f656C5B86e5a79Bd7b5",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x8189AFcC5B73Dc90600FeE92e5267Aff1D192884",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/scroll.json b/deployments/scroll.json
index 6b62e7799..2aedfc383 100644
--- a/deployments/scroll.json
+++ b/deployments/scroll.json
@@ -41,5 +41,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/sei.diamond.json b/deployments/sei.diamond.json
index b24ab8862..8d46a1811 100644
--- a/deployments/sei.diamond.json
+++ b/deployments/sei.diamond.json
@@ -68,6 +68,10 @@
       "0xb28Dd740D27853A91639795223AB409088A73E23": {
         "Name": "WhitelistManagerFacet",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -76,8 +80,8 @@
       "FeeCollector": "0x7956280Ec4B4d651C4083Ca737a1fa808b5319D8",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
-      "LiFiDEXAggregator": "0xfdE9CE4e17B650efdcA13d524F132876700d806f",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xfdE9CE4e17B650efdcA13d524F132876700d806f",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/sei.json b/deployments/sei.json
index 159bd903d..2a6717a8b 100644
--- a/deployments/sei.json
+++ b/deployments/sei.json
@@ -30,5 +30,6 @@
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "GasZipPeriphery": "0x1e5637e6bE93D50bB8eFa70D219d06291dcF5284",
   "PolymerCCTPFacet": "0xC3A6F4A7FA4E9b79a7bBD2C7283C0c5e076590B8",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/soneium.diamond.json b/deployments/soneium.diamond.json
index 501613308..9718bfddc 100644
--- a/deployments/soneium.diamond.json
+++ b/deployments/soneium.diamond.json
@@ -88,6 +88,10 @@
       "0x64d6B0993C4002E671f828BA35F0c53aF9eaA37a": {
         "Name": "GlacisFacet",
         "Version": "1.2.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -96,8 +100,8 @@
       "FeeCollector": "0x262de706627Fe02B46A3643a60948fA6bE007F7b",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x7bb54768255E9278c170981F6ea9BDe332C25148",
       "LidoWrapper": "0xe022f0e02a008C42cBb674e5f292FDea10f7dcfF",
+      "LiFiDEXAggregator": "0x7bb54768255E9278c170981F6ea9BDe332C25148",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x1BCd304fDAd1d1D66529159b1Bc8D13C9158D586",
diff --git a/deployments/soneium.json b/deployments/soneium.json
index 0fcab7c9e..631f667d7 100644
--- a/deployments/soneium.json
+++ b/deployments/soneium.json
@@ -36,5 +36,6 @@
   "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
   "WhitelistManagerFacet": "0x746E5c2ea5b3C005368645544D4B532255177e5c",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/sonic.diamond.json b/deployments/sonic.diamond.json
index c65ba1199..9c677b6ee 100644
--- a/deployments/sonic.diamond.json
+++ b/deployments/sonic.diamond.json
@@ -76,6 +76,10 @@
       "0xA31E7B9715c1950B669Dbb9084B7e4D89186DA9f": {
         "Name": "AllBridgeFacet",
         "Version": "2.1.2"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -84,8 +88,8 @@
       "FeeCollector": "0xaFb8cC8fCd71cd768Ce117C11eB723119FCDb1f8",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0xA03513f40409D1316c4958dbCef86e7Ab5Cd2009",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xA03513f40409D1316c4958dbCef86e7Ab5Cd2009",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/sonic.json b/deployments/sonic.json
index b452bac9e..8a27c3792 100644
--- a/deployments/sonic.json
+++ b/deployments/sonic.json
@@ -31,5 +31,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "PolymerCCTPFacet": "0xC3A6F4A7FA4E9b79a7bBD2C7283C0c5e076590B8",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/superposition.diamond.json b/deployments/superposition.diamond.json
index 9a33b6c62..2eabd331b 100644
--- a/deployments/superposition.diamond.json
+++ b/deployments/superposition.diamond.json
@@ -56,6 +56,10 @@
       "0xEcfF5F473F099FEB3f764264Bc61141788b161B1": {
         "Name": "GasZipFacet",
         "Version": "2.0.4"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -64,8 +68,8 @@
       "FeeCollector": "0x15b9Cf781B4A79C00E4dB7b49d8Bf67359a87Fd2",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x349e00F0D4033CB7014Dbf12fdF9E80CFaf262Bc",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x349e00F0D4033CB7014Dbf12fdF9E80CFaf262Bc",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x1BCd304fDAd1d1D66529159b1Bc8D13C9158D586",
diff --git a/deployments/superposition.json b/deployments/superposition.json
index c8f823b7c..0dba8efe0 100644
--- a/deployments/superposition.json
+++ b/deployments/superposition.json
@@ -24,5 +24,6 @@
   "RelayDepositoryFacet": "0xbd9e11d7E8a29f2568d98BE25B8f3237b140F647",
   "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
   "WhitelistManagerFacet": "0x746E5c2ea5b3C005368645544D4B532255177e5c",
-  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06"
+  "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/taiko.diamond.json b/deployments/taiko.diamond.json
index 72656b3ae..08953d943 100644
--- a/deployments/taiko.diamond.json
+++ b/deployments/taiko.diamond.json
@@ -60,6 +60,10 @@
       "0x184D1d43E73A002B45f9056770fD8d463c6b9388": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x0Bb301cc98299d57Ab7d07381fF0C9E48177Fd50": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -68,8 +72,8 @@
       "FeeCollector": "0xDd8A081efC90DFFD79940948a1528C51793C4B03",
       "FeeForwarder": "0xD8b700cEd3e486c3c4FC31Fc0c3b3590e1a52D7e",
       "GasZipPeriphery": "0x645e8096781d98810226595B3e2411B5CcC4899E",
-      "LiFiDEXAggregator": "0x37A06533fbfad7060D4bA071f0AaF241937DbaC1",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x37A06533fbfad7060D4bA071f0AaF241937DbaC1",
       "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77",
       "Patcher": "",
       "Permit2Proxy": "0xE5A89411c7Ef1502123d84ec1F9Da9D8574F4293",
diff --git a/deployments/taiko.json b/deployments/taiko.json
index f3fddccdd..3a6353c16 100644
--- a/deployments/taiko.json
+++ b/deployments/taiko.json
@@ -27,5 +27,6 @@
   "RelayDepositoryFacet": "0xb7777277Ec16688Fe8C599813a69e8D1478369C6",
   "FeeForwarder": "0xD8b700cEd3e486c3c4FC31Fc0c3b3590e1a52D7e",
   "WhitelistManagerFacet": "0x7e9293D6B59A353fdD11C39B62789fea36cEb6DC",
-  "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77"
+  "OutputValidator": "0x5680A31e4b1d2FeceB14376BA9266dA897d18C77",
+  "LayerSwapFacet": "0x0Bb301cc98299d57Ab7d07381fF0C9E48177Fd50"
 }
diff --git a/deployments/tempo.diamond.json b/deployments/tempo.diamond.json
index dde004081..1bf96953f 100644
--- a/deployments/tempo.diamond.json
+++ b/deployments/tempo.diamond.json
@@ -68,6 +68,10 @@
       "0x7E2dF86452b63f263f55ada32befBe8f58e69BD7": {
         "Name": "GlacisFacet",
         "Version": "1.2.0"
+      },
+      "0xBdD660fa7e8D31f0199E333B85a46aa43Bb3D69C": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -76,8 +80,8 @@
       "FeeCollector": "0x856305Ab6259E1E83FeE6a66b01672E9CfB84055",
       "FeeForwarder": "0xb421420EEf363d62108D040b70F0A8d580708AD1",
       "GasZipPeriphery": "",
-      "LiFiDEXAggregator": "0xB141CfAe0951be61eeE8b5F57DAa094D81b54e1C",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0xB141CfAe0951be61eeE8b5F57DAa094D81b54e1C",
       "OutputValidator": "0xE6ca0479AE3849e393c5b4735c9D41D58CcCb8cb",
       "Patcher": "",
       "Permit2Proxy": "0xa69d78858B27235575D7EfE240be91744a68E005",
diff --git a/deployments/tempo.json b/deployments/tempo.json
index dcbc7566d..73770615f 100644
--- a/deployments/tempo.json
+++ b/deployments/tempo.json
@@ -26,5 +26,6 @@
   "AcrossV4SwapFacet": "0xAe1585f6Ec7AC7589192cEAd7184D478906D4dB0",
   "SymbiosisFacet": "0xac959B1bcf96B7bFcfB0ac5D23E5d44AFc4Fff4c",
   "OutputValidator": "0xE6ca0479AE3849e393c5b4735c9D41D58CcCb8cb",
-  "GlacisFacet": "0x7E2dF86452b63f263f55ada32befBe8f58e69BD7"
+  "GlacisFacet": "0x7E2dF86452b63f263f55ada32befBe8f58e69BD7",
+  "LayerSwapFacet": "0xBdD660fa7e8D31f0199E333B85a46aa43Bb3D69C"
 }
diff --git a/deployments/unichain.diamond.json b/deployments/unichain.diamond.json
index d8f8696b7..bce8305ae 100644
--- a/deployments/unichain.diamond.json
+++ b/deployments/unichain.diamond.json
@@ -108,6 +108,10 @@
       "0xC19B1ea2c3238b8a06E4ea11aB9574a9B12FF1B2": {
         "Name": "SupersetFacet",
         "Version": "1.0.0"
+      },
+      "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -116,8 +120,8 @@
       "FeeCollector": "0x262de706627Fe02B46A3643a60948fA6bE007F7b",
       "FeeForwarder": "0xB401ccdA43C36935e6059C02103E9541FbA3337E",
       "GasZipPeriphery": "0x066439558a95B4D2c621829FC876dBc9F7d1ebc1",
-      "LiFiDEXAggregator": "0x7bb54768255E9278c170981F6ea9BDe332C25148",
       "LidoWrapper": "0xe022f0e02a008C42cBb674e5f292FDea10f7dcfF",
+      "LiFiDEXAggregator": "0x7bb54768255E9278c170981F6ea9BDe332C25148",
       "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
       "Patcher": "",
       "Permit2Proxy": "0x1BCd304fDAd1d1D66529159b1Bc8D13C9158D586",
diff --git a/deployments/unichain.json b/deployments/unichain.json
index 5088ae4b9..5b52f3e78 100644
--- a/deployments/unichain.json
+++ b/deployments/unichain.json
@@ -41,5 +41,6 @@
   "PolymerCCTPFacet": "0x64b48C3aAEaCf8981E75E26Ba6c52380B8669A05",
   "AcrossV4SwapFacet": "0x19Fee51e721B1337354aeEe875dD303E859AB430",
   "OutputValidator": "0xb02d5BCA761495d881Bfa5270771941bCba4Cd06",
-  "SupersetFacet": "0xC19B1ea2c3238b8a06E4ea11aB9574a9B12FF1B2"
+  "SupersetFacet": "0xC19B1ea2c3238b8a06E4ea11aB9574a9B12FF1B2",
+  "LayerSwapFacet": "0x2BfD9Ce2fe03cFf9c25d524bdAAd8E16161087Cd"
 }
diff --git a/deployments/worldchain.diamond.json b/deployments/worldchain.diamond.json
index f0db561a7..0641a0443 100644
--- a/deployments/worldchain.diamond.json
+++ b/deployments/worldchain.diamond.json
@@ -3,7 +3,7 @@
     "Facets": {
       "0x57FdfF2e36De6c8a8Cde297B150Ae291132Eae8d": {
         "Name": "DiamondCutFacet",
-        "Version": "2.0.0"
+        "Version": "1.0.0"
       },
       "0xA1a4d577709dC4A70CA38F1D41562fab3aD09D3f": {
         "Name": "DiamondLoupeFacet",
@@ -84,6 +84,10 @@
       "0x8CD89Ea14345F24d0299c2180Aec97a417Ca34E3": {
         "Name": "AcrossFacetPackedV4",
         "Version": "1.0.0"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -92,8 +96,8 @@
       "FeeCollector": "0x50D5a8aCFAe13Dceb217E9a071F6c6Bd5bDB4155",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x2321F1a63A683a1F3634Dbe1CbA0d657D5F56d54",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/worldchain.json b/deployments/worldchain.json
index 262e09004..a0ca0e3e5 100644
--- a/deployments/worldchain.json
+++ b/deployments/worldchain.json
@@ -33,5 +33,6 @@
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "PolymerCCTPFacet": "0xC3A6F4A7FA4E9b79a7bBD2C7283C0c5e076590B8",
   "AcrossV4SwapFacet": "0x2beEf67989a236e9CA97E8F731050bf7E8039e90",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/deployments/xlayer.diamond.json b/deployments/xlayer.diamond.json
index 0402bc411..2d21a05b7 100644
--- a/deployments/xlayer.diamond.json
+++ b/deployments/xlayer.diamond.json
@@ -60,6 +60,10 @@
       "0xce52856e4d95220389350A822C60779D0D921E30": {
         "Name": "EmergencyPauseFacet",
         "Version": "1.0.1"
+      },
+      "0x04E051D8e3627A79785f8E210B1d61A877AA737A": {
+        "Name": "LayerSwapFacet",
+        "Version": "1.0.0"
       }
     },
     "Periphery": {
@@ -68,8 +72,8 @@
       "FeeCollector": "0xC69994fd72824ca98F8a0B1E2ABc954E65a91cf4",
       "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
       "GasZipPeriphery": "0x363d698649cd04f9692Ab86e8365b227c1ee859d",
-      "LiFiDEXAggregator": "0x77b86A0a71511D077aEA2b54eDF80f0916e27448",
       "LidoWrapper": "",
+      "LiFiDEXAggregator": "0x77b86A0a71511D077aEA2b54eDF80f0916e27448",
       "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
       "Patcher": "",
       "Permit2Proxy": "0x89c6340B1a1f4b25D36cd8B063D49045caF3f818",
diff --git a/deployments/xlayer.json b/deployments/xlayer.json
index 6912843d0..997ba9e07 100644
--- a/deployments/xlayer.json
+++ b/deployments/xlayer.json
@@ -26,5 +26,6 @@
   "FeeForwarder": "0xC18D9E84b8687A2645447A61e52c455Dac1675e1",
   "WhitelistManagerFacet": "0xb28Dd740D27853A91639795223AB409088A73E23",
   "NEARIntentsFacet": "0xf8fA34D58A277060D07bCa7EC24D6B386d86a793",
-  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80"
+  "OutputValidator": "0xFafE4c4CEc5Ed070A4aFDc0f92826c5Ba276Cb80",
+  "LayerSwapFacet": "0x04E051D8e3627A79785f8E210B1d61A877AA737A"
 }
diff --git a/script/deploy/_targetState.json b/script/deploy/_targetState.json
index 7cedb1f1c..a6abb236a 100644
--- a/script/deploy/_targetState.json
+++ b/script/deploy/_targetState.json
@@ -55,7 +55,8 @@
         "SymbiosisFacet": "1.0.0",
         "ThorSwapFacet": "1.2.1",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -141,7 +142,8 @@
         "SymbiosisFacet": "1.0.0",
         "WhitelistManagerFacet": "1.0.0",
         "LiFiIntentEscrowFacetV2": "1.0.0",
-        "SupersetFacet": "1.0.0"
+        "SupersetFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -183,7 +185,8 @@
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
         "ThorSwapFacet": "1.2.1",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -263,7 +266,8 @@
         "ThorSwapFacet": "1.2.1",
         "WhitelistManagerFacet": "1.0.0",
         "LiFiIntentEscrowFacetV2": "1.0.0",
-        "SupersetFacet": "1.0.0"
+        "SupersetFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -297,7 +301,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -337,7 +342,8 @@
         "RelayDepositoryFacet": "1.0.0",
         "SquidFacet": "1.0.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -367,7 +373,8 @@
         "Permit2Proxy": "1.0.4",
         "DeBridgeDlnFacet": "1.0.1",
         "RelayDepositoryFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -447,7 +454,8 @@
         "SymbiosisFacet": "1.0.0",
         "ThorSwapFacet": "1.2.1",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -478,7 +486,8 @@
         "AllBridgeFacet": "2.1.0",
         "GlacisFacet": "1.1.0",
         "SquidFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -565,7 +574,8 @@
         "Permit2Proxy": "1.0.4",
         "SquidFacet": "1.0.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -634,7 +644,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -668,7 +679,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -761,7 +773,8 @@
         "LiFiDEXAggregator": "1.12.0",
         "TokenWrapper": "1.1.0",
         "Permit2Proxy": "1.0.4",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -799,7 +812,8 @@
         "RelayDepositoryFacet": "1.0.0",
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -831,7 +845,8 @@
         "CBridgeFacetPacked": "1.0.3",
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -872,7 +887,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -940,7 +956,8 @@
         "AcrossFacetPackedV4": "1.0.0",
         "ReceiverAcrossV4": "1.0.0",
         "GlacisFacet": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -972,7 +989,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1041,7 +1059,8 @@
         "GlacisFacet": "1.1.0",
         "RelayDepositoryFacet": "1.0.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1121,7 +1140,8 @@
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1149,7 +1169,8 @@
         "LiFiDEXAggregator": "1.12.0",
         "TokenWrapper": "1.1.0",
         "Permit2Proxy": "1.0.4",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1200,7 +1221,8 @@
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1273,7 +1295,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1305,7 +1328,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1345,7 +1369,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1377,7 +1402,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1438,7 +1464,8 @@
         "RelayDepositoryFacet": "1.0.0",
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1469,7 +1496,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1510,7 +1538,8 @@
         "ReceiverStargateV2": "1.1.0",
         "SymbiosisFacet": "1.0.0",
         "WhitelistManagerFacet": "1.0.0",
-        "SupersetFacet": "1.0.0"
+        "SupersetFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1545,7 +1574,8 @@
         "AcrossFacetPackedV4": "1.0.0",
         "ReceiverAcrossV4": "1.0.0",
         "RelayDepositoryFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1575,7 +1605,8 @@
         "Permit2Proxy": "1.0.4",
         "CBridgeFacet": "1.0.0",
         "CBridgeFacetPacked": "1.0.3",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1797,7 +1828,8 @@
         "TokenWrapper": "1.1.0",
         "Permit2Proxy": "1.0.4",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1864,7 +1896,8 @@
         "TokenWrapper": "1.1.0",
         "Permit2Proxy": "1.0.4",
         "RelayDepositoryFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -1929,7 +1962,8 @@
         "RelayDepositoryFacet": "1.0.0",
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -2050,7 +2084,8 @@
         "AcrossFacetV4": "1.0.0",
         "ReceiverAcrossV4": "1.0.0",
         "GlacisFacet": "1.1.0",
-        "WhitelistManagerFacet": "1.0.0"
+        "WhitelistManagerFacet": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -2113,7 +2148,8 @@
         "GlacisFacet": "1.2.0",
         "LiFiIntentEscrowFacet": "1.0.0",
         "WhitelistManagerFacet": "1.0.0",
-        "LiFiIntentEscrowFacetV2": "1.0.0"
+        "LiFiIntentEscrowFacetV2": "1.0.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -2264,7 +2300,8 @@
         "StargateFacetV2": "1.0.1",
         "ReceiverStargateV2": "1.1.0",
         "WhitelistManagerFacet": "1.1.0",
-        "GlacisFacet": "1.2.0"
+        "GlacisFacet": "1.2.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -2294,7 +2331,8 @@
         "Permit2Proxy": "1.0.4",
         "RelayDepositoryFacet": "1.0.0",
         "WhitelistManagerFacet": "1.1.0",
-        "PolymerCCTPFacet": "2.1.0"
+        "PolymerCCTPFacet": "2.1.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },
@@ -2414,7 +2452,8 @@
         "Permit2Proxy": "1.0.4",
         "RelayDepositoryFacet": "1.0.0",
         "SymbiosisFacet": "1.0.0",
-        "WhitelistManagerFacet": "1.1.0"
+        "WhitelistManagerFacet": "1.1.0",
+        "LayerSwapFacet": "1.0.0"
       }
     }
   },