Merge pull request #2104 from cowprotocol/sdk-dogfooding/order-book-5

[#5] SDK dogfooding, alpha version from NPM

craco.config.js

@@ -61,8 +61,6 @@ module.exports = {
       '@cow': path.resolve(__dirname, 'src/cow-react'),
       '@src': path.resolve(__dirname, 'src'),
       'bn.js': path.resolve(__dirname, 'node_modules/bn.js/lib/bn.js'),
-      // TODO: remove after SDK update
-      '@cowprotocol/cow-sdk': path.resolve(__dirname, 'node_modules/@cowprotocol/cow-sdk/dist'),
     },
     // https://webpack.js.org/configuration
     configure: (webpackConfig) => ({
@@ -89,10 +87,6 @@ module.exports = {
           https: require.resolve('https-browserify'),
           crypto: require.resolve('crypto-browserify'),
         },
-        // TODO: remove after SDK update
-        plugins: webpackConfig.resolve.plugins.filter(
-          ({ constructor }) => constructor && constructor.name !== 'ModuleScopePlugin'
-        ),
       },
     }),
   },

package.json

@@ -73,7 +73,8 @@
     "@coinbase/wallet-sdk": "^3.3.0",
     "@cowprotocol/contracts": "^1.3.1",
     "@cowprotocol/cow-runner-game": "^0.2.9",
-    "@cowprotocol/cow-sdk": "cowprotocol/cow-sdk#2.0-alpha-dist",
+    "@cowprotocol/cow-sdk": "^2.0.0-alpha.4",
+    "@cowprotocol/app-data": "v0.1.0-alpha.0",
     "@cowprotocol/ethflowcontract": "cowprotocol/ethflowcontract.git#v1.0.0-artifacts",
     "@davatar/react": "1.8.1",
     "@fontsource/ibm-plex-mono": "^4.5.1",

src/cow-react/api/gnosisProtocol/api.ts

@@ -1,5 +1,5 @@
 import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { APP_DATA_HASH } from 'constants/index'
 import { isBarn, isDev, isLocal, isPr } from 'utils/environments'
 
@@ -9,13 +9,7 @@ import { LegacyFeeQuoteParams as FeeQuoteParams } from './legacy/types'
 import { ZERO_ADDRESS } from 'constants/misc'
 import { getAppDataHash } from 'constants/appDataHash'
 import { orderBookApi } from '@cow/cowSdk'
-import {
-  OrderQuoteRequest,
-  PriceQuality,
-  SigningScheme,
-  OrderQuoteResponse,
-  EnrichedOrder,
-} from '@cowprotocol/cow-sdk/order-book'
+import { OrderQuoteRequest, PriceQuality, SigningScheme, OrderQuoteResponse, EnrichedOrder } from '@cowprotocol/cow-sdk'
 
 function getProfileUrl(): Partial<Record<ChainId, string>> {
   if (isLocal || isDev || isPr || isBarn) {
@@ -134,15 +128,15 @@ export async function getQuote(params: FeeQuoteParams): Promise<OrderQuoteRespon
   const { chainId } = params
   const quoteParams = _mapNewToLegacyParams(params)
 
-  return orderBookApi.getQuote(chainId, quoteParams)
+  return orderBookApi.getQuote(quoteParams, { chainId })
 }
 
 export async function getOrder(chainId: ChainId, orderId: string): Promise<EnrichedOrder | null> {
-  return orderBookApi.getOrder(chainId, orderId)
+  return orderBookApi.getOrder(orderId, { chainId })
 }
 
 export async function getOrders(chainId: ChainId, owner: string, limit = 1000, offset = 0): Promise<EnrichedOrder[]> {
-  return orderBookApi.getOrders(chainId, { owner, limit, offset })
+  return orderBookApi.getOrders({ owner, limit, offset }, { chainId })
 }
 
 export type ProfileData = {

src/cow-react/api/gnosisProtocol/hooks.ts

@@ -4,7 +4,7 @@ import { useWeb3React } from '@web3-react/core'
 import { getOrders } from '@cow/api/gnosisProtocol/api'
 import { AMOUNT_OF_ORDERS_TO_FETCH } from 'constants/index'
 import { supportedChainId } from 'utils/supportedChainId'
-import { EnrichedOrder } from '@cowprotocol/cow-sdk/order-book'
+import { EnrichedOrder } from '@cowprotocol/cow-sdk'
 
 export function useGpOrders(account?: string | null, refreshInterval?: number): EnrichedOrder[] | undefined {
   const { chainId: _chainId } = useWeb3React()

src/cow-react/api/gnosisProtocol/legacy/types.ts

@@ -1,6 +1,6 @@
 import { SupportedChainId as ChainId } from '@cowprotocol/cow-sdk'
 import { FeeInformation, PriceInformation } from '@cow/types'
-import { EnrichedOrder } from '@cowprotocol/cow-sdk/order-book'
+import { EnrichedOrder } from '@cowprotocol/cow-sdk'
 
 type FeeQuoteParams = Pick<EnrichedOrder, 'sellToken' | 'buyToken' | 'kind'> & {
   amount: string

src/cow-react/common/hooks/useCategorizeRecentActivity.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import useRecentActivity, { TransactionAndOrder } from 'hooks/useRecentActivity'
 import { OrderStatus } from 'state/orders/actions'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 const PENDING_STATES = [OrderStatus.PENDING, OrderStatus.PRESIGNATURE_PENDING, OrderStatus.CREATING]
 

src/cow-react/cowSdk.ts

@@ -1,6 +1,6 @@
-import { MetadataApi } from '@cowprotocol/cow-sdk/metadata'
-import { OrderBookApi } from '@cowprotocol/cow-sdk/order-book'
+import { MetadataApi } from '@cowprotocol/app-data'
+import { OrderBookApi } from '@cowprotocol/cow-sdk'
 import { isBarn, isDev, isLocal, isPr } from 'utils/environments'
 
 export const metadataApiSDK = new MetadataApi()
-export const orderBookApi = new OrderBookApi(isLocal || isDev || isPr || isBarn ? 'staging' : 'prod')
+export const orderBookApi = new OrderBookApi({ env: isLocal || isDev || isPr || isBarn ? 'staging' : 'prod' })

src/cow-react/modules/limitOrders/containers/LimitOrdersWidget/index.tsx

@@ -32,7 +32,7 @@ import { UnlockLimitOrders } from '../../pure/UnlockLimitOrders'
 import usePriceImpact from 'hooks/usePriceImpact'
 import { LimitOrdersWarnings } from '@cow/modules/limitOrders/containers/LimitOrdersWarnings'
 import { useLimitOrdersPriceImpactParams } from '@cow/modules/limitOrders/hooks/useLimitOrdersPriceImpactParams'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { useThrottleFn } from '@cow/common/hooks/useThrottleFn'
 import { useWalletInfo } from '@cow/modules/wallet'
 import { useDetectNativeToken } from '@cow/modules/swap/hooks/useDetectNativeToken'

src/cow-react/modules/limitOrders/hooks/useGetInitialPrice.ts

@@ -26,7 +26,7 @@ async function requestPriceForCurrency(chainId: number | undefined, currency: Cu
       return parsePrice(1, currency)
     }
 
-    const result = await orderBookApi.getNativePrice(chainId, currencyAddress)
+    const result = await orderBookApi.getNativePrice(currencyAddress, { chainId })
 
     if (!result) {
       throw new Error('Cannot parse initial price')

src/cow-react/modules/limitOrders/hooks/useIsSellOrder.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { useAtomValue } from 'jotai'
 
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { limitOrdersAtom } from '@cow/modules/limitOrders/state/limitOrdersAtom'
 
 // Returns boolean if the current order kind is SELL or BUY

src/cow-react/modules/limitOrders/hooks/useLimitOrdersTradeState.ts

@@ -3,7 +3,7 @@ import { useAtomValue } from 'jotai/utils'
 import { limitOrdersAtom } from '@cow/modules/limitOrders/state/limitOrdersAtom'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { useTokenBySymbolOrAddress } from '@cow/common/hooks/useTokenBySymbolOrAddress'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import useCurrencyBalance from 'lib/hooks/useCurrencyBalance'
 import { useHigherUSDValue } from 'hooks/useStablecoinPrice'
 import { useSafeMemoObject } from '@cow/common/hooks/useSafeMemo'

src/cow-react/modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl.ts

@@ -9,7 +9,7 @@ import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
 import { useLimitOrdersTradeState } from '@cow/modules/limitOrders/hooks/useLimitOrdersTradeState'
 import { TRADE_URL_BUY_AMOUNT_KEY, TRADE_URL_SELL_AMOUNT_KEY } from '@cow/modules/trade/const/tradeUrl'
 import { getIntOrFloat } from '@cow/utils/getIntOrFloat'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { useUpdateActiveRate } from '@cow/modules/limitOrders/hooks/useUpdateActiveRate'
 
 /**

src/cow-react/modules/limitOrders/hooks/useTradeFlowContext.ts

@@ -7,7 +7,7 @@ import { useDispatch } from 'react-redux'
 import { AppDispatch } from 'state'
 import useENSAddress from 'hooks/useENSAddress'
 import { useLimitOrdersTradeState } from './useLimitOrdersTradeState'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { useAtomValue } from 'jotai/utils'
 import { limitOrdersQuoteAtom } from '@cow/modules/limitOrders/state/limitOrdersQuoteAtom'
 import { useUpdateAtom } from 'jotai/utils'

src/cow-react/modules/limitOrders/hooks/useTypedValue.ts

@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { useLimitOrdersTradeState } from './useLimitOrdersTradeState'
 
 export function useTypedValue() {

src/cow-react/modules/limitOrders/hooks/useUpdateActiveRate.ts

@@ -2,7 +2,7 @@ import { useCallback } from 'react'
 import { useLimitOrdersTradeState } from '@cow/modules/limitOrders/hooks/useLimitOrdersTradeState'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
 import { limitRateAtom, LimitRateState, updateLimitRateAtom } from '@cow/modules/limitOrders/state/limitRateAtom'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { useUpdateCurrencyAmount } from '@cow/modules/limitOrders/hooks/useUpdateCurrencyAmount'
 import { updateLimitOrdersAtom } from '@cow/modules/limitOrders'
 

src/cow-react/modules/limitOrders/hooks/useUpdateCurrencyAmount.ts

@@ -1,7 +1,7 @@
 import { useCallback } from 'react'
 import { useUpdateAtom } from 'jotai/utils'
 
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { LimitOrdersState, updateLimitOrdersAtom } from '@cow/modules/limitOrders/state/limitOrdersAtom'
 import { calculateAmountForRate } from '@cow/modules/limitOrders/utils/calculateAmountForRate'
 import { Field } from 'state/swap/actions'

src/cow-react/modules/limitOrders/pure/LimitOrdersConfirm/index.cosmos.tsx

@@ -3,8 +3,8 @@ import { CurrencyAmount, Percent } from '@uniswap/sdk-core'
 import { CurrencyInfo } from '@cow/common/pure/CurrencyInputPanel/types'
 import { COW, GNO } from 'constants/tokens'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { TradeFlowContext } from '../../services/tradeFlow'
 import { LimitOrdersConfirm } from './index'
 import { LimitOrdersWarnings } from '@cow/modules/limitOrders/containers/LimitOrdersWarnings'

src/cow-react/modules/limitOrders/pure/LimitOrdersDetails/index.cosmos.tsx

@@ -1,8 +1,8 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import { COW, GNO } from 'constants/tokens'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { TradeFlowContext } from '../../services/tradeFlow'
 import { LimitOrdersDetails } from './index'
 import { defaultLimitOrdersSettings } from '@cow/modules/limitOrders/state/limitOrdersSettingsAtom'

src/cow-react/modules/limitOrders/pure/Orders/orders.mock.ts

@@ -1,8 +1,8 @@
 import { Order, OrderStatus } from 'state/orders/actions'
 import { COW, DAI, GNO, USDC } from 'constants/tokens'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { WETH_GOERLI } from 'utils/goerli/constants'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 const chainId = 5
 const owner = '0x4cc6e4f6014cc998fc5ef14c3f5d1184f76ae25b'

src/cow-react/modules/limitOrders/pure/ReceiptModal/FilledField.tsx

@@ -3,7 +3,7 @@ import { useMemo } from 'react'
 import * as styledEl from './styled'
 import { ParsedOrder } from '@cow/modules/limitOrders/containers/OrdersWidget/hooks/useLimitOrdersList'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { BigNumber } from 'bignumber.js'
 import JSBI from 'jsbi'
 import { TokenAmount } from '@cow/common/pure/TokenAmount'

src/cow-react/modules/limitOrders/pure/ReceiptModal/SurplusField.tsx

@@ -1,5 +1,5 @@
 import { ParsedOrder } from '@cow/modules/limitOrders/containers/OrdersWidget/hooks/useLimitOrdersList'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import * as styledEl from './styled'
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import { TokenAmount } from '@cow/common/pure/TokenAmount'

src/cow-react/modules/limitOrders/pure/ReceiptModal/index.tsx

@@ -1,7 +1,7 @@
 import { GpModal } from '@cow/common/pure/Modal'
 import { CurrencyAmount, Fraction, Token } from '@uniswap/sdk-core'
 import * as styledEl from './styled'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { OrderStatus } from 'state/orders/actions'
 import { CloseIcon } from 'theme'
 import { CurrencyField } from './CurrencyField'

src/cow-react/modules/limitOrders/services/tradeFlow/index.ts

@@ -15,7 +15,7 @@ import { tradeFlowAnalytics } from '@cow/modules/trade/utils/analytics'
 import { logTradeFlow } from '@cow/modules/trade/utils/logger'
 import { SwapFlowAnalyticsContext } from '@cow/modules/trade/utils/analytics'
 import { getSwapErrorMessage } from '@cow/modules/trade/utils/swapErrorHelper'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 export interface TradeFlowContext {
   // signer changes creates redundant re-renders

src/cow-react/modules/limitOrders/state/limitOrdersAtom.ts

@@ -1,7 +1,7 @@
 import { atomWithStorage, createJSONStorage } from 'jotai/utils'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { atom } from 'jotai'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { getDefaultTradeState } from '@cow/modules/trade/types/TradeState'
 
 export interface LimitOrdersState {

src/cow-react/modules/limitOrders/state/limitOrdersQuoteAtom.ts

@@ -1,6 +1,6 @@
 import { atom } from 'jotai'
 import GpQuoteError from '@cow/api/gnosisProtocol/errors/QuoteError'
-import { OrderQuoteResponse } from '@cowprotocol/cow-sdk/order-book'
+import { OrderQuoteResponse } from '@cowprotocol/cow-sdk'
 
 export interface LimitOrdersQuoteState {
   response?: OrderQuoteResponse

src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/index.ts

@@ -13,7 +13,7 @@ import GpQuoteError from '@cow/api/gnosisProtocol/errors/QuoteError'
 import { onlyResolvesLast } from 'utils/async'
 import { useDetectNativeToken } from '@cow/modules/swap/hooks/useDetectNativeToken'
 import useIsWindowVisible from 'hooks/useIsWindowVisible'
-import { OrderQuoteResponse } from '@cowprotocol/cow-sdk/order-book'
+import { OrderQuoteResponse } from '@cowprotocol/cow-sdk'
 
 // Every 10s
 const REFETCH_CHECK_INTERVAL = 10000

src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/useHandleResponse.ts

@@ -3,7 +3,7 @@ import { useCallback } from 'react'
 import { useUpdateAtom } from 'jotai/utils'
 import { Fraction } from '@uniswap/sdk-core'
 import JSBI from 'jsbi'
-import { OrderQuoteResponse } from '@cowprotocol/cow-sdk/order-book'
+import { OrderQuoteResponse } from '@cowprotocol/cow-sdk'
 import { useLimitOrdersTradeState } from '@cow/modules/limitOrders/hooks/useLimitOrdersTradeState'
 import { updateLimitRateAtom } from '@cow/modules/limitOrders/state/limitRateAtom'
 import { limitOrdersQuoteAtom } from '@cow/modules/limitOrders/state/limitOrdersQuoteAtom'

src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useQuoteRequestParams.ts

@@ -1,7 +1,7 @@
 import { useLimitOrdersTradeState } from '@cow/modules/limitOrders/hooks/useLimitOrdersTradeState'
 import { useWeb3React } from '@web3-react/core'
 import { LegacyFeeQuoteParams as FeeQuoteParams } from '@cow/api/gnosisProtocol/legacy/types'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { parseUnits } from 'ethers/lib/utils'
 import { useMemo } from 'react'
 import { useTypedValue } from '@cow/modules/limitOrders/hooks/useTypedValue'

src/cow-react/modules/swap/hooks/useEthFlowContext.ts

@@ -1,4 +1,4 @@
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { useEthFlowContract } from 'hooks/useContract'
 import { useBaseFlowContextSetup, getFlowContext } from '@cow/modules/swap/hooks/useFlowContext'
 import { EthFlowContext } from '@cow/modules/swap/services/types'

src/cow-react/modules/swap/hooks/useFlowContext.ts

@@ -13,7 +13,7 @@ import { SwapConfirmManager, useSwapConfirmManager } from '@cow/modules/swap/hoo
 import { useWETHContract } from 'hooks/useContract'
 import { computeSlippageAdjustedAmounts } from 'utils/prices'
 import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { NATIVE_CURRENCY_BUY_TOKEN } from 'constants/index'
 import { useUserTransactionTTL } from 'state/user/hooks'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
@@ -27,7 +27,7 @@ import { Web3Provider } from '@ethersproject/providers'
 import { BaseFlowContext } from '@cow/modules/swap/services/types'
 import { calculateValidTo } from '@cow/utils/time'
 import { PostOrderParams } from 'utils/trade'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 const _computeInputAmountForSignature = (params: {
   input: CurrencyAmount<Currency>

src/cow-react/modules/swap/hooks/useSwapFlowContext.ts

@@ -1,5 +1,5 @@
 import { TradeType } from '@uniswap/sdk-core'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { SwapFlowContext } from '@cow/modules/swap/services/types'
 import { useGP2SettlementContract } from 'hooks/useContract'
 import { getFlowContext, useBaseFlowContextSetup } from '@cow/modules/swap/hooks/useFlowContext'

src/cow-react/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts

@@ -1,13 +1,12 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 
-import { hashOrder, packOrderUidParams } from '@cowprotocol/contracts'
+import type { Order } from '@cowprotocol/contracts'
 import { CoWSwapEthFlow } from '@cow/abis/types'
 import { logTradeFlow } from '@cow/modules/trade/utils/logger'
 import { getOrderParams, PostOrderParams } from 'utils/trade'
 import { getDomain } from 'utils/signatures'
 import { MAX_VALID_TO_EPOCH } from '@cow/utils/time'
 import { WRAPPED_NATIVE_CURRENCY } from 'constants/tokens'
-import { Order } from '@cowprotocol/contracts/src/ts/order'
 
 export interface UniqueOrderIdResult {
   orderId: string
@@ -39,6 +38,7 @@ export async function calculateUniqueOrderId(
 
   const { order } = getOrderParams(orderParams)
 
+  const { hashOrder, packOrderUidParams } = await import('@cowprotocol/contracts')
   const domain = getDomain(chainId)
   // Different validTo when signing because EthFlow contract expects it to be max for all orders
   const orderDigest = hashOrder(domain, {

src/cow-react/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts

@@ -7,7 +7,7 @@ import { calculateGasMargin } from 'utils/calculateGasMargin'
 import { getOrderParams, mapUnsignedOrderToOrder, PostOrderParams } from 'utils/trade'
 import { UnsignedOrder } from 'utils/signatures'
 import { Order } from 'state/orders/actions'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { ETHFLOW_GAS_LIMIT_DEFAULT } from '@cow/modules/swap/services/ethFlow/const'
 
 type EthFlowOrderParams = Omit<PostOrderParams, 'sellToken'> & {

src/cow-react/modules/trade/utils/analytics.ts

@@ -1,6 +1,6 @@
 import { signSwapAnalytics, swapAnalytics } from 'components/analytics'
 import { USER_SWAP_REJECTED_ERROR } from '@cow/modules/trade/utils/swapErrorHelper'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 export interface SwapFlowAnalyticsContext {
   account: string | null
   recipient: string | null

src/cow-react/tsconfig-paths-custom.json

@@ -3,8 +3,6 @@
     "paths": {
       "@cow/*": ["cow-react/*"],
       "@src/*": ["*"],
-      "@cowprotocol/cow-sdk": ["../node_modules/@cowprotocol/cow-sdk/dist/index"],
-      "@cowprotocol/cow-sdk/*": ["../node_modules/@cowprotocol/cow-sdk/dist/*"],
       "*": ["custom/*", "*"]
     }
   }

src/custom/components/TransactionConfirmationModal/index.cosmos.tsx

@@ -3,8 +3,8 @@ import { COW, GNO } from 'constants/tokens'
 import { SupportedChainId } from 'constants/chains'
 import store from 'state'
 import { addPendingOrder, OrderStatus } from 'state/orders/actions'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { TransactionSubmittedContent } from 'components/TransactionConfirmationModal/index'
 import styled from 'styled-components/macro'
 

src/custom/components/analytics/events/transactionEvents.ts

@@ -1,4 +1,4 @@
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { Category, sendEvent } from '../index'
 
 import { PIXEL_EVENTS } from '../pixel/constants'