-
Notifications
You must be signed in to change notification settings - Fork 74
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.
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
Increase branch Coverage #108
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| import { expect } from 'chai' | ||
| import { deployments, ethers } from 'hardhat' | ||
| import { Signer } from 'ethers' | ||
| import { getTestSafe, getSimple4337Module, getEntryPoint } from '../utils/setup' | ||
| import { buildSignatureBytes, signHash, logGas } from '../../src/utils/execution' | ||
| import { | ||
| buildSafeUserOp, | ||
| calculateSafeOperationHash, | ||
| buildUserOperationFromSafeUserOperation, | ||
| buildSafeUserOpTransaction, | ||
| signSafeOp, | ||
| } from '../../src/utils/userOp' | ||
| import { chainId } from '../utils/encoding' | ||
|
|
||
| describe('Simple4337Module', () => { | ||
| const setupTests = deployments.createFixture(async ({ deployments }) => { | ||
| await deployments.fixture() | ||
|
|
||
| const [user, untrusted] = await ethers.getSigners() | ||
| const entryPoint = await getEntryPoint() | ||
| const module = await getSimple4337Module() | ||
| const makeSafeModule = async (user: Signer) => { | ||
| const safe = await getTestSafe(user, await module.getAddress(), await module.getAddress()) | ||
| return await ethers.getContractAt('Simple4337Module', await safe.getAddress()) | ||
| } | ||
| const safeModule = await makeSafeModule(user) | ||
|
|
||
| return { | ||
| user, | ||
| untrusted, | ||
| entryPoint, | ||
| validator: module, | ||
| safeModule, | ||
| makeSafeModule, | ||
| } | ||
| }) | ||
|
|
||
| describe('validateUserOp', () => { | ||
| it('should revert when validating user ops for a different Safe', async () => { | ||
| const { user, entryPoint, validator, safeModule, makeSafeModule } = await setupTests() | ||
|
|
||
| const safeOp = buildSafeUserOpTransaction(await safeModule.getAddress(), user.address, 0, '0x', '0', await entryPoint.getAddress()) | ||
| const safeOpHash = calculateSafeOperationHash(await validator.getAddress(), safeOp, await chainId()) | ||
| const signature = buildSignatureBytes([await signHash(user, safeOpHash)]) | ||
| const userOp = buildUserOperationFromSafeUserOperation({ | ||
| safeAddress: await safeModule.getAddress(), | ||
| safeOp, | ||
| signature, | ||
| }) | ||
|
|
||
| const entryPointImpersonator = await ethers.getSigner(await entryPoint.getAddress()) | ||
| const safeFromEntryPoint = safeModule.connect(entryPointImpersonator) | ||
| expect(await safeFromEntryPoint.validateUserOp.staticCall(userOp, ethers.ZeroHash, 0)).to.eq(0) | ||
|
|
||
| const otherSafe = (await makeSafeModule(user)).connect(entryPointImpersonator) | ||
| await expect(otherSafe.validateUserOp.staticCall(userOp, ethers.ZeroHash, 0)).to.be.revertedWith('Invalid Caller') | ||
| }) | ||
|
|
||
| it('should revert when calling an unsupported Safe method', async () => { | ||
| const { user, untrusted, entryPoint, validator, safeModule } = await setupTests() | ||
|
|
||
| const abi = ['function addOwnerWithThreshold(address owner, uint256 threshold) external'] | ||
| const callData = new ethers.Interface(abi).encodeFunctionData('addOwnerWithThreshold', [untrusted.address, 1]) | ||
| const safeOp = buildSafeUserOp({ | ||
| safe: await safeModule.getAddress(), | ||
| callData, | ||
| nonce: '0', | ||
| entryPoint: await entryPoint.getAddress(), | ||
| }) | ||
| const safeOpHash = calculateSafeOperationHash(await validator.getAddress(), safeOp, await chainId()) | ||
| const signature = buildSignatureBytes([await signHash(user, safeOpHash)]) | ||
| const userOp = buildUserOperationFromSafeUserOperation({ | ||
| safeAddress: await safeModule.getAddress(), | ||
| safeOp, | ||
| signature, | ||
| }) | ||
|
|
||
| await expect(safeModule.validateUserOp(userOp, ethers.ZeroHash, 0)).to.be.revertedWith('Unsupported execution function id') | ||
| }) | ||
|
|
||
| it('should revert when not called from the trusted entrypoint', async () => { | ||
| const { user, untrusted, entryPoint, validator, safeModule } = await setupTests() | ||
| const safeOp = buildSafeUserOpTransaction(await safeModule.getAddress(), user.address, 0, '0x', '0', await entryPoint.getAddress()) | ||
| const safeOpHash = calculateSafeOperationHash(await validator.getAddress(), safeOp, await chainId()) | ||
| const signature = buildSignatureBytes([await signHash(user, safeOpHash)]) | ||
| const userOp = buildUserOperationFromSafeUserOperation({ | ||
| safeAddress: await safeModule.getAddress(), | ||
| safeOp, | ||
| signature, | ||
| }) | ||
|
|
||
| await expect(safeModule.connect(untrusted).validateUserOp(userOp, ethers.ZeroHash, 0)).to.be.revertedWith('Unsupported entry point') | ||
| }) | ||
| }) | ||
|
|
||
| describe('execUserOp', () => { | ||
| it('should revert when not called from the trusted entrypoint', async () => { | ||
| const { untrusted, safeModule } = await setupTests() | ||
| await expect(safeModule.connect(untrusted).executeUserOp(ethers.ZeroAddress, 0, '0x', 0)).to.be.revertedWith( | ||
| 'Unsupported entry point', | ||
| ) | ||
| }) | ||
| }) | ||
|
|
||
| describe('execUserOpWithErrorString', () => { | ||
| it('should revert when not called from the trusted entrypoint', async () => { | ||
| const { untrusted, safeModule } = await setupTests() | ||
| await expect(safeModule.connect(untrusted).executeUserOpWithErrorString(ethers.ZeroAddress, 0, '0x', 0)).to.be.revertedWith( | ||
| 'Unsupported entry point', | ||
| ) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One thing I actually forgot to do in the
executeUserOpWithErrorStringPR is to add tests for it to the EIP4337ModuleNew.spec.ts 🙈 would be amazing if you add themThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added - the revert propagation test was also missing which I added (asserting that the Safe gets deployed even if the user op reverts).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
4f8cd91