updated package dependencies

cli/base-command.ts

@@ -5,7 +5,7 @@ import { Command, flags } from '@oclif/command';
 import { ParserOutput } from '@oclif/parser/lib/parse';
 import DEFAULT_TOKEN_LIST from '@uniswap/default-token-list';
 import { ChainId, Currency, CurrencyAmount, Token } from '@offsetcarbon/sdk-core';
-import { MethodParameters } from '@uniswap/v3-sdk';
+import { MethodParameters } from '@offsetcarbon/v3-sdk';
 import bunyan, { default as Logger } from 'bunyan';
 import bunyanDebugStream from 'bunyan-debug-stream';
 import _ from 'lodash';

cli/commands/quote-to-ratio.ts

@@ -1,7 +1,7 @@
 import { Logger } from '@ethersproject/logger';
 import { flags } from '@oclif/command';
 import { Currency, Ether, Fraction, Percent } from '@offsetcarbon/sdk-core';
-import { Position } from '@uniswap/v3-sdk';
+import { Position } from '@offsetcarbon/v3-sdk';
 import dotenv from 'dotenv';
 import {
   ID_TO_CHAIN_ID,

cli/commands/quote.ts

@@ -1,6 +1,6 @@
 import { Logger } from '@ethersproject/logger';
 import { flags } from '@oclif/command';
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { Currency, Percent, TradeType } from '@offsetcarbon/sdk-core';
 import dotenv from 'dotenv';
 import _ from 'lodash';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offsetcarbon/smart-order-router",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "description": "Offset Smart Order Router",
   "main": "build/main/index.js",
   "typings": "build/main/index.d.ts",
@@ -15,9 +15,8 @@
     "compile-v3-types": "npx typechain --target ethers-v5 --out-dir src/types/v3 './node_modules/@uniswap/?(v3-core|v3-periphery)/artifacts/contracts/**/*.json'",
     "compile-v2-types": "npx typechain --target ethers-v5 --out-dir src/types/v2 './node_modules/@uniswap/?(v2-core|v2-periphery)/build/*UniswapV2*.json'",
     "compile-router": "npx typechain --target ethers-v5 --out-dir src/types/other './node_modules/@uniswap/swap-router-contracts/artifacts/contracts/**/*.json'",
-    "compile-narwhal": "npx typechain --target ethers-v5 --out-dir src/types/other './node_modules/@uniswap/narwhal/artifacts/contracts/**/*.json'",
     "compile-external-types": "npx typechain --target ethers-v5 --out-dir src/types/other 'src/abis/**/*.json'",
-    "build": "run-p compile-v3-types compile-v2-types compile-router compile-narwhal compile-external-types && run-p build:*",
+    "build": "run-p compile-v3-types compile-v2-types compile-router compile-external-types && run-p build:*",
     "build:main": "tsc -p tsconfig.json",
     "build:module": "tsc -p tsconfig.module.json",
     "fix": "run-s fix:*",
@@ -31,6 +30,11 @@
     "node": ">=10"
   },
   "dependencies": {
+    "@offsetcarbon/router-sdk": "1.7.5",
+    "@offsetcarbon/sdk-core": "^4.0.13",
+    "@offsetcarbon/universal-router-sdk": "^1.6.4",
+    "@offsetcarbon/v2-sdk": "4.1.0",
+    "@offsetcarbon/v3-sdk": "^3.10.1",
     "@uniswap/default-token-list": "^11.2.0",
     "@uniswap/permit2-sdk": "^1.2.0",
     "@uniswap/router-sdk": "^1.6.0",
@@ -41,8 +45,6 @@
     "@uniswap/universal-router-sdk": "^1.5.8",
     "@uniswap/v2-sdk": "^3.2.3",
     "@uniswap/v3-sdk": "^3.10.0",
-    "@offsetcarbon/v3-sdk": "^3.10.1",
-    "@offsetcarbon/sdk-core": "^4.0.13",
     "async-retry": "^1.3.1",
     "await-timeout": "^1.1.1",
     "axios": "^0.21.1",
@@ -70,7 +72,7 @@
     "@types/jest": "^27.0.0",
     "@types/jest-sinon": "^1.0.2",
     "@types/lodash": "^4.14.168",
-    "@types/node": "^15.0.2",
+    "@types/node": "^20.11.10",
     "@types/sinon": "^10.0.2",
     "@types/stats-lite": "^2.2.0",
     "@typescript-eslint/eslint-plugin": "^4.0.1",

src/providers/caching/route/model/cached-route.ts

@@ -1,6 +1,6 @@
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { Token } from '@offsetcarbon/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 
 import { MixedRoute, V2Route, V3Route } from '../../../../routers';
 

src/providers/caching/route/model/cached-routes.ts

@@ -1,4 +1,4 @@
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Token, TradeType } from '@offsetcarbon/sdk-core';
 import _ from 'lodash';
 

src/providers/caching/route/route-caching-provider.ts

@@ -4,7 +4,7 @@
  * @export
  * @interface IRouteCachingProvider
  */
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import {
   ChainId,
   Currency,

src/providers/on-chain-quote-provider.ts

@@ -4,9 +4,9 @@ import {
   encodeMixedRouteToPath,
   MixedRouteSDK,
   Protocol,
-} from '@uniswap/router-sdk';
+} from '@offsetcarbon/router-sdk';
 import { ChainId } from '@offsetcarbon/sdk-core';
-import { encodeRouteToPath } from '@uniswap/v3-sdk';
+import { encodeRouteToPath } from '@offsetcarbon/v3-sdk';
 import retry, { Options as RetryOptions } from 'async-retry';
 import _ from 'lodash';
 import stats from 'stats-lite';

src/providers/portion-provider.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { ZERO } from '@uniswap/router-sdk';
+import { ZERO } from '@offsetcarbon/router-sdk';
 import { Fraction, TradeType } from '@offsetcarbon/sdk-core';
 
 import {

src/providers/simulation-provider.ts

@@ -1,6 +1,6 @@
 import { JsonRpcProvider } from '@ethersproject/providers';
 import { ChainId, TradeType } from '@offsetcarbon/sdk-core';
-import { PERMIT2_ADDRESS } from '@uniswap/universal-router-sdk';
+import { PERMIT2_ADDRESS } from '@offsetcarbon/universal-router-sdk';
 import { BigNumber } from 'ethers/lib/ethers';
 
 import {

src/providers/swap-router-provider.ts

@@ -1,4 +1,4 @@
-import { ApprovalTypes } from '@uniswap/router-sdk';
+import { ApprovalTypes } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, CurrencyAmount } from '@offsetcarbon/sdk-core';
 
 import { SwapRouter02__factory } from '../types/other/factories/SwapRouter02__factory';

src/providers/tenderly-simulation-provider.ts

@@ -7,7 +7,7 @@ import { ChainId } from '@offsetcarbon/sdk-core';
 import {
   PERMIT2_ADDRESS,
   UNIVERSAL_ROUTER_ADDRESS,
-} from '@uniswap/universal-router-sdk';
+} from '@offsetcarbon/universal-router-sdk';
 import axios, { AxiosRequestConfig } from 'axios';
 import { BigNumber } from 'ethers/lib/ethers';
 

src/providers/v2/caching-pool-provider.ts

@@ -1,5 +1,5 @@
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
 import _ from 'lodash';
 
 import { log } from '../../util/log';

src/providers/v2/pool-provider.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
 import retry, { Options as RetryOptions } from 'async-retry';
 import _ from 'lodash';
 

src/providers/v2/quote-provider.ts

@@ -3,7 +3,7 @@ import { TradeType } from '@offsetcarbon/sdk-core';
 import {
   InsufficientInputAmountError,
   InsufficientReservesError,
-} from '@uniswap/v2-sdk';
+} from '@offsetcarbon/v2-sdk';
 
 import { V2Route } from '../../routers/router';
 import { CurrencyAmount } from '../../util/amounts';

src/providers/v2/static-subgraph-provider.ts

@@ -1,5 +1,5 @@
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
 import _ from 'lodash';
 
 import { WRAPPED_NATIVE_CURRENCY } from '../../util/chains';
@@ -29,6 +29,7 @@ const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = {
   [ChainId.SEPOLIA]: [WRAPPED_NATIVE_CURRENCY[ChainId.SEPOLIA]!],
   //v2 not deployed on [optimism, arbitrum, polygon, celo, gnosis, moonbeam, bnb, avalanche] and their testnets
   [ChainId.OPTIMISM]: [],
+  [ChainId.OPTIMISM_SEPOLIA]: [],
   [ChainId.ARBITRUM_ONE]: [],
   [ChainId.ARBITRUM_GOERLI]: [],
   [ChainId.ARBITRUM_SEPOLIA]: [WRAPPED_NATIVE_CURRENCY[ChainId.ARBITRUM_SEPOLIA]!],

src/providers/v3/caching-pool-provider.ts

@@ -1,5 +1,5 @@
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { FeeAmount, Pool } from '@uniswap/v3-sdk';
+import { FeeAmount, Pool } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import { metric, MetricLoggerUnit } from '../../util';

src/providers/v3/pool-provider.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { computePoolAddress, FeeAmount, Pool } from '@uniswap/v3-sdk';
+import { computePoolAddress, FeeAmount, Pool } from '@offsetcarbon/v3-sdk';
 import retry, { Options as RetryOptions } from 'async-retry';
 import _ from 'lodash';
 

src/providers/v3/static-subgraph-provider.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { FeeAmount, Pool } from '@uniswap/v3-sdk';
+import { FeeAmount, Pool } from '@offsetcarbon/v3-sdk';
 import JSBI from 'jsbi';
 import _ from 'lodash';
 
@@ -95,6 +95,7 @@ const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = {
     WBTC_OPTIMISM,
     OP_OPTIMISM,
   ],
+  [ChainId.OPTIMISM_SEPOLIA]: [WRAPPED_NATIVE_CURRENCY[ChainId.OPTIMISM_SEPOLIA]!],
   [ChainId.ARBITRUM_ONE]: [
     WRAPPED_NATIVE_CURRENCY[ChainId.ARBITRUM_ONE]!,
     WBTC_ARBITRUM,

src/routers/alpha-router/alpha-router.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { BaseProvider, JsonRpcProvider } from '@ethersproject/providers';
 import DEFAULT_TOKEN_LIST from '@uniswap/default-token-list';
-import { Protocol, SwapRouter, Trade, ZERO } from '@uniswap/router-sdk';
+import { Protocol, SwapRouter, Trade, ZERO } from '@offsetcarbon/router-sdk';
 import {
   ChainId,
   Currency,
@@ -10,7 +10,7 @@ import {
   TradeType,
 } from '@offsetcarbon/sdk-core';
 import { TokenList } from '@uniswap/token-lists';
-import { Pool, Position, SqrtPriceMath, TickMath } from '@uniswap/v3-sdk';
+import { Pool, Position, SqrtPriceMath, TickMath } from '@offsetcarbon/v3-sdk';
 import retry from 'async-retry';
 import JSBI from 'jsbi';
 import _ from 'lodash';

src/routers/alpha-router/entities/route-with-valid-quote.ts

@@ -1,7 +1,7 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { Token, TradeType } from '@offsetcarbon/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import { IV2PoolProvider } from '../../../providers/v2/pool-provider';

src/routers/alpha-router/functions/best-swap-route.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, TradeType } from '@offsetcarbon/sdk-core';
 import JSBI from 'jsbi';
 import _ from 'lodash';

src/routers/alpha-router/functions/compute-all-routes.ts

@@ -1,6 +1,6 @@
 import { Token } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 
 import { log } from '../../../util/log';
 import { poolToString, routeToString } from '../../../util/routes';

src/routers/alpha-router/functions/get-candidate-pools.ts

@@ -1,6 +1,6 @@
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Token, TradeType } from '@offsetcarbon/sdk-core';
-import { FeeAmount } from '@uniswap/v3-sdk';
+import { FeeAmount } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import {

src/routers/alpha-router/gas-models/gas-model.ts

@@ -4,8 +4,8 @@ import {
   CurrencyAmount as CurrencyAmountRaw,
   Token,
 } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 
 import { ProviderConfig } from '../../../providers/provider';
 import {

src/routers/alpha-router/gas-models/mixedRoute/mixed-route-heuristic-gas-model.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { partitionMixedRouteByProtocol } from '@uniswap/router-sdk';
+import { partitionMixedRouteByProtocol } from '@offsetcarbon/router-sdk';
 import { ChainId } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 import JSBI from 'jsbi';
 import _ from 'lodash';
 

src/routers/alpha-router/gas-models/v2/v2-heuristic-gas-model.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { ChainId, Token } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
 import _ from 'lodash';
 
 import { ProviderConfig } from '../../../../providers/provider';

src/routers/alpha-router/gas-models/v3/v3-heuristic-gas-model.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { ChainId, Percent, Price, TradeType } from '@offsetcarbon/sdk-core';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import {

src/routers/alpha-router/quoters/base-quoter.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, Token, TradeType } from '@offsetcarbon/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { Pool } from '@uniswap/v3-sdk';
+import { Pair } from '@offsetcarbon/v2-sdk';
+import { Pool } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import {

src/routers/alpha-router/quoters/mixed-quoter.ts

@@ -1,4 +1,4 @@
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, Token, TradeType } from '@offsetcarbon/sdk-core';
 import _ from 'lodash';
 

src/routers/alpha-router/quoters/v2-quoter.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from '@ethersproject/bignumber';
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, Token, TradeType } from '@offsetcarbon/sdk-core';
 import _ from 'lodash';
 

src/routers/alpha-router/quoters/v3-quoter.ts

@@ -1,4 +1,4 @@
-import { Protocol } from '@uniswap/router-sdk';
+import { Protocol } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, Token, TradeType } from '@offsetcarbon/sdk-core';
 import _ from 'lodash';
 

src/routers/legacy-router/bases.ts

@@ -41,6 +41,9 @@ export const BASES_TO_CHECK_TRADES_AGAINST = (
     [ChainId.OPTIMISM_GOERLI]: [
       WRAPPED_NATIVE_CURRENCY[ChainId.OPTIMISM_GOERLI]!,
     ],
+    [ChainId.OPTIMISM_SEPOLIA]: [
+      WRAPPED_NATIVE_CURRENCY[ChainId.OPTIMISM_SEPOLIA]!,
+    ],
     [ChainId.ARBITRUM_ONE]: [WRAPPED_NATIVE_CURRENCY[ChainId.ARBITRUM_ONE]!],
     [ChainId.ARBITRUM_GOERLI]: [
       WRAPPED_NATIVE_CURRENCY[ChainId.ARBITRUM_GOERLI]!,

src/routers/legacy-router/legacy-router.ts

@@ -1,8 +1,8 @@
 import { BigNumber } from '@ethersproject/bignumber';
 import { Logger } from '@ethersproject/logger';
-import { SwapRouter, Trade } from '@uniswap/router-sdk';
+import { SwapRouter, Trade } from '@offsetcarbon/router-sdk';
 import { ChainId, Currency, Token, TradeType } from '@offsetcarbon/sdk-core';
-import { FeeAmount, MethodParameters, Pool, Route } from '@uniswap/v3-sdk';
+import { FeeAmount, MethodParameters, Pool, Route } from '@offsetcarbon/v3-sdk';
 import _ from 'lodash';
 
 import { IOnChainQuoteProvider, RouteWithQuotes } from '../../providers';

src/routers/router.ts

@@ -4,22 +4,22 @@ import {
   MixedRouteSDK,
   Protocol,
   Trade,
-} from '@uniswap/router-sdk';
+} from '@offsetcarbon/router-sdk';
 import {
   Currency,
   Fraction,
   Percent,
   Token,
   TradeType,
 } from '@offsetcarbon/sdk-core';
-import { SwapOptions as UniversalRouterSwapOptions } from '@uniswap/universal-router-sdk';
-import { Route as V2RouteRaw } from '@uniswap/v2-sdk';
+import { SwapOptions as UniversalRouterSwapOptions } from '@offsetcarbon/universal-router-sdk';
+import { Route as V2RouteRaw } from '@offsetcarbon/v2-sdk';
 import {
   Pool,
   Position,
   MethodParameters as SDKMethodParameters,
   Route as V3RouteRaw,
-} from '@uniswap/v3-sdk';
+} from '@offsetcarbon/v3-sdk';
 
 import { SimulationStatus } from '../providers';
 import { CurrencyAmount } from '../util/amounts';