Skip to content
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

Develop > Main #20

Merged
merged 2 commits into from
Oct 12, 2022
Merged

Develop > Main #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3eb259
add changeowner
adsorptionenthalpy Oct 11, 2022
59577a6
Merge pull request #19 from fioprotocol/changeowner
ericbutz Oct 12, 2022
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
10 changes: 7 additions & 3 deletions contracts/fionft.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ contract FIONFT is ERC721, Pausable, AccessControl {
require(!approvals[hash].approved[msg.sender], "sender has already approved this hash");
approvals[hash].approved[msg.sender] = true;
approvals[hash].approvals++;
//moving this if block after the parent if block will allow the execution to take place immediately instead of requiring a subsequent call
//moving this if block after the parent if block will allow the execution to take place immediately instead of requiring a subsequent call
if (approvals[hash].approvals >= APPROVALS_NEEDED) {
require(approvals[hash].approved[msg.sender], "An approver must execute");
approvals[hash].complete = true;
Expand Down Expand Up @@ -294,9 +294,13 @@ contract FIONFT is ERC721, Pausable, AccessControl {
// Don't accept ETH
// ------------------------------------------------------------------------


receive () external payable {
revert();
}

}
function changeOwner(address account) external onlyRole(OWNER_ROLE) {
_revokeRole(OWNER_ROLE, msg.sender);
_grantRole(OWNER_ROLE, account);
}

}