Skip to content

fix: getUserOperationHash calculation for EIP-7702 UserOperations (#4197)fix: correct EIP-7702 UserOperation hash calculation #4198

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
srivtx wants to merge 1 commit into from
Closed

fix: getUserOperationHash calculation for EIP-7702 UserOperations (#4197)fix: correct EIP-7702 UserOperation hash calculation #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/fuzzy-cats-jump.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"viem": patch
---

Fixed `getUserOperationHash` calculation for EIP-7702 UserOperations.
26 changes: 17 additions & 9 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions src/account-abstraction/utils/userOperation/getInitCode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,21 @@ export function getInitCode(
UserOperation,
'authorization' | 'factory' | 'factoryData'
>,
options?: { forHash?: boolean },
) {
const { authorization, factory, factoryData } = userOperation
if (
factory === '0x7702' ||
factory === '0x7702000000000000000000000000000000000000'
) {
// For hash calculation: substitute delegate address
// For packing (ABI call): keep raw factory
if (options?.forHash && authorization) {
const delegation = authorization.address
return concat([delegation, factoryData ?? '0x'])
}
if (!authorization) return '0x7702000000000000000000000000000000000000'
const delegation = authorization.address
return concat([delegation, factoryData ?? '0x'])
return concat([factory, factoryData ?? '0x'])
}
if (!factory) return '0x'
return concat([factory, factoryData ?? '0x'])
Expand Down
17 changes: 11 additions & 6 deletions src/account-abstraction/utils/userOperation/getUserOperationHash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ export function getUserOperationHash<
if (entryPointVersion === '0.6') {
const factory = userOperation.initCode?.slice(0, 42) as Hex
const factoryData = userOperation.initCode?.slice(42) as Hex | undefined
const initCode = getInitCode({
authorization,
factory,
factoryData,
})
const initCode = getInitCode(
{
authorization,
factory,
factoryData,
},
{ forHash: true },
)
return encodeAbiParameters(
[
{ type: 'address' },
Expand Down Expand Up @@ -88,7 +91,9 @@ export function getUserOperationHash<
}

if (entryPointVersion === '0.7') {
const packedUserOp = toPackedUserOperation(userOperation)
const packedUserOp = toPackedUserOperation(userOperation, {
forHash: true,
})
return encodeAbiParameters(
[
{ type: 'address' },
Expand Down
2 changes: 1 addition & 1 deletion src/account-abstraction/utils/userOperation/getUserOperationTypedData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export function getUserOperationTypedData(
): GetUserOperationTypedDataReturnType {
const { chainId, entryPointAddress, userOperation } = parameters

const packedUserOp = toPackedUserOperation(userOperation)
const packedUserOp = toPackedUserOperation(userOperation, { forHash: true })

return {
types,
Expand Down
4 changes: 3 additions & 1 deletion src/account-abstraction/utils/userOperation/toPackedUserOperation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { getInitCode } from './getInitCode.js'

export function toPackedUserOperation(
userOperation: UserOperation,
options?: { forHash?: boolean },
): PackedUserOperation {
const {
callGasLimit,
Expand All @@ -29,7 +30,8 @@ export function toPackedUserOperation(
pad(numberToHex(verificationGasLimit || 0n), { size: 16 }),
pad(numberToHex(callGasLimit || 0n), { size: 16 }),
])
const initCode = getInitCode(userOperation)
const initCode = getInitCode(userOperation, options)

const gasFees = concat([
pad(numberToHex(maxPriorityFeePerGas || 0n), { size: 16 }),
pad(numberToHex(maxFeePerGas || 0n), { size: 16 }),
Expand Down