Skip to content

contracts-periphery: remove ownable upgradable from erc721 factory #3541

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
mergify merged 3 commits into from
Sep 23, 2022
Merged

contracts-periphery: remove ownable upgradable from erc721 factory #3541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
211238a
contracts-periphery: remove ownable upgradable from erc721 factory
tynes Sep 23, 2022
9c07c8d
Merge branch 'develop' into fix/erc721-factory
mergify[bot] Sep 23, 2022
0de41c6
Merge branch 'develop' into fix/erc721-factory
mergify[bot] Sep 23, 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
5 changes: 5 additions & 0 deletions .changeset/old-countries-lie.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-periphery': patch
---

Remove ownable upgradable from erc721 factory
21 changes: 3 additions & 18 deletions packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.15;

import {
OwnableUpgradeable
} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
import { OptimismMintableERC721 } from "./OptimismMintableERC721.sol";
import { Semver } from "@eth-optimism/contracts-bedrock/contracts/universal/Semver.sol";

/**
* @title OptimismMintableERC721Factory
* @notice Factory contract for creating OptimismMintableERC721 contracts.
*/
contract OptimismMintableERC721Factory is Semver, OwnableUpgradeable {
contract OptimismMintableERC721Factory is Semver {
/**
* @notice Emitted whenever a new OptimismMintableERC721 contract is created.
*
Expand All @@ -23,12 +20,12 @@ contract OptimismMintableERC721Factory is Semver, OwnableUpgradeable {
/**
* @notice Address of the ERC721 bridge on this network.
*/
address public bridge;
address public immutable bridge;

/**
* @notice Chain ID for the remote network.
*/
uint256 public remoteChainId;
uint256 public immutable remoteChainId;

/**
* @notice Tracks addresses created by this factory.
Expand All @@ -41,15 +38,6 @@ contract OptimismMintableERC721Factory is Semver, OwnableUpgradeable {
* @param _bridge Address of the ERC721 bridge on this network.
*/
constructor(address _bridge, uint256 _remoteChainId) Semver(1, 0, 0) {
initialize(_bridge, _remoteChainId);
}

/**
* @notice Initializes the factory.
*
* @param _bridge Address of the ERC721 bridge on this network.
*/
function initialize(address _bridge, uint256 _remoteChainId) public initializer {
require(
_bridge != address(0),
"OptimismMintableERC721Factory: bridge cannot be address(0)"
Expand All @@ -61,9 +49,6 @@ contract OptimismMintableERC721Factory is Semver, OwnableUpgradeable {

bridge = _bridge;
remoteChainId = _remoteChainId;

// Initialize upgradable OZ contracts
__Ownable_init();
}

/**
Expand Down