Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ export const useSwapTokenApproval = ({
const { sendTx, signTxData } = useWeb3Context();
const [loadingPermitData, setLoadingPermitData] = useState(true);

const { isSmartContractWallet, isLoading: isLoadingWalletType } = useGetConnectedWalletType();
const {
isSmartContractWallet,
isEip7702Wallet,
isLoading: isLoadingWalletType,
} = useGetConnectedWalletType();

const [
user,
Expand Down Expand Up @@ -263,8 +267,16 @@ export const useSwapTokenApproval = ({
};
}, [chainId, token]);

// EIP-7702 delegates (Alchemy MA v2, etc.) intercept signTypedData with replay-safe
// wrapping (ERC-7739), so ERC-2612 permits and credit-delegation sigs don't ecrecover
// to the EOA on-chain. Force these wallets through direct approve / approveDelegation
// transactions instead.
const tryPermit =
allowPermit && permitSupported === true && !isSmartContractWallet && !isLoadingWalletType;
allowPermit &&
permitSupported === true &&
!isSmartContractWallet &&
!isEip7702Wallet &&
!isLoadingWalletType;
const usePermit = tryPermit && walletApprovalMethodPreference === ApprovalMethod.PERMIT;

const approval = async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,28 @@ export const isSwapSupportedByCowProtocol = (
*
* Notes:
* - CoW is preferred when supported; fallback to ParaSwap if supported on chain
* - EIP-7702 delegated EOAs always fall back to ParaSwap. Smart-account delegates
* (Alchemy MA v2, etc.) intercept signTypedData and return wrapped signatures
* that don't ecrecover to the EOA, breaking both EIP-712 order signing and the
* flash-loan adapter's EIP-1271 wrapper.
*/
export const getSwitchProvider = ({
chainId,
assetFrom,
assetTo,
shouldUseFlashloan,
swapType,
userIsEip7702Wallet,
}: {
chainId: number;
assetFrom: string;
assetTo: string;
shouldUseFlashloan?: boolean;
swapType: SwapType;
userIsEip7702Wallet?: boolean;
}): SwapProvider | undefined => {
if (
!userIsEip7702Wallet &&
isSwapSupportedByCowProtocol(chainId, assetFrom, assetTo, swapType, shouldUseFlashloan ?? false)
) {
return SwapProvider.COW_PROTOCOL;
Expand Down
2 changes: 2 additions & 0 deletions src/components/transactions/Swap/hooks/useSwapQuote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ export const useSwapQuote = ({
assetTo: state.destinationToken.addressToSwap,
swapType: params.swapType,
shouldUseFlashloan: state.useFlashloan,
userIsEip7702Wallet: state.userIsEip7702Wallet,
});
}, [
state.mainTxState.success,
Expand All @@ -135,6 +136,7 @@ export const useSwapQuote = ({
state.destinationToken.addressToSwap,
params.swapType,
state.useFlashloan,
state.userIsEip7702Wallet,
]);

const requiresQuoteInverted = useMemo(
Expand Down
43 changes: 28 additions & 15 deletions src/components/transactions/Swap/hooks/useUserContext.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Dispatch, useEffect } from 'react';
import { isSafeWallet, isSmartContractWallet } from 'src/helpers/provider';
import { isEip7702Wallet, isSafeWallet, isSmartContractWallet } from 'src/helpers/provider';
import { useWeb3Context } from 'src/libs/hooks/useWeb3Context';
import { getEthersProvider } from 'src/libs/web3-data-provider/adapters/EthersAdapter';
import { useRootStore } from 'src/store/root';
Expand All @@ -12,20 +12,33 @@ export const useUserContext = ({ setState }: { setState: Dispatch<Partial<SwapSt
const { chainId: connectedChainId } = useWeb3Context();

useEffect(() => {
try {
if (user && connectedChainId) {
setState({ user });
getEthersProvider(wagmiConfig, { chainId: connectedChainId }).then((provider) => {
Promise.all([isSmartContractWallet(user, provider), isSafeWallet(user, provider)]).then(
([isSmartContract, isSafe]) => {
setState({ userIsSmartContractWallet: isSmartContract });
setState({ userIsSafeWallet: isSafe });
}
);
if (!user || !connectedChainId) return;

let cancelled = false;
setState({ user });

getEthersProvider(wagmiConfig, { chainId: connectedChainId })
.then((provider) =>
Promise.all([
isSmartContractWallet(user, provider),
isSafeWallet(user, provider),
isEip7702Wallet(user, provider),
Comment thread
mgrabina marked this conversation as resolved.
Outdated
])
)
.then(([isSmartContract, isSafe, isEip7702]) => {
if (cancelled) return;
setState({
userIsSmartContractWallet: isSmartContract,
userIsSafeWallet: isSafe,
userIsEip7702Wallet: isEip7702,
});
}
} catch (error) {
console.error(error);
}
})
.catch((error) => {
console.error(error);
});

return () => {
cancelled = true;
};
}, [user, connectedChainId]);
};
3 changes: 3 additions & 0 deletions src/components/transactions/Swap/types/state.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ export type TokensSwapState = {
userIsSmartContractWallet: boolean;
/** True if the user is a Safe wallet. */
userIsSafeWallet: boolean;
/** True if the user is an EIP-7702 delegated EOA (CoW signature flow incompatible). */
userIsEip7702Wallet: boolean;
/** Token list for the source picker. */
sourceTokens: SwappableToken[];
/** Token list for the destination picker. */
Expand Down Expand Up @@ -261,6 +263,7 @@ export const swapDefaultState: SwapState = {
forcedMaxValue: '',
userIsSmartContractWallet: false,
userIsSafeWallet: false,
userIsEip7702Wallet: false,
sourceTokens: [],
destinationTokens: [],
isMaxSelected: false,
Expand Down
13 changes: 13 additions & 0 deletions src/helpers/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@ export const isSmartContractWallet = async (user: string, provider: JsonRpcProvi
return code !== '0x';
};

export const isEip7702Wallet = async (
user: string,
provider: JsonRpcProvider
): Promise<boolean> => {
try {
const code = await provider.getCode(user);
return isEip7702EOA(code, user);
} catch (error) {
console.error('Error detecting EIP-7702 delegation:', error);
return false;
}
};

// https://eips.ethereum.org/EIPS/eip-7702#abstract
function isEip7702EOA(code: string, account: string): boolean {
return code.startsWith('0xef0100') || code.toLowerCase() === account.toLowerCase();
Expand Down
15 changes: 13 additions & 2 deletions src/hooks/useGetConnectedWalletType.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useState } from 'react';
import {
isEip7702Wallet as getIsEip7702Wallet,
isSafeWallet as getIsSafeWallet,
isSmartContractWallet as getIsSmartContractWallet,
} from 'src/helpers/provider';
Expand All @@ -13,6 +14,7 @@ export const useGetConnectedWalletType = () => {
const user = useRootStore((store) => store.account);
const [isSmartContractWallet, setUserIsSmartContractWallet] = useState(false);
const [isSafeWallet, setUserIsSafeWallet] = useState(false);
const [isEip7702Wallet, setUserIsEip7702Wallet] = useState(false);
const [isLoading, setIsLoading] = useState(true);

useEffect(() => {
Expand All @@ -21,25 +23,34 @@ export const useGetConnectedWalletType = () => {
return;
}

let cancelled = false;
setIsLoading(true);
getEthersProvider(wagmiConfig, { chainId })
.then((provider) => {
return Promise.all([
getIsSmartContractWallet(user, provider),
getIsSafeWallet(user, provider),
getIsEip7702Wallet(user, provider),
]);
})
.then(([isSmartContract, isSafe]) => {
.then(([isSmartContract, isSafe, isEip7702]) => {
if (cancelled) return;
setUserIsSmartContractWallet(isSmartContract);
setUserIsSafeWallet(isSafe);
setUserIsEip7702Wallet(isEip7702);
})
.catch((error) => {
console.error('Error fetching wallet type:', error);
})
.finally(() => {
if (cancelled) return;
setIsLoading(false);
});

return () => {
cancelled = true;
};
}, [chainId, user]);

return { isSmartContractWallet, isSafeWallet, isLoading };
return { isSmartContractWallet, isSafeWallet, isEip7702Wallet, isLoading };
};
Loading