fix

taikoxyz · May 2, 2024 · fb92b25 · fb92b25
1 parent ba9c507
commit fb92b25
Show file tree

Hide file tree

Showing 4 changed files with 9,477 additions and 7,611 deletions.
diff --git a/packages/protocol/contracts/tko/BridgedTaikoToken.sol b/packages/protocol/contracts/tko/BridgedTaikoToken.sol
@@ -43,7 +43,7 @@ contract BridgedTaikoToken is TaikoTokenBase, IBridgedERC20 {
     }
 
     function owner() public view override(IBridgedERC20, OwnableUpgradeable) returns (address) {
-        return super.owner();
+        return OwnableUpgradeable.owner();
     }
 
     /// @notice Checks if the contract supports the given interface.

diff --git a/packages/protocol/contracts/tokenvault/BridgedERC20.sol b/packages/protocol/contracts/tokenvault/BridgedERC20.sol
@@ -158,7 +158,7 @@ contract BridgedERC20 is EssentialContract, IBridgedERC20, ERC20Upgradeable, IER
     /// @notice Returns the owner.
     /// @return The address of the owner.
     function owner() public view override(IBridgedERC20, OwnableUpgradeable) returns (address) {
-        return super.owner();
+        return OwnableUpgradeable.owner();
     }
 
     /// @notice Checks if the contract supports the given interface.

diff --git a/packages/protocol/contracts/tokenvault/ERC1155Vault.sol b/packages/protocol/contracts/tokenvault/ERC1155Vault.sol
@@ -192,16 +192,17 @@ contract ERC1155Vault is BaseNFTVault, ERC1155ReceiverUpgradeable {
     }
 
     /// @dev See {BaseVault-supportsInterface}.
-    /// @param interfaceId The interface identifier.
+    /// @param _interfaceId The interface identifier.
     /// @return true if supports, else otherwise.
-    function supportsInterface(bytes4 interfaceId)
+    function supportsInterface(bytes4 _interfaceId)
         public
         view
         override(BaseVault, ERC1155ReceiverUpgradeable)
         returns (bool)
     {
-        return interfaceId == type(ERC1155ReceiverUpgradeable).interfaceId
-            || super.supportsInterface(interfaceId);
+        // Here we cannot user `super.supportsInterface(_interfaceId)`
+        return BaseVault.supportsInterface(_interfaceId)
+            || ERC1155ReceiverUpgradeable.supportsInterface(_interfaceId);
     }
 
     /// @inheritdoc BaseVault