Added support for flatsigs

2023-05-22 07:43:47 -03:00
parent 26a495246e
commit 631c1d5dfb
32 changed files with 214 additions and 205 deletions
--- a/contracts/core/BaseUtils.sol
+++ b/contracts/core/BaseUtils.sol
@@ -35,9 +35,7 @@ abstract contract BaseUtils is

    function _signerCheck(
        bytes32 _message,
-        bytes32 _r,
-        bytes32 _s,
-        uint8 _v
+        bytes calldata _signature
    ) internal view {
        if (usedTransactions(_message))
            revert TxAlreadyUsed();
@@ -45,13 +43,11 @@ abstract contract BaseUtils is
        if (
            !validBacenSigners(
                _castAddrToKey(
-                    ECDSA.recover(
+                    ECDSA.recoverCalldata(
                        ECDSA.toEthSignedMessageHash(
                            _message
                        ),
-                        _v,
-                        _r,
-                        _s
+                        _signature
                    )
                )
            )
--- a/contracts/core/DataTypes.sol
+++ b/contracts/core/DataTypes.sol
@@ -20,6 +20,12 @@ library DataTypes {
        uint256[] expiredLocks;
    }

+    struct ReleaseArgs {
+        uint256 lockID;
+        bytes32 pixTimestamp;
+        bytes signature;
+    }
+
    struct Lock {
        uint256 counter;
        uint256 expirationBlock;
--- a/contracts/core/OwnerSettings.sol
+++ b/contracts/core/OwnerSettings.sol
@@ -218,7 +218,7 @@ abstract contract OwnerSettings is
        assembly {
            success := staticcall(
                // gas
-                0x7530,
+                gas(),
                // address
                sload(reputation.slot),
                // argsOffset