Fix crash if delegate.xyz doesn't support current chain

EthSign · Apr 19, 2024 · 8da5ec1 · 8da5ec1
1 parent 05181cc
commit 8da5ec1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/contracts/core/TokenTableUnlockerV2.sol b/contracts/core/TokenTableUnlockerV2.sol
@@ -36,6 +36,7 @@ contract TokenTableUnlockerV2 is
         bool isCancelable;
         bool isHookable;
         bool isWithdrawable;
+        bool currentChainSupportsExternalDelegateRegistry;
         mapping(bytes32 => Preset) _presets;
         mapping(uint256 => Actual) actuals;
         mapping(uint256 => uint256) pendingAmountClaimableForCancelledActuals;
@@ -165,6 +166,7 @@ contract TokenTableUnlockerV2 is
         for (uint256 i = 0; i < actualIds.length; i++) {
             if (
                 !callerIsClaimingDelegate &&
+                $.currentChainSupportsExternalDelegateRegistry &&
                 !externalDelegateRegistry.checkDelegateForContract(
                     _msgSender(),
                     $.futureToken.ownerOf(actualIds[i]),
@@ -239,6 +241,14 @@ contract TokenTableUnlockerV2 is
         emit ClaimingDelegateSet(delegate, status);
     }
 
+    function setCurrentChainSupportsExternalDelegateRegistry(
+        bool status
+    ) external override onlyOwner {
+        TokenTableUnlockerV2Storage
+            storage $ = _getTokenTableUnlockerV2Storage();
+        $.currentChainSupportsExternalDelegateRegistry = status;
+    }
+
     function disableCreate() external virtual override onlyOwner {
         TokenTableUnlockerV2Storage
             storage $ = _getTokenTableUnlockerV2Storage();
@@ -464,7 +474,18 @@ contract TokenTableUnlockerV2 is
     }
 
     function version() external pure returns (string memory) {
-        return "2.5.7";
+        return "2.6.0";
+    }
+
+    function currentChainSupportsExternalDelegateRegistry()
+        public
+        view
+        override
+        returns (bool)
+    {
+        TokenTableUnlockerV2Storage
+            storage $ = _getTokenTableUnlockerV2Storage();
+        return $.currentChainSupportsExternalDelegateRegistry;
     }
 
     function calculateAmountClaimable(

diff --git a/contracts/interfaces/ITokenTableUnlockerV2.sol b/contracts/interfaces/ITokenTableUnlockerV2.sol
@@ -191,6 +191,13 @@ abstract contract ITokenTableUnlockerV2 is IOwnable, IVersionable {
         bool status
     ) external virtual;
 
+    /**
+     * @notice Sets if the current chain is supported by delegate.xyz
+     */
+    function setCurrentChainSupportsExternalDelegateRegistry(
+        bool status
+    ) external virtual;
+
     /**
      * @notice Permanently disables the `createActuals()` function.
      * @dev Only callable by the owner.
@@ -294,6 +301,15 @@ abstract contract ITokenTableUnlockerV2 is IOwnable, IVersionable {
      */
     function BIPS_PRECISION() external pure virtual returns (uint256);
 
+    /**
+     * @notice Returns if the current chain is supported by delegate.xyz
+     */
+    function currentChainSupportsExternalDelegateRegistry()
+        public
+        view
+        virtual
+        returns (bool);
+
     /**
      * @notice Calculates the amount of unlocked tokens that have yet to be claimed in an actual unlocking schedule.
      * @dev This is the most complex part of the smart contract. Quite a bit of calculations are performed here.