diff --git a/craco.config.js b/craco.config.js
index 9cc014b628..a481f846be 100644
--- a/craco.config.js
+++ b/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'
-        ),
       },
     }),
   },
diff --git a/package.json b/package.json
index ab35f1fd76..09a7c1acb9 100644
--- a/package.json
+++ b/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",
diff --git a/src/cow-react/api/gnosisProtocol/api.ts b/src/cow-react/api/gnosisProtocol/api.ts
index 6349109bc4..cc1707f3f5 100644
--- a/src/cow-react/api/gnosisProtocol/api.ts
+++ b/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 = {
diff --git a/src/cow-react/api/gnosisProtocol/hooks.ts b/src/cow-react/api/gnosisProtocol/hooks.ts
index 1f349137c6..e4769c94f0 100644
--- a/src/cow-react/api/gnosisProtocol/hooks.ts
+++ b/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()
diff --git a/src/cow-react/api/gnosisProtocol/legacy/types.ts b/src/cow-react/api/gnosisProtocol/legacy/types.ts
index c809932dde..05179d8f84 100644
--- a/src/cow-react/api/gnosisProtocol/legacy/types.ts
+++ b/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
diff --git a/src/cow-react/common/hooks/useCategorizeRecentActivity.ts b/src/cow-react/common/hooks/useCategorizeRecentActivity.ts
index 0625eb3a17..efe9ad3f7e 100644
--- a/src/cow-react/common/hooks/useCategorizeRecentActivity.ts
+++ b/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]
 
diff --git a/src/cow-react/cowSdk.ts b/src/cow-react/cowSdk.ts
index e8119dbc82..df02dc773a 100644
--- a/src/cow-react/cowSdk.ts
+++ b/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' })
diff --git a/src/cow-react/modules/limitOrders/containers/LimitOrdersWidget/index.tsx b/src/cow-react/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
index 4855381256..508be8081c 100644
--- a/src/cow-react/modules/limitOrders/containers/LimitOrdersWidget/index.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/hooks/useGetInitialPrice.ts b/src/cow-react/modules/limitOrders/hooks/useGetInitialPrice.ts
index 89a5fdddde..522319020a 100644
--- a/src/cow-react/modules/limitOrders/hooks/useGetInitialPrice.ts
+++ b/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')
diff --git a/src/cow-react/modules/limitOrders/hooks/useIsSellOrder.ts b/src/cow-react/modules/limitOrders/hooks/useIsSellOrder.ts
index 9dba481fe5..5cec77822a 100644
--- a/src/cow-react/modules/limitOrders/hooks/useIsSellOrder.ts
+++ b/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
diff --git a/src/cow-react/modules/limitOrders/hooks/useLimitOrdersTradeState.ts b/src/cow-react/modules/limitOrders/hooks/useLimitOrdersTradeState.ts
index 7cad3ac1b4..d346be4fd3 100644
--- a/src/cow-react/modules/limitOrders/hooks/useLimitOrdersTradeState.ts
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl.ts b/src/cow-react/modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl.ts
index be466e8f12..d739ae4c2a 100644
--- a/src/cow-react/modules/limitOrders/hooks/useSetupLimitOrderAmountsFromUrl.ts
+++ b/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'
 
 /**
diff --git a/src/cow-react/modules/limitOrders/hooks/useTradeFlowContext.ts b/src/cow-react/modules/limitOrders/hooks/useTradeFlowContext.ts
index bdb4b3d8d7..d60b6fece3 100644
--- a/src/cow-react/modules/limitOrders/hooks/useTradeFlowContext.ts
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/hooks/useTypedValue.ts b/src/cow-react/modules/limitOrders/hooks/useTypedValue.ts
index 5690d11afd..547317514b 100644
--- a/src/cow-react/modules/limitOrders/hooks/useTypedValue.ts
+++ b/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() {
diff --git a/src/cow-react/modules/limitOrders/hooks/useUpdateActiveRate.ts b/src/cow-react/modules/limitOrders/hooks/useUpdateActiveRate.ts
index cec0f3f02c..ca389318b6 100644
--- a/src/cow-react/modules/limitOrders/hooks/useUpdateActiveRate.ts
+++ b/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'
 
diff --git a/src/cow-react/modules/limitOrders/hooks/useUpdateCurrencyAmount.ts b/src/cow-react/modules/limitOrders/hooks/useUpdateCurrencyAmount.ts
index 9808e34c36..52b6ffa814 100644
--- a/src/cow-react/modules/limitOrders/hooks/useUpdateCurrencyAmount.ts
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/LimitOrdersConfirm/index.cosmos.tsx b/src/cow-react/modules/limitOrders/pure/LimitOrdersConfirm/index.cosmos.tsx
index 46f232717c..3d2e46ca81 100644
--- a/src/cow-react/modules/limitOrders/pure/LimitOrdersConfirm/index.cosmos.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/LimitOrdersDetails/index.cosmos.tsx b/src/cow-react/modules/limitOrders/pure/LimitOrdersDetails/index.cosmos.tsx
index d580d79c95..0933ab7e4c 100644
--- a/src/cow-react/modules/limitOrders/pure/LimitOrdersDetails/index.cosmos.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/Orders/orders.mock.ts b/src/cow-react/modules/limitOrders/pure/Orders/orders.mock.ts
index e0e5973ed1..f67a002931 100644
--- a/src/cow-react/modules/limitOrders/pure/Orders/orders.mock.ts
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/ReceiptModal/FilledField.tsx b/src/cow-react/modules/limitOrders/pure/ReceiptModal/FilledField.tsx
index cd3811682d..d2d6c3cf46 100644
--- a/src/cow-react/modules/limitOrders/pure/ReceiptModal/FilledField.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/ReceiptModal/SurplusField.tsx b/src/cow-react/modules/limitOrders/pure/ReceiptModal/SurplusField.tsx
index 6fbbd3eaf6..6ec945ab42 100644
--- a/src/cow-react/modules/limitOrders/pure/ReceiptModal/SurplusField.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/pure/ReceiptModal/index.tsx b/src/cow-react/modules/limitOrders/pure/ReceiptModal/index.tsx
index 19f0455b38..b8c031301e 100644
--- a/src/cow-react/modules/limitOrders/pure/ReceiptModal/index.tsx
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/services/tradeFlow/index.ts b/src/cow-react/modules/limitOrders/services/tradeFlow/index.ts
index 7d71dab522..b96cce2a9b 100644
--- a/src/cow-react/modules/limitOrders/services/tradeFlow/index.ts
+++ b/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
diff --git a/src/cow-react/modules/limitOrders/state/limitOrdersAtom.ts b/src/cow-react/modules/limitOrders/state/limitOrdersAtom.ts
index e7fa651ffe..bd0b5265da 100644
--- a/src/cow-react/modules/limitOrders/state/limitOrdersAtom.ts
+++ b/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 {
diff --git a/src/cow-react/modules/limitOrders/state/limitOrdersQuoteAtom.ts b/src/cow-react/modules/limitOrders/state/limitOrdersQuoteAtom.ts
index f7a457bbce..285fb8ecb8 100644
--- a/src/cow-react/modules/limitOrders/state/limitOrdersQuoteAtom.ts
+++ b/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
diff --git a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/index.ts b/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/index.ts
index c62e63f5a5..6d6658a873 100644
--- a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/index.ts
+++ b/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
diff --git a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/useHandleResponse.ts b/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/useHandleResponse.ts
index 0e90d7d439..beba653cbe 100644
--- a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useFetchMarketPrice/useHandleResponse.ts
+++ b/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'
diff --git a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useQuoteRequestParams.ts b/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useQuoteRequestParams.ts
index a409b9916a..a110139143 100644
--- a/src/cow-react/modules/limitOrders/updaters/QuoteUpdater/hooks/useQuoteRequestParams.ts
+++ b/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'
diff --git a/src/cow-react/modules/swap/hooks/useEthFlowContext.ts b/src/cow-react/modules/swap/hooks/useEthFlowContext.ts
index 27ab435b7e..6670cbf458 100644
--- a/src/cow-react/modules/swap/hooks/useEthFlowContext.ts
+++ b/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'
diff --git a/src/cow-react/modules/swap/hooks/useFlowContext.ts b/src/cow-react/modules/swap/hooks/useFlowContext.ts
index a1effd6f5b..0c87a6f765 100644
--- a/src/cow-react/modules/swap/hooks/useFlowContext.ts
+++ b/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>
diff --git a/src/cow-react/modules/swap/hooks/useSwapFlowContext.ts b/src/cow-react/modules/swap/hooks/useSwapFlowContext.ts
index 9f9b043a5a..ee3310b7f4 100644
--- a/src/cow-react/modules/swap/hooks/useSwapFlowContext.ts
+++ b/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'
diff --git a/src/cow-react/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts b/src/cow-react/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts
index eba04c6bd7..b087fc1e51 100644
--- a/src/cow-react/modules/swap/services/ethFlow/steps/calculateUniqueOrderId.ts
+++ b/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, {
diff --git a/src/cow-react/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts b/src/cow-react/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
index cd728f685a..54a9a48e28 100644
--- a/src/cow-react/modules/swap/services/ethFlow/steps/signEthFlowOrderStep.ts
+++ b/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'> & {
diff --git a/src/cow-react/modules/trade/utils/analytics.ts b/src/cow-react/modules/trade/utils/analytics.ts
index f44b4bf3e9..3231dc736d 100644
--- a/src/cow-react/modules/trade/utils/analytics.ts
+++ b/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
diff --git a/src/cow-react/tsconfig-paths-custom.json b/src/cow-react/tsconfig-paths-custom.json
index f5a0f55910..ff7dd171d3 100644
--- a/src/cow-react/tsconfig-paths-custom.json
+++ b/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/*", "*"]
     }
   }
diff --git a/src/custom/components/TransactionConfirmationModal/index.cosmos.tsx b/src/custom/components/TransactionConfirmationModal/index.cosmos.tsx
index beda2c4482..1cac3735dd 100644
--- a/src/custom/components/TransactionConfirmationModal/index.cosmos.tsx
+++ b/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'
 
diff --git a/src/custom/components/analytics/events/transactionEvents.ts b/src/custom/components/analytics/events/transactionEvents.ts
index 462ca29800..8ce2aa40b6 100644
--- a/src/custom/components/analytics/events/transactionEvents.ts
+++ b/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'
diff --git a/src/custom/hooks/useAppData.ts b/src/custom/hooks/useAppData.ts
index 96b797a478..ec86a5ec72 100644
--- a/src/custom/hooks/useAppData.ts
+++ b/src/custom/hooks/useAppData.ts
@@ -6,7 +6,7 @@ import { buildAppData, BuildAppDataParams } from 'utils/appData'
 import { appDataInfoAtom } from 'state/appData/atoms'
 import { useReferralAddress } from 'state/affiliate/hooks'
 import { useAppCode } from 'hooks/useAppCode'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { useUpdateAtom } from 'jotai/utils'
 
 export type UseAppDataParams = {
diff --git a/src/custom/hooks/usePriceImpact/useQuoteAndSwap.ts b/src/custom/hooks/usePriceImpact/useQuoteAndSwap.ts
index 1e4b0428c8..feb0b1ae3c 100644
--- a/src/custom/hooks/usePriceImpact/useQuoteAndSwap.ts
+++ b/src/custom/hooks/usePriceImpact/useQuoteAndSwap.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 
 import { useTradeExactInWithFee } from 'state/swap/extension'
diff --git a/src/custom/hooks/useStablecoinPrice/index.ts b/src/custom/hooks/useStablecoinPrice/index.ts
index 8d96f191ae..6629669c3f 100644
--- a/src/custom/hooks/useStablecoinPrice/index.ts
+++ b/src/custom/hooks/useStablecoinPrice/index.ts
@@ -12,7 +12,7 @@ import { /*DAI_OPTIMISM,*/ USDC /*, USDC_ARBITRUM, USDC_MAINNET, USDC_POLYGON*/
 import { supportedChainId } from 'utils/supportedChainId'
 import { STABLECOIN_AMOUNT_OUT as STABLECOIN_AMOUNT_OUT_UNI } from 'hooks/useStablecoinPrice'
 import { stringToCurrency } from 'state/swap/extension'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { unstable_batchedUpdates as batchedUpdate } from 'react-dom'
 import { useGetCoingeckoUsdPrice } from '@cow/api/coingecko'
 import { DEFAULT_NETWORK_FOR_LISTS } from 'constants/lists'
diff --git a/src/custom/state/appData/AppDataInfoUpdater.tsx b/src/custom/state/appData/AppDataInfoUpdater.tsx
index 3bfd0ef090..2eac96a5c0 100644
--- a/src/custom/state/appData/AppDataInfoUpdater.tsx
+++ b/src/custom/state/appData/AppDataInfoUpdater.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { useWeb3React } from '@web3-react/core'
 import { useDerivedSwapInfo } from 'state/swap/hooks'
 import { useAppData, UseAppDataParams } from 'hooks/useAppData'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { LIMIT_ORDER_SLIPPAGE } from '@cow/modules/limitOrders/const/trade'
 import { TradeType, useTradeTypeInfo } from '@cow/modules/trade'
 import { percentToBips } from 'utils/misc'
diff --git a/src/custom/state/appData/types.tsx b/src/custom/state/appData/types.tsx
index 351293fe6d..9607554bbc 100644
--- a/src/custom/state/appData/types.tsx
+++ b/src/custom/state/appData/types.tsx
@@ -1,5 +1,5 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
-import { LatestAppDataDocVersion } from '@cowprotocol/cow-sdk/metadata'
+import { LatestAppDataDocVersion } from '@cowprotocol/app-data'
 
 export type AppDataInfo = {
   doc?: LatestAppDataDocVersion // in case of default hash, there's no doc
diff --git a/src/custom/state/enhancedTransactions/reducer.ts b/src/custom/state/enhancedTransactions/reducer.ts
index 5201d9451f..249177bd09 100644
--- a/src/custom/state/enhancedTransactions/reducer.ts
+++ b/src/custom/state/enhancedTransactions/reducer.ts
@@ -10,7 +10,7 @@ import {
 } from 'state/enhancedTransactions/actions'
 import { SafeMultisigTransactionResponse } from '@gnosis.pm/safe-service-client'
 import { SerializableTransactionReceipt } from '@src/state/transactions/types'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 export enum HashType {
   ETHEREUM_TX = 'ETHEREUM_TX',
diff --git a/src/custom/state/orders/actions.ts b/src/custom/state/orders/actions.ts
index 84ddd319f7..35d8c0f011 100644
--- a/src/custom/state/orders/actions.ts
+++ b/src/custom/state/orders/actions.ts
@@ -5,7 +5,7 @@ import { SupportedChainId as ChainId } from 'constants/chains'
 import { SerializedToken } from '@src/state/user/types'
 import { SafeMultisigTransactionResponse } from '@gnosis.pm/safe-service-client'
 import { BigNumberish } from '@ethersproject/bignumber'
-import { UID, EnrichedOrder, OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { UID, EnrichedOrder, OrderClass } from '@cowprotocol/cow-sdk'
 
 export enum OrderStatus {
   PENDING = 'pending',
diff --git a/src/custom/state/orders/middleware.ts b/src/custom/state/orders/middleware.ts
index b474826c9d..ce621c9f6d 100644
--- a/src/custom/state/orders/middleware.ts
+++ b/src/custom/state/orders/middleware.ts
@@ -4,7 +4,7 @@ import { addPopup } from 'state/application/reducer'
 import { AppState } from 'state'
 import * as OrderActions from './actions'
 import { SerializedOrder } from './actions'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 
 import { SupportedChainId as ChainId } from 'constants/chains'
 
diff --git a/src/custom/state/orders/mocks.ts b/src/custom/state/orders/mocks.ts
index 5d00060dcb..391db7b6b7 100644
--- a/src/custom/state/orders/mocks.ts
+++ b/src/custom/state/orders/mocks.ts
@@ -1,7 +1,7 @@
 import { Token } from '@uniswap/sdk-core'
 
 import { Order, OrderStatus, SerializedOrder, addPendingOrder, AddPendingOrderParams } from './actions'
-import { OrderClass, OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass, OrderKind } from '@cowprotocol/cow-sdk'
 import { RADIX_DECIMAL } from 'constants/index'
 import { serializeToken } from 'state/user/hooks'
 import store from '..'
diff --git a/src/custom/state/orders/updaters/GpOrdersUpdater.ts b/src/custom/state/orders/updaters/GpOrdersUpdater.ts
index 189084602b..78cf4f7373 100644
--- a/src/custom/state/orders/updaters/GpOrdersUpdater.ts
+++ b/src/custom/state/orders/updaters/GpOrdersUpdater.ts
@@ -14,7 +14,7 @@ import { computeOrderSummary } from 'state/orders/updaters/utils'
 import { useTokenLazy } from 'hooks/useTokenLazy'
 import { useGpOrders } from '@cow/api/gnosisProtocol/hooks'
 import { supportedChainId } from 'utils/supportedChainId'
-import { EnrichedOrder, EthflowData } from '@cowprotocol/cow-sdk/order-book'
+import { EnrichedOrder, EthflowData } from '@cowprotocol/cow-sdk'
 
 function _getTokenFromMapping(
   address: string,
diff --git a/src/custom/state/orders/updaters/PendingOrdersUpdater.ts b/src/custom/state/orders/updaters/PendingOrdersUpdater.ts
index dd364ea431..c9ee0094ae 100644
--- a/src/custom/state/orders/updaters/PendingOrdersUpdater.ts
+++ b/src/custom/state/orders/updaters/PendingOrdersUpdater.ts
@@ -18,7 +18,7 @@ import {
 } from 'state/orders/hooks'
 import { OrderTransitionStatus } from 'state/orders/utils'
 import { Order, OrderFulfillmentData, OrderStatus } from 'state/orders/actions'
-import { OrderClass, EthflowData } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass, EthflowData } from '@cowprotocol/cow-sdk'
 import { LIMIT_OPERATOR_API_POLL_INTERVAL, MARKET_OPERATOR_API_POLL_INTERVAL } from 'state/orders/consts'
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { getOrder, OrderID } from '@cow/api/gnosisProtocol'
diff --git a/src/custom/state/orders/updaters/UnfillableOrdersUpdater.ts b/src/custom/state/orders/updaters/UnfillableOrdersUpdater.ts
index 1318fdcfa1..61460cacb6 100644
--- a/src/custom/state/orders/updaters/UnfillableOrdersUpdater.ts
+++ b/src/custom/state/orders/updaters/UnfillableOrdersUpdater.ts
@@ -4,7 +4,7 @@ import { timestamp } from '@cowprotocol/contracts'
 import { useWeb3React } from '@web3-react/core'
 import { usePendingOrders, useSetIsOrderUnfillable } from 'state/orders/hooks'
 import { Order } from 'state/orders/actions'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { PENDING_ORDERS_PRICE_CHECK_POLL_INTERVAL } from 'state/orders/consts'
 
 import { SupportedChainId as ChainId } from 'constants/chains'
diff --git a/src/custom/state/orders/updaters/utils.ts b/src/custom/state/orders/updaters/utils.ts
index 8eae820d71..7720789523 100644
--- a/src/custom/state/orders/updaters/utils.ts
+++ b/src/custom/state/orders/updaters/utils.ts
@@ -5,7 +5,7 @@ import { formatSymbol } from '@cow/utils/format'
 import { classifyOrder, OrderTransitionStatus } from 'state/orders/utils'
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { formatTokenAmount } from '@cow/utils/amountFormat'
-import { EnrichedOrder, OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { EnrichedOrder, OrderKind } from '@cowprotocol/cow-sdk'
 
 export type OrderLogPopupMixData = OrderFulfillmentData | OrderID
 
diff --git a/src/custom/state/orders/utils.test.ts b/src/custom/state/orders/utils.test.ts
index 0928111f38..c2549561e2 100644
--- a/src/custom/state/orders/utils.test.ts
+++ b/src/custom/state/orders/utils.test.ts
@@ -3,7 +3,7 @@
  */
 
 import { PriceInformation } from '@cow/types'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 
 import { USDC_MAINNET as USDC, USDT } from 'constants/tokens'
 
diff --git a/src/custom/state/orders/utils.ts b/src/custom/state/orders/utils.ts
index c37b5de381..8add10975a 100644
--- a/src/custom/state/orders/utils.ts
+++ b/src/custom/state/orders/utils.ts
@@ -1,4 +1,4 @@
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { Price } from '@uniswap/sdk-core'
 
 import { ONE_HUNDRED_PERCENT } from 'constants/misc'
@@ -6,7 +6,7 @@ import { PENDING_ORDERS_BUFFER } from 'constants/index'
 import { Order } from 'state/orders/actions'
 import { OUT_OF_MARKET_PRICE_DELTA_PERCENTAGE } from 'state/orders/consts'
 import { PriceInformation } from '@cow/types'
-import { EnrichedOrder } from '@cowprotocol/cow-sdk/order-book'
+import { EnrichedOrder } from '@cowprotocol/cow-sdk'
 
 export type OrderTransitionStatus =
   | 'unknown'
diff --git a/src/custom/state/price/reducer.ts b/src/custom/state/price/reducer.ts
index 6277758431..151664d69d 100644
--- a/src/custom/state/price/reducer.ts
+++ b/src/custom/state/price/reducer.ts
@@ -1,6 +1,6 @@
 import { createReducer, PayloadAction, current } from '@reduxjs/toolkit'
 import { SupportedChainId as ChainId } from 'constants/chains'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { updateQuote, setQuoteError, getNewQuote, refreshQuote, QuoteError } from './actions'
 import { Writable } from 'custom/types'
 import { PrefillStateRequired } from '../orders/reducer'
diff --git a/src/custom/state/price/updater.ts b/src/custom/state/price/updater.ts
index 67463f16ef..721932955d 100644
--- a/src/custom/state/price/updater.ts
+++ b/src/custom/state/price/updater.ts
@@ -4,7 +4,7 @@ import { DEFAULT_DECIMALS } from 'custom/constants'
 
 import { UnsupportedToken } from '@cow/api/gnosisProtocol'
 import { LegacyFeeQuoteParams as LegacyFeeQuoteParamsFull } from '@cow/api/gnosisProtocol/legacy/types'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 
 import { useDerivedSwapInfo, useSwapState } from 'state/swap/hooks'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
diff --git a/src/custom/state/swap/extension.ts b/src/custom/state/swap/extension.ts
index 65fce7e7a3..0af150e19e 100644
--- a/src/custom/state/swap/extension.ts
+++ b/src/custom/state/swap/extension.ts
@@ -2,7 +2,7 @@ import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
 import JSBI from 'jsbi'
 import { QuoteInformationObject } from 'state/price/reducer'
 import TradeGp, { _constructTradePrice } from './TradeGp'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 
 interface TradeParams {
   parsedAmount?: CurrencyAmount<Currency>
diff --git a/src/custom/state/swap/trade.test.ts b/src/custom/state/swap/trade.test.ts
index 5a6d4b30f5..5b8d7634bd 100644
--- a/src/custom/state/swap/trade.test.ts
+++ b/src/custom/state/swap/trade.test.ts
@@ -1,7 +1,7 @@
 import { parseUnits } from '@ethersproject/units'
 import { DEFAULT_PRECISION, LONG_PRECISION } from 'constants/index'
 import { CurrencyAmount, Fraction, Price, Currency, Percent, Token, TradeType } from '@uniswap/sdk-core'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { stringToCurrency } from './extension'
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { WRAPPED_NATIVE_CURRENCY as WETH } from 'constants/tokens'
diff --git a/src/custom/utils/appData.ts b/src/custom/utils/appData.ts
index 1b5eb4a0b8..e2e191a568 100644
--- a/src/custom/utils/appData.ts
+++ b/src/custom/utils/appData.ts
@@ -1,6 +1,6 @@
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { environmentName } from 'utils/environments'
-import { OrderClass } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass } from '@cowprotocol/cow-sdk'
 import { metadataApiSDK } from '@cow/cowSdk'
 
 export type BuildAppDataParams = {
@@ -24,7 +24,7 @@ export async function buildAppData({
   const quoteParams = { slippageBips }
   const orderClassParams = { orderClass }
 
-  const doc = metadataApiSDK.generateAppDataDoc({
+  const doc = await metadataApiSDK.generateAppDataDoc({
     appDataParams: { appCode, environment: environmentName },
     metadataParams: { referrerParams, quoteParams, orderClassParams },
   })
diff --git a/src/custom/utils/misc.ts b/src/custom/utils/misc.ts
index 2c59649bc8..12ddd6fbbc 100644
--- a/src/custom/utils/misc.ts
+++ b/src/custom/utils/misc.ts
@@ -1,6 +1,6 @@
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { Market } from 'types/index'
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { Percent } from '@uniswap/sdk-core'
 
 const PROVIDER_REJECT_REQUEST_CODE = 4001 // See https://eips.ethereum.org/EIPS/eip-1193
diff --git a/src/custom/utils/price.ts b/src/custom/utils/price.ts
index f5fc14406f..628e5d495d 100644
--- a/src/custom/utils/price.ts
+++ b/src/custom/utils/price.ts
@@ -4,7 +4,7 @@ import { Percent } from '@uniswap/sdk-core'
 import { getQuote } from '@cow/api/gnosisProtocol'
 import { SWR_OPTIONS } from 'constants/index'
 
-import { OrderKind } from '@cowprotocol/cow-sdk/order-book'
+import { OrderKind } from '@cowprotocol/cow-sdk'
 import { toErc20Address } from 'utils/tokens'
 import { LegacyFeeQuoteParams, LegacyPriceQuoteParams, LegacyQuoteParams } from '@cow/api/gnosisProtocol/legacy/types'
 import { FeeInformation, PriceInformation } from '@cow/types'
diff --git a/src/custom/utils/signatures.ts b/src/custom/utils/signatures.ts
index 20497db99a..5847c22550 100644
--- a/src/custom/utils/signatures.ts
+++ b/src/custom/utils/signatures.ts
@@ -1,12 +1,11 @@
 import { domain as domainGp } from '@cowprotocol/contracts'
-import type { EcdsaSignature, Signature } from '@cowprotocol/contracts'
-import { EcdsaSigningScheme, SigningScheme, OrderParameters } from '@cowprotocol/cow-sdk/order-book'
+import type { Order, EcdsaSignature, Signature } from '@cowprotocol/contracts'
+import { EcdsaSigningScheme, SigningScheme, OrderParameters } from '@cowprotocol/cow-sdk'
 
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { GP_SETTLEMENT_CONTRACT_ADDRESS } from 'constants/index'
 import { TypedDataDomain, Signer } from '@ethersproject/abstract-signer'
 import { registerOnWindow } from 'utils/misc'
-import { Order } from '@cowprotocol/contracts/src/ts/order'
 
 // For error codes, see:
 // - https://eth.wiki/json-rpc/json-rpc-error-codes-improvement-proposal
diff --git a/src/custom/utils/trade.ts b/src/custom/utils/trade.ts
index 7e0b9bbf25..6aac077cad 100644
--- a/src/custom/utils/trade.ts
+++ b/src/custom/utils/trade.ts
@@ -9,7 +9,7 @@ import { Signer } from '@ethersproject/abstract-signer'
 import { RADIX_DECIMAL, NATIVE_CURRENCY_BUY_ADDRESS } from 'constants/index'
 import { SupportedChainId as ChainId } from 'constants/chains'
 import { formatSymbol } from '@cow/utils/format'
-import { OrderClass, OrderKind, SigningScheme, EcdsaSigningScheme } from '@cowprotocol/cow-sdk/order-book'
+import { OrderClass, OrderKind, SigningScheme, EcdsaSigningScheme } from '@cowprotocol/cow-sdk'
 import { getProfileData } from '@cow/api/gnosisProtocol/api'
 import { formatTokenAmount } from '@cow/utils/amountFormat'
 import { orderBookApi } from '@cow/cowSdk'
@@ -199,15 +199,18 @@ export async function signAndPostOrder(params: PostOrderParams): Promise<AddUnse
   }
 
   // Call API
-  const orderId = await orderBookApi.sendOrder(chainId, {
-    ...unsignedOrder,
-    from: account,
-    receiver,
-    signingScheme,
-    // Include the signature
-    signature,
-    quoteId,
-  })
+  const orderId = await orderBookApi.sendOrder(
+    {
+      ...unsignedOrder,
+      from: account,
+      receiver,
+      signingScheme,
+      // Include the signature
+      signature,
+      quoteId,
+    },
+    { chainId }
+  )
 
   const pendingOrderParams: Order = mapUnsignedOrderToOrder({
     unsignedOrder,
@@ -234,17 +237,21 @@ export async function sendOrderCancellation(params: OrderCancellationParams): Pr
 
   const { signature, signingScheme } = await signOrderCancellation(orderId, chainId, signer)
 
-  await orderBookApi.sendSignedOrderCancellation(chainId, orderId, {
-    signature,
-    signingScheme,
-  })
+  await orderBookApi.sendSignedOrderCancellation(
+    orderId,
+    {
+      signature,
+      signingScheme,
+    },
+    { chainId }
+  )
 
   cancelPendingOrder({ chainId, id: orderId })
 }
 
 export async function hasTrades(chainId: ChainId, address: string): Promise<boolean> {
   const [trades, profileData] = await Promise.all([
-    orderBookApi.getTrades(chainId, { owner: address }),
+    orderBookApi.getTrades({ owner: address }, { chainId }),
     getProfileData(chainId, address),
   ])
 
diff --git a/yarn.lock b/yarn.lock
index 530560b926..a72c186d61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1159,12 +1159,15 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@cowprotocol/app-data@^0.0.3-RC.0":
-  version "0.0.3-RC.0"
-  resolved "https://registry.yarnpkg.com/@cowprotocol/app-data/-/app-data-0.0.3-RC.0.tgz#23fc1e19adade3e95243f03e9624f42e6ae165c6"
-  integrity sha512-N1JpAIK9cTGnmI/Z682GtEN7LJYzc96klqHZMR58mqlsoZVobPpH9x7QDug03hTjE+81N0J7NwdiQ7y3lhKvoQ==
+"@cowprotocol/app-data@v0.1.0-alpha.0":
+  version "0.1.0-alpha.0"
+  resolved "https://registry.yarnpkg.com/@cowprotocol/app-data/-/app-data-0.1.0-alpha.0.tgz#8499136d025e85494f762784e2e308bb3f88ec17"
+  integrity sha512-Dh6QD+rG1Tcv3mSwAkWv7bWCQVhYaJ0L8R/cqLrkVDwqwaxzBYHXLlnNnqC8IKThwvy9iMGM2hrDrYSAIAf/vA==
   dependencies:
     ajv "^8.11.0"
+    cross-fetch "^3.1.5"
+    ipfs-only-hash "^4.0.0"
+    multiformats "^9.6.4"
 
 "@cowprotocol/contracts@^1.3.1":
   version "1.3.1"
@@ -1176,18 +1179,13 @@
   resolved "https://registry.yarnpkg.com/@cowprotocol/cow-runner-game/-/cow-runner-game-0.2.9.tgz#3f94b3f370bd114f77db8b1d238cba3ef4e9d644"
   integrity sha512-rX7HnoV+HYEEkBaqVUsAkGGo0oBrExi+d6Io+8nQZYwZk+IYLmS9jdcIObsLviM2h4YX8+iin6NuKl35AaiHmg==
 
-"@cowprotocol/cow-sdk@cowprotocol/cow-sdk#2.0-alpha-dist":
-  version "1.0.2-RC.0"
-  resolved "https://codeload.github.com/cowprotocol/cow-sdk/tar.gz/c8fba3f43162227ead86a7119764cdab4c9b0324"
+"@cowprotocol/cow-sdk@^2.0.0-alpha.4":
+  version "2.0.0-alpha.4"
+  resolved "https://registry.yarnpkg.com/@cowprotocol/cow-sdk/-/cow-sdk-2.0.0-alpha.4.tgz#a2cd48f748c841a522c043dfb4424174a3a24a38"
+  integrity sha512-qF7kx+cCogk3R0pHBH+/nGpY8P23gLbKnwUjf6/0czoCNAedY9Bxy1xNWejI0YzGLeuNu4VxlN+O0LoB8SoVrA==
   dependencies:
-    "@cowprotocol/app-data" "^0.0.3-RC.0"
-    "@cowprotocol/contracts" "^1.3.1"
-    cross-fetch "^3.1.5"
-    ethers "^5.5.3"
     graphql "^16.3.0"
     graphql-request "^4.3.0"
-    ipfs-only-hash "^4.0.0"
-    multiformats "^9.6.4"
 
 "@cowprotocol/ethflowcontract@cowprotocol/ethflowcontract.git#v1.0.0-artifacts":
   version "1.0.0"
@@ -9218,7 +9216,7 @@ ethereumjs-util@^7.1.0:
     ethereum-cryptography "^0.1.3"
     rlp "^2.2.4"
 
-ethers@5.7.2, ethers@^5.1.4, ethers@^5.5.3, ethers@^5.6.1, ethers@^5.6.8, ethers@^5.7.0:
+ethers@5.7.2, ethers@^5.1.4, ethers@^5.6.1, ethers@^5.6.8, ethers@^5.7.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
   integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==