chore: Consolidated OP chain spoke pools

contracts/Bob_SpokePool.sol → contracts/OP_SpokePool.sol

@@ -6,10 +6,10 @@ import "./Ovm_SpokePool.sol";
 import "./external/interfaces/CCTPInterfaces.sol";
 
 /**
- * @notice Bob Spoke pool.
+ * @notice OP Spoke pool.
  * @custom:security-contact [email protected]
  */
-contract Bob_SpokePool is Ovm_SpokePool {
+contract OP_SpokePool is Ovm_SpokePool {
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor(
         address _wrappedNativeTokenAddress,
@@ -28,7 +28,7 @@ contract Bob_SpokePool is Ovm_SpokePool {
     {} // solhint-disable-line no-empty-blocks
 
     /**
-     * @notice Construct the Bob SpokePool.
+     * @notice Construct the OP SpokePool.
      * @param _initialDepositId Starting deposit ID. Set to 0 unless this is a re-deployment in order to mitigate
      * relay hash collisions.
      * @param _crossDomainAdmin Cross domain admin to set. Can be changed by admin.

deploy/025_deploy_base_spokepool.ts → deploy/025_deploy_op_spokepool.ts

@@ -1,7 +1,7 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { deployNewProxy, getSpokePoolDeploymentInfo } from "../utils/utils.hre";
-import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WETH } from "./consts";
+import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WETH, ZERO_ADDRESS } from "./consts";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { hubPool, spokeChainId } = await getSpokePoolDeploymentInfo(hre);
@@ -18,10 +18,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     WETH[spokeChainId],
     QUOTE_TIME_BUFFER,
     FILL_DEADLINE_BUFFER,
-    USDC[spokeChainId],
-    L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger,
+    USDC[spokeChainId] ?? ZERO_ADDRESS,
+    L2_ADDRESS_MAP[spokeChainId].cctpTokenMessenger ?? ZERO_ADDRESS,
   ];
-  await deployNewProxy("Base_SpokePool", constructorArgs, initArgs);
+  await deployNewProxy("OP_SpokePool", constructorArgs, initArgs);
 };
 module.exports = func;
-func.tags = ["BaseSpokePool", "base"];
+func.tags = ["OPSpokePool", "base", "unichain", "mode", "bob", "redstone", "zora"];