ops: fix config

This commit updates the config so that the CI can run
the batch submitters in each mode so that we continue
to test each of the batch types.

It also lints the yaml files

ops/docker-compose.go-batch-submitter.yml

@@ -14,5 +14,6 @@ services:
       L1_ETH_RPC: http://l1_chain:8545
       L2_ETH_RPC: http://l2geth:8545
       URL: http://deployer:8081/addresses.json
-        BATCH_SUBMITTER_SEQUENCER_PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
-        BATCH_SUBMITTER_PROPOSER_PRIVATE_KEY: "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
+      BATCH_SUBMITTER_SEQUENCER_PRIVATE_KEY: '0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d'
+      BATCH_SUBMITTER_PROPOSER_PRIVATE_KEY: '0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a'
+      BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}

ops/docker-compose.ts-batch-submitter.yml

@@ -15,5 +15,6 @@ services:
       L1_NODE_WEB3_URL: http://l1_chain:8545
       L2_NODE_WEB3_URL: http://l2geth:8545
       URL: http://deployer:8081/addresses.json
-        SEQUENCER_PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
-        PROPOSER_PRIVATE_KEY: "0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a"
+      SEQUENCER_PRIVATE_KEY: '0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d'
+      PROPOSER_PRIVATE_KEY: '0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a'
+      BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}

ops/docker-compose.yml

-version: "3.4"
+version: '3.4'
 
 services:
   # this is a helper service used because there's no official hardhat image
@@ -24,11 +24,11 @@ services:
     environment:
       # Env vars for the deployment script.
       CONTRACTS_RPC_URL: http://l1_chain:8545
-      CONTRACTS_DEPLOYER_KEY: "ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
-      CONTRACTS_TARGET_NETWORK: "custom"
-      OVM_ADDRESS_MANAGER_OWNER: "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
-      OVM_PROPOSER_ADDRESS: "0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc"
-      OVM_SEQUENCER_ADDRESS: "0x70997970c51812dc3a010c7d01b50e0d17dc79c8"
+      CONTRACTS_DEPLOYER_KEY: 'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80'
+      CONTRACTS_TARGET_NETWORK: 'custom'
+      OVM_ADDRESS_MANAGER_OWNER: '0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266'
+      OVM_PROPOSER_ADDRESS: '0x3c44cdddb6a900fa2b585dd299e03d12fa4293bc'
+      OVM_SEQUENCER_ADDRESS: '0x70997970c51812dc3a010c7d01b50e0d17dc79c8'
       SCC_FRAUD_PROOF_WINDOW: 0
       NUM_DEPLOY_CONFIRMATIONS: 0
       # skip compilation when run in docker-compose, since the contracts
@@ -37,13 +37,13 @@ services:
 
       # Env vars for the dump script.
       # Default hardhat account 5
-      GAS_PRICE_ORACLE_OWNER: "0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc"
+      GAS_PRICE_ORACLE_OWNER: '0x9965507d1a55bcc2695c58ba16fb37d819b0a4dc'
       # setting the whitelist owner to address(0) disables the whitelist
-      WHITELIST_OWNER: "0x0000000000000000000000000000000000000000"
-      L1_FEE_WALLET_ADDRESS: "0x391716d440c151c42cdf1c95c1d83a5427bca52c"
+      WHITELIST_OWNER: '0x0000000000000000000000000000000000000000'
+      L1_FEE_WALLET_ADDRESS: '0x391716d440c151c42cdf1c95c1d83a5427bca52c'
       L2_CHAIN_ID: 420
       L2_BLOCK_GAS_LIMIT: 15000000
-      BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
+      BLOCK_SIGNER_ADDRESS: '0x00000398232E2064F896018496b4b44b3D62751F'
       GAS_PRICE_ORACLE_OVERHEAD: 2750
       GAS_PRICE_ORACLE_SCALAR: 1500000
       GAS_PRICE_ORACLE_L1_BASE_FEE: 1
@@ -99,8 +99,8 @@ services:
       ETH1_CTC_DEPLOYMENT_HEIGHT: 8
       RETRIES: 60
       # no need to keep this secret, only used internally to sign blocks
-        BLOCK_SIGNER_KEY: "6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27"
-        BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
+      BLOCK_SIGNER_KEY: '6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27'
+      BLOCK_SIGNER_ADDRESS: '0x00000398232E2064F896018496b4b44b3D62751F'
 
       ROLLUP_ENFORCE_FEES: ${ROLLUP_ENFORCE_FEES:-true}
       ROLLUP_FEE_THRESHOLD_DOWN: 0.9
@@ -126,7 +126,7 @@ services:
       L2_NODE_WEB3_URL: http://l2geth:8545
       URL: http://deployer:8081/addresses.json
       # a funded hardhat account
-        L1_WALLET_KEY: "0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97"
+      L1_WALLET_KEY: '0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97'
       RETRIES: 60
       POLLING_INTERVAL: 500
       GET_LOGS_INTERVAL: 500
@@ -199,6 +199,7 @@ services:
       URL: http://deployer:8081/addresses.json
       ENABLE_GAS_REPORT: 1
       NO_NETWORK: 1
+      BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE: ${BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE:-zlib}
 
   gas_oracle:
     deploy:
@@ -210,4 +211,4 @@ services:
     environment:
       GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l2geth:8545
       # Default hardhat account 5
-      GAS_PRICE_ORACLE_PRIVATE_KEY: "0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba"
+      GAS_PRICE_ORACLE_PRIVATE_KEY: '0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba'

ops/envs/batch-submitter.env

@@ -15,4 +15,3 @@ BATCH_SUBMITTER_RUN_TX_BATCH_SUBMITTER=true
 BATCH_SUBMITTER_RUN_STATE_BATCH_SUBMITTER=true
 BATCH_SUBMITTER_SAFE_MINIMUM_ETHER_BALANCE=0
 BATCH_SUBMITTER_CLEAR_PENDING_TXS=false
-BATCH_SUBMITTER_SEQUENCER_BATCH_TYPE=zlib

ops/envs/batches.env

@@ -17,4 +17,3 @@ MAX_BATCH_SUBMISSION_TIME=0
 SAFE_MINIMUM_ETHER_BALANCE=0
 CLEAR_PENDING_TXS=false
 RETRIES=80
-BATCH_SUBMITTER_USE_ZLIB_COMPRESSION=true