AA-513 single auth tuple for UserOperation #232
Conversation
…3-eip-7702-support
| @@ -8,4 +9,5 @@ export interface UserOperation extends OperationBase { | |||
| nonce: BigNumberish | |||
|
|
|||
| preVerificationGas: BigNumberish | |||
| eip7712auth?: EIP7702Authorization | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| @@ -230,7 +230,7 @@ export class BundleManager implements IBundleManager { | |||
| const authorizationList: AuthorizationList = eip7702Tuples.map(it => { | |||
| const res = { | |||
| // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion,@typescript-eslint/no-base-to-string | |||
| chainId: `0x${parseInt(it.chainId.toString()).toString(16)}` as PrefixedHexString, | |||
| chainId: `0x${parseInt(it.chainId.toString()).toString(16)}`.replace(/0x0*/, '0x') as PrefixedHexString, | |||
There was a problem hiding this comment.
Okay, this is getting out of hand. Please create a getHexChainId() function that would handle this bullshit.
| if (!mergeOk) { | ||
| debug('unable to add bundle as it relies on an EIP-7702 tuple that conflicts with other UserOperations') | ||
| continue | ||
| const authorizationList = getAuthorizationList(entry.userOp) |
There was a problem hiding this comment.
Why did you inline this method? And any way, the mergeEip7702Authorizations is still there. I don't see a point in this change.
There was a problem hiding this comment.
getAuthorizationList is for simpler support for erc4337 and rip7562: it accepts a Base class, and parse it as either UserOp or AATX. also, it always returns a list, and empty one of no tuple exists. This saves checking (and type casts) on each use.
There was a problem hiding this comment.
restored (I didn't "inline" it. maybe I originally created my pr before you extracted it..)
| @@ -463,17 +473,18 @@ export class BundleManager implements IBundleManager { | |||
| * @return {boolean} - Returns `true` if the authorizations were successfully merged, otherwise `false`. | |||
| */ | |||
| mergeEip7702Authorizations (entry: MempoolEntry, authList: EIP7702Authorization[]): boolean { | |||
| for (const eip7702Authorization of entry.userOp.authorizationList ?? []) { | |||
| // TODO: need to replace | |||
There was a problem hiding this comment.
A new TODO for no apparent reason.
| // if (existingAuthorization == null && entry.userOp.authorizationList != null) { | ||
| // authList.push(...getAuthorizationList(entry.userOp)) | ||
| // } |
| if (authorizationList.length > 0) { | ||
| // relevant only for RIP-7562... | ||
| requireCond(authorizationList.length === 1, 'Only one authorization is supported', ValidationErrors.InvalidFields) | ||
|
|
||
| const currentChainId = BigNumber.from((this.entryPoint.provider as any)._network.chainId) | ||
| const authChainId = BigNumber.from(authorizationList[0].chainId) | ||
| requireCond(authChainId.eq(BigNumber.from(0)) || | ||
| authChainId.eq(currentChainId), 'Invalid chainId in authorization', ValidationErrors.InvalidFields) | ||
| requireCond(getEip7702AuthorizationSigner(authorizationList[0]).toLowerCase() === userOp.sender.toLowerCase(), 'Authorization signer is not sender', ValidationErrors.InvalidFields) | ||
| } |
There was a problem hiding this comment.
Please extract to a separate function.
drortirosh
force-pushed
the
single-auth-tuple
branch
from
f9685cb to
c8d37f6
Compare
drortirosh
changed the title
|
@drortirosh I don't know how you did the merge, but something is not right: This is the file on master: They differ. Please undo the merge and redo it, since you might be removing necessary changes. EDIT: fixed |
|
|
||
| const chainId = await this.provider.getNetwork().then(n => n.chainId) | ||
|
|
||
| // list is required to be of size=1. for completeness, we still scan it as a list. |
There was a problem hiding this comment.
Why? we have ValidationManager7560, that will handle it as a list, why do we need it here?
No description provided.