Commit d8a01023 authored by Maurelian's avatar Maurelian

contracts-bedrock: add elipses to deploy logs

parent 32fc813d
...@@ -326,7 +326,7 @@ contract Deploy is Deployer { ...@@ -326,7 +326,7 @@ contract Deploy is Deployer {
/// @notice Deploy the StorageSetter contract, used for upgrades. /// @notice Deploy the StorageSetter contract, used for upgrades.
function deployStorageSetter() public broadcast returns (address addr_) { function deployStorageSetter() public broadcast returns (address addr_) {
console.log("Deploying StorageSetter"); console.log("Deploying StorageSetter...");
StorageSetter setter = new StorageSetter{ salt: _implSalt() }(); StorageSetter setter = new StorageSetter{ salt: _implSalt() }();
console.log("StorageSetter deployed at: %s", address(setter)); console.log("StorageSetter deployed at: %s", address(setter));
string memory version = setter.version(); string memory version = setter.version();
...@@ -340,7 +340,7 @@ contract Deploy is Deployer { ...@@ -340,7 +340,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L1StandardBridgeProxy using a ChugSplashProxy /// @notice Deploy the L1StandardBridgeProxy using a ChugSplashProxy
function deployL1StandardBridgeProxy() public broadcast returns (address addr_) { function deployL1StandardBridgeProxy() public broadcast returns (address addr_) {
console.log("Deploying proxy for L1StandardBridge"); console.log("Deploying proxy for L1StandardBridge...");
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
L1ChugSplashProxy proxy = new L1ChugSplashProxy(proxyAdmin); L1ChugSplashProxy proxy = new L1ChugSplashProxy(proxyAdmin);
...@@ -354,7 +354,7 @@ contract Deploy is Deployer { ...@@ -354,7 +354,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L1CrossDomainMessengerProxy using a ResolvedDelegateProxy /// @notice Deploy the L1CrossDomainMessengerProxy using a ResolvedDelegateProxy
function deployL1CrossDomainMessengerProxy() public broadcast returns (address addr_) { function deployL1CrossDomainMessengerProxy() public broadcast returns (address addr_) {
console.log("Deploying proxy for L1CrossDomainMessenger"); console.log("Deploying proxy for L1CrossDomainMessenger...");
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);
...@@ -373,7 +373,7 @@ contract Deploy is Deployer { ...@@ -373,7 +373,7 @@ contract Deploy is Deployer {
} }
function deployERC1967Proxy(string memory _name) public broadcast returns (address addr_) { function deployERC1967Proxy(string memory _name) public broadcast returns (address addr_) {
console.log(string.concat("Deploying ERC1967 proxy for", _name)); console.log(string.concat("Deploying ERC1967 proxy for", _name, "..."));
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
Proxy proxy = new Proxy({ Proxy proxy = new Proxy({
_admin: proxyAdmin _admin: proxyAdmin
...@@ -393,7 +393,7 @@ contract Deploy is Deployer { ...@@ -393,7 +393,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L1CrossDomainMessenger /// @notice Deploy the L1CrossDomainMessenger
function deployL1CrossDomainMessenger() public broadcast returns (address addr_) { function deployL1CrossDomainMessenger() public broadcast returns (address addr_) {
console.log("Deploying L1CrossDomainMessenger implementation"); console.log("Deploying L1CrossDomainMessenger implementation...");
address portal = mustGetAddress("OptimismPortalProxy"); address portal = mustGetAddress("OptimismPortalProxy");
L1CrossDomainMessenger messenger = new L1CrossDomainMessenger{ salt: _implSalt() }({ L1CrossDomainMessenger messenger = new L1CrossDomainMessenger{ salt: _implSalt() }({
_portal: OptimismPortal(payable(portal)) _portal: OptimismPortal(payable(portal))
...@@ -416,7 +416,7 @@ contract Deploy is Deployer { ...@@ -416,7 +416,7 @@ contract Deploy is Deployer {
/// @notice Deploy the OptimismPortal /// @notice Deploy the OptimismPortal
function deployOptimismPortal() public broadcast returns (address addr_) { function deployOptimismPortal() public broadcast returns (address addr_) {
console.log("Deploying OptimismPortal implementation"); console.log("Deploying OptimismPortal implementation...");
address guardian = cfg.portalGuardian(); address guardian = cfg.portalGuardian();
if (guardian.code.length == 0) { if (guardian.code.length == 0) {
console.log("Portal guardian has no code: %s", guardian); console.log("Portal guardian has no code: %s", guardian);
...@@ -449,7 +449,7 @@ contract Deploy is Deployer { ...@@ -449,7 +449,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L2OutputOracle /// @notice Deploy the L2OutputOracle
function deployL2OutputOracle() public broadcast returns (address addr_) { function deployL2OutputOracle() public broadcast returns (address addr_) {
console.log("Deploying L2OutputOracle implementation"); console.log("Deploying L2OutputOracle implementation...");
L2OutputOracle oracle = new L2OutputOracle{ salt: _implSalt() }({ L2OutputOracle oracle = new L2OutputOracle{ salt: _implSalt() }({
_submissionInterval: cfg.l2OutputOracleSubmissionInterval(), _submissionInterval: cfg.l2OutputOracleSubmissionInterval(),
_l2BlockTime: cfg.l2BlockTime(), _l2BlockTime: cfg.l2BlockTime(),
...@@ -477,7 +477,7 @@ contract Deploy is Deployer { ...@@ -477,7 +477,7 @@ contract Deploy is Deployer {
/// @notice Deploy the OptimismMintableERC20Factory /// @notice Deploy the OptimismMintableERC20Factory
function deployOptimismMintableERC20Factory() public broadcast returns (address addr_) { function deployOptimismMintableERC20Factory() public broadcast returns (address addr_) {
console.log("Deploying OptimismMintableERC20Factory implementation"); console.log("Deploying OptimismMintableERC20Factory implementation...");
address l1standardBridgeProxy = mustGetAddress("L1StandardBridgeProxy"); address l1standardBridgeProxy = mustGetAddress("L1StandardBridgeProxy");
OptimismMintableERC20Factory factory = OptimismMintableERC20Factory factory =
new OptimismMintableERC20Factory{ salt: _implSalt() }({_bridge: l1standardBridgeProxy}); new OptimismMintableERC20Factory{ salt: _implSalt() }({_bridge: l1standardBridgeProxy});
...@@ -497,7 +497,7 @@ contract Deploy is Deployer { ...@@ -497,7 +497,7 @@ contract Deploy is Deployer {
/// @notice Deploy the DisputeGameFactory /// @notice Deploy the DisputeGameFactory
function deployDisputeGameFactory() public onlyDevnet broadcast returns (address addr_) { function deployDisputeGameFactory() public onlyDevnet broadcast returns (address addr_) {
console.log("Deploying DisputeGameFactory implementation"); console.log("Deploying DisputeGameFactory implementation...");
DisputeGameFactory factory = new DisputeGameFactory{ salt: _implSalt() }(); DisputeGameFactory factory = new DisputeGameFactory{ salt: _implSalt() }();
save("DisputeGameFactory", address(factory)); save("DisputeGameFactory", address(factory));
console.log("DisputeGameFactory deployed at %s", address(factory)); console.log("DisputeGameFactory deployed at %s", address(factory));
...@@ -507,7 +507,7 @@ contract Deploy is Deployer { ...@@ -507,7 +507,7 @@ contract Deploy is Deployer {
/// @notice Deploy the BlockOracle /// @notice Deploy the BlockOracle
function deployBlockOracle() public onlyDevnet broadcast returns (address addr_) { function deployBlockOracle() public onlyDevnet broadcast returns (address addr_) {
console.log("Deploying BlockOracle implementation"); console.log("Deploying BlockOracle implementation...");
BlockOracle oracle = new BlockOracle{ salt: _implSalt() }(); BlockOracle oracle = new BlockOracle{ salt: _implSalt() }();
save("BlockOracle", address(oracle)); save("BlockOracle", address(oracle));
console.log("BlockOracle deployed at %s", address(oracle)); console.log("BlockOracle deployed at %s", address(oracle));
...@@ -517,7 +517,7 @@ contract Deploy is Deployer { ...@@ -517,7 +517,7 @@ contract Deploy is Deployer {
/// @notice Deploy the ProtocolVersions /// @notice Deploy the ProtocolVersions
function deployProtocolVersions() public broadcast returns (address addr_) { function deployProtocolVersions() public broadcast returns (address addr_) {
console.log("Deploying ProtocolVersions implementation"); console.log("Deploying ProtocolVersions implementation...");
ProtocolVersions versions = new ProtocolVersions{ salt: _implSalt() }(); ProtocolVersions versions = new ProtocolVersions{ salt: _implSalt() }();
save("ProtocolVersions", address(versions)); save("ProtocolVersions", address(versions));
console.log("ProtocolVersions deployed at %s", address(versions)); console.log("ProtocolVersions deployed at %s", address(versions));
...@@ -536,7 +536,7 @@ contract Deploy is Deployer { ...@@ -536,7 +536,7 @@ contract Deploy is Deployer {
/// @notice Deploy the PreimageOracle /// @notice Deploy the PreimageOracle
function deployPreimageOracle() public onlyDevnet broadcast returns (address addr_) { function deployPreimageOracle() public onlyDevnet broadcast returns (address addr_) {
console.log("Deploying PreimageOracle implementation"); console.log("Deploying PreimageOracle implementation...");
PreimageOracle preimageOracle = new PreimageOracle{ salt: _implSalt() }(); PreimageOracle preimageOracle = new PreimageOracle{ salt: _implSalt() }();
save("PreimageOracle", address(preimageOracle)); save("PreimageOracle", address(preimageOracle));
console.log("PreimageOracle deployed at %s", address(preimageOracle)); console.log("PreimageOracle deployed at %s", address(preimageOracle));
...@@ -546,7 +546,7 @@ contract Deploy is Deployer { ...@@ -546,7 +546,7 @@ contract Deploy is Deployer {
/// @notice Deploy Mips /// @notice Deploy Mips
function deployMips() public onlyDevnet broadcast returns (address addr_) { function deployMips() public onlyDevnet broadcast returns (address addr_) {
console.log("Deploying Mips implementation"); console.log("Deploying Mips implementation...");
MIPS mips = new MIPS{ salt: _implSalt() }(IPreimageOracle(mustGetAddress("PreimageOracle"))); MIPS mips = new MIPS{ salt: _implSalt() }(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));
...@@ -556,7 +556,7 @@ contract Deploy is Deployer { ...@@ -556,7 +556,7 @@ contract Deploy is Deployer {
/// @notice Deploy the SystemConfig /// @notice Deploy the SystemConfig
function deploySystemConfig() public broadcast returns (address addr_) { function deploySystemConfig() public broadcast returns (address addr_) {
console.log("Deploying SystemConfig implementation"); console.log("Deploying SystemConfig implementation...");
ResourceMetering.ResourceConfig memory defaultConfig = Constants.DEFAULT_RESOURCE_CONFIG(); ResourceMetering.ResourceConfig memory defaultConfig = Constants.DEFAULT_RESOURCE_CONFIG();
uint64 minimumGasLimit = uint64(defaultConfig.maxResourceLimit) + uint64(defaultConfig.systemTxMaxGas); uint64 minimumGasLimit = uint64(defaultConfig.maxResourceLimit) + uint64(defaultConfig.systemTxMaxGas);
SystemConfig config = new SystemConfig({ SystemConfig config = new SystemConfig({
...@@ -586,7 +586,7 @@ contract Deploy is Deployer { ...@@ -586,7 +586,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L1StandardBridge /// @notice Deploy the L1StandardBridge
function deployL1StandardBridge() public broadcast returns (address addr_) { function deployL1StandardBridge() public broadcast returns (address addr_) {
console.log("Deploying L1StandardBridge implementation"); console.log("Deploying L1StandardBridge implementation...");
address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy"); address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy");
L1StandardBridge bridge = new L1StandardBridge{ salt: _implSalt() }({ L1StandardBridge bridge = new L1StandardBridge{ salt: _implSalt() }({
...@@ -608,7 +608,7 @@ contract Deploy is Deployer { ...@@ -608,7 +608,7 @@ contract Deploy is Deployer {
/// @notice Deploy the L1ERC721Bridge /// @notice Deploy the L1ERC721Bridge
function deployL1ERC721Bridge() public broadcast returns (address addr_) { function deployL1ERC721Bridge() public broadcast returns (address addr_) {
console.log("Deploying L1ERC721Bridge implementation"); console.log("Deploying L1ERC721Bridge implementation...");
address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy"); address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy");
L1ERC721Bridge bridge = new L1ERC721Bridge{ salt: _implSalt() }({ L1ERC721Bridge bridge = new L1ERC721Bridge{ salt: _implSalt() }({
_messenger: l1CrossDomainMessengerProxy, _messenger: l1CrossDomainMessengerProxy,
...@@ -648,7 +648,7 @@ contract Deploy is Deployer { ...@@ -648,7 +648,7 @@ contract Deploy is Deployer {
/// @notice Initialize the DisputeGameFactory /// @notice Initialize the DisputeGameFactory
function initializeDisputeGameFactory() public onlyDevnet broadcast { function initializeDisputeGameFactory() public onlyDevnet broadcast {
console.log("Initializing DisputeGameFactory contract"); console.log("Upgrading and initializing DisputeGameFactory proxy...");
address disputeGameFactoryProxy = mustGetAddress("DisputeGameFactoryProxy"); address disputeGameFactoryProxy = mustGetAddress("DisputeGameFactoryProxy");
address disputeGameFactory = mustGetAddress("DisputeGameFactory"); address disputeGameFactory = mustGetAddress("DisputeGameFactory");
...@@ -664,7 +664,7 @@ contract Deploy is Deployer { ...@@ -664,7 +664,7 @@ contract Deploy is Deployer {
/// @notice Initialize the SystemConfig /// @notice Initialize the SystemConfig
function initializeSystemConfig() public broadcast { function initializeSystemConfig() public broadcast {
console.log("Initializing SystemConfig contract"); console.log("Upgrading and initializing SystemConfig proxy...");
address systemConfigProxy = mustGetAddress("SystemConfigProxy"); address systemConfigProxy = mustGetAddress("SystemConfigProxy");
address systemConfig = mustGetAddress("SystemConfig"); address systemConfig = mustGetAddress("SystemConfig");
...@@ -698,7 +698,7 @@ contract Deploy is Deployer { ...@@ -698,7 +698,7 @@ contract Deploy is Deployer {
/// @notice Initialize the L1StandardBridge /// @notice Initialize the L1StandardBridge
function initializeL1StandardBridge() public broadcast { function initializeL1StandardBridge() public broadcast {
console.log("Initializing L1StandardBridge contract"); console.log("Upgrading and initializing L1StandardBridge proxy...");
ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin")); ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin"));
address l1StandardBridgeProxy = mustGetAddress("L1StandardBridgeProxy"); address l1StandardBridgeProxy = mustGetAddress("L1StandardBridgeProxy");
address l1StandardBridge = mustGetAddress("L1StandardBridge"); address l1StandardBridge = mustGetAddress("L1StandardBridge");
...@@ -725,7 +725,7 @@ contract Deploy is Deployer { ...@@ -725,7 +725,7 @@ contract Deploy is Deployer {
/// @notice Initialize the L1ERC721Bridge /// @notice Initialize the L1ERC721Bridge
function initializeL1ERC721Bridge() public broadcast { function initializeL1ERC721Bridge() public broadcast {
console.log("Initializing L1ERC721Bridge contract"); console.log("Upgrading and initializing L1ERC721Bridge proxy...");
ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin")); ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin"));
address l1ERC721BridgeProxy = mustGetAddress("L1ERC721BridgeProxy"); address l1ERC721BridgeProxy = mustGetAddress("L1ERC721BridgeProxy");
address l1ERC721Bridge = mustGetAddress("L1ERC721Bridge"); address l1ERC721Bridge = mustGetAddress("L1ERC721Bridge");
...@@ -744,7 +744,7 @@ contract Deploy is Deployer { ...@@ -744,7 +744,7 @@ contract Deploy is Deployer {
/// @notice Ininitialize the OptimismMintableERC20Factory /// @notice Ininitialize the OptimismMintableERC20Factory
function initializeOptimismMintableERC20Factory() public broadcast { function initializeOptimismMintableERC20Factory() public broadcast {
console.log("Initializing OptimismMintableERC20Factory contract"); console.log("Upgrading and initializing OptimismMintableERC20Factory proxy...");
address proxyAdmin = mustGetAddress("ProxyAdmin"); address proxyAdmin = mustGetAddress("ProxyAdmin");
address optimismMintableERC20FactoryProxy = mustGetAddress("OptimismMintableERC20FactoryProxy"); address optimismMintableERC20FactoryProxy = mustGetAddress("OptimismMintableERC20FactoryProxy");
address optimismMintableERC20Factory = mustGetAddress("OptimismMintableERC20Factory"); address optimismMintableERC20Factory = mustGetAddress("OptimismMintableERC20Factory");
...@@ -765,7 +765,7 @@ contract Deploy is Deployer { ...@@ -765,7 +765,7 @@ contract Deploy is Deployer {
/// @notice initializeL1CrossDomainMessenger /// @notice initializeL1CrossDomainMessenger
function initializeL1CrossDomainMessenger() public broadcast { function initializeL1CrossDomainMessenger() public broadcast {
console.log("Initializing L1CrossDomainMessenger contract"); console.log("Upgrading and initializing L1CrossDomainMessenger proxy...");
ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin")); ProxyAdmin proxyAdmin = ProxyAdmin(mustGetAddress("ProxyAdmin"));
address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy"); address l1CrossDomainMessengerProxy = mustGetAddress("L1CrossDomainMessengerProxy");
address l1CrossDomainMessenger = mustGetAddress("L1CrossDomainMessenger"); address l1CrossDomainMessenger = mustGetAddress("L1CrossDomainMessenger");
...@@ -811,7 +811,7 @@ contract Deploy is Deployer { ...@@ -811,7 +811,7 @@ contract Deploy is Deployer {
/// @notice Initialize the L2OutputOracle /// @notice Initialize the L2OutputOracle
function initializeL2OutputOracle() public broadcast { function initializeL2OutputOracle() public broadcast {
console.log("Initializing L2OutputOracle contract"); console.log("Upgrading and initializing L2OutputOracle proxy...");
address l2OutputOracleProxy = mustGetAddress("L2OutputOracleProxy"); address l2OutputOracleProxy = mustGetAddress("L2OutputOracleProxy");
address l2OutputOracle = mustGetAddress("L2OutputOracle"); address l2OutputOracle = mustGetAddress("L2OutputOracle");
...@@ -839,7 +839,7 @@ contract Deploy is Deployer { ...@@ -839,7 +839,7 @@ contract Deploy is Deployer {
/// @notice Initialize the OptimismPortal /// @notice Initialize the OptimismPortal
function initializeOptimismPortal() public broadcast { function initializeOptimismPortal() public broadcast {
console.log("Initializing OptimismPortal contract"); console.log("Upgrading and initializing OptimismPortal proxy...");
address optimismPortalProxy = mustGetAddress("OptimismPortalProxy"); address optimismPortalProxy = mustGetAddress("OptimismPortalProxy");
address optimismPortal = mustGetAddress("OptimismPortal"); address optimismPortal = mustGetAddress("OptimismPortal");
...@@ -859,7 +859,7 @@ contract Deploy is Deployer { ...@@ -859,7 +859,7 @@ contract Deploy is Deployer {
} }
function initializeProtocolVersions() public broadcast { function initializeProtocolVersions() public broadcast {
console.log("Initializing ProtocolVersions contract"); console.log("Upgrading and initializing ProtocolVersions proxy...");
address protocolVersionsProxy = mustGetAddress("ProtocolVersionsProxy"); address protocolVersionsProxy = mustGetAddress("ProtocolVersionsProxy");
address protocolVersions = mustGetAddress("ProtocolVersions"); address protocolVersions = mustGetAddress("ProtocolVersions");
......
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