t-isol 0.0.6 → 0.0.8

package/contracts/ITransferAuthorize.sol

@@ -11,16 +11,10 @@ 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 createTime, uint256 expireTime, 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);
-    
-    /// @notice Emitted when a approve with authorization is executed
-    event ApproveWithAuthorize(address indexed from, address indexed to, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 indexed nonce);
+    event TransferWithAuthorize(address sender, address indexed from, address indexed to, uint256 value, uint256 createTime, uint256 expireTime, bytes32 indexed nonce, bytes auth);
 
     /// @notice Emitted when a burn with authorization is executed
-    event BurnWithAuthorize(address indexed from, uint256 value, uint256 validAfter, uint256 validBefore, bytes32 indexed nonce);
+    event BurnWithAuthorize(address indexed from, uint256 value, uint256 createTime, uint256 expireTime, bytes32 indexed nonce, bytes auth);
 
     /// @notice Returns whether a nonce has been used for a given authorizer
     /// @param authorizer the account that signed the authorization

package/contracts/TransferAuthorize.sol

@@ -61,7 +61,7 @@ abstract contract TransferAuthorize is ITransferAuthorize, EIP712 {
         uint256 expireTime,
         bytes32 nonce,
         bytes calldata auth
-    ) internal view returns (address signer) {
+    ) internal  returns (address signer) {
         require(block.timestamp >= createTime, "TransferAuthorize: not yet created");
         require(block.timestamp <= expireTime, "TransferAuthorize: not yet expired");
         bytes32 structHash = keccak256(
@@ -76,6 +76,7 @@ abstract contract TransferAuthorize is ITransferAuthorize, EIP712 {
             )
         );
         signer = ECDSA.recover(_hashTypedDataV4(structHash), auth);
+        emit TransferWithAuthorize(msg.sender, from, to, value, createTime, expireTime, nonce, auth);
     }
 
     /// @dev Verify an EIP-712 typed signature for TransferFromWithAuthorize and return the recovered signer

package/contracts/kit/ERC20xTransferWithAuthorize.sol

@@ -48,7 +48,6 @@ abstract contract ERC20xTransferWithAuthorize is ERC20, TransferAuthorize, Reent
         require(signer == from, "ERC20TransferAuthorize: invalid signature");
         _useAuthorize(from, nonce);
         _transfer(from, to, value);
-        emit TransferWithAuthorize(from, to, value, createTime, expireTime, 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.6",
+  "version": "0.0.8",
   "module": "index.ts",
   "type": "module",
   "devDependencies": {