ethereum-optimism · smartcontracts · Mar 31, 2021
@@ -10,8 +10,8 @@
 [submodule "batch-submitter"]
 	path = batch-submitter
 	url = git@github.com:ethereum-optimism/batch-submitter.git
-[submodule "data-transport-layer"]
-	path = data-transport-layer
+[submodule "transaction-indexer"]
+	path = transaction-indexer
 	url = git@github.com:ethereum-optimism/data-transport-layer.git
 [submodule "contracts"]
 	path = contracts

@@ -1,4 +1,4 @@
-.PHONY: all integration-tests deployer geth-l2 batch-submitter data-transport-layer test
+.PHONY: all integration-tests deployer geth-l2 batch-submitter transaction-indexer test
 
 SHELL := /bin/bash
 
@@ -22,8 +22,8 @@ geth-l2:
 batch-submitter:
 	./build-local.sh -s batch_submitter
 
-data-transport-layer:
-	./build-local.sh -s data_transport_layer
+transaction-indexer:
+	./build-local.sh -s transaction_indexer
 
 # For developing against published docker images
 up:

@@ -37,10 +37,10 @@ services:
     working_dir: /mnt/batch-submitter
     entrypoint: ["sh", "-c", "yarn && yarn build"]
 
-  data_transport_layer:
+  transaction_indexer:
     image: ethereumoptimism/builder:latest
     network_mode: host
     volumes:
       - ./:/mnt
-    working_dir: /mnt/data-transport-layer
+    working_dir: /mnt/transaction-indexer
     entrypoint: ["sh", "-c", "yarn && yarn build"]
@@ -1,22 +1,22 @@
 version: "3"
 
 services:
-  data_transport_layer:
+  transaction_indexer
     environment:
-      - DATA_TRANSPORT_LAYER__SYNC_FROM_L1=true
-      - DATA_TRANSPORT_LAYER__SYNC_FROM_L2=false
-      - DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://geth_l2:8545
-      - DATA_TRANSPORT_LAYER__L2_CHAIN_ID=
-      - DATA_TRANSPORT_LAYER__DB_PATH=/db
-      - DATA_TRANSPORT_LAYER__SERVER_PORT=7878
-      - DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
-      - DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://l1_chain:9545
-      - DATA_TRANSPORT_LAYER__CONFIRMATIONS=0
-      - DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
-      - DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
-      - DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
-      - DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
-      - DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=
+      - TRANSACTION_INDEXER__SYNC_FROM_L1=true
+      - TRANSACTION_INDEXER__SYNC_FROM_L2=false
+      - TRANSACTION_INDEXER__L2_RPC_ENDPOINT=http://geth_l2:8545
+      - TRANSACTION_INDEXER__L2_CHAIN_ID=
+      - TRANSACTION_INDEXER__DB_PATH=/db
+      - TRANSACTION_INDEXER__SERVER_PORT=7878
+      - TRANSACTION_INDEXER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+      - TRANSACTION_INDEXER__L1_RPC_ENDPOINT=http://l1_chain:9545
+      - TRANSACTION_INDEXER__CONFIRMATIONS=0
+      - TRANSACTION_INDEXER__POLLING_INTERVAL=500
+      - TRANSACTION_INDEXER__LOGS_PER_POLLING_INTERVAL=2000
+      - TRANSACTION_INDEXER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+      - TRANSACTION_INDEXER__SERVER_HOSTNAME=0.0.0.0
+      - TRANSACTION_INDEXER__ADDRESS_MANAGER=
       - L1_NODE_WEB3_URL=http://l1_chain:9545
       - DEPLOYER_HTTP=http://deployer:8080
       - RETRIES=50
@@ -27,7 +27,7 @@ services:
       - ETH1_CTC_DEPLOYMENT_HEIGHT=8
       - ETH1_HTTP=http://l1_chain:9545
       - ETH1_CONFIRMATION_DEPTH=0
-      - ROLLUP_CLIENT_HTTP=http://data_transport_layer:7878
+      - ROLLUP_CLIENT_HTTP=http://transaction-indexer:7878
       - ROLLUP_POLL_INTERVAL_FLAG=3s
       - USING_OVM=true
       - CHAIN_ID=420

@@ -33,10 +33,10 @@ services:
     volumes:
      - ./batch-submitter:/opt/batch-submitter
 
-  data_transport_layer:
-    image: ethereumoptimism/data-transport-layer:${DATA_TRANSPORT_LAYER_TAG:-latest}
+  transaction_indexer:
+    image: ethereumoptimism/transaction-indexer:${TRANSACTION_INDEXER_TAG:-latest}
     volumes:
-      - ./data-transport-layer:/opt/data-transport-layer
+      - ./transaction-indexer:/opt/transaction-indexer
     ports:
       - 7878:7878
 

@@ -22,8 +22,8 @@ services:
   batch_submitter:
     image: ethereumoptimism/batch-submitter:${BATCH_SUBMITTER_TAG:-latest}
 
-  data_transport_layer:
-    image: ethereumoptimism/data-transport-layer:${DATA_TRANSPORT_LAYER_TAG:-latest}
+  transaction_indexer:
+    image: ethereumoptimism/transaction-indexer:${TRANSACTION_INDEXER_TAG:-latest}
     ports:
       - 7878:7878
 

@@ -1,23 +1,23 @@
 version: "3"
 
 services:
-  replica_data_transport_layer:
-    image: ethereumoptimism/data-transport-layer:${REPLICA_DATA_TRANSPORT_LAYER_TAG:-latest}
+  replica_transaction_indexer:
+    image: ethereumoptimism/transaction-indexer:${REPLICA_TRANSACTION_INDEXER_TAG:-latest}
     environment:
-      - DATA_TRANSPORT_LAYER__SYNC_FROM_L1=false
-      - DATA_TRANSPORT_LAYER__SYNC_FROM_L2=true
-      - DATA_TRANSPORT_LAYER__L2_RPC_ENDPOINT=http://geth_l2:8545
-      - DATA_TRANSPORT_LAYER__L2_CHAIN_ID=
-      - DATA_TRANSPORT_LAYER__DB_PATH=/db
-      - DATA_TRANSPORT_LAYER__SERVER_PORT=7878
-      - DATA_TRANSPORT_LAYER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
-      - DATA_TRANSPORT_LAYER__L1_RPC_ENDPOINT=http://l1_chain:9545
-      - DATA_TRANSPORT_LAYER__CONFIRMATIONS=0
-      - DATA_TRANSPORT_LAYER__POLLING_INTERVAL=500
-      - DATA_TRANSPORT_LAYER__LOGS_PER_POLLING_INTERVAL=2000
-      - DATA_TRANSPORT_LAYER__DANGEROUSLY_CATCH_ALL_ERRORS=true
-      - DATA_TRANSPORT_LAYER__SERVER_HOSTNAME=0.0.0.0
-      - DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=
+      - TRANSACTION_INDEXER__SYNC_FROM_L1=false
+      - TRANSACTION_INDEXER__SYNC_FROM_L2=true
+      - TRANSACTION_INDEXER__L2_RPC_ENDPOINT=http://geth_l2:8545
+      - TRANSACTION_INDEXER__L2_CHAIN_ID=
+      - TRANSACTION_INDEXER__DB_PATH=/db
+      - TRANSACTION_INDEXER__SERVER_PORT=7878
+      - TRANSACTION_INDEXER__TRANSACTIONS_PER_POLLING_INTERVAL=1000
+      - TRANSACTION_INDEXER__L1_RPC_ENDPOINT=http://l1_chain:9545
+      - TRANSACTION_INDEXER__CONFIRMATIONS=0
+      - TRANSACTION_INDEXER__POLLING_INTERVAL=500
+      - TRANSACTION_INDEXER__LOGS_PER_POLLING_INTERVAL=2000
+      - TRANSACTION_INDEXER__DANGEROUSLY_CATCH_ALL_ERRORS=true
+      - TRANSACTION_INDEXER__SERVER_HOSTNAME=0.0.0.0
+      - TRANSACTION_INDEXER__ADDRESS_MANAGER=
       - L1_NODE_WEB3_URL=http://l1_chain:9545
       - DEPLOYER_HTTP=http://deployer:8080
     ports:
@@ -30,7 +30,7 @@ services:
       - ETH1_CTC_DEPLOYMENT_HEIGHT=8
       - ETH1_HTTP=http://l1_chain:9545
       - ETH1_CONFIRMATION_DEPTH=0
-      - ROLLUP_CLIENT_HTTP=http://data_transport_layer:7878
+      - ROLLUP_CLIENT_HTTP=http://transaction_indexer:7878
       - ROLLUP_POLL_INTERVAL_FLAG=3s
       - ROLLUP_VERIFIER=true
       - USING_OVM=true

@@ -43,7 +43,7 @@ GETH_L2_TAG=${GETH_L2_TAG:-latest}
 L1_CHAIN_TAG=${L1_CHAIN_TAG:-latest}
 INTEGRATION_TESTS_TAG=${INTEGRATION_TESTS_TAG:-latest}
 MESSAGE_RELAYER_TAG=${MESSAGE_RELAYER_TAG:-latest}
-DATA_TRANSPORT_LAYER_TAG=${DATA_TRANSPORT_LAYER_TAG:-latest}
+TRANSACTION_INDEXER_TAG=${TRANSACTION_INDEXER_TAG:-latest}
 
 # Replace slash with underscore in tags
 DEPLOYER_TAG=$(echo $DEPLOYER_TAG | sed 's/\//_/g')
@@ -52,7 +52,7 @@ GETH_L2_TAG=$(echo $GETH_L2_TAG | sed 's/\//_/g')
 L1_CHAIN_TAG=$(echo $L1_CHAIN_TAG | sed 's/\//_/g')
 INTEGRATION_TESTS_TAG=$(echo $INTEGRATION_TESTS_TAG | sed 's/\//_/g')
 MESSAGE_RELAYER_TAG=$(echo $MESSAGE_RELAYER_TAG | sed 's/\//_/g')
-DATA_TRANSPORT_LAYER_TAG=$(echo $DATA_TRANSPORT_LAYER_TAG | sed 's/\//_/g')
+TRANSACTION_INDEXER_TAG=$(echo $TRANSACTION_INDEXER_TAG | sed 's/\//_/g')
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
 
@@ -81,7 +81,7 @@ function run {
       export L1_CHAIN_TAG=$L1_CHAIN_TAG;
       export INTEGRATION_TESTS_TAG=$INTEGRATION_TESTS_TAG;
       export MESSAGE_RELAYER_TAG=$MESSAGE_RELAYER_TAG;
-      export DATA_TRANSPORT_LAYER_TAG=$DATA_TRANSPORT_LAYER_TAG;
+      export TRANSACTION_INDEXER_TAG=$TRANSACTION_INDEXER_TAG;
 
       if [ "$SUPPRESS_OUTPUT" = true ]; then
         $cmd &> $artifacts_folder/process.log
+4 −4		data-transport-layer/Dockerfile
+11 −11		data-transport-layer/wait-for-l1.sh