tracking safe type

Author: mgrabina

src/components/transactions/Bridge/BridgeDestinationInput.tsx

@@ -23,10 +23,11 @@ export const BridgeDestinationInput = ({
   onInputError: () => void;
   sourceChainId: number;
 }) => {
-  const { data: isContractAddress, isFetching: fetchingIsContractAddress } = useIsContractAddress(
+  const { data, isFetching: fetchingIsContractAddress } = useIsContractAddress(
     connectedAccount,
     sourceChainId
   );
+  const isContractAddress = data?.isContract;
 
   const [useConnectedAccount, setUseConnectedAccount] = useState(true);
   const [destinationAccount, setDestinationAccount] = useState('');

src/components/transactions/FlowCommons/RightHelperText.tsx

@@ -34,7 +34,8 @@ export const RightHelperText = ({ approvalHash, tryPermit }: RightHelperTextProp
       store.currentNetworkConfig,
     ])
   );
-  const { data: isContractAddress } = useIsContractAddress(account);
+  const { data } = useIsContractAddress(account);
+  const isContractAddress = data?.isContract;
   const usingPermit = tryPermit && walletApprovalMethodPreference;
   const isSigned = approvalHash === MOCK_SIGNED_HASH;
 

src/components/transactions/GasStation/GasStation.tsx

@@ -63,7 +63,8 @@ export const GasStation: React.FC<GasStationProps> = ({
   const { data: poolReserves } = usePoolReservesHumanized(marketOnNetwork);
   const { data: gasPrice } = useGasPrice(selectedChainId);
   const { walletBalances } = useWalletBalances(marketOnNetwork);
-  const { data: isContractAddress } = useIsContractAddress(account);
+  const { data } = useIsContractAddress(account);
+  const isContractAddress = data?.isContract;
   const nativeBalanceUSD = walletBalances[API_ETH_MOCK_ADDRESS.toLowerCase()]?.amountUSD;
   const { name, baseAssetSymbol } = getNetworkConfig(selectedChainId);
 

src/helpers/provider.ts

@@ -15,15 +15,18 @@ function isEip7702EOA(code: string, account: string): boolean {
   return code.startsWith('0xef0100') || code.toLowerCase() === account.toLowerCase();
 }
 
-const SAFE_BYTECODE =
-  '0x608060405273ffffffffffffffffffffffffffffffffffffffff600054167fa619486e0000000000000000000000000000000000000000000000000000000060003514156050578060005260206000f35b3660008037600080366000845af43d6000803e60008114156070573d6000fd5b3d6000f3fea264697066735822122003d1488ee65e08fa41e58e888a9865554c535f2c77126a82cb4c0f917f31441364736f6c63430007060033';
+const SAFE_BYTECODE_PREFIX = '0x608060405273ffffffffffffffffffffffffffffffffffffffff600054167fa619486e';
+
+export const isCodeSafeWallet = (code: string) => {
+  return code.startsWith(SAFE_BYTECODE_PREFIX);
+};
 
 // Detect if a smart contract wallet is a Safe wallet
 export const isSafeWallet = async (user: string, provider: JsonRpcProvider): Promise<boolean> => {
   try {
     const code = await provider.getCode(user);
 
-    return code === SAFE_BYTECODE;
+    return isCodeSafeWallet(code);
   } catch (error) {
     console.error('Error detecting Safe wallet:', error);
     return false;

src/hooks/useIsContractAddress.ts

@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+import { isCodeSafeWallet } from 'src/helpers/provider';
 import { useRootStore } from 'src/store/root';
 import { getProvider } from 'src/utils/marketsAndNetworksConfig';
 
@@ -11,6 +12,10 @@ export const useIsContractAddress = (address: string, chainId?: number) => {
     queryKey: ['isContractAddress', address],
     enabled: address !== '',
     staleTime: Infinity,
-    select: (data) => data !== '0x',
+    select: (data) => {
+      const isContract = data !== '0x';
+      const isSafeWallet = isCodeSafeWallet(data);
+      return { isContract, isSafeWallet };
+    },
   });
 };

src/libs/web3-data-provider/Web3Provider.tsx

@@ -5,6 +5,7 @@ import { BigNumber, PopulatedTransaction, utils } from 'ethers';
 import React, { ReactElement, useEffect, useState } from 'react';
 import { useIsContractAddress } from 'src/hooks/useIsContractAddress';
 import { useRootStore } from 'src/store/root';
+import { WalletType } from 'src/store/walletSlice';
 import { wagmiConfig } from 'src/ui-config/wagmiConfig';
 import { hexToAscii } from 'src/utils/utils';
 import { UserRejectedRequestError } from 'viem';
@@ -49,8 +50,8 @@ export const Web3ContextProvider: React.FC<{ children: ReactElement }> = ({ chil
 
   const [readOnlyModeAddress, setReadOnlyModeAddress] = useState<string | undefined>();
   const [switchNetworkError, setSwitchNetworkError] = useState<Error>();
-  const [setAccount, setConnectedAccountIsContract] = useRootStore(
-    useShallow((store) => [store.setAccount, store.setConnectedAccountIsContract])
+  const [setAccount, setConnectedAccountType] = useRootStore(
+    useShallow((store) => [store.setAccount, store.setConnectedAccountType])
   );
 
   const account = address;
@@ -60,7 +61,9 @@ export const Web3ContextProvider: React.FC<{ children: ReactElement }> = ({ chil
     currentAccount = readOnlyModeAddress;
   }
 
-  const { data: isContractAddress } = useIsContractAddress(account || '', chainId);
+  const { data } = useIsContractAddress(account || '', chainId);
+  const isContractAddress = data?.isContract;
+  const isSafeWallet = data?.isSafeWallet;
 
   useEffect(() => {
     if (didInit) {
@@ -187,14 +190,16 @@ export const Web3ContextProvider: React.FC<{ children: ReactElement }> = ({ chil
 
   useEffect(() => {
     if (!account) {
-      setConnectedAccountIsContract(false);
+      setConnectedAccountType(WalletType.EOA);
       return;
     }
 
     if (isContractAddress) {
-      setConnectedAccountIsContract(true);
+      setConnectedAccountType(WalletType.CONTRACT);
+    } else if (isSafeWallet) {
+      setConnectedAccountType(WalletType.SAFE);
     }
-  }, [isContractAddress, setConnectedAccountIsContract, account]);
+  }, [isContractAddress, setConnectedAccountType, account]);
 
   return (
     <Web3Context.Provider

src/store/poolSlice.ts

@@ -55,6 +55,7 @@ import { minBaseTokenRemainingByNetwork, optimizedPath } from 'src/utils/utils';
 import { StateCreator } from 'zustand';
 
 import { RootStore } from './root';
+import { WalletType } from './walletSlice';
 
 // TODO: what is the better name for this type?
 export type PoolReserve = {
@@ -703,9 +704,9 @@ export const createPoolSlice: StateCreator<
       get minRemainingBaseTokenBalance() {
         if (!get()) return '0.001';
 
-        const { currentNetworkConfig, currentChainId, connectedAccountIsContract } = { ...get() };
+        const { currentNetworkConfig, currentChainId, connectedAccountType } = { ...get() };
 
-        if (connectedAccountIsContract) return '0';
+        if (connectedAccountType !== WalletType.EOA) return '0';
 
         const chainId = currentNetworkConfig.underlyingChainId || currentChainId;
         const min = minBaseTokenRemainingByNetwork[chainId];
@@ -771,7 +772,7 @@ export const createPoolSlice: StateCreator<
       return JSON.stringify(typeData);
     },
     estimateGasLimit: async (tx: PopulatedTransaction, chainId?: number) => {
-      const { currentChainId, connectedAccountIsContract, jsonRpcProvider } = get();
+      const { currentChainId, connectedAccountType, jsonRpcProvider } = get();
 
       const effectiveChainId = chainId ?? currentChainId;
 
@@ -781,7 +782,7 @@ export const createPoolSlice: StateCreator<
        *
        *  See here for more details: https://github.com/zkSync-Community-Hub/zksync-developers/discussions/144
        */
-      if (effectiveChainId === ChainId.zksync && connectedAccountIsContract) {
+      if (effectiveChainId === ChainId.zksync && connectedAccountType !== WalletType.EOA) {
         return tx;
       }
 

src/store/walletSlice.ts

@@ -7,6 +7,12 @@ export enum ApprovalMethod {
   PERMIT = 'Signed message',
 }
 
+export enum WalletType {
+  EOA = 'EOA',
+  CONTRACT = 'Contract',
+  SAFE = 'Safe',
+}
+
 export interface WalletSlice {
   account: string;
   walletType: string | undefined;
@@ -17,8 +23,8 @@ export interface WalletSlice {
   walletApprovalMethodPreference: ApprovalMethod;
   setWalletApprovalMethodPreference: (method: ApprovalMethod) => void;
   refreshWalletApprovalMethod: () => void;
-  connectedAccountIsContract: boolean;
-  setConnectedAccountIsContract: (isContract: boolean) => void;
+  connectedAccountType: WalletType;
+  setConnectedAccountType: (type: WalletType) => void;
 }
 
 const getWalletPreferences = () => {
@@ -75,8 +81,8 @@ export const createWalletSlice: StateCreator<
       }));
     }
   },
-  connectedAccountIsContract: false,
-  setConnectedAccountIsContract(isContract) {
-    set({ connectedAccountIsContract: isContract });
+  connectedAccountType: WalletType.EOA,
+  setConnectedAccountType(type) {
+    set({ connectedAccountType: type });
   },
 });