Revert if transaction is expired

2019-05-23 19:46:31 -05:00
parent 4f818d55fa
commit 435c81da98
2 changed files with 10 additions and 1 deletions
--- a/contracts/exchange/contracts/src/MixinTransactions.sol
+++ b/contracts/exchange/contracts/src/MixinTransactions.sol
@@ -85,6 +85,14 @@ contract MixinTransactions is
    {
        bytes32 transactionHash = getTransactionHash(transaction);

+        // Check transaction is not expired
+        if (block.timestamp >= transaction.expirationTimeSeconds) {
+            _rrevert(TransactionError(
+                TransactionErrorCodes.EXPIRED,
+                transactionHash
+            ));
+        }
+
        // Prevent reentrancy
        if (currentContextAddress != address(0)) {
            _rrevert(TransactionError(
--- a/contracts/exchange/contracts/src/mixins/MExchangeRichErrorTypes.sol
+++ b/contracts/exchange/contracts/src/mixins/MExchangeRichErrorTypes.sol
@@ -47,7 +47,8 @@ contract MExchangeRichErrorTypes is

    enum TransactionErrorCodes {
        NO_REENTRANCY,
-        ALREADY_EXECUTED
+        ALREADY_EXECUTED,
+        EXPIRED
    }

    // bytes4(keccak256("SignatureError(uint8,bytes32,address,bytes)"))