Skip to content

Commit 9170e93

Browse files
smartcontractssmartcontracts
authored
maint: move existing interfaces to folders (ethereum-optimism#11749)
Moves any existing interfaces that are not already inside of their corresponding /interfaces folders into those folders.
1 parent 4fbe14f commit 9170e93

File tree

74 files changed

+183
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+183
-183
lines changed

‎packages/contracts-bedrock/semver-lock.json

+71-71
Large diffs are not rendered by default.

‎packages/contracts-bedrock/src/EAS/EAS.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.19;
33

44
import { Address } from "@openzeppelin/contracts/utils/Address.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { Predeploys } from "src/libraries/Predeploys.sol";
77
import { EIP1271Verifier } from "src/EAS/eip1271/EIP1271Verifier.sol";
88
import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";

‎packages/contracts-bedrock/src/EAS/SchemaRegistry.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.19;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { ISchemaResolver } from "src/EAS/resolver/ISchemaResolver.sol";
66
import { EMPTY_UID, MAX_GAP } from "src/EAS/Common.sol";
77
import { ISchemaRegistry, SchemaRecord } from "src/EAS/ISchemaRegistry.sol";

‎packages/contracts-bedrock/src/L1/DataAvailabilityChallenge.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.15;
33

44
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { SafeCall } from "src/libraries/SafeCall.sol";
77

88
/// @dev An enum representing the status of a DA challenge.

‎packages/contracts-bedrock/src/L1/DelayedVetoable.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55

66
/// @title DelayedVetoable
77
/// @notice This contract enables a delay before a call is forwarded to a target contract, and during the delay period
@@ -68,8 +68,8 @@ contract DelayedVetoable is ISemver {
6868
}
6969

7070
/// @notice Semantic version.
71-
/// @custom:semver 1.0.0
72-
string public constant version = "1.0.0";
71+
/// @custom:semver 1.0.1-beta.1
72+
string public constant version = "1.0.1-beta.1";
7373

7474
/// @notice Sets the target admin during contract deployment.
7575
/// @param vetoer_ Address of the vetoer.

‎packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
44
import { Predeploys } from "src/libraries/Predeploys.sol";
55
import { OptimismPortal } from "src/L1/OptimismPortal.sol";
66
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
7-
import { ISemver } from "src/universal/ISemver.sol";
7+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
88
import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
99
import { SystemConfig } from "src/L1/SystemConfig.sol";
1010

‎packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
44
import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
55
import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
66
import { L2ERC721Bridge } from "src/L2/L2ERC721Bridge.sol";
7-
import { ISemver } from "src/universal/ISemver.sol";
7+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
88
import { Predeploys } from "src/libraries/Predeploys.sol";
99
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
1010
import { StandardBridge } from "src/universal/StandardBridge.sol";

‎packages/contracts-bedrock/src/L1/L1StandardBridge.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
33

44
import { Predeploys } from "src/libraries/Predeploys.sol";
55
import { StandardBridge } from "src/universal/StandardBridge.sol";
6-
import { ISemver } from "src/universal/ISemver.sol";
6+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
77
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
88
import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
99
import { OptimismPortal } from "src/L1/OptimismPortal.sol";

‎packages/contracts-bedrock/src/L1/L2OutputOracle.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.15;
33

44
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { Types } from "src/libraries/Types.sol";
77
import { Constants } from "src/libraries/Constants.sol";
88

‎packages/contracts-bedrock/src/L1/OPStackManager.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { SystemConfig } from "src/L1/SystemConfig.sol";
66

77
/// @custom:proxied true

‎packages/contracts-bedrock/src/L1/OptimismPortal.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Hashing } from "src/libraries/Hashing.sol";
1212
import { SecureMerkleTrie } from "src/libraries/trie/SecureMerkleTrie.sol";
1313
import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
1414
import { ResourceMetering } from "src/L1/ResourceMetering.sol";
15-
import { ISemver } from "src/universal/ISemver.sol";
15+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
1616
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
1717
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
1818
import { L1Block } from "src/L2/L1Block.sol";

‎packages/contracts-bedrock/src/L1/OptimismPortal2.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { Hashing } from "src/libraries/Hashing.sol";
1212
import { SecureMerkleTrie } from "src/libraries/trie/SecureMerkleTrie.sol";
1313
import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
1414
import { ResourceMetering } from "src/L1/ResourceMetering.sol";
15-
import { ISemver } from "src/universal/ISemver.sol";
15+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
1616
import { Constants } from "src/libraries/Constants.sol";
1717
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
1818
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

‎packages/contracts-bedrock/src/L1/ProtocolVersions.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.15;
33

44
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { Storage } from "src/libraries/Storage.sol";
77
import { Constants } from "src/libraries/Constants.sol";
88

‎packages/contracts-bedrock/src/L1/SuperchainConfig.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.15;
33

44
import { Initializable } from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { Storage } from "src/libraries/Storage.sol";
77

88
/// @custom:proxied true

‎packages/contracts-bedrock/src/L1/SystemConfig.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity 0.8.15;
33

44
import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
5-
import { ISemver } from "src/universal/ISemver.sol";
5+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
66
import { ResourceMetering } from "src/L1/ResourceMetering.sol";
77
import { Storage } from "src/libraries/Storage.sol";
88
import { Constants } from "src/libraries/Constants.sol";

‎packages/contracts-bedrock/src/L2/BaseFeeVault.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { FeeVault } from "src/universal/FeeVault.sol";
66

77
/// @custom:proxied true

‎packages/contracts-bedrock/src/L2/CrossL2Inbox.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity 0.8.25;
33

44
import { Predeploys } from "src/libraries/Predeploys.sol";
55
import { TransientContext, TransientReentrancyAware } from "src/libraries/TransientContext.sol";
6-
import { ISemver } from "src/universal/ISemver.sol";
7-
import { ICrossL2Inbox } from "src/L2/ICrossL2Inbox.sol";
6+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
7+
import { ICrossL2Inbox } from "src/L2/interfaces/ICrossL2Inbox.sol";
88
import { SafeCall } from "src/libraries/SafeCall.sol";
99
import { IDependencySet } from "src/L2/interfaces/IDependencySet.sol";
1010

‎packages/contracts-bedrock/src/L2/ETHLiquidity.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErro
55
import { Predeploys } from "src/libraries/Predeploys.sol";
66
import { L1Block } from "src/L2/L1Block.sol";
77
import { SafeSend } from "src/universal/SafeSend.sol";
8-
import { ISemver } from "src/universal/ISemver.sol";
8+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
99

1010
/// @title ETHLiquidity
1111
/// @notice The ETHLiquidity contract allows other contracts to access ETH liquidity without
@@ -18,8 +18,8 @@ contract ETHLiquidity is ISemver {
1818
event LiquidityMinted(address indexed caller, uint256 value);
1919

2020
/// @notice Semantic version.
21-
/// @custom:semver 1.0.0-beta.1
22-
string public constant version = "1.0.0-beta.1";
21+
/// @custom:semver 1.0.0-beta.2
22+
string public constant version = "1.0.0-beta.2";
2323

2424
/// @notice Allows an address to lock ETH liquidity into this contract.
2525
function burn() external payable {

‎packages/contracts-bedrock/src/L2/GasPriceOracle.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { Predeploys } from "src/libraries/Predeploys.sol";
66
import { L1Block } from "src/L2/L1Block.sol";
77
import { Constants } from "src/libraries/Constants.sol";

‎packages/contracts-bedrock/src/L2/L1Block.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { Constants } from "src/libraries/Constants.sol";
66
import { GasPayingToken, IGasToken } from "src/libraries/GasPayingToken.sol";
77
import "src/libraries/L1BlockErrors.sol";

‎packages/contracts-bedrock/src/L2/L1FeeVault.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { FeeVault } from "src/universal/FeeVault.sol";
66

77
/// @custom:proxied true

‎packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
44
import { AddressAliasHelper } from "src/vendor/AddressAliasHelper.sol";
55
import { Predeploys } from "src/libraries/Predeploys.sol";
66
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
7-
import { ISemver } from "src/universal/ISemver.sol";
7+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
88
import { L2ToL1MessagePasser } from "src/L2/L2ToL1MessagePasser.sol";
99
import { Constants } from "src/libraries/Constants.sol";
1010
import { L1Block } from "src/L2/L1Block.sol";

‎packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ pragma solidity 0.8.15;
44
import { ERC721Bridge } from "src/universal/ERC721Bridge.sol";
55
import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
66
import { L1ERC721Bridge } from "src/L1/L1ERC721Bridge.sol";
7-
import { IOptimismMintableERC721 } from "src/universal/IOptimismMintableERC721.sol";
7+
import { IOptimismMintableERC721 } from "src/universal/interfaces/IOptimismMintableERC721.sol";
88
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
9-
import { ISemver } from "src/universal/ISemver.sol";
9+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
1010
import { Constants } from "src/libraries/Constants.sol";
1111
import { Predeploys } from "src/libraries/Predeploys.sol";
1212

‎packages/contracts-bedrock/src/L2/L2StandardBridge.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity 0.8.15;
33

44
import { Predeploys } from "src/libraries/Predeploys.sol";
55
import { StandardBridge } from "src/universal/StandardBridge.sol";
6-
import { ISemver } from "src/universal/ISemver.sol";
6+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
77
import { OptimismMintableERC20 } from "src/universal/OptimismMintableERC20.sol";
88
import { CrossDomainMessenger } from "src/universal/CrossDomainMessenger.sol";
99
import { L1Block } from "src/L2/L1Block.sol";

‎packages/contracts-bedrock/src/L2/L2StandardBridgeInterop.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Predeploys } from "src/libraries/Predeploys.sol";
55
import { L2StandardBridge } from "src/L2/L2StandardBridge.sol";
66
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
77
import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
8-
import { IOptimismERC20Factory } from "src/L2/IOptimismERC20Factory.sol";
8+
import { IOptimismERC20Factory } from "src/L2/interfaces/IOptimismERC20Factory.sol";
99

1010
/// @notice Thrown when the decimals of the tokens are not the same.
1111
error InvalidDecimals();

‎packages/contracts-bedrock/src/L2/L2ToL1MessagePasser.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Types } from "src/libraries/Types.sol";
55
import { Hashing } from "src/libraries/Hashing.sol";
66
import { Encoding } from "src/libraries/Encoding.sol";
77
import { Burn } from "src/libraries/Burn.sol";
8-
import { ISemver } from "src/universal/ISemver.sol";
8+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
99

1010
/// @custom:proxied true
1111
/// @custom:predeploy 0x4200000000000000000000000000000000000016

‎packages/contracts-bedrock/src/L2/L2ToL2CrossDomainMessenger.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ pragma solidity 0.8.25;
44
import { Encoding } from "src/libraries/Encoding.sol";
55
import { Predeploys } from "src/libraries/Predeploys.sol";
66
import { CrossL2Inbox } from "src/L2/CrossL2Inbox.sol";
7-
import { IL2ToL2CrossDomainMessenger } from "src/L2/IL2ToL2CrossDomainMessenger.sol";
8-
import { ISemver } from "src/universal/ISemver.sol";
7+
import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
8+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
99
import { SafeCall } from "src/libraries/SafeCall.sol";
1010
import { TransientReentrancyAware } from "src/libraries/TransientContext.sol";
1111

‎packages/contracts-bedrock/src/L2/OptimismSuperchainERC20.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.25;
33

4-
import { IOptimismSuperchainERC20Extension } from "src/L2/IOptimismSuperchainERC20.sol";
4+
import { IOptimismSuperchainERC20Extension } from "src/L2/interfaces/IOptimismSuperchainERC20.sol";
55
import { ERC20 } from "@solady/tokens/ERC20.sol";
6-
import { IL2ToL2CrossDomainMessenger } from "src/L2/IL2ToL2CrossDomainMessenger.sol";
7-
import { ISemver } from "src/universal/ISemver.sol";
6+
import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
7+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
88
import { Predeploys } from "src/libraries/Predeploys.sol";
99
import { Initializable } from "@openzeppelin/contracts-v5/proxy/utils/Initializable.sol";
1010
import { ERC165 } from "@openzeppelin/contracts-v5/utils/introspection/ERC165.sol";

‎packages/contracts-bedrock/src/L2/SequencerFeeVault.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity 0.8.15;
33

4-
import { ISemver } from "src/universal/ISemver.sol";
4+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
55
import { FeeVault } from "src/universal/FeeVault.sol";
66

77
/// @custom:proxied true

‎packages/contracts-bedrock/src/L2/SuperchainWETH.sol

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ import { WETH98 } from "src/dispute/weth/WETH98.sol";
55
import { Unauthorized, NotCustomGasToken } from "src/libraries/errors/CommonErrors.sol";
66
import { Predeploys } from "src/libraries/Predeploys.sol";
77
import { L1Block } from "src/L2/L1Block.sol";
8-
import { IL2ToL2CrossDomainMessenger } from "src/L2/IL2ToL2CrossDomainMessenger.sol";
8+
import { IL2ToL2CrossDomainMessenger } from "src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol";
99
import { ETHLiquidity } from "src/L2/ETHLiquidity.sol";
10-
import { ISuperchainERC20Extensions } from "src/L2/ISuperchainERC20.sol";
11-
import { ISemver } from "src/universal/ISemver.sol";
10+
import { ISuperchainERC20Extensions } from "src/L2/interfaces/ISuperchainERC20.sol";
11+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
1212

1313
/// @title SuperchainWETH
1414
/// @notice SuperchainWETH is a version of WETH that can be freely transfrered between chains
1515
/// within the superchain. SuperchainWETH can be converted into native ETH on chains that
1616
/// do not use a custom gas token.
1717
contract SuperchainWETH is WETH98, ISuperchainERC20Extensions, ISemver {
1818
/// @notice Semantic version.
19-
/// @custom:semver 1.0.0-beta.1
20-
string public constant version = "1.0.0-beta.1";
19+
/// @custom:semver 1.0.0-beta.2
20+
string public constant version = "1.0.0-beta.2";
2121

2222
/// @inheritdoc WETH98
2323
function deposit() public payable override {

‎packages/contracts-bedrock/src/L2/WETH.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ pragma solidity 0.8.15;
44
import { WETH98 } from "src/dispute/weth/WETH98.sol";
55
import { Predeploys } from "src/libraries/Predeploys.sol";
66
import { L1Block } from "src/L2/L1Block.sol";
7-
import { ISemver } from "src/universal/ISemver.sol";
7+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
88

99
/// @title WETH contract that reads the name and symbol from the L1Block contract.
1010
/// Allows for nice rendering of token names for chains using custom gas token.
1111
contract WETH is WETH98, ISemver {
12-
/// @custom:semver 1.0.0
13-
string public constant version = "1.0.0";
12+
/// @custom:semver 1.0.0-beta.1
13+
string public constant version = "1.0.0-beta.1";
1414

1515
/// @notice Returns the name of the wrapped native asset. Will be "Wrapped Ether"
1616
/// if the native asset is Ether.

‎packages/contracts-bedrock/src/L2/ICrossL2Inbox.sol ‎packages/contracts-bedrock/src/L2/interfaces/ICrossL2Inbox.sol

File renamed without changes.

‎packages/contracts-bedrock/src/L2/IL2ToL2CrossDomainMessenger.sol ‎packages/contracts-bedrock/src/L2/interfaces/IL2ToL2CrossDomainMessenger.sol

File renamed without changes.

‎packages/contracts-bedrock/src/L2/IOptimismERC20Factory.sol ‎packages/contracts-bedrock/src/L2/interfaces/IOptimismERC20Factory.sol

File renamed without changes.

‎packages/contracts-bedrock/src/L2/IOptimismSuperchainERC20.sol ‎packages/contracts-bedrock/src/L2/interfaces/IOptimismSuperchainERC20.sol

File renamed without changes.

‎packages/contracts-bedrock/src/L2/ISuperchainERC20.sol ‎packages/contracts-bedrock/src/L2/interfaces/ISuperchainERC20.sol

File renamed without changes.

‎packages/contracts-bedrock/src/Safe/DeputyGuardianModule.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IFaultDisputeGame } from "src/dispute/interfaces/IFaultDisputeGame.sol"
88
import { SuperchainConfig } from "src/L1/SuperchainConfig.sol";
99
import { OptimismPortal2 } from "src/L1/OptimismPortal2.sol";
1010
import { IDisputeGame } from "src/dispute/interfaces/IDisputeGame.sol";
11-
import { ISemver } from "src/universal/ISemver.sol";
11+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
1212
import { Unauthorized } from "src/libraries/PortalErrors.sol";
1313
import { AnchorStateRegistry } from "src/dispute/AnchorStateRegistry.sol";
1414

@@ -45,8 +45,8 @@ contract DeputyGuardianModule is ISemver {
4545
address internal immutable DEPUTY_GUARDIAN;
4646

4747
/// @notice Semantic version.
48-
/// @custom:semver 2.0.0-rc.1
49-
string public constant version = "2.0.0-rc.1";
48+
/// @custom:semver 2.0.1-beta.1
49+
string public constant version = "2.0.1-beta.1";
5050

5151
// Constructor to initialize the Safe and baseModule instances
5252
constructor(Safe _safe, SuperchainConfig _superchainConfig, address _deputyGuardian) {

‎packages/contracts-bedrock/src/Safe/LivenessGuard.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
55
import { Guard as BaseGuard } from "safe-contracts/base/GuardManager.sol";
66
import { SafeSigners } from "src/Safe/SafeSigners.sol";
77
import { Enum } from "safe-contracts/common/Enum.sol";
8-
import { ISemver } from "src/universal/ISemver.sol";
8+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
99
import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
1010

1111
/// @title LivenessGuard
@@ -25,8 +25,8 @@ contract LivenessGuard is ISemver, BaseGuard {
2525
event OwnerRecorded(address owner);
2626

2727
/// @notice Semantic version.
28-
/// @custom:semver 1.0.0
29-
string public constant version = "1.0.0";
28+
/// @custom:semver 1.0.1-beta.1
29+
string public constant version = "1.0.1-beta.1";
3030

3131
/// @notice The safe account for which this contract will be the guard.
3232
Safe internal immutable SAFE;

‎packages/contracts-bedrock/src/Safe/LivenessModule.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { GnosisSafe as Safe } from "safe-contracts/GnosisSafe.sol";
55
import { Enum } from "safe-contracts/common/Enum.sol";
66
import { OwnerManager } from "safe-contracts/base/OwnerManager.sol";
77
import { LivenessGuard } from "src/Safe/LivenessGuard.sol";
8-
import { ISemver } from "src/universal/ISemver.sol";
8+
import { ISemver } from "src/universal/interfaces/ISemver.sol";
99

1010
/// @title LivenessModule
1111
/// @notice This module is intended to be used in conjunction with the LivenessGuard. In the event
@@ -53,8 +53,8 @@ contract LivenessModule is ISemver {
5353
uint256 internal constant GUARD_STORAGE_SLOT = 0x4a204f620c8c5ccdca3fd54d003badd85ba500436a431f0cbda4f558c93c34c8;
5454

5555
/// @notice Semantic version.
56-
/// @custom:semver 1.1.0
57-
string public constant version = "1.2.0";
56+
/// @custom:semver 1.2.1-beta.1
57+
string public constant version = "1.2.1-beta.1";
5858

5959
// Constructor to initialize the Safe and baseModule instances
6060
constructor(

0 commit comments

Comments
 (0)