refactor: migrate on new version

Author: limitofzero

apps/cowswap-frontend/package.json

@@ -39,21 +39,21 @@
     "@cowprotocol/common-utils": "workspace:*",
     "@cowprotocol/core": "workspace:*",
     "@cowprotocol/cow-runner-game": "^0.2.9",
-    "@cowprotocol/cow-sdk": "7.3.4",
+    "@cowprotocol/cow-sdk": "7.3.4-pr-793-f52c1e9f.0",
     "@cowprotocol/cowswap-abis": "workspace:*",
     "@cowprotocol/ens": "workspace:*",
     "@cowprotocol/events": "workspace:*",
     "@cowprotocol/hook-dapp-lib": "workspace:*",
     "@cowprotocol/iframe-transport": "workspace:*",
     "@cowprotocol/multicall": "workspace:*",
     "@cowprotocol/permit-utils": "workspace:*",
-    "@cowprotocol/sdk-bridging": "1.7.3",
-    "@cowprotocol/sdk-contracts-ts": "1.4.2",
-    "@cowprotocol/sdk-cow-shed": "0.2.16",
-    "@cowprotocol/sdk-ethers-v5-adapter": "0.3.5",
-    "@cowprotocol/sdk-order-book": "0.6.3",
-    "@cowprotocol/sdk-trading": "0.10.0",
-    "@cowprotocol/sdk-viem-adapter": "0.3.5",
+    "@cowprotocol/sdk-bridging": "1.7.3-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-contracts-ts": "1.4.2-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-cow-shed": "0.2.16-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-ethers-v5-adapter": "0.3.5-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-order-book": "0.6.3-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-trading": "0.10.0-pr-793-f52c1e9f.0",
+    "@cowprotocol/sdk-viem-adapter": "0.3.5-pr-793-f52c1e9f.0",
     "@cowprotocol/snackbars": "workspace:*",
     "@cowprotocol/tokens": "workspace:*",
     "@cowprotocol/types": "workspace:*",

apps/cowswap-frontend/src/entities/optimisticAllowance/getOptimisticAllowanceKey.ts

@@ -1,9 +1,9 @@
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 
 import { SetOptimisticAllowanceParams } from './useSetOptimisticAllowance'
 
 export function getOptimisticAllowanceKey(
   params: Omit<SetOptimisticAllowanceParams, 'amount' | 'blockNumber'>,
 ): string {
-  return `${params.chainId}-${getTokenAddressKey(params.tokenAddress)}-${getTokenAddressKey(params.owner)}-${getTokenAddressKey(params.spender)}`
+  return `${params.chainId}-${getAddressKey(params.tokenAddress)}-${getAddressKey(params.owner)}-${getAddressKey(params.spender)}`
 }

apps/cowswap-frontend/src/legacy/state/enhancedTransactions/hooks/TransactionHooksMod.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 
 import { useTradeSpenderAddress } from '@cowprotocol/balances-and-allowances'
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
 import { useAppSelector } from '../../hooks'
@@ -35,8 +35,8 @@ export function useHasPendingApproval(tokenAddress: string | undefined): boolean
         if (!approval) return false
 
         return (
-          getTokenAddressKey(approval.spender) === getTokenAddressKey(spender) &&
-          getTokenAddressKey(approval.tokenAddress) === getTokenAddressKey(tokenAddress)
+          getAddressKey(approval.spender) === getAddressKey(spender) &&
+          getAddressKey(approval.tokenAddress) === getAddressKey(tokenAddress)
         )
       }),
     [allTransactions, spender, tokenAddress],

apps/cowswap-frontend/src/modules/accountProxy/containers/WidgetPageTitle/index.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react'
 
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { useTokensByAddressMap } from '@cowprotocol/tokens'
 import { useWalletInfo } from '@cowprotocol/wallet'
 
@@ -15,7 +15,7 @@ export function WidgetPageTitle(): ReactNode {
   const { tokenAddress } = useParams()
   const location = useLocation()
   const tokensByAddress = useTokensByAddressMap()
-  const token = tokenAddress ? tokensByAddress[getTokenAddressKey(tokenAddress)] : null
+  const token = tokenAddress ? tokensByAddress[getAddressKey(tokenAddress)] : null
   const isWalletConnected = !!account
   const isHelpPage = location.pathname.endsWith('/help')
   const isRecoverPage = !!tokenAddress

apps/cowswap-frontend/src/modules/accountProxy/hooks/useTokenBalanceAndUsdValue.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 
 import { useTokensBalances } from '@cowprotocol/balances-and-allowances'
 import { TokenWithLogo } from '@cowprotocol/common-const'
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { useTokensByAddressMap } from '@cowprotocol/tokens'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 
@@ -17,7 +17,7 @@ export function useTokenBalanceAndUsdValue(tokenAddress: string | undefined): To
   const tokensByAddress = useTokensByAddressMap()
   const { values: balances } = useTokensBalances()
 
-  const tokenKey = tokenAddress ? getTokenAddressKey(tokenAddress) : undefined
+  const tokenKey = tokenAddress ? getAddressKey(tokenAddress) : undefined
 
   const token = !!tokenKey && tokensByAddress[tokenKey]
   const balanceRaw = !!tokenKey && balances[tokenKey]

apps/cowswap-frontend/src/modules/accountProxy/hooks/useTokensToRefund.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 
 import { useTokensBalances } from '@cowprotocol/balances-and-allowances'
 import { TokenWithLogo } from '@cowprotocol/common-const'
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { useTokensByAddressMap } from '@cowprotocol/tokens'
 import { BigNumber } from '@ethersproject/bignumber'
 
@@ -18,7 +18,7 @@ export function useTokensToRefund(): TokenToRefund[] | undefined {
   return useMemo(() => {
     return Object.keys(balances.values)
       .reduce<TokenToRefund[]>((acc, tokenAddress) => {
-        const token = tokensByAddress[getTokenAddressKey(tokenAddress)]
+        const token = tokensByAddress[getAddressKey(tokenAddress)]
         const balance = balances.values[tokenAddress]
 
         if (token && balance?.gt(0)) {

apps/cowswap-frontend/src/modules/erc20Approve/containers/TradeApproveModal/approveUtils.ts

@@ -1,4 +1,4 @@
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { SupportedChainId } from '@cowprotocol/cow-sdk'
 import { Nullish } from '@cowprotocol/types'
 import { defaultAbiCoder } from '@ethersproject/abi'
@@ -37,7 +37,7 @@ export function processApprovalTransaction(
 
       if (approvedAmount !== undefined) {
         return {
-          tokenAddress: getTokenAddressKey(tokenAddress),
+          tokenAddress: getAddressKey(tokenAddress),
           owner: account,
           spender,
           amount: approvedAmount,
@@ -69,17 +69,14 @@ function extractApprovalAmountFromLogs(
     // Find the Approval event log
     const approvalLog = txReceipt.logs.find((log) => {
       // Check if it's from the token contract and has the Approval event signature
-      if (getTokenAddressKey(log.address) !== getTokenAddressKey(tokenAddress)) return false
+      if (getAddressKey(log.address) !== getAddressKey(tokenAddress)) return false
       if (log.topics[0] !== APPROVAL_EVENT_TOPIC) return false
 
       // Verify owner and spender match (topics[1] = owner, topics[2] = spender)
       const logOwner = getAddress('0x' + log.topics[1].slice(26))
       const logSpender = getAddress('0x' + log.topics[2].slice(26))
 
-      return (
-        getTokenAddressKey(logOwner) === getTokenAddressKey(owner) &&
-        getTokenAddressKey(logSpender) === getTokenAddressKey(spender)
-      )
+      return getAddressKey(logOwner) === getAddressKey(owner) && getAddressKey(logSpender) === getAddressKey(spender)
     })
 
     if (!approvalLog) return undefined

apps/cowswap-frontend/src/modules/permit/hooks/usePermitInfo.ts

@@ -2,7 +2,7 @@ import { useAtomValue, useSetAtom } from 'jotai'
 import { useEffect, useMemo } from 'react'
 
 import { getIsNativeToken, getWrappedToken } from '@cowprotocol/common-utils'
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { COW_PROTOCOL_VAULT_RELAYER_ADDRESS, mapSupportedNetworks, SupportedChainId } from '@cowprotocol/cow-sdk'
 import { DEFAULT_MIN_GAS_LIMIT, getTokenPermitInfo, PermitInfo } from '@cowprotocol/permit-utils'
 import { useWalletInfo } from '@cowprotocol/wallet'
@@ -136,6 +136,6 @@ function usePermitInfoState(chainId: SupportedChainId, tokenAddress: string | un
   return useMemo(() => {
     if (!tokenAddress) return undefined
 
-    return permitableTokens[chainId]?.[getTokenAddressKey(tokenAddress)]
+    return permitableTokens[chainId]?.[getAddressKey(tokenAddress)]
   }, [chainId, permitableTokens, tokenAddress])
 }

apps/cowswap-frontend/src/modules/permit/state/permitCacheAtom.ts

@@ -1,7 +1,7 @@
 import { atom } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 
 import {
   CachedPermitData,
@@ -98,10 +98,10 @@ export const getPermitCacheAtom = atom(null, (get, set, params: GetPermitCachePa
 })
 
 function buildKey({ chainId, tokenAddress, account, spender, amount }: PermitCacheKeyParams): string {
-  const base = `${chainId}-${getTokenAddressKey(tokenAddress)}-${getTokenAddressKey(spender)}`
+  const base = `${chainId}-${getAddressKey(tokenAddress)}-${getAddressKey(spender)}`
   const withAmount = amount ? `${base}-${amount.toString()}` : base
 
-  return account ? `${withAmount}-${getTokenAddressKey(account)}` : withAmount
+  return account ? `${withAmount}-${getAddressKey(account)}` : withAmount
 }
 
 const removePermitCacheBuilder = (key: string) => (permitCache: PermitCache) => {

apps/cowswap-frontend/src/modules/permit/state/permittableTokensAtom.ts

@@ -2,7 +2,7 @@ import { atom } from 'jotai'
 import { atomWithStorage } from 'jotai/utils'
 
 import { getJotaiMergerStorage } from '@cowprotocol/core'
-import { getTokenAddressKey } from '@cowprotocol/cow-sdk'
+import { getAddressKey } from '@cowprotocol/cow-sdk'
 import { mapSupportedNetworks } from '@cowprotocol/cow-sdk'
 import { PermitInfo } from '@cowprotocol/permit-utils'
 import { PersistentStateByChain } from '@cowprotocol/types'
@@ -35,7 +35,7 @@ export const addPermitInfoForTokenAtom = atom(
 
     permittableTokens[chainId] = {
       ...permittableTokensForChain,
-      [getTokenAddressKey(tokenAddress)]: permitInfo,
+      [getAddressKey(tokenAddress)]: permitInfo,
     }
 
     set(permittableTokensAtom, permittableTokens)