Commit bc3a4e36 authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: bump semver

parent c25dfd9c
......@@ -2,15 +2,11 @@
pragma solidity 0.8.19;
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
import { Semver } from "../universal/Semver.sol";
import { Predeploys } from "../libraries/Predeploys.sol";
import { EIP712Verifier } from "./eip712/EIP712Verifier.sol";
import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
// prettier-ignore
import {
AccessDenied,
EMPTY_UID,
......@@ -22,7 +18,6 @@ import {
uncheckedInc
} from "./Common.sol";
// prettier-ignore
import {
Attestation,
AttestationRequest,
......@@ -85,7 +80,7 @@ contract EAS is IEAS, Semver, EIP712Verifier {
uint256[MAX_GAP - 3] private __gap;
/// @dev Creates a new EAS instance.
constructor() Semver(1, 0, 1) EIP712Verifier("EAS", "1.0.1") { }
constructor() Semver(1, 0, 2) EIP712Verifier("EAS", "1.0.1") { }
/// @inheritdoc IEAS
function getSchemaRegistry() external pure returns (ISchemaRegistry) {
......
......@@ -2,9 +2,7 @@
pragma solidity 0.8.19;
import { Semver } from "../universal/Semver.sol";
import { ISchemaResolver } from "./resolver/ISchemaResolver.sol";
import { EMPTY_UID, MAX_GAP } from "./Common.sol";
import { ISchemaRegistry, SchemaRecord } from "./ISchemaRegistry.sol";
......@@ -22,7 +20,7 @@ contract SchemaRegistry is ISchemaRegistry, Semver {
uint256[MAX_GAP - 1] private __gap;
/// @dev Creates a new SchemaRegistry instance.
constructor() Semver(1, 0, 1) { }
constructor() Semver(1, 0, 2) { }
/// @inheritdoc ISchemaRegistry
function register(string calldata schema, ISchemaResolver resolver, bool revocable) external returns (bytes32) {
......
......@@ -18,9 +18,9 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
/// @custom:legacy
OptimismPortal public PORTAL;
/// @custom:semver 1.5.0
/// @custom:semver 1.5.1
/// @notice Constructs the L1CrossDomainMessenger contract.
constructor() Semver(1, 5, 0) CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) {
constructor() Semver(1, 5, 1) CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) {
initialize({ _portal: OptimismPortal(payable(0)) });
}
......
......@@ -17,9 +17,9 @@ contract L1ERC721Bridge is ERC721Bridge, Semver {
/// by ID was deposited for a given L2 token.
mapping(address => mapping(address => mapping(uint256 => bool))) public deposits;
/// @custom:semver 1.2.0
/// @custom:semver 1.2.1
/// @notice Constructs the contract.
constructor() Semver(1, 2, 0) ERC721Bridge(Predeploys.L2_ERC721_BRIDGE) {
constructor() Semver(1, 2, 1) ERC721Bridge(Predeploys.L2_ERC721_BRIDGE) {
initialize({ _messenger: CrossDomainMessenger(address(0)) });
}
......
......@@ -67,9 +67,9 @@ contract L1StandardBridge is StandardBridge, Semver {
bytes extraData
);
/// @custom:semver 1.2.0
/// @custom:semver 1.2.1
/// @notice Constructs the L1StandardBridge contract.
constructor() Semver(1, 2, 0) StandardBridge(StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE))) {
constructor() Semver(1, 2, 1) StandardBridge(StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE))) {
initialize({ _messenger: CrossDomainMessenger(address(0)) });
}
......
......@@ -62,7 +62,7 @@ contract L2OutputOracle is Initializable, Semver {
/// @param newNextOutputIndex Next L2 output index after the deletion.
event OutputsDeleted(uint256 indexed prevNextOutputIndex, uint256 indexed newNextOutputIndex);
/// @custom:semver 1.4.0
/// @custom:semver 1.4.1
/// @notice Constructs the L2OutputOracle contract.
/// @param _submissionInterval Interval in blocks at which checkpoints must be submitted.
/// @param _l2BlockTime The time per L2 block, in seconds.
......@@ -73,7 +73,7 @@ contract L2OutputOracle is Initializable, Semver {
uint256 _l2BlockTime,
uint256 _finalizationPeriodSeconds
)
Semver(1, 4, 0)
Semver(1, 4, 1)
{
require(_l2BlockTime > 0, "L2OutputOracle: L2 block time must be greater than 0");
require(_submissionInterval > 0, "L2OutputOracle: submission interval must be greater than 0");
......
......@@ -97,9 +97,9 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
_;
}
/// @custom:semver 1.8.0
/// @custom:semver 1.8.1
/// @notice Constructs the OptimismPortal contract.
constructor() Semver(1, 8, 0) {
constructor() Semver(1, 8, 1) {
initialize({
_l2Oracle: L2OutputOracle(address(0)),
_guardian: address(0),
......
......@@ -9,7 +9,7 @@ import { FeeVault } from "../universal/FeeVault.sol";
/// @title BaseFeeVault
/// @notice The BaseFeeVault accumulates the base fee that is paid by transactions.
contract BaseFeeVault is FeeVault, Semver {
/// @custom:semver 1.3.0
/// @custom:semver 1.3.1
/// @notice Constructs the BaseFeeVault contract.
/// @param _recipient Wallet that will receive the fees.
/// @param _minWithdrawalAmount Minimum balance for withdrawals.
......@@ -20,6 +20,6 @@ contract BaseFeeVault is FeeVault, Semver {
WithdrawalNetwork _withdrawalNetwork
)
FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
Semver(1, 3, 0)
Semver(1, 3, 1)
{ }
}
......@@ -23,9 +23,9 @@ contract GasPriceOracle is Semver {
/// @notice Number of decimals used in the scalar.
uint256 public constant DECIMALS = 6;
/// @custom:semver 1.0.1
/// @custom:semver 1.0.2
/// @notice Constructs the GasPriceOracle contract.
constructor() Semver(1, 0, 1) { }
constructor() Semver(1, 0, 2) { }
/// @notice Computes the L1 portion of the fee based on the size of the rlp encoded input
/// transaction, the current L1 base fee, and the various dynamic parameters.
......
......@@ -38,9 +38,9 @@ contract L1Block is Semver {
/// @notice The scalar value applied to the L1 portion of the transaction fee.
uint256 public l1FeeScalar;
/// @custom:semver 1.0.1
/// @custom:semver 1.0.2
/// @notice Constructs the L1Block contract.
constructor() Semver(1, 0, 1) { }
constructor() Semver(1, 0, 2) { }
/// @notice Updates the L1 block values.
/// @param _number L1 blocknumber.
......
......@@ -9,7 +9,7 @@ import { FeeVault } from "../universal/FeeVault.sol";
/// @title L1FeeVault
/// @notice The L1FeeVault accumulates the L1 portion of the transaction fees.
contract L1FeeVault is FeeVault, Semver {
/// @custom:semver 1.3.0
/// @custom:semver 1.3.1
/// @notice Constructs the L1FeeVault contract.
/// @param _recipient Wallet that will receive the fees.
/// @param _minWithdrawalAmount Minimum balance for withdrawals.
......@@ -20,6 +20,6 @@ contract L1FeeVault is FeeVault, Semver {
WithdrawalNetwork _withdrawalNetwork
)
FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
Semver(1, 3, 0)
Semver(1, 3, 1)
{ }
}
......@@ -14,10 +14,10 @@ import { L2ToL1MessagePasser } from "./L2ToL1MessagePasser.sol";
/// L2 on the L2 side. Users are generally encouraged to use this contract instead of lower
/// level message passing contracts.
contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
/// @custom:semver 1.5.0
/// @custom:semver 1.5.1
/// @notice Constructs the L2CrossDomainMessenger contract.
/// @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
constructor(address _l1CrossDomainMessenger) Semver(1, 5, 0) CrossDomainMessenger(_l1CrossDomainMessenger) {
constructor(address _l1CrossDomainMessenger) Semver(1, 5, 1) CrossDomainMessenger(_l1CrossDomainMessenger) {
initialize();
}
......
......@@ -18,10 +18,10 @@ import { Semver } from "../universal/Semver.sol";
/// wait for the one-week challenge period to elapse before their Optimism-native NFT
/// can be refunded on L2.
contract L2ERC721Bridge is ERC721Bridge, Semver {
/// @custom:semver 1.2.0
/// @custom:semver 1.2.1
/// @notice Constructs the L2ERC721Bridge contract.
/// @param _otherBridge Address of the ERC721 bridge on the other network.
constructor(address _otherBridge) Semver(1, 2, 0) ERC721Bridge(_otherBridge) {
constructor(address _otherBridge) Semver(1, 2, 1) ERC721Bridge(_otherBridge) {
initialize({ _messenger: CrossDomainMessenger(address(0)) });
}
......
......@@ -51,10 +51,10 @@ contract L2StandardBridge is StandardBridge, Semver {
bytes extraData
);
/// @custom:semver 1.2.0
/// @custom:semver 1.2.1
/// @notice Constructs the L2StandardBridge contract.
/// @param _otherBridge Address of the L1StandardBridge.
constructor(StandardBridge _otherBridge) Semver(1, 2, 0) StandardBridge(_otherBridge) {
constructor(StandardBridge _otherBridge) Semver(1, 2, 1) StandardBridge(_otherBridge) {
initialize();
}
......
......@@ -48,9 +48,9 @@ contract L2ToL1MessagePasser is Semver {
/// @param amount Amount of ETh that was burned.
event WithdrawerBalanceBurnt(uint256 indexed amount);
/// @custom:semver 1.0.1
/// @custom:semver 1.0.2
/// @notice Constructs the L2ToL1MessagePasser contract.
constructor() Semver(1, 0, 1) { }
constructor() Semver(1, 0, 2) { }
/// @notice Allows users to withdraw ETH by sending directly to this contract.
receive() external payable {
......
......@@ -10,7 +10,7 @@ import { FeeVault } from "../universal/FeeVault.sol";
/// @notice The SequencerFeeVault is the contract that holds any fees paid to the Sequencer during
/// transaction processing and block production.
contract SequencerFeeVault is FeeVault, Semver {
/// @custom:semver 1.3.0
/// @custom:semver 1.3.1
/// @notice Constructs the SequencerFeeVault contract.
/// @param _recipient Wallet that will receive the fees.
/// @param _minWithdrawalAmount Minimum balance for withdrawals.
......@@ -21,7 +21,7 @@ contract SequencerFeeVault is FeeVault, Semver {
WithdrawalNetwork _withdrawalNetwork
)
FeeVault(_recipient, _minWithdrawalAmount, _withdrawalNetwork)
Semver(1, 3, 0)
Semver(1, 3, 1)
{ }
/// @custom:legacy
......
......@@ -35,7 +35,7 @@ contract DisputeGameFactory is OwnableUpgradeable, IDisputeGameFactory, Semver {
GameId[] internal _disputeGameList;
/// @notice constructs a new DisputeGameFactory contract.
constructor() OwnableUpgradeable() Semver(0, 0, 3) {
constructor() OwnableUpgradeable() Semver(0, 0, 4) {
initialize(address(0));
}
......
......@@ -95,7 +95,7 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, Semver {
L2OutputOracle _l2oo,
BlockOracle _blockOracle
)
Semver(0, 0, 7)
Semver(0, 0, 8)
{
GAME_TYPE = _gameType;
ABSOLUTE_PRESTATE = _absolutePrestate;
......
......@@ -40,8 +40,8 @@ contract DeployerWhitelist is Semver {
_;
}
/// @custom:semver 1.0.1
constructor() Semver(1, 0, 1) { }
/// @custom:semver 1.0.2
constructor() Semver(1, 0, 2) { }
/// @notice Adds or removes an address from the deployment whitelist.
/// @param _deployer Address to update permissions for.
......
......@@ -14,8 +14,8 @@ import { Semver } from "../universal/Semver.sol";
/// If you want to access the L1 block number going forward, you should use the L1Block
/// contract instead.
contract L1BlockNumber is Semver {
/// @custom:semver 1.0.1
constructor() Semver(1, 0, 1) { }
/// @custom:semver 1.0.2
constructor() Semver(1, 0, 2) { }
/// @notice Returns the L1 block number.
receive() external payable {
......
......@@ -13,8 +13,8 @@ contract LegacyMessagePasser is Semver {
/// @notice Mapping of sent message hashes to boolean status.
mapping(bytes32 => bool) public sentMessages;
/// @custom:semver 1.0.1
constructor() Semver(1, 0, 1) { }
/// @custom:semver 1.0.2
constructor() Semver(1, 0, 2) { }
/// @notice Passes a message to L1.
/// @param _message Message to pass to L1.
......
......@@ -28,12 +28,12 @@ contract OptimismMintableERC20Factory is Semver {
/// @param deployer Address of the account that deployed the token.
event OptimismMintableERC20Created(address indexed localToken, address indexed remoteToken, address deployer);
/// @custom:semver 1.1.1
/// @custom:semver 1.1.2
/// @notice The semver MUST be bumped any time that there is a change in
/// the OptimismMintableERC20 token contract since this contract
/// is responsible for deploying OptimismMintableERC20 contracts.
/// @param _bridge Address of the StandardBridge on this chain.
constructor(address _bridge) Semver(1, 1, 1) {
constructor(address _bridge) Semver(1, 1, 2) {
BRIDGE = _bridge;
}
......
......@@ -31,7 +31,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
_;
}
/// @custom:semver 1.1.1
/// @custom:semver 1.1.2
/// @param _bridge Address of the bridge on this network.
/// @param _remoteChainId Chain ID where the remote token is deployed.
/// @param _remoteToken Address of the corresponding token on the other network.
......@@ -45,7 +45,7 @@ contract OptimismMintableERC721 is ERC721Enumerable, IOptimismMintableERC721, Se
string memory _symbol
)
ERC721(_name, _symbol)
Semver(1, 1, 1)
Semver(1, 1, 2)
{
require(_bridge != address(0), "OptimismMintableERC721: bridge cannot be address(0)");
require(_remoteChainId != 0, "OptimismMintableERC721: remote chain id cannot be zero");
......
......@@ -22,13 +22,13 @@ contract OptimismMintableERC721Factory is Semver {
/// @param deployer Address of the initiator of the deployment
event OptimismMintableERC721Created(address indexed localToken, address indexed remoteToken, address deployer);
/// @custom:semver 1.2.1
/// @custom:semver 1.2.2
/// @notice The semver MUST be bumped any time that there is a change in
/// the OptimismMintableERC721 token contract since this contract
/// is responsible for deploying OptimismMintableERC721 contracts.
/// @param _bridge Address of the ERC721 bridge on this network.
/// @param _remoteChainId Chain ID for the remote network.
constructor(address _bridge, uint256 _remoteChainId) Semver(1, 2, 1) {
constructor(address _bridge, uint256 _remoteChainId) Semver(1, 2, 2) {
BRIDGE = _bridge;
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