fix: ERC725X and ERC725Y inherit Ownable first

mattgstevens · mattgstevens · commit 4a95fcdf2a76 · 2021-09-14T12:38:47.000Z
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
diff --git a/implementations/contracts/ERC725/ERC725X.sol b/implementations/contracts/ERC725/ERC725X.sol
@@ -16,7 +16,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";
  *
  *  @author Fabian Vogelsteller <fabian@lukso.network>
  */
-contract ERC725X is ERC725XCore, Ownable {
+contract ERC725X is Ownable, ERC725XCore {
     /**
      * @notice Sets the owner of the contract
      * @param _newOwner the owner of the contract.
diff --git a/implementations/contracts/ERC725/ERC725Y.sol b/implementations/contracts/ERC725/ERC725Y.sol
@@ -16,7 +16,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";
  *
  *  @author Fabian Vogelsteller <fabian@lukso.network>
  */
-contract ERC725Y is ERC725YCore, Ownable {
+contract ERC725Y is Ownable, ERC725YCore {
     /**
      * @notice Sets the owner of the contract
      * @param _newOwner the owner of the contract.

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import "@openzeppelin/contracts/access/Ownable.sol";`
`16`	`16`	`*`
`17`	`17`	`* @author Fabian Vogelsteller <[email protected]>`
`18`	`18`	`*/`
`19`		`-contract ERC725X is ERC725XCore, Ownable {`
	`19`	`+contract ERC725X is Ownable, ERC725XCore {`
`20`	`20`	`/**`
`21`	`21`	`* @notice Sets the owner of the contract`
`22`	`22`	`* @param _newOwner the owner of the contract.`