contracts-bedrock: delete dead typescript

This commit deletes a bunch of dead typescript code
from the contracts-bedrock package.

This deletes bundling in all of the artifacts into the
npm package so it will make the npm package must smaller.
It will also reduce the build time by removing some steps
from the build.

nx.json

@@ -28,7 +28,6 @@
     "configsProject": [
       "{projectRoot}/foundry.toml",
       "{projectRoot}/tsconfig.json",
-      "{projectRoot}/hardhat.config.ts",
       "{projectRoot}/package.json"
     ],
     "default": ["{projectRoot}/**/*", "configsWorkspace"],
@@ -38,8 +37,6 @@
     ],
     "productionSrc": [
       "{projectRoot}/src/**/*",
-      "!{projectRoot}/src/contract-artifacts.ts",
-      "!{projectRoot}/src/contract-deployed-artifacts.ts",
       "!{projectRoot}/src/**/*.spec.ts"
     ],
     "productionContracts": ["{projectRoot}/contracts/**/*"],
@@ -63,16 +60,6 @@
       "dependsOn": ["^build"],
       "outputs": ["{projectRoot}/artifacts", "{projectRoot}/forge-artifacts"]
     },
-    "autogen:artifacts": {
-      "inputs": [
-        "configsWorkspace",
-        "configsProject",
-        "productionContracts",
-        "^productionContracts"
-      ],
-      "dependsOn": ["^build", "build:contracts"],
-      "outputs": ["srcGenerated"]
-    },
     "build": {
       "inputs": [
         "configsWorkspace",
@@ -80,7 +67,7 @@
         "production",
         "^production"
       ],
-      "dependsOn": ["^build", "autogen:artifacts", "build:contracts"],
+      "dependsOn": ["^build", "build:contracts"],
       "outputs": ["{projectRoot}/dist"]
     }
   }

packages/contracts-bedrock/deploy-config/devnetL1.ts

-import { DeployConfig } from '../src/deploy-config'
-import config from './devnetL1.json'
-
-export default config satisfies DeployConfig

packages/contracts-bedrock/deploy-config/getting-started.ts

-import { DeployConfig } from '../src/deploy-config'
-import config from './getting-started.json'
-
-export default config satisfies DeployConfig

packages/contracts-bedrock/deploy-config/goerli-forked.ts

-import { DeployConfig } from '../src/deploy-config'
-import config from './goerli-forked.json'
-
-export default config satisfies DeployConfig

packages/contracts-bedrock/deploy-config/goerli.ts

-import { DeployConfig } from '../src/deploy-config'
-import config from './goerli.json'
-
-export default config satisfies DeployConfig

packages/contracts-bedrock/deploy-config/hardhat.ts

-import { DeployConfig } from '../src/deploy-config'
-import config from './hardhat.json'
-
-export default config satisfies DeployConfig

packages/contracts-bedrock/deploy-config/local.ts

-import { DeployConfig } from '../src/deploy-config'
-
-const config: DeployConfig = {
-  finalSystemOwner: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-  controller: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-  portalGuardian: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-  proxyAdminOwner: '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
-
-  l1StartingBlockTag:
-    '0x126e52a0cc0ae18948f567ee9443f4a8f0db67c437706e35baee424eb314a0d0',
-  l1ChainID: 1,
-  l2ChainID: 10,
-  l2BlockTime: 2,
-
-  maxSequencerDrift: 600,
-  sequencerWindowSize: 3600,
-  channelTimeout: 300,
-
-  p2pSequencerAddress: '0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65',
-  batchInboxAddress: '0xff00000000000000000000000000000000000010',
-  batchSenderAddress: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
-  l2OutputOracleSubmissionInterval: 20,
-  l2OutputOracleStartingTimestamp: 1679069195,
-  l2OutputOracleStartingBlockNumber: 79149704,
-  l2OutputOracleProposer: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
-  l2OutputOracleChallenger: '0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC',
-  finalizationPeriodSeconds: 2,
-
-  baseFeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906',
-  l1FeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906',
-  sequencerFeeVaultRecipient: '0x90F79bf6EB2c4f870365E785982E1f101E93b906',
-
-  baseFeeVaultMinimumWithdrawalAmount: '0x8ac7230489e80000',
-  l1FeeVaultMinimumWithdrawalAmount: '0x8ac7230489e80000',
-  sequencerFeeVaultMinimumWithdrawalAmount: '0x8ac7230489e80000',
-  baseFeeVaultWithdrawalNetwork: 0,
-  l1FeeVaultWithdrawalNetwork: 0,
-  sequencerFeeVaultWithdrawalNetwork: 0,
-
-  enableGovernance: true,
-  governanceTokenName: 'Optimism',
-  governanceTokenSymbol: 'OP',
-  governanceTokenOwner: '0x90F79bf6EB2c4f870365E785982E1f101E93b906',
-
-  l2GenesisBlockGasLimit: '0x17D7840',
-  l2GenesisBlockCoinbase: '0x4200000000000000000000000000000000000011',
-  l2GenesisBlockBaseFeePerGas: '0x3b9aca00',
-
-  gasPriceOracleOverhead: 2100,
-  gasPriceOracleScalar: 1000000,
-  eip1559Denominator: 50,
-  eip1559Elasticity: 10,
-
-  l2GenesisRegolithTimeOffset: '0x0',
-}
-
-export default config

packages/contracts-bedrock/deploy-config/mainnet.ts

-import { DeployConfig } from '../src/deploy-config'
-import mainnetJson from './mainnet.json'
-
-// NOTE: The 'mainnet' network is currently being used for bedrock migration rehearsals.
-// The system configured below is not yet live on mainnet, and many of the addresses used are
-// unsafe for a production system.
-
-// Re-export the mainnet json as a DeployConfig object.
-//
-// Notice, the following roles in the system are assigned to the:
-// Optimism Foundation Mulitisig:
-// - finalSystemOwner
-// - controller
-// - portalGuardian
-// - proxyAdminOwner
-// - l2OutputOracleChallenger
-//
-// The following roles are assigned to the same fee recipient:
-// - baseFeeVaultRecipient
-// - l1FeeVaultRecipient
-// - sequencerFeeVaultRecipient
-//
-// The following role is assigned to the Mint Manager contract:
-// - governanceTokenOwner
-
-export default mainnetJson satisfies DeployConfig

packages/contracts-bedrock/hardhat.config.ts

-import { ethers } from 'ethers'
-import { HardhatUserConfig } from 'hardhat/config'
-import dotenv from 'dotenv'
-
-// Hardhat plugins
-import '@eth-optimism/hardhat-deploy-config'
-import '@foundry-rs/hardhat-forge'
-import '@nomiclabs/hardhat-ethers'
-import 'hardhat-deploy'
-
-// Hardhat tasks
-import './tasks'
-
-// Deploy configuration
-import { deployConfigSpec } from './src/deploy-config'
-
-// Load environment variables
-dotenv.config()
-
-const config: HardhatUserConfig = {
-  networks: {
-    hardhat: {
-      live: false,
-    },
-    local: {
-      live: false,
-      url: 'http://localhost:8545',
-      saveDeployments: !!process.env.SAVE_DEPLOYMENTS || false,
-      accounts: [
-        'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
-      ],
-    },
-    // NOTE: The 'mainnet' network is currently being used for mainnet rehearsals.
-    mainnet: {
-      url: process.env.L1_RPC || 'https://mainnet-l1-rehearsal.optimism.io',
-      accounts: [
-        process.env.PRIVATE_KEY_DEPLOYER ||
-          'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
-      ],
-    },
-    devnetL1: {
-      live: false,
-      url: 'http://localhost:8545',
-      accounts: [
-        'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
-      ],
-    },
-    devnetL2: {
-      live: false,
-      url: process.env.RPC_URL || 'http://localhost:9545',
-      accounts: [
-        'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
-      ],
-    },
-    hivenet: {
-      chainId: Number(process.env.CHAIN_ID),
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-    },
-    goerli: {
-      chainId: 5,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      companionNetworks: {
-        l2: 'optimism-goerli',
-      },
-    },
-    'optimism-goerli': {
-      chainId: 420,
-      url: process.env.L2_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      companionNetworks: {
-        l1: 'goerli',
-      },
-    },
-    'alpha-1': {
-      chainId: 5,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-    },
-    deployer: {
-      chainId: Number(process.env.CHAIN_ID),
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      live: process.env.VERIFY_CONTRACTS === 'true',
-    },
-    'mainnet-forked': {
-      chainId: 1,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      live: false,
-    },
-    'goerli-forked': {
-      chainId: 5,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      live: true,
-    },
-    'internal-devnet': {
-      chainId: 5,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      live: true,
-    },
-    'getting-started': {
-      chainId: 5,
-      url: process.env.L1_RPC || '',
-      accounts: [process.env.PRIVATE_KEY_DEPLOYER || ethers.constants.HashZero],
-      live: true,
-    },
-  },
-  foundry: {
-    buildInfo: true,
-  },
-  paths: {
-    deploy: './deploy',
-    deployments: './deployments',
-    deployConfig: './deploy-config',
-  },
-  namedAccounts: {
-    deployer: {
-      default: 0,
-    },
-  },
-  deployConfigSpec,
-  external: {
-    contracts: [
-      {
-        artifacts: '../contracts/artifacts',
-      },
-    ],
-    deployments: {
-      goerli: [
-        '../contracts/deployments/goerli',
-        '../contracts-periphery/deployments/goerli',
-      ],
-      mainnet: [
-        '../contracts/deployments/mainnet',
-        '../contracts-periphery/deployments/mainnet',
-      ],
-      'mainnet-forked': [
-        '../contracts/deployments/mainnet',
-        '../contracts-periphery/deployments/mainnet',
-      ],
-      'goerli-forked': [
-        '../contracts/deployments/goerli',
-        '../contracts-periphery/deployments/goerli',
-      ],
-    },
-  },
-  solidity: {
-    compilers: [
-      {
-        version: '0.8.15',
-        settings: {
-          optimizer: { enabled: true, runs: 10_000 },
-        },
-      },
-      {
-        version: '0.5.17', // Required for WETH9
-        settings: {
-          optimizer: { enabled: true, runs: 10_000 },
-        },
-      },
-    ],
-    settings: {
-      metadata: {
-        bytecodeHash:
-          process.env.FOUNDRY_PROFILE === 'echidna' ? 'ipfs' : 'none',
-      },
-      outputSelection: {
-        '*': {
-          '*': ['metadata', 'storageLayout'],
-        },
-      },
-    },
-  },
-}
-
-export default config

packages/contracts-bedrock/package.json

@@ -16,22 +16,19 @@
   "scripts": {
     "bindings": "cd ../../op-bindings && make",
     "build:with-metadata": "FOUNDRY_PROFILE=echidna yarn build:forge",
-    "build": "npx nx build:ts && npx nx typechain",
+    "build": "npx nx build:contracts",
     "prebuild:contracts": "./scripts/verify-foundry-install.sh",
-    "build:contracts": "yarn build:hardhat",
+    "build:contracts": "yarn build:forge",
     "build:forge": "forge build",
-    "build:hardhat": "hardhat compile",
-    "build:ts": "tsc -p tsconfig.build.json",
     "build:differential": "go build -o ./scripts/differential-testing/differential-testing ./scripts/differential-testing",
     "build:fuzz": "(cd test-case-generator && go build ./cmd/fuzz.go)",
-    "autogen:artifacts": "ts-node scripts/generate-artifacts.ts",
     "autogen:invariant-docs": "ts-node scripts/invariant-doc-gen.ts",
     "test": "yarn build:differential && yarn build:fuzz && forge test",
     "coverage": "yarn build:differential && yarn build:fuzz && forge coverage",
     "coverage:lcov": "yarn build:differential && yarn build:fuzz && forge coverage --report lcov",
     "gas-snapshot": "yarn build:differential && yarn build:fuzz && forge snapshot --no-match-test 'testDiff|testFuzz|invariant|generateArtifact'",
     "storage-snapshot": "./scripts/storage-snapshot.sh",
-    "validate-deploy-configs": "hardhat compile && hardhat generate-deploy-config && ./scripts/validate-deploy-configs.sh",
+    "validate-deploy-configs": "./scripts/validate-deploy-configs.sh",
     "validate-spacers": "forge build && npx ts-node scripts/validate-spacers.ts",
     "slither": "./scripts/slither.sh",
     "slither:triage": "TRIAGE_MODE=1 ./scripts/slither.sh",
@@ -57,31 +54,54 @@
     "@eth-optimism/core-utils": "^0.12.1",
     "@openzeppelin/contracts": "4.7.3",
     "@openzeppelin/contracts-upgradeable": "4.7.3",
+    "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
+    "clones-with-immutable-args": "https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2",
     "ethers": "^5.7.0"
   },
   "devDependencies": {
     "@eth-optimism/hardhat-deploy-config": "^0.2.6",
+<<<<<<< HEAD
+    "@ethersproject/abstract-provider": "^5.7.0",
+    "@ethersproject/abstract-signer": "^5.7.0",
+    "ethereumjs-wallet": "^1.0.2",
+    "@defi-wonderland/smock": "^2.0.2",
+    "@foundry-rs/hardhat-forge": "^0.1.17",
+    "@nomiclabs/hardhat-ethers": "^2.0.0",
+    "@nomiclabs/hardhat-waffle": "^2.0.0",
+    "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
+    "clones-with-immutable-args": "https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2",
+||||||| parent of c49e9c477 (contracts-bedrock: delete dead typescript)
     "@ethersproject/abstract-provider": "^5.7.0",
     "@ethersproject/abstract-signer": "^5.7.0",
     "ethereumjs-wallet": "^1.0.2",
     "@defi-wonderland/smock": "^2.0.2",
     "@foundry-rs/hardhat-forge": "^0.1.17",
+    "@foundry-rs/easy-foundryup": "^0.1.3",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@nomiclabs/hardhat-waffle": "^2.0.0",
     "@rari-capital/solmate": "https://github.com/rari-capital/solmate.git#8f9b23f8838670afda0fd8983f2c41e8037ae6bc",
     "clones-with-immutable-args": "https://github.com/Saw-mon-and-Natalie/clones-with-immutable-args.git#105efee1b9127ed7f6fedf139e1fc796ce8791f2",
+=======
+    "@foundry-rs/easy-foundryup": "^0.1.3",
+>>>>>>> c49e9c477 (contracts-bedrock: delete dead typescript)
     "@typechain/ethers-v5": "^10.1.0",
     "@typescript-eslint/eslint-plugin": "^5.45.1",
     "@typescript-eslint/parser": "^5.45.1",
+<<<<<<< HEAD
+    "bip39": "^3.0.4",
+    "chai": "^4.2.0",
+    "dotenv": "^16.0.0",
+||||||| parent of c49e9c477 (contracts-bedrock: delete dead typescript)
     "bip39": "^3.0.4",
     "chai": "^4.2.0",
+    "command-exists": "1.2.9",
     "dotenv": "^16.0.0",
+=======
+    "command-exists": "1.2.9",
+>>>>>>> c49e9c477 (contracts-bedrock: delete dead typescript)
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
-    "ethereum-waffle": "^3.0.0",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
     "glob": "^7.1.6",
-    "hardhat": "^2.9.6",
-    "hardhat-deploy": "^0.11.4",
     "solhint": "^3.3.7",
     "solhint-plugin-prettier": "^0.0.5",
     "ts-node": "^10.9.1",

packages/contracts-bedrock/src/contract-defs.ts

-import { ethers } from 'ethers'
-
-/**
- * Gets the hardhat artifact for the given contract name.
- * Will throw an error if the contract artifact is not found.
- *
- * @param name Contract name.
- * @returns The artifact for the given contract name.
- */
-export const getContractDefinition = (name: string): any => {
-  // We import this using `require` because hardhat tries to build this file when compiling
-  // the contracts, but we need the contracts to be compiled before the contract-artifacts.ts
-  // file can be generated.
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const { getContractArtifact } = require('./contract-artifacts')
-  const artifact = getContractArtifact(name)
-  if (artifact === undefined) {
-    throw new Error(`Unable to find artifact for contract: ${name}`)
-  }
-  return artifact
-}
-
-/**
- * Gets an ethers Interface instance for the given contract name.
- *
- * @param name Contract name.
- * @returns The interface for the given contract name.
- */
-export const getContractInterface = (name: string): ethers.utils.Interface => {
-  const definition = getContractDefinition(name)
-  return new ethers.utils.Interface(definition.abi)
-}
-
-/**
- * Gets an ethers ContractFactory instance for the given contract name.
- *
- * @param name Contract name.
- * @param signer The signer for the ContractFactory to use.
- * @returns The contract factory for the given contract name.
- */
-export const getContractFactory = (
-  name: string,
-  signer?: ethers.Signer
-): ethers.ContractFactory => {
-  const definition = getContractDefinition(name)
-  const contractInterface = getContractInterface(name)
-  return new ethers.ContractFactory(
-    contractInterface,
-    definition.bytecode,
-    signer
-  )
-}

packages/contracts-bedrock/src/index.ts

-export * from './constants'
-export * from './contract-defs'

packages/contracts-bedrock/tasks/generate-deploy-config.ts

-import fs from 'fs'
-import path from 'path'
-
-import { task } from 'hardhat/config'
-import { HardhatRuntimeEnvironment } from 'hardhat/types'
-
-task(
-  'generate-deploy-config',
-  'generates a json config file for the current network'
-).setAction(async ({}, hre: HardhatRuntimeEnvironment) => {
-  try {
-    const base = path.join(hre.config.paths.deployConfig, hre.network.name)
-    if (fs.existsSync(`${base}.ts`)) {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const config = require(`${base}.ts`).default
-      fs.writeFileSync(`${base}.json`, JSON.stringify(config, null, 2), 'utf8')
-    } else {
-      throw new Error('not found')
-    }
-  } catch (err) {
-    throw new Error(
-      `error while loading deploy config for network: ${hre.network.name}, ${err}`
-    )
-  }
-})

packages/contracts-bedrock/tasks/index.ts

-import './solidity'
-import './generate-deploy-config'

packages/contracts-bedrock/tasks/solidity.ts

-import { subtask } from 'hardhat/config'
-import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names'
-
-subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(
-  async (_, __, runSuper) => {
-    const paths = await runSuper()
-
-    return paths.filter((p: string) => !p.endsWith('.t.sol'))
-  }
-)

packages/contracts-bedrock/tsconfig.json

@@ -4,10 +4,8 @@
     "outDir": "./dist"
   },
   "include": [
-    "src/**/*",
     "deploy-config/**/*",
     "deploy-config/**/*.json",
-    "tasks/**/*",
     "scripts/**/*"
   ]
 }

packages/core-utils/package.json

@@ -32,6 +32,7 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "dependencies": {
+    "ethers": "^5.7.0",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/abstract-provider": "^5.7.0",
     "@ethersproject/address": "^5.7.0",

packages/core-utils/src/optimism/index.ts

@@ -9,3 +9,4 @@ export * from './deposit-transaction'
 export * from './encoding'
 export * from './hashing'
 export * from './op-provider'
+export * from './constants'