From 5d41653d83f660494a6578e51f0b5dbe3c077026 Mon Sep 17 00:00:00 2001 From: Kelvin Fichter Date: Wed, 7 Dec 2022 16:32:29 -0500 Subject: [PATCH] maint(ctb): standardized whitespace in deploys Standardizes the whitespace in deployment files. I have nothing better to do right now. --- packages/contracts-bedrock/deploy/000-ProxyAdmin.ts | 1 + .../contracts-bedrock/deploy/001-AddressManager.ts | 1 + .../deploy/002-L1StandardBridgeProxy.ts | 1 + .../deploy/003-L2OutputOracleProxy.ts | 1 + .../deploy/004-L1CrossDomainMessengerProxy.ts | 1 + .../deploy/005-OptimismPortalProxy.ts | 1 + .../deploy/006-OptimismMintableERC20FactoryProxy.ts | 1 + .../deploy/007-L1ERC721BridgeProxy.ts | 1 + .../deploy/008-SystemConfigProxy.ts | 1 + .../deploy/009-SystemDictatorProxy.ts | 1 + .../deploy/017-SystemConfigImpl.ts | 13 ++++--------- 11 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts b/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts index 136a153f0eb85..9b03c4cbef454 100644 --- a/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts +++ b/packages/contracts-bedrock/deploy/000-ProxyAdmin.ts @@ -4,6 +4,7 @@ import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const { deployer } = await hre.getNamedAccounts() + await deploy({ hre, name: 'ProxyAdmin', diff --git a/packages/contracts-bedrock/deploy/001-AddressManager.ts b/packages/contracts-bedrock/deploy/001-AddressManager.ts index 0f9e2dcb09c2c..a5e3fd7cb150f 100644 --- a/packages/contracts-bedrock/deploy/001-AddressManager.ts +++ b/packages/contracts-bedrock/deploy/001-AddressManager.ts @@ -4,6 +4,7 @@ import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const { deployer } = await hre.getNamedAccounts() + await deploy({ hre, name: 'Lib_AddressManager', diff --git a/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts b/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts index d4a52709ecf3d..f034484214223 100644 --- a/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts +++ b/packages/contracts-bedrock/deploy/002-L1StandardBridgeProxy.ts @@ -4,6 +4,7 @@ import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const { deployer } = await hre.getNamedAccounts() + await deploy({ hre, name: 'Proxy__OVM_L1StandardBridge', diff --git a/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts b/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts index 26e19d5864e8d..d89ff210c6779 100644 --- a/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts +++ b/packages/contracts-bedrock/deploy/003-L2OutputOracleProxy.ts @@ -8,6 +8,7 @@ import { const deployFn: DeployFunction = async (hre) => { const proxyAdmin = await getDeploymentAddress(hre, 'ProxyAdmin') + await deploy({ hre, name: 'L2OutputOracleProxy', diff --git a/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts b/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts index b41c35cf84f67..ed83325fdd590 100644 --- a/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts +++ b/packages/contracts-bedrock/deploy/004-L1CrossDomainMessengerProxy.ts @@ -4,6 +4,7 @@ import { deploy, getDeploymentAddress } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const addressManager = await getDeploymentAddress(hre, 'Lib_AddressManager') + await deploy({ hre, name: 'Proxy__OVM_L1CrossDomainMessenger', diff --git a/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts b/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts index 74dd812f3a817..181f94f908279 100644 --- a/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts +++ b/packages/contracts-bedrock/deploy/005-OptimismPortalProxy.ts @@ -8,6 +8,7 @@ import { const deployFn: DeployFunction = async (hre) => { const proxyAdmin = await getDeploymentAddress(hre, 'ProxyAdmin') + await deploy({ hre, name: 'OptimismPortalProxy', diff --git a/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts b/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts index 0630b39bbb98a..e269163b66055 100644 --- a/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts +++ b/packages/contracts-bedrock/deploy/006-OptimismMintableERC20FactoryProxy.ts @@ -8,6 +8,7 @@ import { const deployFn: DeployFunction = async (hre) => { const proxyAdmin = await getDeploymentAddress(hre, 'ProxyAdmin') + await deploy({ hre, name: 'OptimismMintableERC20FactoryProxy', diff --git a/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts b/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts index 983f5376b83c2..376d045f721c8 100644 --- a/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts +++ b/packages/contracts-bedrock/deploy/007-L1ERC721BridgeProxy.ts @@ -4,6 +4,7 @@ import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const { deployer } = await hre.getNamedAccounts() + await deploy({ hre, name: 'L1ERC721BridgeProxy', diff --git a/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts b/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts index 0bd1c98f7be45..bd9d66bb0f9c6 100644 --- a/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts +++ b/packages/contracts-bedrock/deploy/008-SystemConfigProxy.ts @@ -8,6 +8,7 @@ import { const deployFn: DeployFunction = async (hre) => { const proxyAdmin = await getDeploymentAddress(hre, 'ProxyAdmin') + await deploy({ hre, name: 'SystemConfigProxy', diff --git a/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts b/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts index b7d0f28795775..ad5be644d1913 100644 --- a/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts +++ b/packages/contracts-bedrock/deploy/009-SystemDictatorProxy.ts @@ -4,6 +4,7 @@ import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { const { deployer } = await hre.getNamedAccounts() + await deploy({ hre, name: 'SystemDictatorProxy', diff --git a/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts b/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts index 36a2868e3baf9..d882a49959872 100644 --- a/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts +++ b/packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts @@ -4,10 +4,9 @@ import '@eth-optimism/hardhat-deploy-config' import { assertContractVariable, deploy } from '../src/deploy-utils' const deployFn: DeployFunction = async (hre) => { - const batcherHash = hre.ethers.utils.hexZeroPad( - hre.deployConfig.batchSenderAddress, - 32 - ) + const batcherHash = hre.ethers.utils + .hexZeroPad(hre.deployConfig.batchSenderAddress, 32) + .toLowerCase() await deploy({ hre, @@ -35,11 +34,7 @@ const deployFn: DeployFunction = async (hre) => { 'scalar', hre.deployConfig.gasPriceOracleScalar ) - await assertContractVariable( - contract, - 'batcherHash', - batcherHash.toLowerCase() - ) + await assertContractVariable(contract, 'batcherHash', batcherHash) }, }) }