diff --git a/packages/contracts-periphery/config/deploy/hardhat.ts b/packages/contracts-periphery/config/deploy/hardhat.ts index 5e9d978a3ff94531b47eacc7edcf0ae63cf9d5f7..5dac27225635970c93b330580511ad0e5bc15e01 100644 --- a/packages/contracts-periphery/config/deploy/hardhat.ts +++ b/packages/contracts-periphery/config/deploy/hardhat.ts @@ -12,14 +12,6 @@ const config: DeployConfig = { '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', optimistAllowlistCoinbaseQuestAttestor: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8', - faucetAdmin: '', - faucetName: '', - githubFamAdmin: '', - githubFamName: '', - githubFamVersion: '', - optimistFamAdmin: '', - optimistFamName: '', - optimistFamVersion: '', } export default config diff --git a/packages/contracts-periphery/deploy/faucet/Faucet.ts b/packages/contracts-periphery/deploy/faucet/Faucet.ts deleted file mode 100644 index 6c7aa812cacd489069435890e5908298f2712cbc..0000000000000000000000000000000000000000 --- a/packages/contracts-periphery/deploy/faucet/Faucet.ts +++ /dev/null @@ -1,29 +0,0 @@ -/* Imports: External */ -import { DeployFunction } from 'hardhat-deploy/dist/types' -import { HardhatRuntimeEnvironment } from 'hardhat/types' - -import '@nomiclabs/hardhat-ethers' -import '@eth-optimism/hardhat-deploy-config' -import 'hardhat-deploy' -import type { DeployConfig } from '../../src' - -const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { - const deployConfig = hre.deployConfig as DeployConfig - - const { deployer } = await hre.getNamedAccounts() - console.log('Deploying Faucet') - - const { deploy } = await hre.deployments.deterministic('Faucet', { - salt: hre.ethers.utils.solidityKeccak256(['string'], ['Faucet']), - from: deployer, - args: [deployConfig.faucetAdmin], - log: true, - }) - - const result = await deploy() - console.log(`Faucet deployed to ${result.address}`) -} - -deployFn.tags = ['Faucet', 'FaucetEnvironment'] - -export default deployFn diff --git a/packages/contracts-periphery/deploy/faucet/authmodules/GithubFaucetAuthModule.ts b/packages/contracts-periphery/deploy/faucet/authmodules/GithubFaucetAuthModule.ts deleted file mode 100644 index bb67eecb9ad6923bcef18675d56ecc6d2e9b2096..0000000000000000000000000000000000000000 --- a/packages/contracts-periphery/deploy/faucet/authmodules/GithubFaucetAuthModule.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* Imports: External */ -import { DeployFunction } from 'hardhat-deploy/dist/types' -import { HardhatRuntimeEnvironment } from 'hardhat/types' - -import '@nomiclabs/hardhat-ethers' -import '@eth-optimism/hardhat-deploy-config' -import 'hardhat-deploy' -import type { DeployConfig } from '../../../src' - -const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { - const deployConfig = hre.deployConfig as DeployConfig - - const { deployer } = await hre.getNamedAccounts() - - const { deploy } = await hre.deployments.deterministic( - 'AdminFaucetAuthModule', - { - salt: hre.ethers.utils.solidityKeccak256( - ['string'], - ['AdminFaucetAuthModule'] - ), - from: deployer, - args: [ - deployConfig.githubFamAdmin, - deployConfig.githubFamName, - deployConfig.githubFamVersion, - ], - log: true, - } - ) - - await deploy() -} - -deployFn.tags = ['Faucet', 'FaucetEnvironment'] - -export default deployFn diff --git a/packages/contracts-periphery/deploy/faucet/authmodules/OptimistFaucetAuthModule.ts b/packages/contracts-periphery/deploy/faucet/authmodules/OptimistFaucetAuthModule.ts deleted file mode 100644 index 50b5d398c90f45f45642fb3f8918ef92c9a6deef..0000000000000000000000000000000000000000 --- a/packages/contracts-periphery/deploy/faucet/authmodules/OptimistFaucetAuthModule.ts +++ /dev/null @@ -1,37 +0,0 @@ -/* Imports: External */ -import { DeployFunction } from 'hardhat-deploy/dist/types' -import { HardhatRuntimeEnvironment } from 'hardhat/types' - -import '@nomiclabs/hardhat-ethers' -import '@eth-optimism/hardhat-deploy-config' -import 'hardhat-deploy' -import type { DeployConfig } from '../../../src' - -const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { - const deployConfig = hre.deployConfig as DeployConfig - - const { deployer } = await hre.getNamedAccounts() - - const { deploy } = await hre.deployments.deterministic( - 'AdminFaucetAuthModule', - { - salt: hre.ethers.utils.solidityKeccak256( - ['string'], - ['AdminFaucetAuthModule'] - ), - from: deployer, - args: [ - deployConfig.optimistFamAdmin, - deployConfig.optimistFamName, - deployConfig.optimistFamVersion, - ], - log: true, - } - ) - - await deploy() -} - -deployFn.tags = ['Faucet', 'FaucetEnvironment'] - -export default deployFn diff --git a/packages/contracts-periphery/src/config/deploy.ts b/packages/contracts-periphery/src/config/deploy.ts index 532324eccc371a4bc4a67999e67a6b53dfe74c75..b33879be2c80be7146f2d412cd93d66c86c681b0 100644 --- a/packages/contracts-periphery/src/config/deploy.ts +++ b/packages/contracts-periphery/src/config/deploy.ts @@ -54,46 +54,6 @@ export interface DeployConfig { */ optimistAllowlistCoinbaseQuestAttestor: string - /** - * Address of privileged account for the Faucet contract. - */ - faucetAdmin: string - - /** - * Name of Faucet contract. - */ - faucetName: string - - /** - * Address of admin account for the Github FaucetAuthModule. - */ - githubFamAdmin: string - - /** - * Name of Github FaucetAuthModule contract, used for the EIP712 domain separator. - */ - githubFamName: string - - /** - * Version of Github FaucetAuthModule contract, used for the EIP712 domain separator. - */ - githubFamVersion: string - - /** - * Address of admin account for Optimist FaucetAuthModule. - */ - optimistFamAdmin: string - - /** - * Name of Optimist FaucetAuthModule contract, used for the EIP712 domain separator. - */ - optimistFamName: string - - /** - * Version of Optimist FaucetAuthModule contract, used for the EIP712 domain separator. - */ - optimistFamVersion: string - /** * Address of the owner of the proxies on L2. There will be a ProxyAdmin deployed as a predeploy * after bedrock, so the owner of proxies should be updated to that after the upgrade. @@ -138,30 +98,6 @@ export const configSpec: DeployConfigSpec<DeployConfig> = { optimistAllowlistCoinbaseQuestAttestor: { type: 'address', }, - faucetAdmin: { - type: 'address', - }, - faucetName: { - type: 'string', - }, - githubFamAdmin: { - type: 'address', - }, - githubFamName: { - type: 'string', - }, - githubFamVersion: { - type: 'string', - }, - optimistFamAdmin: { - type: 'address', - }, - optimistFamName: { - type: 'string', - }, - optimistFamVersion: { - type: 'string', - }, l2ProxyOwnerAddress: { type: 'address', },