From 2b3d60bd657d7288d4a3ca48bd2af16070eba3e3 Mon Sep 17 00:00:00 2001 From: Akshay Date: Tue, 5 Mar 2024 11:21:21 +0100 Subject: [PATCH] [#287] Move WebAuthnVerifier to passkey package --- modules/4337/contracts/Imports.sol | 5 +++++ modules/4337/contracts/experimental/WebAuthnSigner.sol | 2 +- .../4337/contracts/experimental/WebAuthnSingletonSigner.sol | 2 +- modules/4337/package.json | 3 ++- .../contracts/vendor/FCL/utils/Base64Url.sol | 0 .../contracts}/verifiers/P256Verifier.sol | 2 +- .../contracts}/verifiers/P256Wrapper.sol | 0 .../contracts}/verifiers/WebAuthnVerifier.sol | 2 +- 8 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 modules/4337/contracts/Imports.sol rename modules/{4337 => passkey}/contracts/vendor/FCL/utils/Base64Url.sol (100%) rename modules/{4337/contracts/experimental => passkey/contracts}/verifiers/P256Verifier.sol (96%) rename modules/{4337/contracts/experimental => passkey/contracts}/verifiers/P256Wrapper.sol (100%) rename modules/{4337/contracts/experimental => passkey/contracts}/verifiers/WebAuthnVerifier.sol (99%) diff --git a/modules/4337/contracts/Imports.sol b/modules/4337/contracts/Imports.sol new file mode 100644 index 000000000..96fa6a599 --- /dev/null +++ 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 index b2a863787..7b9d25ee7 100644 --- 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 index 1b4687c9f..84ff87306 100644 --- 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 index cc984c45d..3c061130e 100644 --- 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/modules/4337/contracts/vendor/FCL/utils/Base64Url.sol b/modules/passkey/contracts/vendor/FCL/utils/Base64Url.sol similarity index 100% rename from modules/4337/contracts/vendor/FCL/utils/Base64Url.sol rename to modules/passkey/contracts/vendor/FCL/utils/Base64Url.sol diff --git a/modules/4337/contracts/experimental/verifiers/P256Verifier.sol b/modules/passkey/contracts/verifiers/P256Verifier.sol similarity index 96% rename from modules/4337/contracts/experimental/verifiers/P256Verifier.sol rename to modules/passkey/contracts/verifiers/P256Verifier.sol index 15e318f8a..b6d75ce92 100644 --- a/modules/4337/contracts/experimental/verifiers/P256Verifier.sol +++ b/modules/passkey/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/modules/4337/contracts/experimental/verifiers/P256Wrapper.sol b/modules/passkey/contracts/verifiers/P256Wrapper.sol similarity index 100% rename from modules/4337/contracts/experimental/verifiers/P256Wrapper.sol rename to modules/passkey/contracts/verifiers/P256Wrapper.sol diff --git a/modules/4337/contracts/experimental/verifiers/WebAuthnVerifier.sol b/modules/passkey/contracts/verifiers/WebAuthnVerifier.sol similarity index 99% rename from modules/4337/contracts/experimental/verifiers/WebAuthnVerifier.sol rename to modules/passkey/contracts/verifiers/WebAuthnVerifier.sol index 989158da6..a73466bc7 100644 --- a/modules/4337/contracts/experimental/verifiers/WebAuthnVerifier.sol +++ b/modules/passkey/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