@uniswap/universal-router-sdk 2.2.3 → 3.0.0

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export { SwapRouter } from './swapRouter';
 export * from './entities';
 export * from './utils/routerTradeAdapter';
 export { RoutePlanner, CommandType } from './utils/routerCommands';
-export { UNIVERSAL_ROUTER_ADDRESS, UNIVERSAL_ROUTER_CREATION_BLOCK, PERMIT2_ADDRESS, ROUTER_AS_RECIPIENT, WETH_ADDRESS, } from './utils/constants';
+export { UNIVERSAL_ROUTER_CREATION_BLOCK, UNIVERSAL_ROUTER_ADDRESS, PERMIT2_ADDRESS, ROUTER_AS_RECIPIENT, WETH_ADDRESS, } from './utils/constants';

package/dist/universal-router-sdk.cjs.development.js

@@ -210,88 +210,184 @@ function createCommand(type, parameters) {
   };
 }
 
-var _CHAIN_CONFIGS;
+var _routerConfigs, _routerConfigs2, _routerConfigs3, _routerConfigs4, _routerConfigs5, _routerConfigs6, _routerConfigs7, _routerConfigs8, _routerConfigs9, _routerConfigs10, _routerConfigs11, _routerConfigs12, _routerConfigs13, _routerConfigs14, _routerConfigs15, _routerConfigs16, _routerConfigs17, _routerConfigs18, _CHAIN_CONFIGS;
+var RouterVersion;
+(function (RouterVersion) {
+  RouterVersion[RouterVersion["V1_2"] = 0] = "V1_2";
+  RouterVersion[RouterVersion["V2_0"] = 1] = "V2_0";
+})(RouterVersion || (RouterVersion = {}));
 var WETH_NOT_SUPPORTED_ON_CHAIN = '0x0000000000000000000000000000000000000000';
+// Todo: Change `CHAIN_CONFIGS` to pull the UR address with v4
 var CHAIN_CONFIGS = (_CHAIN_CONFIGS = {}, _CHAIN_CONFIGS[1] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-  creationBlock: 17143817
+  routerConfigs: (_routerConfigs = {}, _routerConfigs[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 17143817
+  }, _routerConfigs[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 17143817
+  }, _routerConfigs)
 }, _CHAIN_CONFIGS[5] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0xb4fbf271143f4fbf7b91a5ded31805e42b2208d6',
-  creationBlock: 8940568
+  routerConfigs: (_routerConfigs2 = {}, _routerConfigs2[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 8940568
+  }, _routerConfigs2[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 8940568
+  }, _routerConfigs2)
 }, _CHAIN_CONFIGS[11155111] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
-  creationBlock: 3543575
+  routerConfigs: (_routerConfigs3 = {}, _routerConfigs3[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 3543575
+  }, _routerConfigs3[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 3543575
+  }, _routerConfigs3)
 }, _CHAIN_CONFIGS[137] = {
-  router: '0xec7BE89e9d109e7e3Fec59c222CF297125FEFda2',
   weth: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
-  creationBlock: 52210153
+  routerConfigs: (_routerConfigs4 = {}, _routerConfigs4[RouterVersion.V1_2] = {
+    address: '0xec7BE89e9d109e7e3Fec59c222CF297125FEFda2',
+    creationBlock: 52210153
+  }, _routerConfigs4[RouterVersion.V2_0] = {
+    address: '0xec7BE89e9d109e7e3Fec59c222CF297125FEFda2',
+    creationBlock: 52210153
+  }, _routerConfigs4)
 }, _CHAIN_CONFIGS[80001] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889',
-  creationBlock: 35176052
+  routerConfigs: (_routerConfigs5 = {}, _routerConfigs5[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 35176052
+  }, _routerConfigs5[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 35176052
+  }, _routerConfigs5)
 }, _CHAIN_CONFIGS[10] = {
-  router: '0xCb1355ff08Ab38bBCE60111F1bb2B784bE25D7e8',
   weth: '0x4200000000000000000000000000000000000006',
-  creationBlock: 114702266
+  routerConfigs: (_routerConfigs6 = {}, _routerConfigs6[RouterVersion.V1_2] = {
+    address: '0xCb1355ff08Ab38bBCE60111F1bb2B784bE25D7e8',
+    creationBlock: 114702266
+  }, _routerConfigs6[RouterVersion.V2_0] = {
+    address: '0xCb1355ff08Ab38bBCE60111F1bb2B784bE25D7e8',
+    creationBlock: 114702266
+  }, _routerConfigs6)
 }, _CHAIN_CONFIGS[420] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0x4200000000000000000000000000000000000006',
-  creationBlock: 8887728
+  routerConfigs: (_routerConfigs7 = {}, _routerConfigs7[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 8887728
+  }, _routerConfigs7[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 8887728
+  }, _routerConfigs7)
 }, _CHAIN_CONFIGS[42161] = {
-  router: '0x5E325eDA8064b456f4781070C0738d849c824258',
   weth: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
-  creationBlock: 169472836
+  routerConfigs: (_routerConfigs8 = {}, _routerConfigs8[RouterVersion.V1_2] = {
+    address: '0x5E325eDA8064b456f4781070C0738d849c824258',
+    creationBlock: 169472836
+  }, _routerConfigs8[RouterVersion.V2_0] = {
+    address: '0x5E325eDA8064b456f4781070C0738d849c824258',
+    creationBlock: 169472836
+  }, _routerConfigs8)
 }, _CHAIN_CONFIGS[421613] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0xe39Ab88f8A4777030A534146A9Ca3B52bd5D43A3',
-  creationBlock: 18815277
+  routerConfigs: (_routerConfigs9 = {}, _routerConfigs9[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 18815277
+  }, _routerConfigs9[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 18815277
+  }, _routerConfigs9)
 }, _CHAIN_CONFIGS[42220] = {
-  router: '0x643770e279d5d0733f21d6dc03a8efbabf3255b4',
   weth: WETH_NOT_SUPPORTED_ON_CHAIN,
-  creationBlock: 21407637
+  routerConfigs: (_routerConfigs10 = {}, _routerConfigs10[RouterVersion.V1_2] = {
+    address: '0x643770e279d5d0733f21d6dc03a8efbabf3255b4',
+    creationBlock: 21407637
+  }, _routerConfigs10[RouterVersion.V2_0] = {
+    address: '0x643770e279d5d0733f21d6dc03a8efbabf3255b4',
+    creationBlock: 21407637
+  }, _routerConfigs10)
 }, _CHAIN_CONFIGS[44787] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: WETH_NOT_SUPPORTED_ON_CHAIN,
-  creationBlock: 17566658
+  routerConfigs: (_routerConfigs11 = {}, _routerConfigs11[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 17566658
+  }, _routerConfigs11[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 17566658
+  }, _routerConfigs11)
 }, _CHAIN_CONFIGS[56] = {
-  router: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
   weth: '0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
-  creationBlock: 35160263
+  routerConfigs: (_routerConfigs12 = {}, _routerConfigs12[RouterVersion.V1_2] = {
+    address: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
+    creationBlock: 35160263
+  }, _routerConfigs12[RouterVersion.V2_0] = {
+    address: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
+    creationBlock: 35160263
+  }, _routerConfigs12)
 }, _CHAIN_CONFIGS[43114] = {
-  router: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
   weth: '0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7',
-  creationBlock: 40237257
+  routerConfigs: (_routerConfigs13 = {}, _routerConfigs13[RouterVersion.V1_2] = {
+    address: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
+    creationBlock: 40237257
+  }, _routerConfigs13[RouterVersion.V2_0] = {
+    address: '0x4Dae2f939ACf50408e13d58534Ff8c2776d45265',
+    creationBlock: 40237257
+  }, _routerConfigs13)
 }, _CHAIN_CONFIGS[84531] = {
-  router: '0xd0872d928672ae2ff74bdb2f5130ac12229cafaf',
   weth: '0x4200000000000000000000000000000000000006',
-  creationBlock: 6915289
+  routerConfigs: (_routerConfigs14 = {}, _routerConfigs14[RouterVersion.V1_2] = {
+    address: '0xd0872d928672ae2ff74bdb2f5130ac12229cafaf',
+    creationBlock: 6915289
+  }, _routerConfigs14[RouterVersion.V2_0] = {
+    address: '0xd0872d928672ae2ff74bdb2f5130ac12229cafaf',
+    creationBlock: 6915289
+  }, _routerConfigs14)
 }, _CHAIN_CONFIGS[8453] = {
-  router: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
   weth: '0x4200000000000000000000000000000000000006',
-  creationBlock: 9107268
+  routerConfigs: (_routerConfigs15 = {}, _routerConfigs15[RouterVersion.V1_2] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 9107268
+  }, _routerConfigs15[RouterVersion.V2_0] = {
+    address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
+    creationBlock: 9107268
+  }, _routerConfigs15)
 }, _CHAIN_CONFIGS[81457] = {
-  router: '0x643770E279d5D0733F21d6DC03A8efbABf3255B4',
   weth: '0x4300000000000000000000000000000000000004',
-  creationBlock: 1116444
+  routerConfigs: (_routerConfigs16 = {}, _routerConfigs16[RouterVersion.V1_2] = {
+    address: '0x643770E279d5D0733F21d6DC03A8efbABf3255B4',
+    creationBlock: 1116444
+  }, _routerConfigs16[RouterVersion.V2_0] = {
+    address: '0x643770E279d5D0733F21d6DC03A8efbABf3255B4',
+    creationBlock: 1116444
+  }, _routerConfigs16)
 }, _CHAIN_CONFIGS[7777777] = {
-  router: '0x2986d9721A49838ab4297b695858aF7F17f38014',
   weth: '0x4200000000000000000000000000000000000006',
-  creationBlock: 11832155
+  routerConfigs: (_routerConfigs17 = {}, _routerConfigs17[RouterVersion.V1_2] = {
+    address: '0x2986d9721A49838ab4297b695858aF7F17f38014',
+    creationBlock: 11832155
+  }, _routerConfigs17[RouterVersion.V2_0] = {
+    address: '0x2986d9721A49838ab4297b695858aF7F17f38014',
+    creationBlock: 11832155
+  }, _routerConfigs17)
 }, _CHAIN_CONFIGS[324] = {
-  router: '0x28731BCC616B5f51dD52CF2e4dF0E78dD1136C06',
   weth: '0x5aea5775959fbc2557cc8789bc1bf90a239d9a91',
-  creationBlock: 12640979
+  routerConfigs: (_routerConfigs18 = {}, _routerConfigs18[RouterVersion.V1_2] = {
+    address: '0x28731BCC616B5f51dD52CF2e4dF0E78dD1136C06',
+    creationBlock: 12640979
+  }, _routerConfigs18[RouterVersion.V2_0] = {
+    address: '0x28731BCC616B5f51dD52CF2e4dF0E78dD1136C06',
+    creationBlock: 12640979
+  }, _routerConfigs18)
 }, _CHAIN_CONFIGS);
-var UNIVERSAL_ROUTER_ADDRESS = function UNIVERSAL_ROUTER_ADDRESS(chainId) {
+var UNIVERSAL_ROUTER_ADDRESS = function UNIVERSAL_ROUTER_ADDRESS(version, chainId) {
   if (!(chainId in CHAIN_CONFIGS)) throw new Error("Universal Router not deployed on chain " + chainId);
-  return CHAIN_CONFIGS[chainId].router;
+  return CHAIN_CONFIGS[chainId].routerConfigs[version].address;
 };
-var UNIVERSAL_ROUTER_CREATION_BLOCK = function UNIVERSAL_ROUTER_CREATION_BLOCK(chainId) {
+var UNIVERSAL_ROUTER_CREATION_BLOCK = function UNIVERSAL_ROUTER_CREATION_BLOCK(version, chainId) {
   if (!(chainId in CHAIN_CONFIGS)) throw new Error("Universal Router not deployed on chain " + chainId);
-  return CHAIN_CONFIGS[chainId].creationBlock;
+  return CHAIN_CONFIGS[chainId].routerConfigs[version].creationBlock;
 };
 var WETH_ADDRESS = function WETH_ADDRESS(chainId) {
   if (!(chainId in CHAIN_CONFIGS)) throw new Error("Universal Router not deployed on chain " + chainId);
@@ -414,12 +510,12 @@ function addV2Swap(planner, _ref, tradeType, options, payerIsUser, routerMustCus
   if (tradeType == sdkCore.TradeType.EXACT_INPUT) {
     planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [
     // if native, we have to unwrap so keep in the router for now
-    routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), route.path.map(function (pool) {
-      return pool.address;
+    routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), route.path.map(function (token) {
+      return token.wrapped.address;
     }), payerIsUser]);
   } else if (tradeType == sdkCore.TradeType.EXACT_OUTPUT) {
-    planner.addCommand(exports.CommandType.V2_SWAP_EXACT_OUT, [routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), route.path.map(function (pool) {
-      return pool.address;
+    planner.addCommand(exports.CommandType.V2_SWAP_EXACT_OUT, [routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), route.path.map(function (token) {
+      return token.wrapped.address;
     }), payerIsUser]);
   }
 }
@@ -480,7 +576,7 @@ function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMust
     var newRouteOriginal = new routerSdk.MixedRouteSDK([].concat(section), section[0].token0.equals(inputToken) ? section[0].token0 : section[0].token1, outputToken);
     var newRoute = new routerSdk.MixedRoute(newRouteOriginal);
     /// Previous output is now input
-    inputToken = outputToken;
+    inputToken = outputToken.wrapped;
     var mixedRouteIsAllV3 = function mixedRouteIsAllV3(route) {
       return route.pools.every(function (pool) {
         return pool instanceof v3Sdk.Pool;
@@ -493,8 +589,8 @@ function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMust
       // note: because of the partitioning function we can be sure that the next section is v2
       isLastSectionInRoute(i) ? tradeRecipient : sections[i + 1][0].liquidityToken.address, i == 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, path, payerIsUser && i === 0]);
     } else {
-      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [isLastSectionInRoute(i) ? tradeRecipient : ROUTER_AS_RECIPIENT, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, newRoute.path.map(function (pool) {
-        return pool.address;
+      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [isLastSectionInRoute(i) ? tradeRecipient : ROUTER_AS_RECIPIENT, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, newRoute.path.map(function (token) {
+        return token.wrapped.address;
       }), payerIsUser && i === 0]);
     }
   }
@@ -10654,6 +10750,8 @@ var RouterTradeAdapter = /*#__PURE__*/function () {
           outputAmount: route.outputAmount
         };
       }),
+      // TODO: ROUTE-219 - Support v4 trade in universal-router sdk
+      v4Routes: [],
       mixedRoutes: typedRoutes.filter(function (route) {
         return route.mixedRoute;
       }).map(function (route) {