t-isol 0.0.4 → 0.0.5

package/contracts/ITransferAuthorize.sol

@@ -11,7 +11,7 @@ interface ITransferAuthorize {
     event AuthorizeUsed(address indexed authorizer, bytes32 indexed nonce);
 
         /// @notice Emitted when a transfer with authorization is executed
-    event TransferWithAuthorize(address indexed from, address indexed to, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 indexed nonce);
+    event TransferWithAuthorize(address indexed from, address indexed to, uint256 value, uint256 timeMFG, uint256 timeEXP, bytes32 indexed nonce, bytes auth);
 
     /// @notice Emitted when a transferFrom with authorization is executed
     event TransferFromWithAuthorize(address indexed from, address indexed to, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 indexed nonce);
@@ -36,10 +36,10 @@ interface ITransferAuthorize {
         address from,
         address to,
         uint256 value,
-        uint256 validAfter,
-        uint256 validBefore,
+        uint256 timeMFG,
+        uint256 timeEXP,
         bytes32 nonce,
-        bytes calldata signature
+        bytes calldata auth
     ) external;
     
     // ++   

package/contracts/TransferAuthorize.sol

@@ -15,7 +15,7 @@ abstract contract TransferAuthorize is ITransferAuthorize, EIP712 {
     mapping(address => mapping(bytes32 => bool)) private _authorizeState;
 
     bytes32 public constant TRANSFER_TYPEHASH =
-        keccak256("TransferWithAuthorize(address from,address to,uint256 value,uint256 validAfter,uint256 validBefore,bytes32 nonce)");
+        keccak256("TransferWithAuthorize(address from,address to,uint256 value,uint256 timeMFG,uint256 timeEXP,bytes32 nonce)");
 
     bytes32 public constant TRANSFERFROM_TYPEHASH =
         keccak256("TransferFromWithAuthorize(address from,address to,uint256 value,uint256 validAfter,uint256 validBefore,bytes32 nonce)");
@@ -52,30 +52,30 @@ abstract contract TransferAuthorize is ITransferAuthorize, EIP712 {
         emit AuthorizeUsed(authorizer, nonce);
     }
 
-    /// @dev Verify an EIP-712 typed signature for TransferWithAuthorize and return the recovered signer
+    /// @dev Verify an EIP-712 typed signature (auth) for TransferWithAuthorize and return the recovered signer
     function _verifyTransfer(
         address from,
         address to,
         uint256 value,
-        uint256 validAfter,
-        uint256 validBefore,
+        uint256 timeMFG,
+        uint256 timeEXP,
         bytes32 nonce,
-        bytes calldata signature
+        bytes calldata auth
     ) internal view returns (address signer) {
-        require(block.timestamp >= validAfter, "TransferAuthorize: not yet valid");
-        require(block.timestamp <= validBefore, "TransferAuthorize: expired");
+        require(block.timestamp >= timeMFG, "TransferAuthorize: not yet valid");
+        require(block.timestamp <= timeEXP, "TransferAuthorize: expired");
         bytes32 structHash = keccak256(
             abi.encode(
                 TRANSFER_TYPEHASH,
                 from,
                 to,
                 value,
-                validAfter,
-                validBefore,
+                timeMFG,
+                timeEXP,
                 nonce
             )
         );
-        signer = ECDSA.recover(_hashTypedDataV4(structHash), signature);
+        signer = ECDSA.recover(_hashTypedDataV4(structHash), auth);
     }
 
     /// @dev Verify an EIP-712 typed signature for TransferFromWithAuthorize and return the recovered signer

package/contracts/kit/ERC20xTransferWithAuthorize.sol

@@ -31,24 +31,24 @@ abstract contract ERC20xTransferWithAuthorize is ERC20, TransferAuthorize, Reent
         address from,
         address to,
         uint256 value,
-        uint256 validAfter,
-        uint256 validBefore,
+        uint256 timeMFG,
+        uint256 timeEXP,
         bytes32 nonce,
-        bytes calldata signature
+        bytes calldata auth
     ) external override nonReentrant {
         address signer = _verifyTransfer(
             from,
             to,
             value,
-            validAfter,
-            validBefore,
+            timeMFG,
+            timeEXP,
             nonce,
-            signature
+            auth
         );
         require(signer == from, "ERC20TransferAuthorize: invalid signature");
         _useAuthorize(from, nonce);
         _transfer(from, to, value);
-        emit TransferWithAuthorize(from, to, value, validAfter, validBefore, nonce);
+        emit TransferWithAuthorize(from, to, value, timeMFG, timeEXP, nonce, auth);
     }
 
     /// @notice Relayer-triggered transfer using an off-chain signature by `from`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t-isol",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {