@kittycorn-labs/universal-router-sdk 1.1.0 → 1.3.0

package/dist/test/utils/uniswapData.d.ts

@@ -1,9 +1,9 @@
 import { MixedRouteTrade, Trade as RouterTrade } from '@kittycorn-labs/router-sdk';
 import { Trade as V2Trade, Pair } from '@uniswap/v2-sdk';
 import { Trade as V3Trade, Pool, FeeAmount } from '@uniswap/v3-sdk';
-import { Trade as V4Trade } from '@kittycorn-labs/v4-sdk';
+import { Pool as V4Pool, Trade as V4Trade } from '@kittycorn-labs/v4-sdk';
 import { SwapOptions } from '../../src';
-import { TradeType, Ether, Token, Currency } from '@uniswap/sdk-core';
+import { TradeType, Ether, Token, Currency, ChainId } from '@kittycorn-labs/sdk-core';
 export declare const ETHER: Ether;
 export declare const WETH: Token;
 export declare const DAI: Token;
@@ -19,6 +19,7 @@ declare type UniswapPools = {
 export declare function getUniswapPools(forkBlock?: number): Promise<UniswapPools>;
 export declare function getPair(tokenA: Token, tokenB: Token, blockNumber: number): Promise<Pair>;
 export declare function getPool(tokenA: Token, tokenB: Token, feeAmount: FeeAmount, blockNumber: number): Promise<Pool>;
+export declare function getPoolTokenize(chainId: ChainId, tokenize: Token): V4Pool;
 export declare function swapOptions(options: Partial<SwapOptions>): SwapOptions;
 export declare function buildTrade(trades: (V2Trade<Currency, Currency, TradeType> | V3Trade<Currency, Currency, TradeType> | V4Trade<Currency, Currency, TradeType> | MixedRouteTrade<Currency, Currency, TradeType>)[]): RouterTrade<Currency, Currency, TradeType>;
 export {};

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

@@ -16,6 +16,7 @@ var v2Sdk = require('@uniswap/v2-sdk');
 var routerSdk = require('@kittycorn-labs/router-sdk');
 require('jsbi');
 require('bignumber.js');
+var smartOrderRouter = require('@kittycorn-labs/smart-order-router');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -415,7 +416,7 @@ var CHAIN_CONFIGS = (_CHAIN_CONFIGS = {}, _CHAIN_CONFIGS[1] = {
     creationBlock: 8940568
   }, _routerConfigs2)
 }, _CHAIN_CONFIGS[11155111] = {
-  weth: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
+  weth: '0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c',
   routerConfigs: (_routerConfigs3 = {}, _routerConfigs3[exports.UniversalRouterVersion.V1_2] = {
     address: '0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD',
     creationBlock: 3543575
@@ -835,8 +836,85 @@ function addV3Swap(planner, _ref2, tradeType, options, payerIsUser, routerMustCu
     planner.addCommand(exports.CommandType.V3_SWAP_EXACT_OUT, [routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), path, payerIsUser]);
   }
 }
-function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody) {
+function getReducePools(pools, tokenIn, tokenOut) {
+  if (pools.length < 3) {
+    return pools;
+  }
+  var chainId = pools[0].chainId;
+  var token0 = smartOrderRouter.getSupportUnderlyingByTokenize(chainId, tokenIn); // assume tokenIn is tokenize
+  var token1 = smartOrderRouter.getSupportUnderlyingByTokenize(chainId, tokenOut); // assume tokenOut is tokenize
+  var isSupport0 = token0 !== undefined;
+  var isSupport1 = token1 !== undefined;
+  var underlyingIn = isSupport0 ? token0 : tokenIn;
+  var underlyingOut = isSupport1 ? token1 : tokenOut;
+  // Find reduce pool for
+  // - first pool is underlying and tokenize for tokenIn
+  // - last pool is underlying and previous tokenize for tokenOut
+  if (!isSupport0) {
+    var tokenizeIn = smartOrderRouter.getSupportTokenizeByUnderlying(chainId, underlyingIn);
+    if (tokenizeIn !== undefined) {
+      var reduceFirst = pools[0].token0.equals(underlyingIn) && pools[0].token1.equals(tokenizeIn) || pools[0].token0.equals(tokenizeIn) && pools[0].token1.equals(underlyingIn);
+      if (reduceFirst) {
+        pools.shift();
+      }
+    }
+  }
+  if (!isSupport1) {
+    var tokenizeOut = smartOrderRouter.getSupportTokenizeByUnderlying(chainId, underlyingOut);
+    if (tokenizeOut !== undefined) {
+      var lastIndex = pools.length - 1;
+      var reduceLast = pools[lastIndex].token0.equals(underlyingOut) && pools[lastIndex].token1.equals(tokenizeOut) || pools[lastIndex].token0.equals(tokenizeOut) && pools[lastIndex].token1.equals(underlyingOut);
+      if (reduceLast) {
+        pools.pop();
+      }
+    }
+  }
+  return pools;
+}
+function buildV4Planner(trade, tradeType, options, payerIsUser, routerMustCustody) {
   var _options$recipient;
+  var chainId = trade.route.chainId;
+  var currencyIn = trade.route.pathInput;
+  var currencyOut = trade.route.pathOutput;
+  var slippageToleranceOnSwap = routerMustCustody && tradeType == sdkCore.TradeType.EXACT_INPUT ? undefined : options.slippageTolerance;
+  // Make tokens path from pools
+  var path = [];
+  var nextToken = currencyIn;
+  trade.route.pools.forEach(function (pool) {
+    if (nextToken.equals(pool.token0)) {
+      path.push(pool.token0);
+      nextToken = pool.token1;
+    } else {
+      path.push(pool.token1);
+      nextToken = pool.token0;
+    }
+  });
+  var v4Planner = new v4Sdk.V4Planner();
+  // Add trade swap type with encode pathKeys
+  v4Planner.addTrade(trade, slippageToleranceOnSwap);
+  // Pay currency in
+  v4Planner.addSettle(currencyIn, payerIsUser);
+  var token0 = smartOrderRouter.getSupportUnderlyingByTokenize(chainId, currencyIn);
+  var isSupport0 = token0 !== undefined;
+  // Build action planner for path
+  for (var i = 1; i < path.length; i++) {
+    var token1 = smartOrderRouter.getSupportUnderlyingByTokenize(chainId, path[i]);
+    var isSupport1 = token1 !== undefined;
+    if (isSupport0 && path[i].equals(token0)) {
+      v4Planner.addTake(path[i - 1], ROUTER_AS_RECIPIENT);
+      v4Planner.addSettle(token0, false);
+    } else if (isSupport1 && path[i - 1].equals(token1)) {
+      v4Planner.addTake(token1, ROUTER_AS_RECIPIENT);
+      v4Planner.addSettle(path[i], false);
+    }
+    isSupport0 = isSupport1;
+    token0 = token1;
+  }
+  // Take currency out
+  v4Planner.addTake(currencyOut, routerMustCustody ? ROUTER_AS_RECIPIENT : (_options$recipient = options.recipient) != null ? _options$recipient : SENDER_AS_RECIPIENT);
+  return v4Planner;
+}
+function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody) {
   var inputAmount = _ref3.inputAmount,
     outputAmount = _ref3.outputAmount,
     route = _ref3.route;
@@ -844,6 +922,8 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
   var pools = route.pools.map(function (p) {
     return p;
   });
+  // reduce pools for tokenize
+  pools = getReducePools(pools, inputAmount.currency, outputAmount.currency);
   var v4Route = new v4Sdk.Route(pools, inputAmount.currency, outputAmount.currency);
   var trade = v4Sdk.Trade.createUncheckedTrade({
     route: v4Route,
@@ -851,11 +931,8 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
     outputAmount: outputAmount,
     tradeType: tradeType
   });
-  var slippageToleranceOnSwap = routerMustCustody && tradeType == sdkCore.TradeType.EXACT_INPUT ? undefined : options.slippageTolerance;
-  var v4Planner = new v4Sdk.V4Planner();
-  v4Planner.addTrade(trade, slippageToleranceOnSwap);
-  v4Planner.addSettle(trade.route.pathInput, payerIsUser);
-  v4Planner.addTake(trade.route.pathOutput, routerMustCustody ? ROUTER_AS_RECIPIENT : (_options$recipient = options.recipient) != null ? _options$recipient : SENDER_AS_RECIPIENT);
+  // build planner
+  var v4Planner = buildV4Planner(trade, tradeType, options, payerIsUser, routerMustCustody);
   planner.addCommand(exports.CommandType.V4_SWAP, [v4Planner.finalize()]);
 }
 // encode a mixed route swap, i.e. including both v2 and v3 pools