refactor!: remove EIP191Signer library to use function from OZ library

lukso-network · Jun 21, 2023 · 19a6de9 · 19a6de9
1 parent e1a0379
commit 19a6de9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/contracts/Custom/EIP191Signer.sol b/contracts/Custom/EIP191Signer.sol
diff --git a/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol b/contracts/LSP6KeyManager/LSP6KeyManagerCore.sol
@@ -19,7 +19,6 @@ import {BytesLib} from "solidity-bytes-utils/contracts/BytesLib.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import {LSP6Utils} from "./LSP6Utils.sol";
-import {EIP191Signer} from "../Custom/EIP191Signer.sol";
 
 // errors
 import {
@@ -70,8 +69,7 @@ abstract contract LSP6KeyManagerCore is
     LSP6OwnershipModule
 {
     using LSP6Utils for *;
-    using ECDSA for bytes32;
-    using EIP191Signer for address;
+    using ECDSA for *;
     using BytesLib for bytes;
 
     address internal _target;
@@ -339,7 +337,7 @@ abstract contract LSP6KeyManagerCore is
             payload
         );
 
-        address signer = address(this).toDataWithIntendedValidator(encodedMessage).recover(
+        address signer = address(this).toDataWithIntendedValidatorHash(encodedMessage).recover(
             signature
         );
 

diff --git a/contracts/Mocks/EIP191SignerTester.sol b/contracts/Mocks/EIP191SignerTester.sol
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.4;
 
-import {EIP191Signer} from "../Custom/EIP191Signer.sol";
+import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
 contract EIP191SignerTester {
     function toDataWithIntendedValidator(
         address validator,
         bytes memory dataToSign
     ) public pure returns (bytes32) {
-        return EIP191Signer.toDataWithIntendedValidator(validator, dataToSign);
+        return ECDSA.toDataWithIntendedValidatorHash(validator, dataToSign);
     }
 }