Review fixes to notes from @smartcontracts

integration-tests/test/shared/env.ts

@@ -73,12 +73,12 @@ export class OptimismEnv {
     if (balance.isZero()) {
       await fundUser(watcher, l1Bridge, utils.parseEther('20'))
     }
-    const l1Messenger = getContractFactory('IL1CrossDomainMessenger')
+    const l1Messenger = getContractFactory('L1CrossDomainMessenger')
       .connect(l1Wallet)
       .attach(watcher.l1.messengerAddress)
     const ovmEth = getOvmEth(l2Wallet)
     const l2Bridge = await getL2Bridge(l2Wallet)
-    const l2Messenger = getContractFactory('IL2CrossDomainMessenger')
+    const l2Messenger = getContractFactory('L2CrossDomainMessenger')
       .connect(l2Wallet)
       .attach(watcher.l2.messengerAddress)
 

packages/contracts/src/contract-data.ts

@@ -10,23 +10,23 @@ import { Network } from './connect-contracts'
 
 const Mainnet__Lib_AddressManager = require('../deployments/mainnet/Lib_AddressManager.json')
 const Mainnet__CanonicalTransactionChain = require('../deployments/mainnet/CanonicalTransactionChain.json')
-const Mainnet__OVM_L1CrossDomainMessenger = require('../deployments/mainnet/L1CrossDomainMessenger.json')
+const Mainnet__L1CrossDomainMessenger = require('../deployments/mainnet/L1CrossDomainMessenger.json')
 const Mainnet__StateCommitmentChain = require('../deployments/mainnet/StateCommitmentChain.json')
-const Mainnet__Proxy__OVM_L1CrossDomainMessenger = require('../deployments/mainnet/Proxy__OVM_L1CrossDomainMessenger.json')
+const Mainnet__Proxy__L1CrossDomainMessenger = require('../deployments/mainnet/Proxy__L1CrossDomainMessenger.json')
 const Mainnet__BondManager = require('../deployments/mainnet/mockBondManager.json')
 
 const Kovan__Lib_AddressManager = require('../deployments/kovan/Lib_AddressManager.json')
 const Kovan__CanonicalTransactionChain = require('../deployments/kovan/CanonicalTransactionChain.json')
-const Kovan__OVM_L1CrossDomainMessenger = require('../deployments/kovan/L1CrossDomainMessenger.json')
+const Kovan__L1CrossDomainMessenger = require('../deployments/kovan/L1CrossDomainMessenger.json')
 const Kovan__StateCommitmentChain = require('../deployments/kovan/StateCommitmentChain.json')
-const Kovan__Proxy__OVM_L1CrossDomainMessenger = require('../deployments/kovan/Proxy__OVM_L1CrossDomainMessenger.json')
+const Kovan__Proxy__L1CrossDomainMessenger = require('../deployments/kovan/Proxy__L1CrossDomainMessenger.json')
 const Kovan__BondManager = require('../deployments/kovan/mockBondManager.json')
 
 const Goerli__Lib_AddressManager = require('../deployments/goerli/Lib_AddressManager.json')
 const Goerli__CanonicalTransactionChain = require('../deployments/goerli/CanonicalTransactionChain.json')
-const Goerli__OVM_L1CrossDomainMessenger = require('../deployments/goerli/L1CrossDomainMessenger.json')
+const Goerli__L1CrossDomainMessenger = require('../deployments/goerli/L1CrossDomainMessenger.json')
 const Goerli__StateCommitmentChain = require('../deployments/goerli/StateCommitmentChain.json')
-const Goerli__Proxy__OVM_L1CrossDomainMessenger = require('../deployments/goerli/Proxy__OVM_L1CrossDomainMessenger.json')
+const Goerli__Proxy__L1CrossDomainMessenger = require('../deployments/goerli/Proxy__L1CrossDomainMessenger.json')
 const Goerli__BondManager = require('../deployments/goerli/mockBondManager.json')
 
 export const getL1ContractData = (network: Network) => {
@@ -42,19 +42,19 @@ export const getL1ContractData = (network: Network) => {
       goerli: Goerli__CanonicalTransactionChain,
     }[network],
     L1CrossDomainMessenger: {
-      mainnet: Mainnet__OVM_L1CrossDomainMessenger,
-      kovan: Kovan__OVM_L1CrossDomainMessenger,
-      goerli: Goerli__OVM_L1CrossDomainMessenger,
+      mainnet: Mainnet__L1CrossDomainMessenger,
+      kovan: Kovan__L1CrossDomainMessenger,
+      goerli: Goerli__L1CrossDomainMessenger,
     }[network],
     StateCommitmentChain: {
       mainnet: Mainnet__StateCommitmentChain,
       kovan: Kovan__StateCommitmentChain,
       goerli: Goerli__StateCommitmentChain,
     }[network],
-    Proxy__OVM_L1CrossDomainMessenger: {
-      mainnet: Mainnet__Proxy__OVM_L1CrossDomainMessenger,
-      kovan: Kovan__Proxy__OVM_L1CrossDomainMessenger,
-      goerli: Goerli__Proxy__OVM_L1CrossDomainMessenger,
+    Proxy__L1CrossDomainMessenger: {
+      mainnet: Mainnet__Proxy__L1CrossDomainMessenger,
+      kovan: Kovan__Proxy__L1CrossDomainMessenger,
+      goerli: Goerli__Proxy__L1CrossDomainMessenger,
     }[network],
     BondManager: {
       mainnet: Mainnet__BondManager,

packages/data-transport-layer/README.md

@@ -5,9 +5,9 @@
 
 The Optimistic Ethereum Data Transport Layer is a long-running software service (written in TypeScript) designed to reliably index Optimistic Ethereum transaction data from Layer 1 (Ethereum). Specifically, this service indexes:
 
-* Transactions that have been enqueued for submission to the CanonicalTransactionChain via [`enqueue`](https://github.com/ethereum-optimism/contracts-v2/blob/13b7deef60f773241723ea874fc6e81b4003b164/contracts/optimistic-ethereum/OVM/chain/CanonicalTransactionChain.sol#L225-L231).
-* Transactions that have been included in the CanonicalTransactionChain via [`appendQueueBatch`](https://github.com/ethereum-optimism/contracts-v2/blob/13b7deef60f773241723ea874fc6e81b4003b164/contracts/optimistic-ethereum/OVM/chain/CanonicalTransactionChain.sol#L302-L306) or [`appendSequencerBatch`](https://github.com/ethereum-optimism/contracts-v2/blob/13b7deef60f773241723ea874fc6e81b4003b164/contracts/optimistic-ethereum/OVM/chain/CanonicalTransactionChain.sol#L352-L354).
-* State roots (transaction results) that have been published to the StateCommitmentChain via [`appendStateBatch`](https://github.com/ethereum-optimism/contracts-v2/blob/13b7deef60f773241723ea874fc6e81b4003b164/contracts/optimistic-ethereum/OVM/chain/OVM_StateCommitmentChain.sol#L127-L132).
+* Transactions that have been enqueued for submission to the CanonicalTransactionChain via [`CanonicalTransactionChain.enqueue`].
+* Transactions that have been included in the CanonicalTransactionChain via [`CanonicalTransactionChain.appendQueueBatch`] or [`CanonicalTransactionChain.appendSequencerBatch`].
+* State roots (transaction results) that have been published to the StateCommitmentChain via [`StateCommitmentChain.appendStateBatch`].
 
 ## How does it work?