SYS-Labs · Luke-Liquify · May 20, 2024
diff --git a/ops-bedrock/docker-compose-rollux.yml b/ops-bedrock/docker-compose-rollux.yml
@@ -15,32 +15,16 @@ volumes:
 
 
 services:
-  l1:
-    build:
-      context: .
-      dockerfile: Dockerfile.l1
-    image: l1:${TAG}
-    stop_signal: SIGINT
-    stop_grace_period: 30s
-    ports:
-      - "127.0.0.1:8545:8545"   # local, rpc L1
-      #      - "7060:6060"            # ?
-    volumes:
-      - "${HOME}/${COMPOSE_PROJECT_NAME}-data/l1_data:/db/.syscoin"
-    dns:
-      - 8.8.8.8
-      - 8.8.4.4
-      - 192.168.9.45
   l2:
     build:
       context: .
       dockerfile: Dockerfile.l2
-    image: l2:${TAG}
+    image: l2:latest
     stop_signal: SIGINT
     stop_grace_period: 30s
     ports:
-      - "127.0.0.1:9545:8545"   # local, rpc L2
-      - "127.0.0.1:9546:8546"   # local, wss L2
+      - "8545:8545"   # local, rpc L2
+      - "8546:8546"   # local, wss L2
       #      - "8060:6060"            # ?
     volumes:
       - "${HOME}/${COMPOSE_PROJECT_NAME}-data/l2_data:/db"
@@ -55,17 +39,16 @@ services:
 
   op-node:
     depends_on:
-      - l1
       - l2
     build:
       context: ../
       dockerfile: ./op-node/Dockerfile
-    image: op-node:${TAG}
+    image: op-node:latest
     stop_signal: SIGINT
     stop_grace_period: 30s
     command: >
       op-node
-      --l1=ws://l1:8546
+      --l1=ws://10.9.0.20/syscoin
       --l2=http://l2:9551
       --l2.jwt-secret=/config/test-jwt-secret.txt
       --sequencer.enabled
@@ -84,7 +67,6 @@ services:
       --metrics.port=7300
       --pprof.enabled
       --rpc.enable-admin
-      --sys-poda-url=https://poda.syscoin.org/vh/
     ports:
       #      - "7545:8545"            # ? rpc ?
       - "9003:9003"             # public, p2p
@@ -104,7 +86,6 @@ services:
 
   op-proposer:
     depends_on:
-      - l1
       - l2
       - op-node
     build:
@@ -136,7 +117,6 @@ services:
 
   op-batcher:
     depends_on:
-      - l1
       - l2
       - op-node
     build:

diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
@@ -7,9 +7,6 @@ version: '3.4'
 volumes:
   l1_data:
   l2_data:
-  safedb_data:
-  challenger_data:
-  da_data:
   op_log:
 
 
@@ -64,13 +61,14 @@ services:
 
   op-node:
     depends_on:
-      - l1
+      - op_stack_go_builder
       - l2
     build:
       context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: op-node-target
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:devnet
+      dockerfile: ./op-node/Dockerfile
+    image: op-node:${TAG}
+    stop_signal: SIGINT
+    stop_grace_period: 30s
     command: >
       op-node
       --l1=ws://l1:8546
@@ -93,17 +91,12 @@ services:
       --pprof.enabled
       --rpc.enable-admin
       --sys-poda-url=http://poda.tanenbaum.io/vh/
-      --safedb.path=/db
-      --plasma.enabled=${PLASMA_ENABLED}
-      --plasma.da-server=http://da-server:3100
     ports:
       #      - "7545:8545"            # ? rpc ?
       - "9003:9003"             # public, p2p
       - "7300:7300"             # public, metrics ?
       #      - "6060:6060"            # ?
     volumes:
-      - "safedb_data:/db"
-      - "${PWD}/p2p-sequencer-key.txt:/config/p2p-sequencer-key.txt"
       - "${PWD}/p2p-node-key.txt:/config/p2p-node-key.txt"
       - "${PWD}/test-jwt-secret.txt:/config/test-jwt-secret.txt"
       - "${PWD}/../.nebula/rollup.json:/rollup.json"
@@ -117,14 +110,15 @@ services:
 
   op-proposer:
     depends_on:
-      - l1
+      - op_stack_go_builder
       - l2
       - op-node
     build:
       context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: op-proposer-target
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:devnet
+      dockerfile: ./op-proposer/Dockerfile
+    image: op-proposer:${TAG}
+    stop_signal: SIGINT
+    stop_grace_period: 30s
     ports:
       - "6062:6060"
       - "7302:7300"
@@ -149,14 +143,16 @@ services:
 
   op-batcher:
     depends_on:
-      - l1
+      - op_stack_go_builder
       - l2
       - op-node
     build:
       context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: op-batcher-target
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:devnet
+      dockerfile: ./op-batcher/Dockerfile
+    image: op-batcher:${TAG}
+    stop_signal: SIGINT
+    stop_grace_period: 30s
+
     ports:
       - "6061:6060"
       - "7301:7300"
@@ -180,28 +176,26 @@ services:
       OP_BATCHER_METRICS_ENABLED: "true"
       OP_BATCHER_RPC_ENABLE_ADMIN: "true"
       OP_BATCHER_BATCH_TYPE: 0
-      OP_BATCHER_PLASMA_ENABLED: "${PLASMA_ENABLED}"
-      OP_BATCHER_PLASMA_DA_SERVER: "http://da-server:3100"
     dns:
       - 8.8.8.8
       - 8.8.4.4
       - 192.168.9.45
     env_file:
       - ./envs/op-node.env
 
+
   op-challenger:
     depends_on:
+      - op_stack_go_builder
       - l1
       - l2
       - op-node
     build:
       context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: op-challenger-target
+      dockerfile: ./op-challenger/Dockerfile
+      args:
+        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-challenger:devnet
-    volumes:
-      - "challenger_data:/db"
-      - "../op-program/bin:/op-program"
     environment:
       OP_CHALLENGER_L1_ETH_RPC: http://l1:8545
       # Note: this will need to be updated to point to a L1 consensus node when there is one in the devnet
@@ -211,49 +205,18 @@ services:
       OP_CHALLENGER_GAME_FACTORY_ADDRESS: ${DGF_ADDRESS}
       # The devnet can't set the absolute prestate output root because the contracts are deployed in L1 genesis
       # before the L2 genesis is known.
-      OP_CHALLENGER_UNSAFE_ALLOW_INVALID_PRESTATE: "true"
-      OP_CHALLENGER_DATADIR: /db
+      OP_CHALLENGER_UNSAFE_ALLOW_INVALID_PRESTATE: true
+      OP_CHALLENGER_DATADIR: temp/challenger-data
       OP_CHALLENGER_CANNON_ROLLUP_CONFIG: ./.devnet/rollup.json
       OP_CHALLENGER_CANNON_L2_GENESIS: ./.devnet/genesis-l2.json
       OP_CHALLENGER_CANNON_BIN: ./cannon/bin/cannon
-      OP_CHALLENGER_CANNON_SERVER: /op-program/op-program
-      OP_CHALLENGER_CANNON_PRESTATE: /op-program/prestate.json
-      OP_CHALLENGER_L2_ETH_RPC: http://l2:8545
+      OP_CHALLENGER_CANNON_SERVER: ./op-program/bin/op-program
+      OP_CHALLENGER_CANNON_PRESTATE: ./op-program/bin/prestate.json
+      OP_CHALLENGER_CANNON_L2: http://l2:8545
       OP_CHALLENGER_MNEMONIC: test test test test test test test test test test test junk
       OP_CHALLENGER_HD_PATH: "m/44'/60'/0'/0/4"
       OP_CHALLENGER_NUM_CONFIRMATIONS: 1
 
-  da-server:
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/da-server:devnet
-    build:
-      context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: da-server-target
-    command: >
-      da-server
-      --file.path=/data
-      --addr=0.0.0.0
-      --port=3100
-      --log.level=debug
-    ports:
-      - "3100:3100"
-    volumes:
-      - "da_data:/data"
-
-  sentinel:
-    image: quarry/sentinel # TODO(10141): We need a public image for this (sentinel is out of repo)
-    volumes:
-      - "${PWD}/../.devnet/rollup.json:/rollup.json"
-    # private-key is mnemonic index 5 of the test mnemonic.
-    command: >
-      sentinel
-      --datadir=data
-      --l1-rpc-http=http://l1:8545
-      --l1-rpc-ws=ws://l1:8546
-      --da-storage-uri=http://da-server:3100
-      --private-key=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
-      --config=/rollup.json
-
 
   artifact-server:
     depends_on:

diff --git a/ops-bedrock/entrypoint-l2.sh b/ops-bedrock/entrypoint-l2.sh
@@ -33,11 +33,11 @@ if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
 else
 	echo "$GETH_CHAINDATA_DIR exists."
 fi
-L1_URL="http://u:p@l1:8370"
+L1_URL="http://u-liquify:[email protected]/api-syscoin"
 function wait_up {
   echo -n "Waiting for $1 to come up inside entrypoint ..."
   i=0
-  until curl -s --data-binary '{"jsonrpc": "2.0", "id":"curltest", "method": "getblockcount", "params": [] }' -H 'content-type: application/json;' "$L1_URL" 2>&1 | grep -c '"error":null'
+  until curl -s --data-binary '{"jsonrpc": "2.0", "method": "getblockcount", "params": [] }' -H 'content-type: application/json;' "$L1_URL" 2>&1 | grep -c '"error":null'
   do
     echo -n .
     sleep 0.25
@@ -68,9 +68,9 @@ exec geth \
 	--ws.port="$WS_PORT" \
 	--ws.origins="*" \
 	--ws.api=debug,eth,txpool,net,engine \
-	--syncmode=snap \
-	--discovery.port=30303
-	--maxpeers=3 \
+	--syncmode=full \
+	--nodiscover \
+	--maxpeers=0 \
 	--networkid="$CHAIN_ID" \
 	--rpc.allow-unprotected-txs \
 	--authrpc.addr="0.0.0.0" \

diff --git a/ops-bedrock/envs/op-node-rollux.env b/ops-bedrock/envs/op-node-rollux.env
@@ -4,6 +4,6 @@ OP_PROPOSER_MNEMONIC="test test test test test test test test test test test jun
 BLOCK_SIGNER_ADDRESS="0xca062b0fd91172d89bcd4bb084ac4e21972cc467"
 # tsys1qkppdm5nct40dxjn3a05vqwx7magkdpdhwdmczc
 SYS_KEY=tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK
-OP_BATCHER_SYS_DESC='[{"desc": "wpkh('tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK'/0h/*h)#y4dfsj7n", "timestamp": "now", "active": true}]'
-OP_BATCHER_SYS_DESC_INTERNAL='[{"desc": "wpkh('tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK'/84h/1h/*h)#ewygda2l", "timestamp": 0, "internal": true, "active": true}]'
+#OP_BATCHER_SYS_DESC='[{"desc": "wpkh('tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK'/0h/*h)#y4dfsj7n", "timestamp": "now", "active": true}]'
+#OP_BATCHER_SYS_DESC_INTERNAL='[{"desc": "wpkh('tprv8ZgxMBicQKsPd7Uf69XL1XwhmjHopUGep8GuEiJDZmbQz6o58LninorQAfcKZWARbtRtfnLcJ5MQ2AtHcQJCCRUcMRvmDUjyEmNUWwx8UbK'/84h/1h/*h)#ewygda2l", "timestamp": 0, "internal": true, "active": true}]'
 MINING_ENABLED=true
diff --git a/ops-bedrock/p2p-docker-compose-rollux.yml b/ops-bedrock/p2p-docker-compose-rollux.yml
@@ -6,7 +6,6 @@ version: '3.4'
 
 volumes:
   l1_data:
-  safedb_data:
   l2_data:
   op_log:
   influxdb_data:
@@ -42,7 +41,7 @@ services:
       - "127.0.0.1:9546:8546"   # local, wss L2
     #      - "8060:6060"            # ?
     volumes:
-      - "${HOME}/${COMPOSE_PROJECT_NAME}-data/l2_data:/db"
+      - "${HOME}/${COMPOSE_PROJECT_NAME}-data/l2_data-new:/db"
       - "${PWD}/../.rollux/genesis-l2.json:/genesis.json"
       - "${PWD}/test-jwt-secret.txt:/config/test-jwt-secret.txt"
     entrypoint: # pass the L2 specific flags by overriding the entry-point and adding extra arguments
@@ -51,26 +50,14 @@ services:
       - "--authrpc.jwtsecret=/config/test-jwt-secret.txt"
     env_file:
       - ./envs/p2p-node-rollux.env
-
-  op_stack_go_builder: # Not an actual service, but builds the prerequisite go images
-    build:
-      context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      args:
-        GIT_COMMIT: "dev"
-        GIT_DATE: "0"
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
-    entrypoint: [ "echo", "build complete" ]
-
   op-node:
     depends_on:
-      - l1
       - l2
     build:
       context: ../
-      dockerfile: ops/docker/op-stack-go/Dockerfile
-      target: op-node-target
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:devnet
+      dockerfile: ./op-node/Dockerfile
+    stop_signal: SIGINT
+    stop_grace_period: 30s
     command: >
       op-node
       --l1=ws://l1:8546
@@ -86,7 +73,7 @@ services:
       --p2p.listen.ip=0.0.0.0
       --p2p.listen.tcp=9003
       --p2p.listen.udp=9003
-      --p2p.static=/ip4/213.239.234.158/tcp/9003/p2p/16Uiu2HAmPfLFVjVDoRvrMwXCY5AMiL1YAVCriFXo5k7aL7MikGB1
+      --p2p.static=/ip4/<ip>/tcp/9003/p2p/<peer_ids>
       --snapshotlog.file=/op_log/snapshot.log
       --p2p.priv.path=/config/p2p-node-key.txt
       --metrics.enabled
@@ -97,15 +84,13 @@ services:
       --heartbeat.enabled
       --heartbeat.moniker=sequencer
       --heartbeat.url=http://op-heartbeat:8080
-      --syncmode=execution-layer
       --sys-poda-url=https://poda.syscoin.org/vh/
     ports:
       #      - "7545:8545"            # ? rpc ?
       - "9003:9003"             # public, p2p
       - "7300:7300"             # public, metrics ?
       #      - "6060:6060"            # ?
     volumes:
-      - "safedb_data:/db"
       - "${PWD}/p2p-node-key.txt:/config/p2p-node-key.txt"
       - "${PWD}/test-jwt-secret.txt:/config/test-jwt-secret.txt"
       - "${PWD}/../.rollux/rollup.json:/rollup.json"

diff --git a/ops-bedrock/p2p-node-key.txt b/ops-bedrock/p2p-node-key.txt
@@ -1 +1 @@
-dae4671006c60a3619556ace98eca6f6e092948d05b13070a27ac492a4fba419
+6512897761cf8777d5e215e3317b00851e81feeb9650d404c9a4d1daf66cd6be
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dae4671006c60a3619556ace98eca6f6e092948d05b13070a27ac492a4fba419
		6512897761cf8777d5e215e3317b00851e81feeb9650d404c9a4d1daf66cd6be