Rename OVM_BondManager to BondManager

packages/contracts/contracts/L1/rollup/StateCommitmentChain.sol

@@ -10,7 +10,7 @@ import { Lib_MerkleTree } from "../../libraries/utils/Lib_MerkleTree.sol";
 /* Interface Imports */
 import { IStateCommitmentChain } from "./IStateCommitmentChain.sol";
 import { ICanonicalTransactionChain } from "./ICanonicalTransactionChain.sol";
-import { iOVM_BondManager } from "../verification/iOVM_BondManager.sol";
+import { IBondManager } from "../verification/IBondManager.sol";
 import { IChainStorageContainer } from "./IChainStorageContainer.sol";
 
 /* External Imports */
@@ -137,7 +137,7 @@ contract StateCommitmentChain is IStateCommitmentChain, Lib_AddressResolver {
 
         // Proposers must have previously staked at the BondManager
         require(
-            iOVM_BondManager(resolve("OVM_BondManager")).isCollateralized(msg.sender),
+            IBondManager(resolve("BondManager")).isCollateralized(msg.sender),
             "Proposer does not have enough collateral posted"
         );
 

packages/contracts/contracts/L1/verification/OVM_BondManager.sol → packages/contracts/contracts/L1/verification/BondManager.sol

@@ -2,19 +2,19 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /* Interface Imports */
-import { iOVM_BondManager } from "./iOVM_BondManager.sol";
+import { IBondManager } from "./IBondManager.sol";
 
 /* Contract Imports */
 import { Lib_AddressResolver } from "../../libraries/resolver/Lib_AddressResolver.sol";
 
 /**
- * @title OVM_BondManager
- * @dev This contract is, for now, a stub of the "real" OVM_BondManager that does nothing but
+ * @title BondManager
+ * @dev This contract is, for now, a stub of the "real" BondManager that does nothing but
  * allow the "OVM_Proposer" to submit state root batches.
  *
  * Runtime target: EVM
  */
-contract OVM_BondManager is iOVM_BondManager, Lib_AddressResolver {
+contract BondManager is IBondManager, Lib_AddressResolver {
 
     constructor(
         address _libAddressManager

packages/contracts/contracts/L1/verification/iOVM_BondManager.sol → packages/contracts/contracts/L1/verification/IBondManager.sol

@@ -2,9 +2,9 @@
 pragma solidity >0.5.0 <0.8.0;
 
 /**
- * @title iOVM_BondManager
+ * @title IBondManager
  */
-interface iOVM_BondManager {
+interface IBondManager {
 
     /********************
      * Public Functions *

packages/contracts/deploy/006-OVM_BondManager.deploy.ts

@@ -16,7 +16,7 @@ const deployFn: DeployFunction = async (hre) => {
     }
   )
 
-  const result = await deploy('OVM_BondManager', {
+  const result = await deploy('BondManager', {
     from: deployer,
     args: [Lib_AddressManager.address],
     log: true,
@@ -26,10 +26,10 @@ const deployFn: DeployFunction = async (hre) => {
     return
   }
 
-  await Lib_AddressManager.setAddress('OVM_BondManager', result.address)
+  await Lib_AddressManager.setAddress('BondManager', result.address)
 }
 
 deployFn.dependencies = ['Lib_AddressManager']
-deployFn.tags = ['OVM_BondManager']
+deployFn.tags = ['BondManager']
 
 export default deployFn

packages/contracts/scripts/verify.js

@@ -6,7 +6,7 @@ const { hideBin } = require('yargs/helpers')
 const argv = yargs(hideBin(process.argv)).argv
 
 const nicknames = {
-  mockOVM_BondManager: 'OVM_BondManager',
+  mockBondManager: 'BondManager',
 }
 
 ;(async () => {

packages/contracts/src/connect-contracts.ts

@@ -69,7 +69,7 @@ export const connectL1Contracts = async (
     xDomainMessengerProxy: getEthersContract(
       'Proxy__OVM_L1CrossDomainMessenger'
     ),
-    bondManager: getEthersContract('mockOVM_BondManager'),
+    bondManager: getEthersContract('mockBondManager'),
   }
 }
 

packages/contracts/src/contract-data.ts

@@ -13,21 +13,21 @@ const Mainnet__CanonicalTransactionChain = require('../deployments/mainnet/Canon
 const Mainnet__OVM_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__OVM_BondManager = require('../deployments/mainnet/mockOVM_BondManager.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__StateCommitmentChain = require('../deployments/kovan/StateCommitmentChain.json')
 const Kovan__Proxy__OVM_L1CrossDomainMessenger = require('../deployments/kovan/Proxy__OVM_L1CrossDomainMessenger.json')
-const Kovan__OVM_BondManager = require('../deployments/kovan/mockOVM_BondManager.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__StateCommitmentChain = require('../deployments/goerli/StateCommitmentChain.json')
 const Goerli__Proxy__OVM_L1CrossDomainMessenger = require('../deployments/goerli/Proxy__OVM_L1CrossDomainMessenger.json')
-const Goerli__OVM_BondManager = require('../deployments/goerli/mockOVM_BondManager.json')
+const Goerli__BondManager = require('../deployments/goerli/mockBondManager.json')
 
 export const getL1ContractData = (network: Network) => {
   return {
@@ -56,10 +56,10 @@ export const getL1ContractData = (network: Network) => {
       kovan: Kovan__Proxy__OVM_L1CrossDomainMessenger,
       goerli: Goerli__Proxy__OVM_L1CrossDomainMessenger,
     }[network],
-    OVM_BondManager: {
-      mainnet: Mainnet__OVM_BondManager,
-      kovan: Kovan__OVM_BondManager,
-      goerli: Goerli__OVM_BondManager,
+    BondManager: {
+      mainnet: Mainnet__BondManager,
+      kovan: Kovan__BondManager,
+      goerli: Goerli__BondManager,
     }[network],
   }
 }

packages/contracts/test/contracts/L1/rollup/StateCommitmentChain.spec.ts

@@ -27,7 +27,7 @@ describe('StateCommitmentChain', () => {
   })
 
   let Mock__CanonicalTransactionChain: MockContract
-  let Mock__OVM_BondManager: MockContract
+  let Mock__BondManager: MockContract
   before(async () => {
     Mock__CanonicalTransactionChain = await smockit(
       await ethers.getContractFactory('CanonicalTransactionChain')
@@ -39,17 +39,17 @@ describe('StateCommitmentChain', () => {
       Mock__CanonicalTransactionChain
     )
 
-    Mock__OVM_BondManager = await smockit(
-      await ethers.getContractFactory('OVM_BondManager')
+    Mock__BondManager = await smockit(
+      await ethers.getContractFactory('BondManager')
     )
 
     await setProxyTarget(
       AddressManager,
-      'OVM_BondManager',
-      Mock__OVM_BondManager
+      'BondManager',
+      Mock__BondManager
     )
 
-    Mock__OVM_BondManager.smocked.isCollateralized.will.return.with(true)
+    Mock__BondManager.smocked.isCollateralized.will.return.with(true)
 
     await AddressManager.setAddress(
       'OVM_Proposer',

packages/contracts/test/contracts/L1/verification/OVM_BondManager.spec.ts → packages/contracts/test/contracts/L1/verification/BondManager.spec.ts

@@ -7,7 +7,7 @@ import { Signer, Contract } from 'ethers'
 /* Internal Imports */
 import { makeAddressManager } from '../../../helpers'
 
-describe('OVM_BondManager', () => {
+describe('BondManager', () => {
   let sequencer: Signer
   let nonSequencer: Signer
   before(async () => {
@@ -19,10 +19,10 @@ describe('OVM_BondManager', () => {
     AddressManager = await makeAddressManager()
   })
 
-  let OVM_BondManager: Contract
+  let BondManager: Contract
   before(async () => {
-    OVM_BondManager = await (
-      await ethers.getContractFactory('OVM_BondManager')
+    BondManager = await (
+      await ethers.getContractFactory('BondManager')
     ).deploy(AddressManager.address)
 
     AddressManager.setAddress('OVM_Proposer', await sequencer.getAddress())
@@ -31,13 +31,13 @@ describe('OVM_BondManager', () => {
   describe('isCollateralized', () => {
     it('should return true for OVM_Proposer', async () => {
       expect(
-        await OVM_BondManager.isCollateralized(await sequencer.getAddress())
+        await BondManager.isCollateralized(await sequencer.getAddress())
       ).to.equal(true)
     })
 
     it('should return false for non-sequencer', async () => {
       expect(
-        await OVM_BondManager.isCollateralized(await nonSequencer.getAddress())
+        await BondManager.isCollateralized(await nonSequencer.getAddress())
       ).to.equal(false)
     })
   })