Merge branch 'ethereum-optimism:develop' into develop

packages/contracts-bedrock/contracts/deployment/MigrationSystemDictator.sol

@@ -66,9 +66,7 @@ contract MigrationSystemDictator is BaseSystemDictator {
      */
     function step3() external onlyOwner step(3) {
         // Remove all deprecated addresses from the AddressManager
-        string[18] memory deprecated = [
-            "Proxy__OVM_L1CrossDomainMessenger",
-            "Proxy__OVM_L1StandardBridge",
+        string[17] memory deprecated = [
             "OVM_CanonicalTransactionChain",
             "OVM_L2CrossDomainMessenger",
             "OVM_DecompressionPrecompileAddress",
@@ -84,7 +82,8 @@ contract MigrationSystemDictator is BaseSystemDictator {
             "OVM_StateManagerFactory",
             "OVM_StateTransitionerFactory",
             "OVM_SafetyChecker",
-            "OVM_L1MultiMessageRelayer"
+            "OVM_L1MultiMessageRelayer",
+            "BondManager"
         ];
 
         for (uint256 i = 0; i < deprecated.length; i++) {

packages/contracts-bedrock/deploy/019-MigrationSystemDictatorSteps.ts

@@ -195,8 +195,6 @@ const deployFn: DeployFunction = async (hre) => {
     },
     3: async () => {
       const deads = [
-        'Proxy__OVM_L1CrossDomainMessenger',
-        'Proxy__OVM_L1StandardBridge',
         'OVM_CanonicalTransactionChain',
         'OVM_L2CrossDomainMessenger',
         'OVM_DecompressionPrecompileAddress',
@@ -213,6 +211,7 @@ const deployFn: DeployFunction = async (hre) => {
         'OVM_StateTransitionerFactory',
         'OVM_SafetyChecker',
         'OVM_L1MultiMessageRelayer',
+        'BondManager',
       ]
       for (const dead of deads) {
         assert(