[#287] Move WebAuthnVerifier to passkey package

safe-global · Mar 5, 2024 · 2b3d60b · 2b3d60b
1 parent d778646
commit 2b3d60b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/modules/4337/contracts/Imports.sol b/modules/4337/contracts/Imports.sol
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.8.0;
+
+import {P256Verifier} from "@safe-global/safe-passkey/contracts/verifiers/P256Verifier.sol";
+import {WebAuthnVerifier} from "@safe-global/safe-passkey/contracts/verifiers/WebAuthnVerifier.sol";
diff --git a/modules/4337/contracts/experimental/WebAuthnSigner.sol b/modules/4337/contracts/experimental/WebAuthnSigner.sol
@@ -6,7 +6,7 @@ import {SignatureValidatorConstants} from "./SignatureValidatorConstants.sol";
 import {IUniqueSignerFactory} from "./SafeSignerLaunchpad.sol";
 import {SignatureValidator} from "./SignatureValidator.sol";
 import {SignatureValidatorConstants} from "./SignatureValidatorConstants.sol";
-import {IWebAuthnVerifier, WebAuthnConstants} from "./verifiers/WebAuthnVerifier.sol";
+import {IWebAuthnVerifier, WebAuthnConstants} from "@safe-global/safe-passkey/contracts/verifiers/WebAuthnVerifier.sol";
 
 struct SignatureData {
     bytes authenticatorData;

diff --git a/modules/4337/contracts/experimental/WebAuthnSingletonSigner.sol b/modules/4337/contracts/experimental/WebAuthnSingletonSigner.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.0;
 
 import {SignatureValidator} from "./SignatureValidator.sol";
-import {IWebAuthnVerifier, WebAuthnConstants} from "./verifiers/WebAuthnVerifier.sol";
+import {IWebAuthnVerifier, WebAuthnConstants} from "@safe-global/safe-passkey/contracts/verifiers/WebAuthnVerifier.sol";
 
 /**
  * @title WebAuthnSingletonSigner

diff --git a/modules/4337/package.json b/modules/4337/package.json
@@ -77,6 +77,7 @@
     }
   },
   "dependencies": {
-    "@safe-global/safe-contracts": "^1.4.1"
+    "@safe-global/safe-contracts": "^1.4.1",
+    "@safe-global/safe-passkey": "^0.1.0"
   }
 }
diff --git a/.../contracts/vendor/FCL/utils/Base64Url.sol → .../contracts/vendor/FCL/utils/Base64Url.sol b/.../contracts/vendor/FCL/utils/Base64Url.sol → .../contracts/vendor/FCL/utils/Base64Url.sol
diff --git a/...s/experimental/verifiers/P256Verifier.sol → ...skey/contracts/verifiers/P256Verifier.sol b/...s/experimental/verifiers/P256Verifier.sol → ...skey/contracts/verifiers/P256Verifier.sol
@@ -3,7 +3,7 @@
 /* solhint-disable payable-fallback */
 pragma solidity >=0.8.0;
 
-import {FCL_ecdsa} from "../../vendor/FCL/FCL_ecdsa.sol";
+import {FCL_ecdsa} from "../vendor/FCL/FCL_ecdsa.sol";
 
 /**
  * @title P256VerifierWithFallback

diff --git a/...ts/experimental/verifiers/P256Wrapper.sol → ...sskey/contracts/verifiers/P256Wrapper.sol b/...ts/experimental/verifiers/P256Wrapper.sol → ...sskey/contracts/verifiers/P256Wrapper.sol
diff --git a/...perimental/verifiers/WebAuthnVerifier.sol → .../contracts/verifiers/WebAuthnVerifier.sol b/...perimental/verifiers/WebAuthnVerifier.sol → .../contracts/verifiers/WebAuthnVerifier.sol
@@ -3,7 +3,7 @@
 pragma solidity >=0.8.0;
 
 import {P256Wrapper} from "./P256Wrapper.sol";
-import {Base64Url} from "../../vendor/FCL/utils/Base64Url.sol";
+import {Base64Url} from "../vendor/FCL/utils/Base64Url.sol";
 
 /**
  * @title WebAuthnConstants