diff --git a/deployments/0g.diamond.json b/deployments/0g.diamond.json
index c37f03cf4c..3fca0dbdd0 100644
--- a/deployments/0g.diamond.json
+++ b/deployments/0g.diamond.json
@@ -29,9 +29,9 @@
         "Name": "GlacisFacet",
         "Version": "1.2.0"
       },
-      "0xFDAE19e236380BF01B48272508Ed08fDd84bBccD": {
+      "0x65bE4db5A9d3AaF3B08291df31110A89defC795b": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x0ead0f146F587169443D83F67F25A1b8c0748772": {
         "Name": "OwnershipFacet",
diff --git a/deployments/0g.json b/deployments/0g.json
index 3f3ab39d90..25395e84ef 100644
--- a/deployments/0g.json
+++ b/deployments/0g.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x640a8cd1c603ECB398e4D63B9Ffd4201BD682BbB",
   "DiamondLoupeFacet": "0xCf023935F1e0edC30997bA1Ea1Ee7dD967D6dEba",
   "EmergencyPauseFacet": "0x3F52301B7028D80427D47A5a7Fa9b70ed768A39B",
-  "GenericSwapFacetV3": "0xFDAE19e236380BF01B48272508Ed08fDd84bBccD",
+  "GenericSwapFacetV3": "0x65bE4db5A9d3AaF3B08291df31110A89defC795b",
   "OwnershipFacet": "0x0ead0f146F587169443D83F67F25A1b8c0748772",
   "PeripheryRegistryFacet": "0x21eC05577f0731925F41C4D360853D861e9C5603",
   "WhitelistManagerFacet": "0xD4aec240D76C232a2a845E91351975Ba59afedf7",
diff --git a/deployments/arbitrumsepolia.diamond.json b/deployments/arbitrumsepolia.diamond.json
index 05020fb791..e5182ea9d8 100644
--- a/deployments/arbitrumsepolia.diamond.json
+++ b/deployments/arbitrumsepolia.diamond.json
@@ -17,9 +17,9 @@
         "Name": "CalldataVerificationFacet",
         "Version": "1.3.1"
       },
-      "0x710Efd35F4a958eA028536c230f3e280B97D6A05": {
+      "0x9Cd41674566354E1Cd7e6C7E91bC6ec4Fd8e4eEa": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x5377cA47771dF271AD471387295c7F0BF1FBed6D": {
         "Name": "OwnershipFacet",
diff --git a/deployments/arbitrumsepolia.json b/deployments/arbitrumsepolia.json
index 3be23c06ef..2a3b0681c8 100644
--- a/deployments/arbitrumsepolia.json
+++ b/deployments/arbitrumsepolia.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x90F42915616EEf4118B9F5627BE67Bd42a6c388B",
   "DiamondLoupeFacet": "0x57280540ADc00A505cbfd74AEbbc8f08ADeB0281",
   "EmergencyPauseFacet": "0xF218bf600e9C9C03DDD176902b94a5FAfb59D99A",
-  "GenericSwapFacetV3": "0x710Efd35F4a958eA028536c230f3e280B97D6A05",
+  "GenericSwapFacetV3": "0x9Cd41674566354E1Cd7e6C7E91bC6ec4Fd8e4eEa",
   "OwnershipFacet": "0x5377cA47771dF271AD471387295c7F0BF1FBed6D",
   "PeripheryRegistryFacet": "0x9939b2D7b188cEBDD0D3220f7e952955532563d5",
   "WhitelistManagerFacet": "0xcB61A046e32CEE2Efa740922617C2Ac21856AD2b",
diff --git a/deployments/basesepolia.diamond.json b/deployments/basesepolia.diamond.json
index 05020fb791..e5182ea9d8 100644
--- a/deployments/basesepolia.diamond.json
+++ b/deployments/basesepolia.diamond.json
@@ -17,9 +17,9 @@
         "Name": "CalldataVerificationFacet",
         "Version": "1.3.1"
       },
-      "0x710Efd35F4a958eA028536c230f3e280B97D6A05": {
+      "0x9Cd41674566354E1Cd7e6C7E91bC6ec4Fd8e4eEa": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x5377cA47771dF271AD471387295c7F0BF1FBed6D": {
         "Name": "OwnershipFacet",
diff --git a/deployments/basesepolia.json b/deployments/basesepolia.json
index 015cd9e381..d9f46585f0 100644
--- a/deployments/basesepolia.json
+++ b/deployments/basesepolia.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x90F42915616EEf4118B9F5627BE67Bd42a6c388B",
   "DiamondLoupeFacet": "0x57280540ADc00A505cbfd74AEbbc8f08ADeB0281",
   "EmergencyPauseFacet": "0xF218bf600e9C9C03DDD176902b94a5FAfb59D99A",
-  "GenericSwapFacetV3": "0x710Efd35F4a958eA028536c230f3e280B97D6A05",
+  "GenericSwapFacetV3": "0x9Cd41674566354E1Cd7e6C7E91bC6ec4Fd8e4eEa",
   "OwnershipFacet": "0x5377cA47771dF271AD471387295c7F0BF1FBed6D",
   "PeripheryRegistryFacet": "0x9939b2D7b188cEBDD0D3220f7e952955532563d5",
   "WhitelistManagerFacet": "0xcB61A046e32CEE2Efa740922617C2Ac21856AD2b",
diff --git a/deployments/morph.diamond.json b/deployments/morph.diamond.json
index 60b9875b57..f9b3097c85 100644
--- a/deployments/morph.diamond.json
+++ b/deployments/morph.diamond.json
@@ -37,9 +37,9 @@
         "Name": "SymbiosisFacet",
         "Version": "2.0.0"
       },
-      "0xb1e9A4b09e2b8c35D21Ede99Fa60276fe0647551": {
+      "0x65bE4db5A9d3AaF3B08291df31110A89defC795b": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0xC2B440c209890caA45952F6143c116204994c0D2": {
         "Name": "CalldataVerificationFacet",
diff --git a/deployments/morph.json b/deployments/morph.json
index 38dc30acf6..624da9ac32 100644
--- a/deployments/morph.json
+++ b/deployments/morph.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x24601F729cFce5288764Eff6C237033236DFd843",
   "DiamondLoupeFacet": "0x12d5427De38bf6e754a21EA7Eaf8c1eE8cd7Aa5c",
   "EmergencyPauseFacet": "0x3F52301B7028D80427D47A5a7Fa9b70ed768A39B",
-  "GenericSwapFacetV3": "0xb1e9A4b09e2b8c35D21Ede99Fa60276fe0647551",
+  "GenericSwapFacetV3": "0x65bE4db5A9d3AaF3B08291df31110A89defC795b",
   "OwnershipFacet": "0xf8bd3B0c644183FcDf04D9e2DCE8F12AfD5aD004",
   "PeripheryRegistryFacet": "0x49ee202b84be232126a308F20b7AD42162184A45",
   "WhitelistManagerFacet": "0x99E1a2E574100e07EA059FA5c010cC86Df26a046",
diff --git a/deployments/optimismsepolia.diamond.json b/deployments/optimismsepolia.diamond.json
index c65194f4df..ec0db2e9f0 100644
--- a/deployments/optimismsepolia.diamond.json
+++ b/deployments/optimismsepolia.diamond.json
@@ -17,9 +17,9 @@
         "Name": "CalldataVerificationFacet",
         "Version": "1.3.1"
       },
-      "0xd508814ee8475658889a91759481D21816880Ad6": {
+      "0xA15a3ed3F94f397012Ed5a0AE307539B3b821f2e": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x22197947060a617dbf2a4be985b63bD19eEeF092": {
         "Name": "OwnershipFacet",
diff --git a/deployments/optimismsepolia.json b/deployments/optimismsepolia.json
index aab466b5b6..ff1162cf7a 100644
--- a/deployments/optimismsepolia.json
+++ b/deployments/optimismsepolia.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x3cc89Fe25d9939BE67065917DaF3D7E95Ccb71Df",
   "DiamondLoupeFacet": "0xd178BAF8fC90fC23D2c9a682Bdb325F5c67De091",
   "EmergencyPauseFacet": "0x6f0671e8dfE45606AACAb5E6f20efcbDC2328cdF",
-  "GenericSwapFacetV3": "0xd508814ee8475658889a91759481D21816880Ad6",
+  "GenericSwapFacetV3": "0xA15a3ed3F94f397012Ed5a0AE307539B3b821f2e",
   "OwnershipFacet": "0x22197947060a617dbf2a4be985b63bD19eEeF092",
   "PeripheryRegistryFacet": "0x5c4d803003C6c20bF4C36B8A4d617C0b08774631",
   "WhitelistManagerFacet": "0x67e45B67B1A1c7dB65E5B3F38D9614C37717A273",
diff --git a/deployments/pharos.diamond.json b/deployments/pharos.diamond.json
index 8b9c9b4ba6..ab2797cd68 100644
--- a/deployments/pharos.diamond.json
+++ b/deployments/pharos.diamond.json
@@ -25,9 +25,9 @@
         "Name": "LiFiIntentEscrowFacetV2",
         "Version": "2.0.0"
       },
-      "0xbc140b5ecE539c2A73878badC5014F33F5fe0d83": {
+      "0xEf4D1C860DF16697FC15f930ED4caDE935826e01": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x23Abcd6a3B11A161B044EEe5448ACc1c71a280A0": {
         "Name": "OwnershipFacet",
diff --git a/deployments/pharos.json b/deployments/pharos.json
index b49dd0dad5..53bb50e80e 100644
--- a/deployments/pharos.json
+++ b/deployments/pharos.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x81Aa26F9c9b9d5DE24b61b36dD602da7755aC769",
   "DiamondLoupeFacet": "0xe60F67d9963977C929eF6Dc465c9874290F746aa",
   "EmergencyPauseFacet": "0x9d9785F4C40a1FF1497fBE141219E94ccd89c008",
-  "GenericSwapFacetV3": "0xbc140b5ecE539c2A73878badC5014F33F5fe0d83",
+  "GenericSwapFacetV3": "0xEf4D1C860DF16697FC15f930ED4caDE935826e01",
   "OwnershipFacet": "0x23Abcd6a3B11A161B044EEe5448ACc1c71a280A0",
   "PeripheryRegistryFacet": "0xffdF032efC87a5ae95a133637d8F10A5C8e9AC0c",
   "WhitelistManagerFacet": "0xb0AF986eACb968B7bf0116C0AC1769D47E97cb40",
diff --git a/deployments/somnia.diamond.json b/deployments/somnia.diamond.json
index 43f3d59c13..5e56a558ce 100644
--- a/deployments/somnia.diamond.json
+++ b/deployments/somnia.diamond.json
@@ -25,9 +25,9 @@
         "Name": "GasZipFacet",
         "Version": "2.0.5"
       },
-      "0xBBF6551c5573d3689981f3C4d39539285b7C2A5b": {
+      "0xCff4b967cB7f5BE23fD6F76b545c4f1f92808b4d": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0xB9e3952b7f884cbAf58383f8C4f8136a319519Db": {
         "Name": "OwnershipFacet",
diff --git a/deployments/somnia.json b/deployments/somnia.json
index dc201c893c..eda8b48f73 100644
--- a/deployments/somnia.json
+++ b/deployments/somnia.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x67fb34dd0FFe5A73EC2AC4eB392E649b7f58e744",
   "DiamondLoupeFacet": "0xBE5DdfBD1a00e8a7dbf19d77cDa1745455d4593B",
   "EmergencyPauseFacet": "0x13cdabEC579f1ee1f0222C8cc346aD294426DfE0",
-  "GenericSwapFacetV3": "0xBBF6551c5573d3689981f3C4d39539285b7C2A5b",
+  "GenericSwapFacetV3": "0xCff4b967cB7f5BE23fD6F76b545c4f1f92808b4d",
   "OwnershipFacet": "0xB9e3952b7f884cbAf58383f8C4f8136a319519Db",
   "PeripheryRegistryFacet": "0x2fc43E0784f33e9510b8B1dd65c6C64389212Bd4",
   "WhitelistManagerFacet": "0x329019D07737d5e089E12B1C7F1a962c666EEE9c",
diff --git a/deployments/telos.diamond.json b/deployments/telos.diamond.json
index efc2e40afc..8b729f7015 100644
--- a/deployments/telos.diamond.json
+++ b/deployments/telos.diamond.json
@@ -25,9 +25,9 @@
         "Name": "SymbiosisFacet",
         "Version": "2.0.0"
       },
-      "0x85871394F73F9Aa666A82221dae855dEa57F48d6": {
+      "0xFEEBa9524B1ac4974542212C1854a4fbE199104b": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0x3b4dADd3976720cD7f9E97f0ec0D2732cAfF9e72": {
         "Name": "OwnershipFacet",
diff --git a/deployments/telos.json b/deployments/telos.json
index 50dd455822..461cb1731b 100644
--- a/deployments/telos.json
+++ b/deployments/telos.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x5F4fbFb97AcD1267ae5F383E0E5D4800AA002811",
   "DiamondLoupeFacet": "0x9A3fa9036C5F1CdF99B9A89B5727497529F62E36",
   "EmergencyPauseFacet": "0xe4600ABa2F8A488166a9Ac6CfdD898263c58e111",
-  "GenericSwapFacetV3": "0x85871394F73F9Aa666A82221dae855dEa57F48d6",
+  "GenericSwapFacetV3": "0xFEEBa9524B1ac4974542212C1854a4fbE199104b",
   "OwnershipFacet": "0x3b4dADd3976720cD7f9E97f0ec0D2732cAfF9e72",
   "PeripheryRegistryFacet": "0x8Ca6EDa36C295592eB250FB44E5b268AE2b7e925",
   "WhitelistManagerFacet": "0x8d64E693522bc0A3d5b297f09E96aF6845e13453",
diff --git a/deployments/tempo.diamond.json b/deployments/tempo.diamond.json
index cd2688bf61..0837f1bf45 100644
--- a/deployments/tempo.diamond.json
+++ b/deployments/tempo.diamond.json
@@ -25,9 +25,9 @@
         "Name": "SymbiosisFacet",
         "Version": "2.0.0"
       },
-      "0xc2029A96C95AC48dA05778B41B965CfC4640317D": {
+      "0xEf4D1C860DF16697FC15f930ED4caDE935826e01": {
         "Name": "GenericSwapFacetV3",
-        "Version": "1.0.2"
+        "Version": "2.0.0"
       },
       "0xFE5Aa21A6681ff2E76195c53Eb5F12214F29fd1A": {
         "Name": "OwnershipFacet",
diff --git a/deployments/tempo.json b/deployments/tempo.json
index 6a642bffd1..8b2fd2e6b4 100644
--- a/deployments/tempo.json
+++ b/deployments/tempo.json
@@ -4,7 +4,7 @@
   "DiamondCutFacet": "0x2dDfDc3A8DB124273612288F98f1b889f97218a7",
   "DiamondLoupeFacet": "0xbC85b004DF4E099844b0f6BeE544F7cf714aCd00",
   "EmergencyPauseFacet": "0x9d9785F4C40a1FF1497fBE141219E94ccd89c008",
-  "GenericSwapFacetV3": "0xc2029A96C95AC48dA05778B41B965CfC4640317D",
+  "GenericSwapFacetV3": "0xEf4D1C860DF16697FC15f930ED4caDE935826e01",
   "OwnershipFacet": "0xFE5Aa21A6681ff2E76195c53Eb5F12214F29fd1A",
   "PeripheryRegistryFacet": "0xA434e8F0690017083893262009B3c4D5EF41e0Db",
   "WhitelistManagerFacet": "0xc3C6f458BF0A8652AAC4A937f398B3B85C8185D4",