[hebao-v2] Support signature without signatureType (#2627)

* [hebao-v2] Support signature without signatureType

* fix

* optimize ReentantGuard

* feedback

* add test

* update

* add proxy test

* revert changes in ReenTrancyGuard

* update

Author: kongliangzhong

packages/hebao_v2/contracts/lib/SignatureUtil.sol

@@ -115,31 +115,32 @@ library SignatureUtil
             return false;
         }
 
-        uint signatureTypeOffset = signature.length.sub(1);
-        SignatureType signatureType = SignatureType(signature.toUint8(signatureTypeOffset));
+	require(signature.length == 65 || signature.length == 66, "INVALID_SIGNATURE_LENGTH");
 
-        // Strip off the last byte of the signature by updating the length
-        assembly {
-            mstore(signature, signatureTypeOffset)
-        }
+	bool trimmed = false;
+	if (signature.length == 66) {
+	    // Strip off the last byte of the signature by updating the length
+	    assembly {
+		mstore(signature, 65)
+	    }
 
-        if (signatureType == SignatureType.EIP_712) {
-            success = (signer == recoverECDSASigner(signHash, signature));
-        } else if (signatureType == SignatureType.ETH_SIGN) {
+	    trimmed = true;
+	}
+
+	success = (signer == recoverECDSASigner(signHash, signature));
+	if (!success) {
             bytes32 hash = keccak256(
                 abi.encodePacked("\x19Ethereum Signed Message:\n32", signHash)
             );
             success = (signer == recoverECDSASigner(hash, signature));
-        } else {
-            success = false;
-        }
-
-        // Restore the signature length
-        assembly {
-            mstore(signature, add(signatureTypeOffset, 1))
         }
 
-        return success;
+	if (trimmed) {
+	    // Restore the signature length
+	    assembly {
+		mstore(signature, 66)
+	    }
+	}
     }
 
     function verifyERC1271Signature(

packages/hebao_v2/hardhat.config.ts

@@ -40,6 +40,13 @@ export default {
       accounts: loadTestAccounts()
     },
 
+    optimistic: {
+      chainId: 420,
+      url: 'http://127.0.0.1:8545',
+      gas: 6700000,
+      accounts: { mnemonic: 'test test test test test test test test test test test junk' }
+    },
+
     // HttpNetworkConfig
     ganache: {
       chainId: 31337,