From 99c5d83699f00476aacfabe26a2f4a3967f8e11b Mon Sep 17 00:00:00 2001 From: Diego <105765223+0xfuturistic@users.noreply.github.com> Date: Thu, 18 Apr 2024 22:09:43 -0300 Subject: [PATCH] contracts-bedrock: add -beta+custom-gas-token to semver of PR-modified contracts --- .../contracts-bedrock/src/L1/L1CrossDomainMessenger.sol | 4 ++-- packages/contracts-bedrock/src/L1/L1StandardBridge.sol | 4 ++-- packages/contracts-bedrock/src/L1/OptimismPortal.sol | 4 ++-- packages/contracts-bedrock/src/L1/SystemConfig.sol | 4 ++-- packages/contracts-bedrock/src/L2/L1Block.sol | 6 +++--- .../contracts-bedrock/src/L2/L2CrossDomainMessenger.sol | 4 ++-- packages/contracts-bedrock/src/L2/L2StandardBridge.sol | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol index d9a071eddf9b..3140f1e6d614 100644 --- a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol +++ b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol @@ -25,8 +25,8 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver { SystemConfig public systemConfig; /// @notice Semantic version. - /// @custom:semver 2.4.0 - string public constant version = "2.4.0"; + /// @custom:semver 2.3.0-beta+custom-gas-token + string public constant version = "2.3.0-beta+custom-gas-token"; /// @notice Constructs the L1CrossDomainMessenger contract. constructor() CrossDomainMessenger() { diff --git a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol index 2b2ab1ccb980..a734b529f420 100644 --- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol +++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol @@ -72,8 +72,8 @@ contract L1StandardBridge is StandardBridge, ISemver { ); /// @notice Semantic version. - /// @custom:semver 2.2.0 - string public constant version = "2.2.0"; + /// @custom:semver 2.1.0-beta+custom-gas-token + string public constant version = "2.1.0-beta+custom-gas-token"; /// @notice Address of the SuperchainConfig contract. SuperchainConfig public superchainConfig; diff --git a/packages/contracts-bedrock/src/L1/OptimismPortal.sol b/packages/contracts-bedrock/src/L1/OptimismPortal.sol index 99e81d4cc9d5..8661a16859a1 100644 --- a/packages/contracts-bedrock/src/L1/OptimismPortal.sol +++ b/packages/contracts-bedrock/src/L1/OptimismPortal.sol @@ -103,8 +103,8 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver { } /// @notice Semantic version. - /// @custom:semver 2.6.0 - string public constant version = "2.6.0"; + /// @custom:semver 2.6.0-beta+custom-gas-token + string public constant version = "2.6.0-beta+custom-gas-token"; /// @notice Constructs the OptimismPortal contract. constructor() { diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol index daba03c3541b..14bf076e766a 100644 --- a/packages/contracts-bedrock/src/L1/SystemConfig.sol +++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol @@ -109,8 +109,8 @@ contract SystemConfig is OwnableUpgradeable, ISemver { event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data); /// @notice Semantic version. - /// @custom:semver 1.12.0 - string public constant version = "1.12.0"; + /// @custom:semver 1.12.0-beta+custom-gas-token + string public constant version = "1.12.0-beta+custom-gas-token"; /// @notice Constructs the SystemConfig contract. Cannot set /// the owner to `address(0)` due to the Ownable contract's diff --git a/packages/contracts-bedrock/src/L2/L1Block.sol b/packages/contracts-bedrock/src/L2/L1Block.sol index e9158d26c12b..e89b94c772c2 100644 --- a/packages/contracts-bedrock/src/L2/L1Block.sol +++ b/packages/contracts-bedrock/src/L2/L1Block.sol @@ -58,6 +58,9 @@ contract L1Block is ISemver { /// @notice The latest L1 blob base fee. uint256 public blobBaseFee; + /// @custom:semver 1.2.0-beta+custom-gas-token + string public constant version = "1.2.0-beta+custom-gas-token"; + /// @notice Returns the gas paying token, its decimals, name and symbol. /// If nothing is set in state, then it means ether is used. function gasPayingToken() public view returns (address addr_, uint8 decimals_) { @@ -83,9 +86,6 @@ contract L1Block is ISemver { return token != Constants.ETHER; } - /// @custom:semver 1.3.0 - string public constant version = "1.3.0"; - /// @custom:legacy /// @notice Updates the L1 block values. /// @param _number L1 blocknumber. diff --git a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol index e5e003de3181..0bc02b448490 100644 --- a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol +++ b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol @@ -17,8 +17,8 @@ import { Predeploys } from "src/libraries/Predeploys.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, ISemver { - /// @custom:semver 2.0.0 - string public constant version = "2.1.0"; + /// @custom:semver 2.0.0-beta+custom-gas-token + string public constant version = "2.0.0-beta+custom-gas-token"; /// @notice Constructs the L2CrossDomainMessenger contract. constructor() CrossDomainMessenger() { diff --git a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol index 923e580074bb..01a9b3ac4ea6 100644 --- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol +++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol @@ -52,8 +52,8 @@ contract L2StandardBridge is StandardBridge, ISemver { bytes extraData ); - /// @custom:semver 1.9.0 - string public constant version = "1.9.0"; + /// @custom:semver 1.8.0-beta+custom-gas-token + string public constant version = "1.8.0-beta+custom-gas-token"; /// @notice Constructs the L2StandardBridge contract. constructor() StandardBridge() {