@lukso/lsp8-contracts 0.17.3 → 0.18.1

package/artifacts/LSP8NonTransferableAbstract.json

@@ -564,6 +564,12 @@
     {
       "anonymous": false,
       "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bool",
+          "name": "nonTransferabilityEnabled",
+          "type": "bool"
+        },
         {
           "indexed": true,
           "internalType": "uint256",
@@ -943,6 +949,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "nonTransferabilityEnabled",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "owner",
@@ -1282,19 +1301,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "transferLockEnabled",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "transferLockEnd",
@@ -1363,5 +1369,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8NonTransferable/LSP8NonTransferableAbstract.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/artifacts/LSP8NonTransferableInitAbstract.json

@@ -572,6 +572,12 @@
     {
       "anonymous": false,
       "inputs": [
+        {
+          "indexed": true,
+          "internalType": "bool",
+          "name": "nonTransferabilityEnabled",
+          "type": "bool"
+        },
         {
           "indexed": true,
           "internalType": "uint256",
@@ -951,6 +957,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "nonTransferabilityEnabled",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "owner",
@@ -1290,19 +1309,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "transferLockEnabled",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "transferLockEnd",
@@ -1371,5 +1377,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8NonTransferable/LSP8NonTransferableInitAbstract.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/artifacts/LSP8RevokableAbstract.json

@@ -516,6 +516,43 @@
       "name": "TokenIdDataChanged",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "revoker",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "tokenId",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "TokenRevoked",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -1313,5 +1350,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8Revokable/LSP8RevokableAbstract.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/artifacts/LSP8RevokableInitAbstract.json

@@ -524,6 +524,43 @@
       "name": "TokenIdDataChanged",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "revoker",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "tokenId",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "TokenRevoked",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -1321,5 +1358,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8Revokable/LSP8RevokableInitAbstract.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/artifacts/LSP8Votes.json

@@ -1229,5 +1229,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8Votes/LSP8Votes.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/artifacts/LSP8VotesInitAbstract.json

@@ -1221,5 +1221,5 @@
   "deployedLinkReferences": {},
   "immutableReferences": {},
   "inputSourceName": "project/contracts/extensions/LSP8Votes/LSP8VotesInitAbstract.sol",
-  "buildInfoId": "solc-0_8_28-51761251365f530b69e394f3aa78b9f98e3e9d6a"
+  "buildInfoId": "solc-0_8_28-a1f189205db65800e276c245fa7f2fa7071cb3a5"
 }

package/contracts/extensions/LSP8NonTransferable/ILSP8NonTransferable.sol

@@ -5,9 +5,14 @@ pragma solidity ^0.8.27;
 /// @dev Interface for a non-transferable LSP8 token, enabling control over transferability, lock periods, and role-based exemptions.
 interface ILSP8NonTransferable {
     /// @dev Emitted when the transfer lock period is updated.
+    /// @param nonTransferabilityEnabled Whether the non-transferability feature is enabled or not.
     /// @param start The new start timestamp of the transfer lock period.
     /// @param end The new end timestamp of the transfer lock period.
-    event TransferLockPeriodChanged(uint256 indexed start, uint256 indexed end);
+    event TransferLockPeriodChanged(
+        bool indexed nonTransferabilityEnabled,
+        uint256 indexed start,
+        uint256 indexed end
+    );
 
     /// @notice The start timestamp of the transfer lock period, at which point the token becomes non-transferable.
     function transferLockStart() external view returns (uint256);
@@ -17,7 +22,7 @@ interface ILSP8NonTransferable {
 
     /// @notice Returns whether the transfer lock feature is still enabled.
     /// @dev When this returns `false`, the token has been permanently made transferable and the lock period can no longer be updated.
-    function transferLockEnabled() external view returns (bool);
+    function nonTransferabilityEnabled() external view returns (bool);
 
     /// @notice Checks if the token is currently transferable.
     /// @dev Returns true if the token is transferable (based on the lock period). Note that transfers from addresses holding the bypass role and burning (transfers to address(0)) is always allowed, regardless of transferability status.
@@ -34,7 +39,8 @@ interface ILSP8NonTransferable {
     /// - When `transferLockStart` is set to a value and `transferLockEnd` is 0, it means the tokens becomes non-transferable at a certain point in time and indefinitely (no end time).
     ///
     /// - To make the token always non-transferable, set `transferLockStart` to 0 and `transferLockEnd` to type(uint256).max.
-    /// - To disable completely the non-transferable feature (= make the token always transferable), set both `transferLockStart` and `transferLockEnd` to 0.
+    /// - To remove the active lock while keeping the non-transferability feature configurable, set both `newTransferLockStart` and `newTransferLockEnd` to 0. In this state, transfers are currently unrestricted, but the owner can still configure a new lock period later.
+    /// - To permanently disable the non-transferability feature and prevent future lock-period updates, use the {makeTransferable} function.
     ///
     /// @dev Can only be called by the contract owner. Reverts once {makeTransferable} has been called.
     ///

package/contracts/extensions/LSP8NonTransferable/LSP8NonTransferableAbstract.sol

@@ -39,7 +39,7 @@ abstract contract LSP8NonTransferableAbstract is
     uint256 public transferLockEnd;
 
     /// @inheritdoc ILSP8NonTransferable
-    bool public transferLockEnabled;
+    bool public nonTransferabilityEnabled;
 
     /// @notice Initializes the contract with lock period.
     /// @param transferLockStart_ The start timestamp of the transfer lock period, 0 to disable.
@@ -51,9 +51,13 @@ abstract contract LSP8NonTransferableAbstract is
         );
         transferLockStart = transferLockStart_;
         transferLockEnd = transferLockEnd_;
-        transferLockEnabled = true;
+        nonTransferabilityEnabled = true;
 
-        emit TransferLockPeriodChanged(transferLockStart_, transferLockEnd_);
+        emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: true,
+            start: transferLockStart_,
+            end: transferLockEnd_
+        });
         _grantRole(NON_TRANSFERABLE_BYPASS_ROLE, owner());
     }
 
@@ -75,7 +79,7 @@ abstract contract LSP8NonTransferableAbstract is
     // solhint-disable not-rely-on-time
     // Transfer-lock windows are inherently time-based; `block.timestamp` is the intended source.
     function isTransferable() public view virtual override returns (bool) {
-        if (!transferLockEnabled) return true;
+        if (!nonTransferabilityEnabled) return true;
 
         bool isTransferLockStartEnabled = transferLockStart != 0;
         bool isTransferLockEndEnabled = transferLockEnd != 0;
@@ -105,13 +109,17 @@ abstract contract LSP8NonTransferableAbstract is
     /// @inheritdoc ILSP8NonTransferable
     /// @custom:info The list of addresses holding the `NON_TRANSFERABLE_BYPASS_ROLE` remains populated after the non-transferable feature is switched off.
     function makeTransferable() public virtual override onlyOwner {
-        require(transferLockEnabled, LSP8TokenAlreadyTransferable());
+        require(nonTransferabilityEnabled, LSP8TokenAlreadyTransferable());
 
-        transferLockEnabled = false;
+        nonTransferabilityEnabled = false;
         transferLockStart = 0;
         transferLockEnd = 0;
 
-        emit TransferLockPeriodChanged({start: 0, end: 0});
+        emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: false,
+            start: 0,
+            end: 0
+        });
     }
 
     /// @inheritdoc ILSP8NonTransferable
@@ -119,7 +127,7 @@ abstract contract LSP8NonTransferableAbstract is
         uint256 newTransferLockStart,
         uint256 newTransferLockEnd
     ) public virtual override onlyOwner {
-        require(transferLockEnabled, LSP8CannotUpdateTransferLockPeriod());
+        require(nonTransferabilityEnabled, LSP8CannotUpdateTransferLockPeriod());
 
         // When transferLockEnd is 0, it means no end time is set (transfers locked indefinitely after transferLockStart)
         // When transferLockStart is 0, it means no start time is set (transfers locked up until transferLockEnd)
@@ -134,6 +142,7 @@ abstract contract LSP8NonTransferableAbstract is
         transferLockEnd = newTransferLockEnd;
 
         emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: true,
             start: newTransferLockStart,
             end: newTransferLockEnd
         });

package/contracts/extensions/LSP8NonTransferable/LSP8NonTransferableInitAbstract.sol

@@ -42,7 +42,7 @@ abstract contract LSP8NonTransferableInitAbstract is
     uint256 public transferLockEnd;
 
     /// @inheritdoc ILSP8NonTransferable
-    bool public transferLockEnabled;
+    bool public nonTransferabilityEnabled;
 
     /// @notice Initializes the LSP8NonTransferable contract with base token params and transfer settings.
     /// @dev Initializes the LSP8IdentifiableDigitalAsset base, the access control layer and transfer settings.
@@ -90,9 +90,13 @@ abstract contract LSP8NonTransferableInitAbstract is
         );
         transferLockStart = transferLockStart_;
         transferLockEnd = transferLockEnd_;
-        transferLockEnabled = true;
+        nonTransferabilityEnabled = true;
 
-        emit TransferLockPeriodChanged(transferLockStart_, transferLockEnd_);
+        emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: true,
+            start: transferLockStart_,
+            end: transferLockEnd_
+        });
         _grantRole(NON_TRANSFERABLE_BYPASS_ROLE, owner());
     }
 
@@ -119,7 +123,7 @@ abstract contract LSP8NonTransferableInitAbstract is
     // solhint-disable not-rely-on-time
     // Transfer-lock windows are inherently time-based; `block.timestamp` is the intended source.
     function isTransferable() public view virtual override returns (bool) {
-        if (!transferLockEnabled) return true;
+        if (!nonTransferabilityEnabled) return true;
 
         bool isTransferLockStartEnabled = transferLockStart != 0;
         bool isTransferLockEndEnabled = transferLockEnd != 0;
@@ -149,13 +153,17 @@ abstract contract LSP8NonTransferableInitAbstract is
     /// @inheritdoc ILSP8NonTransferable
     /// @custom:info The list of addresses holding the `NON_TRANSFERABLE_BYPASS_ROLE` remains populated after the non-transferable feature is switched off.
     function makeTransferable() public virtual override onlyOwner {
-        require(transferLockEnabled, LSP8TokenAlreadyTransferable());
+        require(nonTransferabilityEnabled, LSP8TokenAlreadyTransferable());
 
-        transferLockEnabled = false;
+        nonTransferabilityEnabled = false;
         transferLockStart = 0;
         transferLockEnd = 0;
 
-        emit TransferLockPeriodChanged({start: 0, end: 0});
+        emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: false,
+            start: 0,
+            end: 0
+        });
     }
 
     /// @inheritdoc ILSP8NonTransferable
@@ -163,7 +171,7 @@ abstract contract LSP8NonTransferableInitAbstract is
         uint256 newTransferLockStart,
         uint256 newTransferLockEnd
     ) public virtual override onlyOwner {
-        require(transferLockEnabled, LSP8CannotUpdateTransferLockPeriod());
+        require(nonTransferabilityEnabled, LSP8CannotUpdateTransferLockPeriod());
 
         // When transferLockEnd is 0, it means no end time is set (transfers locked indefinitely after transferLockStart)
         // When transferLockStart is 0, it means no start time is set (transfers locked up until transferLockEnd)
@@ -178,6 +186,7 @@ abstract contract LSP8NonTransferableInitAbstract is
         transferLockEnd = newTransferLockEnd;
 
         emit TransferLockPeriodChanged({
+            nonTransferabilityEnabled: true,
             start: newTransferLockStart,
             end: newTransferLockEnd
         });

package/contracts/extensions/LSP8Revokable/ILSP8Revokable.sol

@@ -9,6 +9,15 @@ interface ILSP8Revokable {
     /// @dev Emitted when revokable status is changed.
     event RevokableStatusChanged(bool indexed enabled);
 
+    /// @dev Emitted when a token is revoked from a holder.
+    event TokenRevoked(
+        address indexed revoker,
+        address indexed from,
+        address indexed to,
+        bytes32 tokenId,
+        bytes data
+    );
+
     /// @notice Returns whether the feature to revoke tokens from users is enabled or not.
     function isRevokable() external view returns (bool);
 

package/contracts/extensions/LSP8Revokable/LSP8RevokableAbstract.sol

@@ -75,6 +75,14 @@ abstract contract LSP8RevokableAbstract is
             AccessControlUnauthorizedAccount(to, REVOKER_ROLE)
         );
 
+        emit TokenRevoked({
+            revoker: msg.sender,
+            from: from,
+            to: to,
+            tokenId: tokenId,
+            data: data
+        });
+
         // We assume revokers are trusted when specifying revocation destinations.
         // Therefore, we bypass LSP1 receiver checks.
         _transfer({

package/contracts/extensions/LSP8Revokable/LSP8RevokableInitAbstract.sol

@@ -109,9 +109,23 @@ abstract contract LSP8RevokableInitAbstract is
             AccessControlUnauthorizedAccount(to, REVOKER_ROLE)
         );
 
+        emit TokenRevoked({
+            revoker: msg.sender,
+            from: from,
+            to: to,
+            tokenId: tokenId,
+            data: data
+        });
+
         // We assume revokers are trusted when specifying revocation destinations.
         // Therefore, we bypass LSP1 receiver checks.
-        _transfer(from, to, tokenId, true, data);
+        _transfer({
+            from: from,
+            to: to,
+            tokenId: tokenId,
+            force: true,
+            data: data
+        });
     }
 
     function supportsInterface(