Skip to content

fix(swap): prevent spurious nonce() revert modal before Approve/Swap on Celo Reserve (#635) #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ocakciomursel-pixel wants to merge 2 commits into from
Closed

fix(swap): prevent spurious nonce() revert modal before Approve/Swap on Celo Reserve (#635) #647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f74d22a
fix(web3): prevent @usedapp/core nonce() revert on EIP-7702 and non-S…
ocakciomursel-pixel Oct 18, 2026
9b336ef
fix(web3): restrict eth_getCode override to EIP-7702 delegation desig…
ocakciomursel-pixel Oct 18, 2026
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
18 changes: 18 additions & 0 deletions src/hooks/useWeb3.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,23 @@ export function Web3ContextProvider({ children }: { children: ReactNode | ReactN
params[0] = { ...params[0], ...gasSettingsForChain }
}
}
if (
method === 'eth_getCode' &&
address &&
typeof params?.[0] === 'string' &&
params[0].toLowerCase() === address.toLowerCase()
) {
const code = await webprovider.jsonRpcFetchFunc(method, params)
// EIP-7702 delegated EOAs (e.g. MetaMask Smart Accounts on Celo) return a 23-byte
// delegation designator (`0xef0100` + 20-byte target address). Per EIP-3541, deployed
// smart contracts (such as Gnosis Safe) cannot have bytecode starting with `0xef`.
// Returning `'0x'` prevents `@usedapp/core` from misclassifying EIP-7702 EOAs as
// Gnosis Safe contracts and calling `nonce()` on them before transaction signing.
if (typeof code === 'string' && /^0xef0100[0-9a-fA-F]{40}$/.test(code)) {
return '0x'
}
return code
}
return webprovider.jsonRpcFetchFunc(method, params)
}
}
Expand Down Expand Up @@ -271,3 +288,4 @@ export function Web3ContextProvider({ children }: { children: ReactNode | ReactN
</GdSdkContext.Provider>
)
}