fixes + cleanup

deploy-addresses/arbitrum-goerli.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0x4648a43B2C14Da09FdF82B161150d3F634f40491",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_NoV2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
 }

deploy-addresses/arbitrum.json

@@ -1,6 +1,6 @@
 {
   "UniversalRouterV1": "0x4C60051384bd2d3C01bfc845Cf5F4b44bcbE9de5",
-  "UniversalRouterV1_2": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
+  "UniversalRouterV1_2_NoV2Support": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
   "UnsupportedProtocol": "0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B",
   "UniversalRouterV1_2_V2Support": "0x5E325eDA8064b456f4781070C0738d849c824258",
   "UniversalRouterV2": "0xa51afafe0263b40edaef0df8781ea9aa03e381a3"

deploy-addresses/avalanche.json

@@ -1,5 +1,5 @@
 {
-  "UniversalRouterV1_2": "0x82635AF6146972cD6601161c4472ffe97237D292",
+  "UniversalRouterV1_2_NoV2Support": "0x82635AF6146972cD6601161c4472ffe97237D292",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B",
   "UniversalRouterV1_2_V2Support": "0x4Dae2f939ACf50408e13d58534Ff8c2776d45265"
 }

deploy-addresses/base-goerli.json

@@ -1,4 +1,4 @@
 {
-  "UniversalRouterV1_2": "0xd0872d928672ae2ff74bdb2f5130ac12229cafaf",
+  "UniversalRouterV1_2_NoV2Support": "0xd0872d928672ae2ff74bdb2f5130ac12229cafaf",
   "UnsupportedProtocol": "0x7B46ee9BaB49bd5b37117494689A035b0F187B59"
 }

deploy-addresses/base-sepolia.json

@@ -1,4 +1,4 @@
 {
-  "UniversalRouterV1_2": "0x95273d871c8156636e114b63797d78D7E1720d81",
-  "UnsupportedProtocol": "0x7B46ee9BaB49bd5b37117494689A035b0F187B59"
+  "UnsupportedProtocol": "0x76870DEbef0BE25589A5CddCe9B1D99276C73B4e",
+  "UniversalRouterV2": "0x95273d871c8156636e114b63797d78D7E1720d81"
 }

deploy-addresses/base.json

@@ -1,5 +1,5 @@
 {
-  "UniversalRouterV1_2": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
+  "UniversalRouterV1_2_NoV2Support": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
   "UnsupportedProtocol": "0x9E18Efb3BE848940b0C92D300504Fb08C287FE85",
   "UniversalRouterV1_2_V2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UniversalRouterV2": "0x6ff5693b99212da76ad316178a184ab56d299b43"

deploy-addresses/bsc.json

@@ -1,6 +1,6 @@
 {
   "UniversalRouterV1": "0x5Dc88340E1c5c6366864Ee415d6034cadd1A9897",
-  "UniversalRouterV1_2": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
+  "UniversalRouterV1_2_NoV2Support": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B",
   "UniversalRouterV1_2_V2Support": "0x4Dae2f939ACf50408e13d58534Ff8c2776d45265",
   "UniversalRouterV2": "0x1906c1d672b88cd1b9ac7593301ca990f94eae07"

deploy-addresses/celo-alfajores.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0x4648a43B2C14Da09FdF82B161150d3F634f40491",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_NoV2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
 }

deploy-addresses/celo.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0xC73d61d192FB994157168Fb56730FdEc64C9Cb8F",
-  "UniversalRouterV1_2": "0x643770e279d5d0733f21d6dc03a8efbabf3255b4",
+  "UniversalRouterV1_2_V2Support": "0x643770e279d5d0733f21d6dc03a8efbabf3255b4",
   "UnsupportedProtocol": "0x5Dc88340E1c5c6366864Ee415d6034cadd1A9897"
 }

deploy-addresses/goerli.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0x4648a43B2C14Da09FdF82B161150d3F634f40491",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_V2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
 }

deploy-addresses/mainnet.json

@@ -1,6 +1,6 @@
 {
   "UniversalRouterV1": "0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_V2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x76D631990d505E4e5b432EEDB852A60897824D68",
   "UniversalRouterV2": "0x66a9893cc07d91d95644aedd05d03f95e1dba8af"
 }

deploy-addresses/op-sepolia.json

@@ -1,4 +1,4 @@
 {
-  "UniversalRouterV1_2": "0x78e7F1502A9e4115dEbd6876E0AC4FaEBDB96880",
+  "UniversalRouterV1_2_NoV2Support": "0x78e7F1502A9e4115dEbd6876E0AC4FaEBDB96880",
   "UnsupportedProtocol": "0xFC885F37F5A9FA8159c8dBb907fc1b0C2fB31323"
 }

deploy-addresses/optimism-goerli.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0x4648a43B2C14Da09FdF82B161150d3F634f40491",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_NoV2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
 }

deploy-addresses/optimism.json

@@ -1,6 +1,6 @@
 {
   "UniversalRouterV1": "0xb555edF5dcF85f42cEeF1f3630a52A108E55A654",
-  "UniversalRouterV1_2": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
+  "UniversalRouterV1_2_NoV2Support": "0xeC8B0F7Ffe3ae75d7FfAb09429e3675bb63503e4",
   "UnsupportedProtocol": "0x40d51104Da22E3e77b683894E7e3E12e8FC61E65",
   "UniversalRouterV1_2_V2Support": "0xCb1355ff08Ab38bBCE60111F1bb2B784bE25D7e8",
   "UniversalRouterV2": "0x851116d9223fabed8e56c0e6b8ad0c31d98b3507"

deploy-addresses/polygon-mumbai.json

@@ -1,5 +1,5 @@
 {
   "UniversalRouterV1": "0x4648a43B2C14Da09FdF82B161150d3F634f40491",
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_NoV2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B"
 }

deploy-addresses/polygon.json

@@ -1,7 +1,7 @@
 {
   "UniversalRouterV1": "0x4C60051384bd2d3C01bfc845Cf5F4b44bcbE9de5",
-  "UniversalRouterV1_2": "0x643770E279d5D0733F21d6DC03A8efbABf3255B4",
-  "UniversalRouterV1_2_V2Support": "0xec7BE89e9d109e7e3Fec59c222CF297125FEFda2",
+  "UniversalRouterV1_2_NoV2Support": "0x643770E279d5D0733F21d6DC03A8efbABf3255B4",
   "UnsupportedProtocol": "0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B",
+  "UniversalRouterV1_2_V2Support": "0xec7BE89e9d109e7e3Fec59c222CF297125FEFda2",
   "UniversalRouterV2": "0x1095692a6237d83c6a72f3f5efedb9a670c49223"
 }

deploy-addresses/sepolia.json

@@ -1,5 +1,5 @@
 {
-  "UniversalRouterV1_2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
+  "UniversalRouterV1_2_V2Support": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD",
   "UnsupportedProtocol": "0x5302086A3a25d473aAbBd0356eFf8Dd811a4d89B",
-  "UniversalRouterV2": "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD"
+  "UniversalRouterV2": "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b"
 }

deploy-addresses/worldchain.json

@@ -1,5 +1,5 @@
 {
-  "UnsupportedProtocol": "0x16D4F26C15f3658ec65B1126ff27DD3dF2a2996b",
   "UniversalRouterV1_2_V2Support": "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
+  "UnsupportedProtocol": "0x16D4F26C15f3658ec65B1126ff27DD3dF2a2996b",
   "UniversalRouterV2": "0x8ac7bee993bb44dab564ea4bc9ea67bf9eb5e743"
 }

script/deployParameters/DeployInk.s.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.15;
+
+import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol';
+import {RouterParameters} from 'contracts/types/RouterParameters.sol';
+
+contract DeployInk is DeployUniversalRouter {
+    function setUp() public override {
+        params = RouterParameters({
+            permit2: 0x000000000022D473030F116dDEE9F6B43aC78BA3,
+            weth9: 0x4200000000000000000000000000000000000006,
+            v2Factory: 0xfe57A6BA1951F69aE2Ed4abe23e0f095DF500C04,
+            v3Factory: 0x640887A9ba3A9C53Ed27D0F7e8246A4F933f3424,
+            pairInitCodeHash: 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f,
+            poolInitCodeHash: 0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54,
+            v4PoolManager: 0x360E68faCcca8cA495c1B759Fd9EEe466db9FB32,
+            v3NFTPositionManager: 0xC0836E5B058BBE22ae2266e1AC488A1A0fD8DCE8,
+            v4PositionManager: 0x1b35d13a2E2528f192637F14B05f0Dc0e7dEB566
+        });
+    }
+}

script/deployParameters/DeployOPSepolia.s.sol

@@ -11,7 +11,7 @@ contract DeployOPSepolia is DeployUniversalRouter {
             weth9: 0x4200000000000000000000000000000000000006,
             v2Factory: UNSUPPORTED_PROTOCOL,
             v3Factory: 0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24,
-            pairInitCodeHash: 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f,
+            pairInitCodeHash: BYTES32_ZERO,
             poolInitCodeHash: 0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54,
             v4PoolManager: 0xf7F5aB3DcA35e17dE187b459159BC643853B3c67,
             v3NFTPositionManager: 0x27F971cb582BF9E50F397e4d29a5C7A34f11faA2,

script/deployParameters/DeploySoneium.s.sol

@@ -1 +1,21 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.15;
 
+import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol';
+import {RouterParameters} from 'contracts/types/RouterParameters.sol';
+
+contract DeploySoneium is DeployUniversalRouter {
+    function setUp() public override {
+        params = RouterParameters({
+            permit2: 0x000000000022D473030F116dDEE9F6B43aC78BA3,
+            weth9: 0x4200000000000000000000000000000000000006,
+            v2Factory: 0x8702463e73f74d0b6765aBceb314Ef07aCb92650,
+            v3Factory: 0x8702463e73f74d0b6765aBceb314Ef07aCb92650,
+            pairInitCodeHash: 0x0000000000000000000000000000000000000000000000000000000000000000,
+            poolInitCodeHash: 0x0000000000000000000000000000000000000000000000000000000000000000,
+            v4PoolManager: 0x360E68faCcca8cA495c1B759Fd9EEe466db9FB32,
+            v3NFTPositionManager: 0x8702463e73f74d0b6765aBceb314Ef07aCb92650,
+            v4PositionManager: 0x1b35d13a2E2528f192637F14B05f0Dc0e7dEB566
+        });
+    }
+}

script/deployParameters/DeployUnichain.s.sol

@@ -1 +1,21 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.15;
 
+import {DeployUniversalRouter} from '../DeployUniversalRouter.s.sol';
+import {RouterParameters} from 'contracts/types/RouterParameters.sol';
+
+contract DeployUnichain is DeployUniversalRouter {
+    function setUp() public override {
+        params = RouterParameters({
+            permit2: 0x000000000022D473030F116dDEE9F6B43aC78BA3,
+            weth9: 0x4200000000000000000000000000000000000006,
+            v2Factory: 0x1F98400000000000000000000000000000000002,
+            v3Factory: 0x1F98400000000000000000000000000000000002,
+            pairInitCodeHash: 0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f,
+            poolInitCodeHash: 0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54,
+            v4PoolManager: 0x1F98400000000000000000000000000000000004,
+            v3NFTPositionManager: 0x943e6e07a7E8E791dAFC44083e54041D743C46E9,
+            v4PositionManager: 0x4529A01c7A0410167c5740C487A8DE60232617b
+        });
+    }
+}