Skip to content

Roles Lookup and Managed Grant updates #1873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pdyraga merged 2 commits into from
Jun 23, 2020
Merged

Roles Lookup and Managed Grant updates #1873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c5c461
Use StakeDelegatable in RolesLookup
nkuba Jun 17, 2020
924acac
Added missing import in ManagedGrant
nkuba Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions solidity/contracts/ManagedGrant.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pragma solidity ^0.5.4;

import "openzeppelin-solidity/contracts/token/ERC20/ERC20Burnable.sol";
import "openzeppelin-solidity/contracts/token/ERC20/SafeERC20.sol";
import "./TokenGrant.sol";

Expand Down
8 changes: 4 additions & 4 deletions solidity/contracts/libraries/RolesLookup.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity 0.5.17;

import "../utils/AddressArrayUtils.sol";
import "../TokenStaking.sol";
import "../StakeDelegatable.sol";
import "../TokenGrant.sol";
import "../ManagedGrant.sol";

Expand All @@ -11,15 +11,15 @@ library RolesLookup {
using AddressArrayUtils for address[];

/// @notice Returns true if the tokenOwner delegated tokens to operator
/// using the provided tokenStaking contract. Othwerwise, returns false.
/// using the provided stakeDelegatable contract. Othwerwise, returns false.
/// This function works only for the case when tokenOwner own those tokens
/// and those are not tokens from a grant.
function isTokenOwnerForOperator(
address tokenOwner,
address operator,
TokenStaking tokenStaking
StakeDelegatable stakeDelegatable
) internal view returns (bool) {
return tokenStaking.ownerOf(operator) == tokenOwner;
return stakeDelegatable.ownerOf(operator) == tokenOwner;
}

/// @notice Returns true if the grantee delegated tokens to operator
Expand Down