chore(protocol): change two vars to immutable & use SignatureChecker (#…

…16584)
taikoxyz · Apr 2, 2024 · 11ad84d · 11ad84d
1 parent 643bd17
commit 11ad84d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 42 deletions.
diff --git a/packages/protocol/contracts/L1/hooks/AssignmentHook.sol b/packages/protocol/contracts/L1/hooks/AssignmentHook.sol
@@ -3,6 +3,7 @@ pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts/utils/cryptography/SignatureChecker.sol";
 import "../../common/EssentialContract.sol";
 import "../../libs/LibAddress.sol";
 import "../ITaikoL1.sol";
@@ -13,6 +14,7 @@ import "./IHook.sol";
 /// @custom:security-contact [email protected]
 contract AssignmentHook is EssentialContract, IHook {
     using LibAddress for address;
+    using SignatureChecker for address;
     using SafeERC20 for IERC20;
 
     struct ProverAssignment {
@@ -95,7 +97,7 @@ contract AssignmentHook is EssentialContract, IHook {
         address taikoL1Address = msg.sender;
         bytes32 hash = hashAssignment(assignment, taikoL1Address, _meta.blobHash);
 
-        if (!_blk.assignedProver.isValidSignature(hash, assignment.signature)) {
+        if (!_blk.assignedProver.isValidSignatureNow(hash, assignment.signature)) {
             revert HOOK_ASSIGNMENT_INVALID_SIG();
         }
 

diff --git a/packages/protocol/contracts/automata-attestation/AutomataDcapV3Attestation.sol b/packages/protocol/contracts/automata-attestation/AutomataDcapV3Attestation.sol
@@ -49,7 +49,7 @@ contract AutomataDcapV3Attestation is IAttestation {
     mapping(string fmspc => TCBInfoStruct.TCBInfo tcbInfo) public tcbInfo;
     EnclaveIdStruct.EnclaveId public qeIdentity;
 
-    address public owner;
+    address public immutable owner;
 
     constructor(address sigVerifyLibAddr, address pemCertLibAddr) {
         sigVerifyLib = ISigVerifyLib(sigVerifyLibAddr);

diff --git a/packages/protocol/contracts/automata-attestation/utils/SigVerifyLib.sol b/packages/protocol/contracts/automata-attestation/utils/SigVerifyLib.sol
@@ -10,7 +10,7 @@ import "./BytesUtils.sol";
 contract SigVerifyLib is ISigVerifyLib {
     using BytesUtils for bytes;
 
-    address private __es256Verifier;
+    address private immutable __es256Verifier;
 
     constructor(address es256Verifier) {
         __es256Verifier = es256Verifier;

diff --git a/packages/protocol/contracts/libs/LibAddress.sol b/packages/protocol/contracts/libs/LibAddress.sol
@@ -2,7 +2,6 @@
 pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/utils/Address.sol";
-import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import "@openzeppelin/contracts/interfaces/IERC1271.sol";
 
@@ -83,20 +82,4 @@ library LibAddress {
             result_ = _result;
         } catch { }
     }
-
-    function isValidSignature(
-        address _addr,
-        bytes32 _hash,
-        bytes memory _sig
-    )
-        internal
-        view
-        returns (bool)
-    {
-        if (Address.isContract(_addr)) {
-            return IERC1271(_addr).isValidSignature(_hash, _sig) == _EIP1271_MAGICVALUE;
-        } else {
-            return ECDSA.recover(_hash, _sig) == _addr;
-        }
-    }
 }
diff --git a/packages/protocol/test/libs/LibAddress.t.sol b/packages/protocol/test/libs/LibAddress.t.sol
@@ -61,18 +61,6 @@ contract EtherSenderContract {
     {
         return LibAddress.supportsInterface(_addr, _interfaceId);
     }
-
-    function isValidSignature(
-        address _addr,
-        bytes32 _hash,
-        bytes memory _sig
-    )
-        public
-        view
-        returns (bool)
-    {
-        return LibAddress.isValidSignature(_addr, _hash, _sig);
-    }
 }
 
 contract TestLibAddress is TaikoTest {
@@ -141,14 +129,4 @@ contract TestLibAddress is TaikoTest {
 
         assertEq(doesSupport, true);
     }
-
-    function test_isValidSignature() public {
-        bytes32 hash = bytes32("DUMMY_SIGNATURE_HASH_DATA");
-
-        // 0x1 is Alice's private key
-        (uint8 v, bytes32 r, bytes32 s) = vm.sign(0x1, hash);
-        bool validSignature = bridge.isValidSignature(Alice, hash, abi.encodePacked(r, s, v));
-
-        assertEq(validSignature, true);
-    }
 }