-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add passkey support * Add support for passkeys to 4337 * verificationGasLimit adjustment * feat(relay-kit): add dummy signature as a passkey signature (#857) * feat(relay-kit): Tests for using passkey with 4337 (#846)
- Loading branch information
1 parent
cdf05dc
commit aaaf44c
Showing
71 changed files
with
4,159 additions
and
446 deletions.
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
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
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,219 @@ | ||
| // SPDX-License-Identifier: UNLICENSED | ||
| pragma solidity 0.8.24; | ||
|
|
||
| import {SafeWebAuthnSignerFactory} from '@safe-global/safe-passkey/contracts/SafeWebAuthnSignerFactory.sol'; | ||
| import {FCLP256Verifier} from '@safe-global/safe-passkey/contracts/verifiers/FCLP256Verifier.sol'; | ||
| import {SignatureValidator} from '@safe-global/safe-passkey/contracts/base/SignatureValidator.sol'; | ||
| import {P256, WebAuthn} from '@safe-global/safe-passkey/contracts/libraries/WebAuthn.sol'; | ||
|
|
||
| /** | ||
| * @title Safe Smart Account | ||
| * @dev Minimal interface of a Safe smart account. This only includes functions that are used by | ||
| * this project. | ||
| * @custom:security-contact [email protected] | ||
| */ | ||
| interface ISafeTest { | ||
| /** | ||
| * @notice Sets an initial storage of the Safe contract. | ||
| * @dev This method can only be called once. If a proxy was created without setting up, anyone | ||
| * can call setup and claim the proxy. | ||
| * @param owners List of Safe owners. | ||
| * @param threshold Number of required confirmations for a Safe transaction. | ||
| * @param to Contract address for optional delegate call. | ||
| * @param data Data payload for optional delegate call. | ||
| * @param fallbackHandler Handler for fallback calls to this contract | ||
| * @param paymentToken Token that should be used for the payment (0 is ETH) | ||
| * @param payment Value that should be paid | ||
| * @param paymentReceiver Address that should receive the payment (or 0 if tx.origin) | ||
| */ | ||
| function setup( | ||
| address[] calldata owners, | ||
| uint256 threshold, | ||
| address to, | ||
| bytes calldata data, | ||
| address fallbackHandler, | ||
| address paymentToken, | ||
| uint256 payment, | ||
| address payable paymentReceiver | ||
| ) external; | ||
|
|
||
| /** | ||
| * @notice Reads `length` bytes of storage in the currents contract | ||
| * @param offset - the offset in the current contract's storage in words to start reading from | ||
| * @param length - the number of words (32 bytes) of data to read | ||
| * @return the bytes that were read. | ||
| */ | ||
| function getStorageAt(uint256 offset, uint256 length) external view returns (bytes memory); | ||
| } | ||
|
|
||
| contract SafeWebAuthnSignerFactory_SV1_4_1 is SafeWebAuthnSignerFactory {} | ||
|
|
||
| contract WebAuthnContract is FCLP256Verifier {} | ||
|
|
||
| // TODO: ADD SHARED SIGNER CONTRACT FROM @safe-global/safe-passkey | ||
|
|
||
| /** | ||
| * @title Safe WebAuthn Shared Signer | ||
| * @dev A contract for verifying WebAuthn signatures shared by all Safe accounts. This contract uses | ||
| * storage from the Safe account itself for full ERC-4337 compatibility. | ||
| */ | ||
| contract SafeWebAuthnSharedSigner is SignatureValidator { | ||
| /** | ||
| * @notice Data associated with a WebAuthn signer. It represents the X and Y coordinates of the | ||
| * signer's public key as well as the P256 verifiers to use. This is stored in account storage | ||
| * starting at the storage slot {SIGNER_SLOT}. | ||
| */ | ||
| struct Signer { | ||
| uint256 x; | ||
| uint256 y; | ||
| P256.Verifiers verifiers; | ||
| } | ||
|
|
||
| /** | ||
| * @notice The storage slot of the mapping from shared WebAuthn signer address to signer data. | ||
| * @custom:computed-as keccak256("SafeWebAuthnSharedSigner.signer") - 1 | ||
| * @dev This value is intentionally computed to be a hash -1 as a precaution to avoid any | ||
| * potential issues from unintended hash collisions, and have enough space for all the signer | ||
| * fields. Also, this is the slot of a `mapping(address self => Signer)` to ensure that multiple | ||
| * {SafeWebAuthnSharedSigner} instances can coexist with the same account. | ||
| */ | ||
| uint256 private constant _SIGNER_MAPPING_SLOT = | ||
| 0x2e0aed53485dc2290ceb5ce14725558ad3e3a09d38c69042410ad15c2b4ea4e8; | ||
|
|
||
| /** | ||
| * @notice An error indicating a `CALL` to a function that should only be `DELEGATECALL`-ed. | ||
| */ | ||
| error NotDelegateCalled(); | ||
|
|
||
| /** | ||
| * @notice Address of the shared signer contract itself. | ||
| * @dev This is used for determining whether or not the contract is being `DELEGATECALL`-ed when | ||
| * setting signer data. | ||
| */ | ||
| address private immutable _SELF; | ||
|
|
||
| /** | ||
| * @notice The starting storage slot on the account containing the signer data. | ||
| */ | ||
| uint256 public immutable SIGNER_SLOT; | ||
|
|
||
| /** | ||
| * @notice Create a new shared WebAuthn signer instance. | ||
| */ | ||
| constructor() { | ||
| _SELF = address(this); | ||
| SIGNER_SLOT = uint256(keccak256(abi.encode(address(this), _SIGNER_MAPPING_SLOT))); | ||
| } | ||
|
|
||
| /** | ||
| * @notice Validates the call is done via `DELEGATECALL`. | ||
| */ | ||
| modifier onlyDelegateCall() { | ||
| if (address(this) == _SELF) { | ||
| revert NotDelegateCalled(); | ||
| } | ||
| _; | ||
| } | ||
|
|
||
| /** | ||
| * @notice Return the signer configuration for the specified account. | ||
| * @dev The calling account must be a Safe, as the signer data is stored in the Safe's storage | ||
| * and must be read with the {StorageAccessible} support from the Safe. | ||
| * @param account The account to request signer data for. | ||
| */ | ||
| function getConfiguration(address account) public view returns (Signer memory signer) { | ||
| bytes memory getStorageAtData = abi.encodeCall( | ||
| ISafeTest(account).getStorageAt, | ||
| (SIGNER_SLOT, 3) | ||
| ); | ||
|
|
||
| // Call the {StorageAccessible.getStorageAt} with assembly. This allows us to return a | ||
| // zeroed out signer configuration instead of reverting for `account`s that are not Safes. | ||
| // We also, expect the implementation to behave **exactly** like the Safe's - that is it | ||
| // should encode the return data using a standard ABI encoding: | ||
| // - The first 32 bytes is the offset of the values bytes array, always `0x20` | ||
| // - The second 32 bytes is the length of the values bytes array, always `0x60` | ||
| // - the following 3 words (96 bytes) are the values of the signer configuration. | ||
|
|
||
| // solhint-disable-next-line no-inline-assembly | ||
| assembly ('memory-safe') { | ||
| // Note that Yul expressions are evaluated in reverse order, so the `staticcall` is the | ||
| // first thing to be evaluated in the nested `and` expression. | ||
| if and( | ||
| and( | ||
| // The offset of the ABI encoded bytes is 0x20, this should always be the case | ||
| // for standard ABI encoding of `(bytes)` tuple that `getStorageAt` returns. | ||
| eq(mload(0x00), 0x20), | ||
| // The length of the encoded bytes is exactly 0x60 bytes (i.e. 3 words, which is | ||
| // exactly how much we read from the Safe's storage in the `getStorageAt` call). | ||
| eq(mload(0x20), 0x60) | ||
| ), | ||
| and( | ||
| // The length of the return data should be exactly 0xa0 bytes, which should | ||
| // always be the case for the Safe's `getStorageAt` implementation. | ||
| eq(returndatasize(), 0xa0), | ||
| // The call succeeded. We write the first two words of the return data into the | ||
| // scratch space, as we need to inspect them before copying the signer | ||
| // signer configuration to our `signer` memory pointer. | ||
| staticcall( | ||
| gas(), | ||
| account, | ||
| add(getStorageAtData, 0x20), | ||
| mload(getStorageAtData), | ||
| 0x00, | ||
| 0x40 | ||
| ) | ||
| ) | ||
| ) { | ||
| // Copy only the storage values from the return data to our `signer` memory address. | ||
| // This only happens on success, so the `signer` value will be zeroed out if any of | ||
| // the above conditions fail, indicating that no signer is configured. | ||
| returndatacopy(signer, 0x40, 0x60) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @notice Sets the signer configuration for the calling account. | ||
| * @dev The Safe must call this function with a `DELEGATECALL`, as the signer data is stored in | ||
| * the Safe account's storage. | ||
| * @param signer The new signer data to set for the calling account. | ||
| */ | ||
| function configure(Signer memory signer) external onlyDelegateCall { | ||
| uint256 signerSlot = SIGNER_SLOT; | ||
| Signer storage signerStorage; | ||
|
|
||
| // solhint-disable-next-line no-inline-assembly | ||
| assembly ('memory-safe') { | ||
| signerStorage.slot := signerSlot | ||
| } | ||
|
|
||
| signerStorage.x = signer.x; | ||
| signerStorage.y = signer.y; | ||
| signerStorage.verifiers = signer.verifiers; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritdoc SignatureValidator | ||
| */ | ||
| function _verifySignature( | ||
| bytes32 message, | ||
| bytes calldata signature | ||
| ) internal view virtual override returns (bool isValid) { | ||
| Signer memory signer = getConfiguration(msg.sender); | ||
|
|
||
| // Make sure that the signer is configured in the first place. | ||
| if (P256.Verifiers.unwrap(signer.verifiers) == 0) { | ||
| return false; | ||
| } | ||
|
|
||
| isValid = WebAuthn.verifySignature( | ||
| message, | ||
| signature, | ||
| WebAuthn.USER_VERIFICATION, | ||
| signer.x, | ||
| signer.y, | ||
| signer.verifiers | ||
| ); | ||
| } | ||
| } |
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
Oops, something went wrong.