Commit a345131c authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: forge fmt

parent cb44d295
...@@ -121,7 +121,7 @@ contract Deploy is Deployer { ...@@ -121,7 +121,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the AddressManager /// @notice Deploy the AddressManager
function deployAddressManager() broadcast() public returns (address addr_) { function deployAddressManager() public broadcast returns (address addr_) {
AddressManager manager = new AddressManager(); AddressManager manager = new AddressManager();
require(manager.owner() == msg.sender); require(manager.owner() == msg.sender);
...@@ -131,7 +131,7 @@ contract Deploy is Deployer { ...@@ -131,7 +131,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the ProxyAdmin /// @notice Deploy the ProxyAdmin
function deployProxyAdmin() broadcast() public returns (address addr_) { function deployProxyAdmin() public broadcast returns (address addr_) {
ProxyAdmin admin = new ProxyAdmin({ ProxyAdmin admin = new ProxyAdmin({
_owner: msg.sender _owner: msg.sender
}); });
...@@ -150,7 +150,7 @@ contract Deploy is Deployer { ...@@ -150,7 +150,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1StandardBridgeProxy /// @notice Deploy the L1StandardBridgeProxy
function deployL1StandardBridgeProxy() broadcast() public returns (address addr_) { function deployL1StandardBridgeProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
L1ChugSplashProxy proxy = new L1ChugSplashProxy(proxyAdmin); L1ChugSplashProxy proxy = new L1ChugSplashProxy(proxyAdmin);
...@@ -163,7 +163,7 @@ contract Deploy is Deployer { ...@@ -163,7 +163,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L2OutputOracleProxy /// @notice Deploy the L2OutputOracleProxy
function deployL2OutputOracleProxy() broadcast() public returns (address addr_) { function deployL2OutputOracleProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -178,7 +178,7 @@ contract Deploy is Deployer { ...@@ -178,7 +178,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1CrossDomainMessengerProxy /// @notice Deploy the L1CrossDomainMessengerProxy
function deployL1CrossDomainMessengerProxy() broadcast() public returns (address addr_) { function deployL1CrossDomainMessengerProxy() public broadcast returns (address addr_) {
AddressManager addressManager = AddressManager(mustGetAddress("AddressManager")); AddressManager addressManager = AddressManager(mustGetAddress("AddressManager"));
string memory contractName = "OVM_L1CrossDomainMessenger"; string memory contractName = "OVM_L1CrossDomainMessenger";
ResolvedDelegateProxy proxy = new ResolvedDelegateProxy(addressManager, contractName); ResolvedDelegateProxy proxy = new ResolvedDelegateProxy(addressManager, contractName);
...@@ -197,7 +197,7 @@ contract Deploy is Deployer { ...@@ -197,7 +197,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the OptimismPortalProxy /// @notice Deploy the OptimismPortalProxy
function deployOptimismPortalProxy() broadcast() public returns (address addr_) { function deployOptimismPortalProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -213,7 +213,7 @@ contract Deploy is Deployer { ...@@ -213,7 +213,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the OptimismMintableERC20FactoryProxy /// @notice Deploy the OptimismMintableERC20FactoryProxy
function deployOptimismMintableERC20FactoryProxy() broadcast() public returns (address addr_) { function deployOptimismMintableERC20FactoryProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -229,7 +229,7 @@ contract Deploy is Deployer { ...@@ -229,7 +229,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1ERC721BridgeProxy /// @notice Deploy the L1ERC721BridgeProxy
function deployL1ERC721BridgeProxy() broadcast() public returns (address addr_) { function deployL1ERC721BridgeProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -245,7 +245,7 @@ contract Deploy is Deployer { ...@@ -245,7 +245,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the SystemConfigProxy /// @notice Deploy the SystemConfigProxy
function deploySystemConfigProxy() broadcast() public returns (address addr_) { function deploySystemConfigProxy() public broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -261,7 +261,7 @@ contract Deploy is Deployer { ...@@ -261,7 +261,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the DisputeGameFactoryProxy /// @notice Deploy the DisputeGameFactoryProxy
function deployDisputeGameFactoryProxy() onlyDevnet broadcast() public returns (address addr_) { function deployDisputeGameFactoryProxy() public onlyDevnet broadcast returns (address addr_) {
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -277,7 +277,7 @@ contract Deploy is Deployer { ...@@ -277,7 +277,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1CrossDomainMessenger /// @notice Deploy the L1CrossDomainMessenger
function deployL1CrossDomainMessenger() broadcast() public returns (address addr_) { function deployL1CrossDomainMessenger() public broadcast returns (address addr_) {
L1CrossDomainMessenger messenger = new L1CrossDomainMessenger(); L1CrossDomainMessenger messenger = new L1CrossDomainMessenger();
require(address(messenger.PORTAL()) == address(0)); require(address(messenger.PORTAL()) == address(0));
...@@ -293,7 +293,7 @@ contract Deploy is Deployer { ...@@ -293,7 +293,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the OptimismPortal /// @notice Deploy the OptimismPortal
function deployOptimismPortal() broadcast() public returns (address addr_) { function deployOptimismPortal() public broadcast returns (address addr_) {
OptimismPortal portal = new OptimismPortal(); OptimismPortal portal = new OptimismPortal();
require(address(portal.L2_ORACLE()) == address(0)); require(address(portal.L2_ORACLE()) == address(0));
...@@ -308,7 +308,7 @@ contract Deploy is Deployer { ...@@ -308,7 +308,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L2OutputOracle /// @notice Deploy the L2OutputOracle
function deployL2OutputOracle() broadcast() public returns (address addr_) { function deployL2OutputOracle() public broadcast returns (address addr_) {
L2OutputOracle oracle = new L2OutputOracle({ L2OutputOracle oracle = new L2OutputOracle({
_submissionInterval: cfg.l2OutputOracleSubmissionInterval(), _submissionInterval: cfg.l2OutputOracleSubmissionInterval(),
_l2BlockTime: cfg.l2BlockTime(), _l2BlockTime: cfg.l2BlockTime(),
...@@ -335,7 +335,7 @@ contract Deploy is Deployer { ...@@ -335,7 +335,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the OptimismMintableERC20Factory /// @notice Deploy the OptimismMintableERC20Factory
function deployOptimismMintableERC20Factory() broadcast() public returns (address addr_) { function deployOptimismMintableERC20Factory() public broadcast returns (address addr_) {
address l1StandardBridgeProxy = mustGetAddress("L1StandardBridgeProxy"); address l1StandardBridgeProxy = mustGetAddress("L1StandardBridgeProxy");
OptimismMintableERC20Factory factory = new OptimismMintableERC20Factory(l1StandardBridgeProxy); OptimismMintableERC20Factory factory = new OptimismMintableERC20Factory(l1StandardBridgeProxy);
...@@ -348,7 +348,7 @@ contract Deploy is Deployer { ...@@ -348,7 +348,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the DisputeGameFactory /// @notice Deploy the DisputeGameFactory
function deployDisputeGameFactory() onlyDevnet broadcast() public returns (address addr_) { function deployDisputeGameFactory() public onlyDevnet broadcast returns (address addr_) {
DisputeGameFactory factory = new DisputeGameFactory(); DisputeGameFactory factory = new DisputeGameFactory();
save("DisputeGameFactory", address(factory)); save("DisputeGameFactory", address(factory));
console.log("DisputeGameFactory deployed at %s", address(factory)); console.log("DisputeGameFactory deployed at %s", address(factory));
...@@ -357,7 +357,7 @@ contract Deploy is Deployer { ...@@ -357,7 +357,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the BlockOracle /// @notice Deploy the BlockOracle
function deployBlockOracle() onlyDevnet broadcast() public returns (address addr_) { function deployBlockOracle() public onlyDevnet broadcast returns (address addr_) {
BlockOracle oracle = new BlockOracle(); BlockOracle oracle = new BlockOracle();
save("BlockOracle", address(oracle)); save("BlockOracle", address(oracle));
console.log("BlockOracle deployed at %s", address(oracle)); console.log("BlockOracle deployed at %s", address(oracle));
...@@ -366,7 +366,7 @@ contract Deploy is Deployer { ...@@ -366,7 +366,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the PreimageOracle /// @notice Deploy the PreimageOracle
function deployPreimageOracle() onlyDevnet broadcast() public returns (address addr_) { function deployPreimageOracle() public onlyDevnet broadcast returns (address addr_) {
PreimageOracle preimageOracle = new PreimageOracle(); PreimageOracle preimageOracle = new PreimageOracle();
save("PreimageOracle", address(preimageOracle)); save("PreimageOracle", address(preimageOracle));
console.log("PreimageOracle deployed at %s", address(preimageOracle)); console.log("PreimageOracle deployed at %s", address(preimageOracle));
...@@ -375,7 +375,7 @@ contract Deploy is Deployer { ...@@ -375,7 +375,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy Mips /// @notice Deploy Mips
function deployMips() onlyDevnet broadcast() public returns (address addr_) { function deployMips() public onlyDevnet broadcast returns (address addr_) {
MIPS mips = new MIPS(IPreimageOracle(mustGetAddress("PreimageOracle"))); MIPS mips = new MIPS(IPreimageOracle(mustGetAddress("PreimageOracle")));
save("Mips", address(mips)); save("Mips", address(mips));
console.log("MIPS deployed at %s", address(mips)); console.log("MIPS deployed at %s", address(mips));
...@@ -384,7 +384,7 @@ contract Deploy is Deployer { ...@@ -384,7 +384,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the SystemConfig /// @notice Deploy the SystemConfig
function deploySystemConfig() broadcast() public returns (address addr_) { function deploySystemConfig() public broadcast returns (address addr_) {
SystemConfig config = new SystemConfig(); SystemConfig config = new SystemConfig();
bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress()))); bytes32 batcherHash = bytes32(uint256(uint160(cfg.batchSenderAddress())));
...@@ -418,7 +418,7 @@ contract Deploy is Deployer { ...@@ -418,7 +418,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1StandardBridge /// @notice Deploy the L1StandardBridge
function deployL1StandardBridge() broadcast() public returns (address addr_) { function deployL1StandardBridge() public broadcast returns (address addr_) {
L1StandardBridge bridge = new L1StandardBridge(); L1StandardBridge bridge = new L1StandardBridge();
require(address(bridge.MESSENGER()) == address(0)); require(address(bridge.MESSENGER()) == address(0));
...@@ -433,7 +433,7 @@ contract Deploy is Deployer { ...@@ -433,7 +433,7 @@ contract Deploy is Deployer {
} }
/// @notice Deploy the L1ERC721Bridge /// @notice Deploy the L1ERC721Bridge
function deployL1ERC721Bridge() broadcast() public returns (address addr_) { function deployL1ERC721Bridge() public broadcast returns (address addr_) {
L1ERC721Bridge bridge = new L1ERC721Bridge(); L1ERC721Bridge bridge = new L1ERC721Bridge();
require(address(bridge.MESSENGER()) == address(0)); require(address(bridge.MESSENGER()) == address(0));
......
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