[#312] Remove replace SafeWebAuthnSigner.sol with SafeWebAuthnSignerP…

…roxy.sol, same for factory
safe-global · Apr 11, 2024 · 3c4fd03 · 3c4fd03
1 parent 03dc99d
commit 3c4fd03
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 231 deletions.
diff --git a/modules/passkey/contracts/SafeWebAuthnSigner.sol b/modules/passkey/contracts/SafeWebAuthnSigner.sol
diff --git a/modules/passkey/contracts/SafeWebAuthnSignerFactory.sol b/modules/passkey/contracts/SafeWebAuthnSignerFactory.sol
diff --git a/modules/passkey/contracts/SafeWebAuthnSignerProxy.sol b/modules/passkey/contracts/SafeWebAuthnSignerProxy.sol
@@ -4,7 +4,7 @@ import {IP256Verifier} from "./interfaces/IP256Verifier.sol";
 
 /**
  * @title SafeWebAuthnSignerProxy
- * @dev A proxy contract that points to SafeWebAuthnSigner.
+ * @dev A proxy contract that points to SafeWebAuthnSigner singleton.
  */
 contract SafeWebAuthnSignerProxy {
     uint256 internal immutable X;

diff --git a/modules/passkey/contracts/SafeWebAuthnSignerProxyFactory.sol b/modules/passkey/contracts/SafeWebAuthnSignerProxyFactory.sol
@@ -2,10 +2,8 @@
 pragma solidity >=0.8.0;
 
 import {ICustomECDSASignerFactory} from "./interfaces/ICustomECDSASignerFactory.sol";
-import {IP256Verifier} from "./interfaces/IP256Verifier.sol";
-import {ERC1271} from "./libraries/ERC1271.sol";
-import {WebAuthn} from "./libraries/WebAuthn.sol";
 import {SafeWebAuthnSignerProxy} from "./SafeWebAuthnSignerProxy.sol";
+import {SafeWebAuthnSignerSingleton} from "./SafeWebAuthnSignerSingleton.sol";
 /**
  * @title SafeWebAuthnSignerProxyFactory
  * @dev A factory contract for creating and managing WebAuthn proxy signers.
@@ -49,8 +47,25 @@ contract SafeWebAuthnSignerProxyFactory is ICustomECDSASignerFactory {
         uint256 y,
         address verifier
     ) external view override returns (bytes4 magicValue) {
-        if (WebAuthn.verifySignature(message, signature, WebAuthn.USER_VERIFICATION, x, y, IP256Verifier(verifier))) {
-            magicValue = ERC1271.MAGIC_VALUE;
+        address _singleton = SINGLETON;
+        bytes memory data = abi.encodePacked(
+            abi.encodeWithSignature("isValidSignature(bytes32,bytes)", message, signature),
+            x,
+            y,
+            verifier
+        );
+
+        // solhint-disable-next-line no-inline-assembly
+        assembly {
+            let dataSize := mload(data)
+            let dataLocation := add(data, 0x20)
+
+            let success := staticcall(gas(), _singleton, dataLocation, dataSize, 0, 0)
+            returndatacopy(magicValue, 0, returndatasize())
+            if iszero(success) {
+                // TODO
+            }
+            return(0, returndatasize())
         }
     }
 

diff --git a/modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol b/modules/passkey/contracts/SafeWebAuthnSignerSingleton.sol
@@ -19,7 +19,7 @@ contract SafeWebAuthnSignerSingleton is SignatureValidatorProxy {
         uint256 x,
         uint256 y,
         address verifier
-    ) public view virtual override returns (bool success) {
+    ) internal view virtual override returns (bool success) {
         success = WebAuthn.verifySignature(message, signature, WebAuthn.USER_VERIFICATION, x, y, IP256Verifier(verifier));
     }
 }
diff --git a/modules/passkey/contracts/base/SignatureValidatorProxy.sol b/modules/passkey/contracts/base/SignatureValidatorProxy.sol
@@ -66,5 +66,5 @@ abstract contract SignatureValidatorProxy {
         uint256 x,
         uint256 y,
         address verifier
-    ) public view virtual returns (bool success);
+    ) internal view virtual returns (bool success);
 }
diff --git a/modules/passkey/src/deploy/webauthn.ts b/modules/passkey/src/deploy/webauthn.ts
@@ -4,23 +4,9 @@ const deploy: DeployFunction = async ({ deployments, getNamedAccounts }) => {
   const { deployer } = await getNamedAccounts()
   const { deploy } = deployments
 
-  await deploy('SafeWebAuthnSignerFactory', {
-    from: deployer,
-    args: [],
-    log: true,
-    deterministicDeployment: true,
-  })
-
-  const singletonDeployment = await deploy('SafeWebAuthnSignerSingleton', {
-    from: deployer,
-    args: [],
-    log: true,
-    deterministicDeployment: true,
-  })
-
   await deploy('SafeWebAuthnSignerProxyFactory', {
     from: deployer,
-    args: [singletonDeployment.address],
+    args: [],
     log: true,
     deterministicDeployment: true,
   })

diff --git a/modules/passkey/test/4337/WebAuthn.spec.ts b/modules/passkey/test/4337/WebAuthn.spec.ts
@@ -21,7 +21,7 @@ describe('Safe4337Module - WebAuthn Owner', () => {
       Safe4337Module,
       SafeECDSASignerLaunchpad,
       EntryPoint,
-      SafeWebAuthnSignerFactory,
+      SafeWebAuthnSignerProxyFactory,
     } = await deployments.fixture()
 
     const [user] = await ethers.getSigners()
@@ -32,7 +32,7 @@ describe('Safe4337Module - WebAuthn Owner', () => {
     const signerLaunchpad = await ethers.getContractAt('SafeECDSASignerLaunchpad', SafeECDSASignerLaunchpad.address)
     const singleton = await ethers.getContractAt(SafeL2.abi, SafeL2.address)
     const verifier = await ethers.getContractAt('IP256Verifier', FCLP256Verifier.address)
-    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerFactory', SafeWebAuthnSignerFactory.address)
+    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerProxyFactory', SafeWebAuthnSignerProxyFactory.address)
 
     const navigator = {
       credentials: new WebAuthnCredentials(),
@@ -228,7 +228,7 @@ describe('Safe4337Module - WebAuthn Owner', () => {
       const publicKey = decodePublicKey(credential.response)
       await signerFactory.createSigner(publicKey.x, publicKey.y, verifierAddress)
       const signer = await ethers.getContractAt(
-        'SafeWebAuthnSigner',
+        'SafeWebAuthnSignerProxy',
         await signerFactory.getSigner(publicKey.x, publicKey.y, verifierAddress),
       )
 

diff --git a/modules/passkey/test/4337/WebAuthnSigner.spec.ts b/modules/passkey/test/4337/WebAuthnSigner.spec.ts
@@ -20,7 +20,7 @@ describe('WebAuthn Signers [@4337]', () => {
       SafeModuleSetup,
       SafeL2,
       FCLP256Verifier,
-      SafeWebAuthnSignerFactory,
+      SafeWebAuthnSignerProxyFactory,
     } = await deployments.run()
     const [user] = await prepareAccounts()
     const bundler = bundlerRpc()
@@ -32,7 +32,7 @@ describe('WebAuthn Signers [@4337]', () => {
     const signerLaunchpad = await ethers.getContractAt('SafeECDSASignerLaunchpad', SafeECDSASignerLaunchpad.address)
     const singleton = await ethers.getContractAt(SafeL2.abi, SafeL2.address)
     const verifier = await ethers.getContractAt('IP256Verifier', FCLP256Verifier.address)
-    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerFactory', SafeWebAuthnSignerFactory.address)
+    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerProxyFactory', SafeWebAuthnSignerProxyFactory.address)
 
     const navigator = {
       credentials: new WebAuthnCredentials(),

diff --git a/modules/passkey/test/GasBenchmarking.spec.ts b/modules/passkey/test/GasBenchmarking.spec.ts
diff --git a/modules/passkey/test/userstories/CreateSafeWithPasskeySignerAsOwner.spec.ts b/modules/passkey/test/userstories/CreateSafeWithPasskeySignerAsOwner.spec.ts
@@ -17,7 +17,7 @@ import { buildSignatureBytes } from '@safe-global/safe-4337/src/utils/execution'
 describe('Create a Safe with Passkey signer as owner: [@userstory]', () => {
   // Create a fixture to setup the contracts and signer(s)
   const setupTests = deployments.createFixture(async ({ deployments }) => {
-    const { EntryPoint, Safe4337Module, SafeProxyFactory, SafeModuleSetup, SafeL2, FCLP256Verifier, SafeWebAuthnSignerFactory } =
+    const { EntryPoint, Safe4337Module, SafeProxyFactory, SafeModuleSetup, SafeL2, FCLP256Verifier, SafeWebAuthnSignerProxyFactory } =
       await deployments.run()
 
     const [user] = await ethers.getSigners()
@@ -28,7 +28,7 @@ describe('Create a Safe with Passkey signer as owner: [@userstory]', () => {
     const safeModuleSetup = await ethers.getContractAt(SafeModuleSetup.abi, SafeModuleSetup.address)
     const singleton = await ethers.getContractAt(SafeL2.abi, SafeL2.address)
     const verifier = await ethers.getContractAt('IP256Verifier', FCLP256Verifier.address)
-    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerFactory', SafeWebAuthnSignerFactory.address)
+    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerProxyFactory', SafeWebAuthnSignerProxyFactory.address)
 
     const navigator = {
       credentials: new WebAuthnCredentials(),

diff --git a/modules/passkey/test/userstories/ExecuteUserOpFromPasskeySigner.spec.ts b/modules/passkey/test/userstories/ExecuteUserOpFromPasskeySigner.spec.ts
@@ -16,7 +16,7 @@ import { buildSignatureBytes } from '@safe-global/safe-4337/src/utils/execution'
  */
 describe('Execute userOp from Passkey signer [@userstory]', () => {
   const setupTests = deployments.createFixture(async ({ deployments }) => {
-    const { EntryPoint, Safe4337Module, SafeProxyFactory, SafeModuleSetup, SafeL2, FCLP256Verifier, SafeWebAuthnSignerFactory } =
+    const { EntryPoint, Safe4337Module, SafeProxyFactory, SafeModuleSetup, SafeL2, FCLP256Verifier, SafeWebAuthnSignerProxyFactory } =
       await deployments.run()
 
     const [relayer] = await ethers.getSigners()
@@ -27,7 +27,7 @@ describe('Execute userOp from Passkey signer [@userstory]', () => {
     const safeModuleSetup = await ethers.getContractAt(SafeModuleSetup.abi, SafeModuleSetup.address)
     const singleton = await ethers.getContractAt(SafeL2.abi, SafeL2.address)
     const verifier = await ethers.getContractAt('IP256Verifier', FCLP256Verifier.address)
-    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerFactory', SafeWebAuthnSignerFactory.address)
+    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerProxyFactory', SafeWebAuthnSignerProxyFactory.address)
 
     const navigator = {
       credentials: new WebAuthnCredentials(),

diff --git a/modules/passkey/test/userstories/OffchainPasskeyVerification.spec.ts b/modules/passkey/test/userstories/OffchainPasskeyVerification.spec.ts
@@ -14,13 +14,14 @@ import { buildSignatureBytes } from '@safe-global/safe-4337/src/utils/execution'
  */
 describe('Offchain Passkey Signature Verification [@userstory]', () => {
   const setupTests = deployments.createFixture(async ({ deployments }) => {
-    const { SafeProxyFactory, SafeL2, FCLP256Verifier, SafeWebAuthnSignerFactory, CompatibilityFallbackHandler } = await deployments.run()
+    const { SafeProxyFactory, SafeL2, FCLP256Verifier, SafeWebAuthnSignerProxyFactory, CompatibilityFallbackHandler } =
+      await deployments.run()
 
     const proxyFactory = await ethers.getContractAt(SafeProxyFactory.abi, SafeProxyFactory.address)
     const singleton = await ethers.getContractAt(SafeL2.abi, SafeL2.address)
     const fallbackHandler = await ethers.getContractAt(CompatibilityFallbackHandler.abi, CompatibilityFallbackHandler.address)
     const verifier = await ethers.getContractAt('IP256Verifier', FCLP256Verifier.address)
-    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerFactory', SafeWebAuthnSignerFactory.address)
+    const signerFactory = await ethers.getContractAt('SafeWebAuthnSignerProxyFactory', SafeWebAuthnSignerProxyFactory.address)
 
     const navigator = {
       credentials: new WebAuthnCredentials(),
@@ -49,7 +50,7 @@ describe('Offchain Passkey Signature Verification [@userstory]', () => {
     const publicKey = decodePublicKey(credential.response)
     await signerFactory.createSigner(publicKey.x, publicKey.y, verifierAddress)
     const signerAddress = await signerFactory.getSigner(publicKey.x, publicKey.y, verifierAddress)
-    const signer = await ethers.getContractAt('SafeWebAuthnSigner', signerAddress)
+    const signer = await ethers.getContractAt('SafeWebAuthnSignerProxy', signerAddress)
 
     // Deploy Safe with the WebAuthn signer as a single owner.
     const singletonAddress = await singleton.getAddress()