Commit c19b77f3 authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: semver

parent c241ba6d
...@@ -248,10 +248,10 @@ OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds() ...@@ -248,10 +248,10 @@ OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_succeeds()
OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418) OptimismMintableERC721Factory_Test:test_createOptimismMintableERC721_zeroRemoteToken_reverts() (gas: 9418)
OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966) OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966)
OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832) OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832)
OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28301) OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 29003)
OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11143) OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11143)
OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524) OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524)
OptimismMintableERC721_Test:test_supportsInterfaces_succeeds() (gas: 8886) OptimismMintableERC721_Test:test_supportsInterfaces_succeeds() (gas: 9027)
OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163441) OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163441)
OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580) OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390) OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
......
...@@ -50,21 +50,21 @@ contract OptimismMintableERC721_Test is ERC721Bridge_Initializer { ...@@ -50,21 +50,21 @@ contract OptimismMintableERC721_Test is ERC721Bridge_Initializer {
assertEq(L2Token.REMOTE_TOKEN(), address(L1Token)); assertEq(L2Token.REMOTE_TOKEN(), address(L1Token));
assertEq(L2Token.BRIDGE(), address(L2Bridge)); assertEq(L2Token.BRIDGE(), address(L2Bridge));
assertEq(L2Token.REMOTE_CHAIN_ID(), 1); assertEq(L2Token.REMOTE_CHAIN_ID(), 1);
assertEq(L2Token.version(), "1.0.0"); assertEq(L2Token.version(), "1.1.0");
} }
function test_supportsInterfaces_succeeds() external view { /**
* @notice Ensure that the contract supports the expected interfaces.
*/
function test_supportsInterfaces_succeeds() external {
// Checks if the contract supports the IOptimismMintableERC721 interface. // Checks if the contract supports the IOptimismMintableERC721 interface.
assert(L2Token.supportsInterface(type(IOptimismMintableERC721).interfaceId)); assertTrue(L2Token.supportsInterface(type(IOptimismMintableERC721).interfaceId));
// Checks if the contract supports the IERC721Enumerable interface. // Checks if the contract supports the IERC721Enumerable interface.
assert(L2Token.supportsInterface(type(IERC721Enumerable).interfaceId)); assertTrue(L2Token.supportsInterface(type(IERC721Enumerable).interfaceId));
// Checks if the contract supports the IERC721 interface. // Checks if the contract supports the IERC721 interface.
assert(L2Token.supportsInterface(type(IERC721).interfaceId)); assertTrue(L2Token.supportsInterface(type(IERC721).interfaceId));
// Checks if the contract supports the IERC165 interface. // Checks if the contract supports the IERC165 interface.
assert(L2Token.supportsInterface(type(IERC165).interfaceId)); assertTrue(L2Token.supportsInterface(type(IERC165).interfaceId));
} }
function test_safeMint_succeeds() external { function test_safeMint_succeeds() external {
......
...@@ -46,7 +46,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se ...@@ -46,7 +46,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
} }
/** /**
* @custom:semver 1.0.0 * @custom:semver 1.1.0
* *
* @param _bridge Address of the bridge on this network. * @param _bridge Address of the bridge on this network.
* @param _remoteChainId Chain ID where the remote token is deployed. * @param _remoteChainId Chain ID where the remote token is deployed.
...@@ -60,7 +60,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se ...@@ -60,7 +60,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
address _remoteToken, address _remoteToken,
string memory _name, string memory _name,
string memory _symbol string memory _symbol
) ERC721(_name, _symbol) Semver(1, 0, 0) { ) ERC721(_name, _symbol) Semver(1, 1, 0) {
require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)"); require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero"); require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero");
require( require(
......
...@@ -38,7 +38,7 @@ contract OptimismMintableERC721Factory is Semver { ...@@ -38,7 +38,7 @@ contract OptimismMintableERC721Factory is Semver {
); );
/** /**
* @custom:semver 1.1.0 * @custom:semver 1.2.0
* @notice The semver MUST be bumped any time that there is a change in * @notice The semver MUST be bumped any time that there is a change in
* the OptimismMintableERC721 token contract since this contract * the OptimismMintableERC721 token contract since this contract
* is responsible for deploying OptimismMintableERC721 contracts. * is responsible for deploying OptimismMintableERC721 contracts.
...@@ -46,7 +46,7 @@ contract OptimismMintableERC721Factory is Semver { ...@@ -46,7 +46,7 @@ contract OptimismMintableERC721Factory is Semver {
* @param _bridge Address of the ERC721 bridge on this network. * @param _bridge Address of the ERC721 bridge on this network.
* @param _remoteChainId Chain ID for the remote network. * @param _remoteChainId Chain ID for the remote network.
*/ */
constructor(address _bridge, uint256 _remoteChainId) Semver(1, 1, 0) { constructor(address _bridge, uint256 _remoteChainId) Semver(1, 2, 0) {
BRIDGE = _bridge; BRIDGE = _bridge;
REMOTE_CHAIN_ID = _remoteChainId; REMOTE_CHAIN_ID = _remoteChainId;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment