split p256 validator and webauthn validator

ququzone · Oct 7, 2023 · a2c8e73 · a2c8e73
1 parent c066535
commit a2c8e73
Show file tree

Hide file tree

Showing 6 changed files with 393 additions and 30 deletions.
diff --git a/contracts/validators/p256/P256Validator.sol b/contracts/validators/p256/P256Validator.sol
@@ -25,24 +25,7 @@ contract P256Validator is BaseValidator {
         override
         returns (uint256 validationData)
     {
-        bytes memory sig;
-        bytes32 messageHash;
-        {
-            (
-                bytes memory realSig,
-                bytes memory authenticatorData,
-                string memory clientDataJSONPre,
-                string memory clientDataJSONPost
-            ) = abi.decode(signature, (bytes, bytes, string, string));
-
-            string memory clientDataJSON =
-                string.concat(clientDataJSONPre, Base64.encode(bytes.concat(userOpHash)), clientDataJSONPost);
-            bytes32 clientDataHash = sha256(bytes(clientDataJSON));
-            messageHash = sha256(bytes.concat(authenticatorData, clientDataHash));
-            sig = realSig;
-        }
-
-        if (impl.validateSignature(messageHash, sig, pks[account])) {
+        if (impl.validateSignature(sha256(abi.encode(userOpHash)), signature, pks[account])) {
             return 0;
         }
         return Contants.SIG_VALIDATION_FAILED;

diff --git a/contracts/validators/p256/WebauthnValidator.sol b/contracts/validators/p256/WebauthnValidator.sol
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.19;
+
+import "../../common/Contants.sol";
+import "../BaseValidator.sol";
+import "./ISecp256r1.sol";
+import "./Base64.sol";
+
+contract WebauthnValidator is BaseValidator {
+    string public constant override NAME = "Webauthn Validator";
+    string public constant override VERSION = "0.0.1";
+
+    event PkChanged(address indexed account, bytes oldPk, bytes newPk);
+
+    ISecp256r1 public immutable impl;
+    mapping(address => bytes) public pks;
+
+    constructor(ISecp256r1 _impl) {
+        impl = _impl;
+    }
+
+    function validateSignature(address account, bytes32 userOpHash, bytes calldata signature)
+        external
+        payable
+        override
+        returns (uint256 validationData)
+    {
+        bytes memory sig;
+        bytes32 messageHash;
+        {
+            (
+                bytes memory realSig,
+                bytes memory authenticatorData,
+                string memory clientDataJSONPre,
+                string memory clientDataJSONPost
+            ) = abi.decode(signature, (bytes, bytes, string, string));
+
+            string memory clientDataJSON =
+                string.concat(clientDataJSONPre, Base64.encode(bytes.concat(userOpHash)), clientDataJSONPost);
+            bytes32 clientDataHash = sha256(bytes(clientDataJSON));
+            messageHash = sha256(bytes.concat(authenticatorData, clientDataHash));
+            sig = realSig;
+        }
+
+        if (impl.validateSignature(messageHash, sig, pks[account])) {
+            return 0;
+        }
+        return Contants.SIG_VALIDATION_FAILED;
+    }
+
+    function enable(bytes calldata data) external payable override {
+        bytes memory old = pks[msg.sender];
+        pks[msg.sender] = data;
+        emit PkChanged(msg.sender, old, data);
+    }
+
+    function validCaller(address, bytes calldata) external pure override returns (bool) {
+        revert("not implemented");
+    }
+}
diff --git a/deploy/validator_secp256r1.ts b/deploy/validator_secp256r1.ts
@@ -25,6 +25,12 @@ const deploy: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     log: true,
     deterministicDeployment: true,
   })
+  await deploy('WebauthnValidator', {
+    from: deployer,
+    args: [secp256r1.address],
+    log: true,
+    deterministicDeployment: true,
+  })
 }
 
 deploy.tags = ['secp256r1', 'validator']

diff --git a/deployments/iotex_testnet/P256Validator.json b/deployments/iotex_testnet/P256Validator.json