Skip to content

fix: ERC725X and ERC725Y inherit Ownable first #48

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
frozeman merged 1 commit into from
Sep 14, 2021
Merged

fix: ERC725X and ERC725Y inherit Ownable first #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: ERC725X and ERC725Y inherit Ownable first 
this solves a solc compile error `TypeError: Linearization of inheritance graph impossible` by inheriting the "most base-like" contracts first to prevent errors from inheriting contract. See a similar fix here OpenZeppelin/openzeppelin-contracts#1128
  • Loading branch information
@mattgstevens
mattgstevens committed Sep 14, 2021
commit 4a95fcdf2a76152936cdbd248ea789a5050ecbc0
2 changes: 1 addition & 1 deletion implementations/contracts/ERC725/ERC725X.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";
*
* @author Fabian Vogelsteller <[email protected]>
*/
contract ERC725X is ERC725XCore, Ownable {
contract ERC725X is Ownable, ERC725XCore {
/**
* @notice Sets the owner of the contract
* @param _newOwner the owner of the contract.
Expand Down
2 changes: 1 addition & 1 deletion implementations/contracts/ERC725/ERC725Y.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";
*
* @author Fabian Vogelsteller <[email protected]>
*/
contract ERC725Y is ERC725YCore, Ownable {
contract ERC725Y is Ownable, ERC725YCore {
/**
* @notice Sets the owner of the contract
* @param _newOwner the owner of the contract.
Expand Down