Merge pull request #6147 from cowprotocol/hotfix/2025-08-12

Hotfix 2025-08-12

Author: shoom3301

apps/cowswap-frontend/src/common/hooks/useContract.ts

@@ -19,7 +19,7 @@ import {
 } from '@cowprotocol/common-const'
 import { getContract } from '@cowprotocol/common-utils'
 import { isEns, isProd, isStaging } from '@cowprotocol/common-utils'
-import { COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS, SupportedChainId } from '@cowprotocol/cow-sdk'
+import { COW_PROTOCOL_SETTLEMENT_CONTRACT_ADDRESS, CowEnv, SupportedChainId } from '@cowprotocol/cow-sdk'
 import { useWalletInfo } from '@cowprotocol/wallet'
 import { useWalletProvider } from '@cowprotocol/wallet-provider'
 import { Contract, ContractInterface } from '@ethersproject/contracts'
@@ -29,7 +29,7 @@ const WETH_CONTRACT_ADDRESS_MAP = Object.fromEntries(
   Object.entries(WRAPPED_NATIVE_CURRENCIES).map(([chainId, token]) => [chainId, token.address]),
 )
 
-export const ethFlowEnv = isProd || isStaging || isEns ? 'prod' : 'barn'
+export const ethFlowEnv: CowEnv = isProd || isStaging || isEns ? 'prod' : 'staging'
 
 export type UseContractResult<T extends Contract = Contract> = {
   contract: T | null

apps/cowswap-frontend/src/modules/cowShed/containers/InvalidCoWShedSetup/index.tsx

@@ -2,6 +2,7 @@ import React, { ReactNode } from 'react'
 
 import { DISCORD_LINK } from '@cowprotocol/common-const'
 import { ExternalLink, InlineBanner, StatusColorVariant } from '@cowprotocol/ui'
+import { useWalletInfo } from '@cowprotocol/wallet'
 
 import styled from 'styled-components/macro'
 
@@ -22,10 +23,13 @@ const Wrapper = styled.div`
 `
 
 export function InvalidCoWShedSetup(): ReactNode {
+  const { chainId } = useWalletInfo()
   const proxyInfo = useCurrentAccountProxy()?.data
   const isProxySetupValid = proxyInfo?.isProxySetupValid
 
-  if (isProxySetupValid !== false) return null
+  if (isProxySetupValid !== false || proxyInfo?.chainId !== chainId) return null
+
+  console.debug('[CoWShed validation] InvalidCoWShedSetup', proxyInfo)
 
   return (
     <Wrapper>

apps/cowswap-frontend/src/modules/cowShed/hooks/useCurrentAccountProxy.ts

@@ -1,6 +1,7 @@
+import { ZERO_ADDRESS } from '@cowprotocol/common-const'
 import { areAddressesEqual, getContract } from '@cowprotocol/common-utils'
 import { implementationAddress } from '@cowprotocol/contracts'
-import type { CowShedHooks } from '@cowprotocol/cow-sdk'
+import type { CowShedHooks, SupportedChainId } from '@cowprotocol/cow-sdk'
 import { useWalletInfo } from '@cowprotocol/wallet'
 import { useWalletProvider } from '@cowprotocol/wallet-provider'
 import type { BaseContract } from '@ethersproject/contracts'
@@ -28,6 +29,7 @@ interface CoWShedContract extends BaseContract {
 }
 
 interface ProxyAndAccount {
+  chainId: SupportedChainId
   proxyAddress: string
   account: string
   isProxyDeployed: boolean
@@ -60,18 +62,19 @@ export function useCurrentAccountProxy(): SWRResponse<ProxyAndAccount | undefine
 
   return useSWR(
     account && provider && cowShedHooks ? [account, chainId, 'useCurrentAccountProxyAddress'] : null,
-    async ([account]) => {
+    async ([account, chainId]) => {
       if (!provider || !cowShedHooks) return
 
       const proxyAddress = cowShedHooks.proxyOf(account)
       const proxyCode = await provider.getCode(proxyAddress)
       const isProxyDeployed = !!proxyCode && proxyCode !== '0x'
 
       const isProxySetupValid = isProxyDeployed
-        ? await getIsProxySetupValid(proxyAddress, provider, cowShedHooks)
+        ? await getIsProxySetupValid(chainId, proxyAddress, provider, cowShedHooks)
         : true
 
       return {
+        chainId,
         proxyAddress,
         account,
         isProxyDeployed,
@@ -87,18 +90,41 @@ export function useCurrentAccountProxyAddress(): string | undefined {
 }
 
 async function getIsProxySetupValid(
+  chainId: SupportedChainId,
   proxyAddress: string,
   provider: Web3Provider,
   cowShedHooks: CowShedHooks,
 ): Promise<boolean | null> {
+  const providerNetwork = await provider.getNetwork()
+
+  // Skip validation if network mismatch
+  if (providerNetwork.chainId !== chainId) return true
+
+  console.debug('[CoWShed validation] networks', {
+    providerNetwork,
+    chainId,
+  })
+
   const shedContract = getContract(proxyAddress, COW_SHED_ABI, provider) as CoWShedContract
   const expectedImplementation = cowShedHooks.getImplementationAddress()
   const expectedFactoryAddress = cowShedHooks.getFactoryAddress()
 
   try {
     const implementation = await implementationAddress(provider, proxyAddress)
 
-    if (!areAddressesEqual(implementation, expectedImplementation)) return false
+    // If implementation is zero, it means proxy is not deployed and is considered as valid
+    if (areAddressesEqual(implementation, ZERO_ADDRESS)) {
+      return true
+    }
+
+    if (!areAddressesEqual(implementation, expectedImplementation)) {
+      console.debug('[CoWShed validation] implementation', {
+        implementation,
+        expectedImplementation,
+      })
+
+      return false
+    }
   } catch (e) {
     console.error('[CoWShed validation] Could not get implementationAddress', e)
 
@@ -108,7 +134,16 @@ async function getIsProxySetupValid(
   try {
     const trustedExecutor = await shedContract.callStatic.trustedExecutor()
 
-    return areAddressesEqual(trustedExecutor, expectedFactoryAddress)
+    const isTrustedExecutorValid = areAddressesEqual(trustedExecutor, expectedFactoryAddress)
+
+    if (!isTrustedExecutorValid) {
+      console.debug('[CoWShed validation] trustedExecutor', {
+        trustedExecutor,
+        expectedFactoryAddress,
+      })
+    }
+
+    return isTrustedExecutorValid
   } catch (e) {
     console.error('[CoWShed validation] Could not get trustedExecutor', e)
 

apps/cowswap-frontend/src/modules/ordersTable/hooks/useTokenAllowances.ts

@@ -40,16 +40,16 @@ export function useTokenAllowances(tokenAddresses: string[]): {
     account,
   )
 
+  const results = data?.results
+
   const state = useMemo(() => {
-    if (!data) return
+    if (!results?.length) return
 
-    const res = tokenAddresses.reduce<AllowancesState>((acc, address, index) => {
-      acc[address.toLowerCase()] = data[index]?.[0]
+    return tokenAddresses.reduce<AllowancesState>((acc, address, index) => {
+      acc[address.toLowerCase()] = results[index]?.[0]
       return acc
     }, {})
-
-    return res
-  }, [tokenAddresses, data])
+  }, [tokenAddresses, results])
 
   return useMemo(() => ({ state, isLoading }), [state, isLoading])
 }

apps/cowswap-frontend/src/modules/twap/hooks/useTwapOrdersAuthMulticall.ts

@@ -14,19 +14,20 @@ const SWR_CONFIG = { refreshInterval: ms`30s` }
 export function useTwapOrdersAuthMulticall(
   safeAddress: string,
   composableCowContract: ComposableCoW,
-  ordersInfo: TwapOrderInfo[]
+  ordersInfo: TwapOrderInfo[],
 ): TwapOrdersAuthResult | null {
   const input = useMemo(() => {
     return ordersInfo.map(({ id }) => [safeAddress, id])
   }, [safeAddress, ordersInfo])
 
-  const { data: loadedResults, isLoading } = useSingleContractMultipleData<[boolean]>(
+  const { data, isLoading } = useSingleContractMultipleData<[boolean]>(
     composableCowContract,
     'singleOrders',
     input,
     MULTICALL_OPTIONS,
-    SWR_CONFIG
+    SWR_CONFIG,
   )
+  const loadedResults = data?.results
 
   return useMemo(() => {
     if (ordersInfo.length === 0) return EMPTY_AUTH_RESULT

apps/cowswap-frontend/src/modules/wallet/containers/AccountSelectorModal/index.tsx

@@ -1,5 +1,5 @@
 import { useAtom, useAtomValue, useSetAtom } from 'jotai'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { ReactNode, useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useNativeTokensBalances } from '@cowprotocol/balances-and-allowances'
 import { NATIVE_CURRENCIES } from '@cowprotocol/common-const'
@@ -24,10 +24,7 @@ import * as styledEl from './styled'
 
 const EMPTY_BALANCES = {}
 
-// TODO: Break down this large function into smaller functions
-// TODO: Add proper return type annotation
-// eslint-disable-next-line max-lines-per-function, @typescript-eslint/explicit-function-return-type
-export function AccountSelectorModal() {
+export function AccountSelectorModal(): ReactNode {
   const { chainId } = useWalletInfo()
   const { isOpen } = useAtomValue(accountSelectorModalAtom)
   const closeModal = useSetAtom(toggleAccountSelectorModalAtom)
@@ -43,7 +40,7 @@ export function AccountSelectorModal() {
 
   const [accountsList, setAccountsList] = useState<string[] | null>(null)
 
-  const nativeTokensBalances = useNativeTokensBalances(accountsList || undefined)
+  const nativeTokensBalances = useNativeTokensBalances(chainId, accountsList || undefined)
 
   const balances = useMemo(() => {
     if (!nativeTokensBalances) return EMPTY_BALANCES
@@ -57,7 +54,7 @@ export function AccountSelectorModal() {
         }
         return acc
       },
-      {}
+      {},
     )
   }, [nativeTokensBalances, nativeToken])
 
@@ -76,7 +73,7 @@ export function AccountSelectorModal() {
 
       addSnackbar({ content: <Trans>{walletName} account changed</Trans>, id: 'account-changed', icon: 'success' })
     },
-    [walletName, addSnackbar, setHwAccountIndex, closeModal]
+    [walletName, addSnackbar, setHwAccountIndex, closeModal],
   )
 
   useEffect(() => {

apps/cowswap-frontend/src/pages/error/AnySwapAffectedUsers/useIsAnySwapAffectedUser.ts

@@ -31,7 +31,7 @@ const SWR_CONFIG: SWRConfiguration = {
 
 export function useIsAnySwapAffectedUser(): boolean {
   const { chainId, account } = useWalletInfo()
-  const { data: allowances } = useMultipleContractSingleData<[BigNumber]>(
+  const { data } = useMultipleContractSingleData<[BigNumber]>(
     chainId,
     AFFECTED_TOKENS,
     ERC20_INTERFACE,
@@ -42,6 +42,8 @@ export function useIsAnySwapAffectedUser(): boolean {
     `useIsAnySwapAffectedUser`,
   )
 
+  const allowances = data?.results
+
   return useMemo(() => {
     // The error affects Mainnet
     if (chainId !== ChainId.MAINNET || !allowances) {

apps/cowswap-frontend/src/utils/orderUtils/getOrderFilledAmount.ts

@@ -1,10 +1,11 @@
-import { ZERO_BIG_NUMBER } from '@cowprotocol/common-const'
 import { isSellOrder } from '@cowprotocol/common-utils'
 
 import BigNumber from 'bignumber.js'
 
 import { Order } from 'legacy/state/orders/actions'
 
+const ZERO_BIG_NUMBER = new BigNumber(0)
+
 /**
  * Get order filled amount, both as raw amount (in atoms) and as percentage (from 0 to 1)
  *
@@ -25,7 +26,7 @@ export function getOrderFilledAmount(order: Order): FilledAmountResult {
 
   if (isSellOrder(order.kind)) {
     executedAmount = new BigNumber(order.apiAdditionalInfo.executedSellAmount).minus(
-      order.apiAdditionalInfo?.executedFeeAmount
+      order.apiAdditionalInfo?.executedFeeAmount,
     )
     totalAmount = new BigNumber(order.sellAmount.toString())
   } else {

apps/cowswap-frontend/src/utils/orderUtils/getOrderSurplus.ts

@@ -1,5 +1,3 @@
-// Util functions that only pertain to/deal with operator API related stuff
-import { ZERO_BIG_NUMBER } from '@cowprotocol/common-const'
 import { isSellOrder } from '@cowprotocol/common-utils'
 
 import BigNumber from 'bignumber.js'
@@ -9,6 +7,8 @@ import { Order } from 'legacy/state/orders/actions'
 
 import { getOrderExecutedAmounts } from './getOrderExecutedAmounts'
 
+const ZERO_BIG_NUMBER = new BigNumber(0)
+
 type Surplus = {
   amount: BigNumber
   percentage: BigNumber

libs/abis/src/abis/Multicall3.json

@@ -1,4 +1,17 @@
 [
+  {
+    "inputs": [],
+    "name": "getBlockNumber",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "blockNumber",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {