Add constructor checks to Adapters, update deploy script

Author: nicholaspai

contracts/chain-adapters/ZkStack_Adapter.sol

@@ -65,6 +65,7 @@ contract ZkStack_Adapter is AdapterInterface, CircleCCTPAdapter {
 
     error ETHGasTokenRequired();
     error TransactionFeeTooHigh();
+    error InvalidBridgeConfig();
 
     /**
      * @notice Constructs new Adapter.
@@ -101,6 +102,17 @@ contract ZkStack_Adapter is AdapterInterface, CircleCCTPAdapter {
         MAX_TX_GASPRICE = _maxTxGasprice;
         L1_GAS_TO_L2_GAS_PER_PUB_DATA_LIMIT = _l1GasToL2GasPerPubDataLimit;
         SHARED_BRIDGE = BRIDGE_HUB.sharedBridge();
+        address zero = address(0);
+        if (address(_l1Usdc) != zero) {
+            if (_usdcSharedBridge == zero && address(_cctpTokenMessenger) == zero) {
+                revert InvalidBridgeConfig();
+            }
+
+            // Bridged and Native USDC are mutually exclusive.
+            if (_usdcSharedBridge != zero && address(_cctpTokenMessenger) != zero) {
+                revert InvalidBridgeConfig();
+            }
+        }
         USDC_SHARED_BRIDGE = _usdcSharedBridge;
         address gasToken = BRIDGE_HUB.baseToken(CHAIN_ID);
         if (gasToken != ETH_TOKEN_ADDRESS) {

contracts/chain-adapters/ZkStack_CustomGasToken_Adapter.sol

@@ -85,6 +85,7 @@ contract ZkStack_CustomGasToken_Adapter is AdapterInterface, CircleCCTPAdapter {
     event ZkStackMessageRelayed(bytes32 indexed canonicalTxHash);
     error ETHGasTokenNotAllowed();
     error TransactionFeeTooHigh();
+    error InvalidBridgeConfig();
 
     /**
      * @notice Constructs new Adapter.
@@ -124,6 +125,17 @@ contract ZkStack_CustomGasToken_Adapter is AdapterInterface, CircleCCTPAdapter {
         MAX_TX_GASPRICE = _maxTxGasprice;
         L1_GAS_TO_L2_GAS_PER_PUB_DATA_LIMIT = _l1GasToL2GasPerPubDataLimit;
         SHARED_BRIDGE = BRIDGE_HUB.sharedBridge();
+        address zero = address(0);
+        if (address(_l1Usdc) != zero) {
+            if (_usdcSharedBridge == zero && address(_cctpTokenMessenger) == zero) {
+                revert InvalidBridgeConfig();
+            }
+
+            // Bridged and Native USDC are mutually exclusive.
+            if (_usdcSharedBridge != zero && address(_cctpTokenMessenger) != zero) {
+                revert InvalidBridgeConfig();
+            }
+        }
         USDC_SHARED_BRIDGE = _usdcSharedBridge;
         CUSTOM_GAS_TOKEN = BRIDGE_HUB.baseToken(CHAIN_ID);
         if (CUSTOM_GAS_TOKEN == ETH_TOKEN_ADDRESS) {

deploy/059_deploy_lens_spokepool.ts

@@ -4,7 +4,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction, DeploymentSubmission } from "hardhat-deploy/types";
 import { getDeployedAddress } from "../src/DeploymentUtils";
 import { getSpokePoolDeploymentInfo } from "../utils/utils.hre";
-import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WGHO } from "./consts";
+import { FILL_DEADLINE_BUFFER, L2_ADDRESS_MAP, QUOTE_TIME_BUFFER, USDC, WGHO, ZERO_ADDRESS } from "./consts";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractName = "Lens_SpokePool";
@@ -19,7 +19,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const artifact = await deployer.loadArtifact(contractName);
 
-  const { zkErc20Bridge, zkUSDCBridge, cctpTokenMessenger } = L2_ADDRESS_MAP[spokeChainId];
+  const { zkErc20Bridge, zkUSDCBridge, cctpTokenMessenger = ZERO_ADDRESS } = L2_ADDRESS_MAP[spokeChainId];
   const initArgs = [
     0, // Start at 0 since this first time we're deploying this spoke pool. On future upgrades increase this.
     zkErc20Bridge,