From 4ebb42bc0329dc528c3560c6df27a8ffe14933af Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 15:44:35 +0530
Subject: [PATCH 1/8] Check existing L1 contracts deployment

---
 .../docker-compose-fixturenet-optimism.yml    |  1 +
 .../optimism-contracts/run.sh                 | 40 ++++++++++++++-----
 .../config/fixturenet-optimism/run-op-geth.sh |  4 +-
 .../verify-contract-deployment.ts             | 30 ++++++++++++++
 4 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts

diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml
index ee7d3cde..2c3181cc 100644
--- a/app/data/compose/docker-compose-fixturenet-optimism.yml
+++ b/app/data/compose/docker-compose-fixturenet-optimism.yml
@@ -14,6 +14,7 @@ services:
       "./wait-for-it.sh -h $${L1_HOST} -p $${L1_PORT} -s -t 60 -- ./run.sh"
     volumes:
       - ../config/wait-for-it.sh:/app/packages/contracts-bedrock/wait-for-it.sh
+      - ../container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts:/app/packages/contracts-bedrock/tasks/verify-contract-deployment.ts
       - ../container-build/cerc-optimism-contracts/hardhat-tasks/rekey-json.ts:/app/packages/contracts-bedrock/tasks/rekey-json.ts
       - ../container-build/cerc-optimism-contracts/hardhat-tasks/send-balance.ts:/app/packages/contracts-bedrock/tasks/send-balance.ts
       - ../config/fixturenet-optimism/optimism-contracts/update-config.js:/app/packages/contracts-bedrock/update-config.js
diff --git a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
index e10c45e1..411eabf1 100755
--- a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
+++ b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
@@ -4,22 +4,42 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-# TODO Support restarts; fixturenet-eth-geth currently starts fresh on a restart
-# Exit if a deployment already exists (on restarts)
-# if [ -d "deployments/getting-started" ]; then
-#     echo "Deployment directory deployments/getting-started already exists, exiting"
-#     exit 0
-# fi
-
 echo "Using L1 RPC endpoint ${L1_RPC}"
 
-# Append tasks/index.ts file
-echo "import './rekey-json'" >> tasks/index.ts
-echo "import './send-balance'" >> tasks/index.ts
+IMPORT_1="import './verify-contract-deployment'"
+IMPORT_2="import './rekey-json'"
+IMPORT_3="import './send-balance'"
+
+# Append mounted tasks to tasks/index.ts file if not present
+if ! grep -Fxq "$IMPORT_1" tasks/index.ts; then
+  echo "$IMPORT_1" >> tasks/index.ts
+  echo "$IMPORT_2" >> tasks/index.ts
+  echo "$IMPORT_3" >> tasks/index.ts
+fi
 
 # Update the chainId in the hardhat config
 sed -i "/getting-started/ {n; s/.*chainId.*/      chainId: $L1_CHAIN_ID,/}" hardhat.config.ts
 
+# Exit if a deployment already exists (on restarts)
+# Note: fixturenet-eth-geth currently starts fresh on a restart
+if [ -d "deployments/getting-started" ]; then
+  echo "Deployment directory deployments/getting-started found, checking SystemDictator deployment"
+
+  # Read JSON file into variable
+  SYSTEM_DICTATOR_DETAILS=$(cat deployments/getting-started/SystemDictator.json)
+
+  # Parse JSON into variables
+  SYSTEM_DICTATOR_ADDRESS=$(echo "$SYSTEM_DICTATOR_DETAILS" | jq -r '.address')
+  SYSTEM_DICTATOR_TXHASH=$(echo "$SYSTEM_DICTATOR_DETAILS" | jq -r '.transactionHash')
+
+  if yarn hardhat verify-contract-deployment --contract "${SYSTEM_DICTATOR_ADDRESS}" --transaction-hash "${SYSTEM_DICTATOR_TXHASH}"; then
+    echo "Deployment verfication successful, exiting"
+    exit 0
+  else
+    echo "Deployment verfication failed"
+  fi
+fi
+
 # Generate the L2 account addresses
 yarn hardhat rekey-json --output /l2-accounts/keys.json
 
diff --git a/app/data/config/fixturenet-optimism/run-op-geth.sh b/app/data/config/fixturenet-optimism/run-op-geth.sh
index cb180065..055f31f0 100755
--- a/app/data/config/fixturenet-optimism/run-op-geth.sh
+++ b/app/data/config/fixturenet-optimism/run-op-geth.sh
@@ -9,7 +9,7 @@ mkdir datadir
 echo "pwd" > datadir/password
 
 # TODO: Add in container build or use other tool
-echo "installing jq"
+echo "Installing jq"
 apk update && apk add jq
 
 # Get SEQUENCER KEY from keys.json
@@ -32,6 +32,8 @@ geth init --datadir=datadir genesis.json
 SEQUENCER_ADDRESS=$(jq -r '.Sequencer.address' /l2-accounts/keys.json | tr -d '"')
 echo "SEQUENCER_ADDRESS: ${SEQUENCER_ADDRESS}"
 cp /op-node/jwt.txt ./
+
+# Run op-geth
 geth \
   --datadir ./datadir \
   --http \
diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts b/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
new file mode 100644
index 00000000..1ce8a0e2
--- /dev/null
+++ b/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
@@ -0,0 +1,30 @@
+import { task } from 'hardhat/config'
+import '@nomiclabs/hardhat-ethers'
+
+task(
+  'verify-contract-deployment',
+  'Verifies the given contract deployment transaction'
+)
+  .addParam('contract', 'Address of the contract deployed')
+  .addParam('transactionHash', 'Hash of the deployment transaction')
+  .setAction(async ({ contract, transactionHash }, { ethers }) => {
+    // Open the wallet using sender's private key
+    const provider = new ethers.providers.JsonRpcProvider(
+      `${process.env.L1_RPC}`
+    )
+
+    const receipt = await provider.getTransactionReceipt(transactionHash)
+    if (
+      receipt &&
+      receipt.contractAddress &&
+      receipt.contractAddress === contract
+    ) {
+      console.log(
+        `Deployment for contract ${contract} in transaction ${transactionHash} verified`
+      )
+      process.exit(0)
+    } else {
+      console.log(`Contract ${contract} deployment verification failed`)
+      process.exit(1)
+    }
+  })
-- 
2.45.2


From 6ac8d7f3f7726f433cd14aa022af2e0a60534edf Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 17:21:27 +0530
Subject: [PATCH 2/8] Rename volume used for generated L2 config

---
 .../compose/docker-compose-fixturenet-optimism.yml     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml
index 2c3181cc..316d1741 100644
--- a/app/data/compose/docker-compose-fixturenet-optimism.yml
+++ b/app/data/compose/docker-compose-fixturenet-optimism.yml
@@ -25,7 +25,7 @@ services:
     extra_hosts:
     - "host.docker.internal:host-gateway"
 
-  # Generates the config files required for L2 (outputs to volume op_node_data)
+  # Generates the config files required for L2 (outputs to volume l2_config)
   op-node-l2-config-gen:
     image: cerc/optimism-op-node:local
     depends_on:
@@ -36,7 +36,7 @@ services:
     volumes:
       - ../config/fixturenet-optimism/generate-l2-config.sh:/app/generate-l2-config.sh
       - l1_deployment:/contracts-bedrock:ro
-      - op_node_data:/app
+      - l2_config:/app
     command: ["sh", "/app/generate-l2-config.sh"]
     extra_hosts:
     - "host.docker.internal:host-gateway"
@@ -49,7 +49,7 @@ services:
         condition: service_started
     volumes:
       - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
-      - op_node_data:/op-node:ro
+      - l2_config:/op-node:ro
       - l2_accounts:/l2-accounts:ro
     entrypoint: "sh"
     command: "/run-op-geth.sh"
@@ -72,7 +72,7 @@ services:
     image: cerc/optimism-op-node:local
     volumes:
       - ../config/fixturenet-optimism/run-op-node.sh:/app/run-op-node.sh
-      - op_node_data:/op-node-data:ro
+      - l2_config:/op-node-data:ro
       - l2_accounts:/l2-accounts:ro
     command: ["sh", "/app/run-op-node.sh"]
     ports:
@@ -111,4 +111,4 @@ volumes:
   fixturenet_geth_accounts:
   l1_deployment:
   l2_accounts:
-  op_node_data:
+  l2_config:
-- 
2.45.2


From 2a2e52751a163f252608d85ac0aeb28678088bf9 Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 17:22:54 +0530
Subject: [PATCH 3/8] Check for existing L2 geth data directory

---
 .../docker-compose-fixturenet-optimism.yml    |  4 +-
 .../fixturenet-optimism/generate-l2-config.sh |  6 +++
 .../config/fixturenet-optimism/run-op-geth.sh | 41 +++++++++++--------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/data/compose/docker-compose-fixturenet-optimism.yml b/app/data/compose/docker-compose-fixturenet-optimism.yml
index 316d1741..d2e96d3f 100644
--- a/app/data/compose/docker-compose-fixturenet-optimism.yml
+++ b/app/data/compose/docker-compose-fixturenet-optimism.yml
@@ -41,7 +41,7 @@ services:
     extra_hosts:
     - "host.docker.internal:host-gateway"
 
-  # Initializes and runs the L2 execution client
+  # Initializes and runs the L2 execution client  (outputs to volume l2_geth_data)
   op-geth:
     image: cerc/optimism-l2geth:local
     depends_on:
@@ -51,6 +51,7 @@ services:
       - ../config/fixturenet-optimism/run-op-geth.sh:/run-op-geth.sh
       - l2_config:/op-node:ro
       - l2_accounts:/l2-accounts:ro
+      - l2_geth_data:/datadir
     entrypoint: "sh"
     command: "/run-op-geth.sh"
     ports:
@@ -112,3 +113,4 @@ volumes:
   l1_deployment:
   l2_accounts:
   l2_config:
+  l2_geth_data:
diff --git a/app/data/config/fixturenet-optimism/generate-l2-config.sh b/app/data/config/fixturenet-optimism/generate-l2-config.sh
index 0ec60a08..9e4b53fd 100755
--- a/app/data/config/fixturenet-optimism/generate-l2-config.sh
+++ b/app/data/config/fixturenet-optimism/generate-l2-config.sh
@@ -4,6 +4,12 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
+# Skip if /app/jwt.txt exists
+if [ -f /app/jwt.txt ]; then
+  echo "Found existing config, exiting"
+  exit 0
+fi
+
 op-node genesis l2 \
   --deploy-config /contracts-bedrock/deploy-config/getting-started.json \
   --deployment-dir /contracts-bedrock/deployments/getting-started/ \
diff --git a/app/data/config/fixturenet-optimism/run-op-geth.sh b/app/data/config/fixturenet-optimism/run-op-geth.sh
index 055f31f0..7f50dfbc 100755
--- a/app/data/config/fixturenet-optimism/run-op-geth.sh
+++ b/app/data/config/fixturenet-optimism/run-op-geth.sh
@@ -4,34 +4,39 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-mkdir datadir
-
-echo "pwd" > datadir/password
-
 # TODO: Add in container build or use other tool
 echo "Installing jq"
 apk update && apk add jq
 
-# Get SEQUENCER KEY from keys.json
-SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
-echo $SEQUENCER_KEY > datadir/block-signer-key
+# Initialize op-geth if datadir/geth not found
+if [ -f /op-node/jwt.txt ] && [ -d datadir/geth ]; then
+  echo "Found existing datadir, skipping initialization"
+else
+  echo "Initializing op-geth"
 
-geth account import --datadir=datadir --password=datadir/password datadir/block-signer-key
+  mkdir datadir
+  echo "pwd" > datadir/password
 
-while [ ! -f "/op-node/jwt.txt" ]
-do
-  echo "Config files not created. Checking after 5 seconds."
-  sleep 5
-done
+  # Get SEQUENCER KEY from keys.json
+  SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
+  echo $SEQUENCER_KEY > datadir/block-signer-key
 
-echo "Config files created by op-node, proceeding with script..."
+  geth account import --datadir=datadir --password=datadir/password datadir/block-signer-key
 
-cp /op-node/genesis.json ./
-geth init --datadir=datadir genesis.json
+  while [ ! -f "/op-node/jwt.txt" ]
+  do
+    echo "Config files not created. Checking after 5 seconds."
+    sleep 5
+  done
+
+  echo "Config files created by op-node, proceeding with the initialization..."
+
+  geth init --datadir=datadir /op-node/genesis.json
+  echo "Node Initialized"
+fi
 
 SEQUENCER_ADDRESS=$(jq -r '.Sequencer.address' /l2-accounts/keys.json | tr -d '"')
 echo "SEQUENCER_ADDRESS: ${SEQUENCER_ADDRESS}"
-cp /op-node/jwt.txt ./
 
 # Run op-geth
 geth \
@@ -54,7 +59,7 @@ geth \
   --authrpc.vhosts="*" \
   --authrpc.addr=0.0.0.0 \
   --authrpc.port=8551 \
-  --authrpc.jwtsecret=./jwt.txt \
+  --authrpc.jwtsecret=/op-node/jwt.txt \
   --rollup.disabletxpoolgossip=true \
   --password=./datadir/password \
   --allow-insecure-unlock \
-- 
2.45.2


From 0de7365b48690e436eac80e3ab5575f6ab4676c6 Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 18:13:59 +0530
Subject: [PATCH 4/8] Cross check existing L2 config against L1 deployment
 config

---
 .../fixturenet-optimism/generate-l2-config.sh | 23 +++++++++++++++----
 .../optimism-contracts/run.sh                 |  3 ++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/data/config/fixturenet-optimism/generate-l2-config.sh b/app/data/config/fixturenet-optimism/generate-l2-config.sh
index 9e4b53fd..9c439f32 100755
--- a/app/data/config/fixturenet-optimism/generate-l2-config.sh
+++ b/app/data/config/fixturenet-optimism/generate-l2-config.sh
@@ -4,10 +4,25 @@ if [ -n "$CERC_SCRIPT_DEBUG" ]; then
   set -x
 fi
 
-# Skip if /app/jwt.txt exists
-if [ -f /app/jwt.txt ]; then
-  echo "Found existing config, exiting"
-  exit 0
+# Check existing config if it exists
+if [ -f /app/jwt.txt ] && [ -f /app/rollup.json ]; then
+  echo "Found existing L2 config, cross-checking with L1 deployment config"
+
+  SOURCE_L1_CONF=$(cat /contracts-bedrock/deploy-config/getting-started.json)
+  EXP_L1_BLOCKHASH=$(echo "$SOURCE_L1_CONF" | jq -r '.l1StartingBlockTag')
+  EXP_BATCHER=$(echo "$SOURCE_L1_CONF" | jq -r '.batchSenderAddress')
+
+  GEN_L2_CONF=$(cat /app/rollup.json)
+  GEN_L1_BLOCKHASH=$(echo "$GEN_L2_CONF" | jq -r '.genesis.l1.hash')
+  GEN_BATCHER=$(echo "$GEN_L2_CONF" | jq -r '.genesis.system_config.batcherAddr')
+
+  if [ "$EXP_L1_BLOCKHASH" = "$GEN_L1_BLOCKHASH" ] && [ "$EXP_BATCHER" = "$GEN_BATCHER" ]; then
+    echo "Config cross-checked, exiting"
+    exit 0
+  fi
+
+  echo "Existing L2 config doesn't match the L1 deployment config, please clear L2 config volume before starting"
+  exit 1
 fi
 
 op-node genesis l2 \
diff --git a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
index 411eabf1..d4585d4a 100755
--- a/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
+++ b/app/data/config/fixturenet-optimism/optimism-contracts/run.sh
@@ -36,7 +36,8 @@ if [ -d "deployments/getting-started" ]; then
     echo "Deployment verfication successful, exiting"
     exit 0
   else
-    echo "Deployment verfication failed"
+    echo "Deployment verfication failed, please clear L1 deployment volume before starting"
+    exit 1
   fi
 fi
 
-- 
2.45.2


From 8defeadb02509da05ab800dea0e739802f530afb Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 18:58:53 +0530
Subject: [PATCH 5/8] Verify sequencer key in existing L2 geth data directory

---
 .../config/fixturenet-optimism/run-op-geth.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/data/config/fixturenet-optimism/run-op-geth.sh b/app/data/config/fixturenet-optimism/run-op-geth.sh
index 7f50dfbc..68f6c5c5 100755
--- a/app/data/config/fixturenet-optimism/run-op-geth.sh
+++ b/app/data/config/fixturenet-optimism/run-op-geth.sh
@@ -8,17 +8,26 @@ fi
 echo "Installing jq"
 apk update && apk add jq
 
+# Get SEQUENCER key from keys.json
+SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
+
 # Initialize op-geth if datadir/geth not found
 if [ -f /op-node/jwt.txt ] && [ -d datadir/geth ]; then
-  echo "Found existing datadir, skipping initialization"
+  echo "Found existing datadir, checking block signer key"
+
+  BLOCK_SIGNER_KEY=$(cat datadir/block-signer-key)
+
+  if [ "$SEQUENCER_KEY" = "$BLOCK_SIGNER_KEY" ]; then
+    echo "Sequencer and block signer keys match, skipping initialization"
+  else
+    echo "Sequencer and block signer keys don't match, please clear L2 geth data volume before starting"
+    exit 1
+  fi
 else
   echo "Initializing op-geth"
 
-  mkdir datadir
+  mkdir -p datadir
   echo "pwd" > datadir/password
-
-  # Get SEQUENCER KEY from keys.json
-  SEQUENCER_KEY=$(jq -r '.Sequencer.privateKey' /l2-accounts/keys.json | tr -d '"')
   echo $SEQUENCER_KEY > datadir/block-signer-key
 
   geth account import --datadir=datadir --password=datadir/password datadir/block-signer-key
-- 
2.45.2


From 2a1407a580da23b419e103aa6b21546455be1ead Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 19:28:31 +0530
Subject: [PATCH 6/8] Add instructions to troubleshoot corrupt L2 geth dir

---
 .../verify-contract-deployment.ts             |  2 +-
 app/data/stacks/fixturenet-optimism/README.md | 36 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts b/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
index 1ce8a0e2..5b673ca1 100644
--- a/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
+++ b/app/data/container-build/cerc-optimism-contracts/hardhat-tasks/verify-contract-deployment.ts
@@ -8,11 +8,11 @@ task(
   .addParam('contract', 'Address of the contract deployed')
   .addParam('transactionHash', 'Hash of the deployment transaction')
   .setAction(async ({ contract, transactionHash }, { ethers }) => {
-    // Open the wallet using sender's private key
     const provider = new ethers.providers.JsonRpcProvider(
       `${process.env.L1_RPC}`
     )
 
+    // Get the deployment tx receipt
     const receipt = await provider.getTransactionReceipt(transactionHash)
     if (
       receipt &&
diff --git a/app/data/stacks/fixturenet-optimism/README.md b/app/data/stacks/fixturenet-optimism/README.md
index 2f13ec88..c891c74a 100644
--- a/app/data/stacks/fixturenet-optimism/README.md
+++ b/app/data/stacks/fixturenet-optimism/README.md
@@ -98,7 +98,37 @@ docker volume rm $(docker volume ls -q --filter name=laconic*)
 
 ## Known Issues
 
-* Currently not supported:
-  * Stopping and restarting the stack from where it left off; currently starts fresh on a restart
-* Resource requirements (memory + time) for building `cerc/foundry` image are on the higher side
+* `fixturenet-eth` currently starts fresh on a restart
+* Resource requirements (memory + time) for building the `cerc/foundry` image are on the higher side
   * `cerc/optimism-contracts` image is currently based on `cerc/foundry` (Optimism requires foundry installation)
+
+## Troubleshooting
+
+* If `op-geth` service aborts or is restarted, the following error might occur in the `op-node` service:
+
+  ```bash
+  WARN [02-16|21:22:02.868] Derivation process temporary error       attempts=14 err="stage 0 failed resetting: temp: failed to find the L2 Heads to start from: failed to fetch L2 block by hash 0x0000000000000000000000000000000000000000000000000000000000000000: failed to determine block-hash of hash 0x0000000000000000000000000000000000000000000000000000000000000000, could not get payload: not found"
+  ```
+
+* This means that the data directory that `op-geth` is using is corrupted and needs to be reinitialized; the containers `op-geth`, `op-node` and `op-batcher` need to be started afresh:
+  * Stop and remove the concerned containers:
+
+    ```bash
+    # List the containers
+    docker ps -f "name=op-geth|op-node|op-batcher"
+
+    # Force stop and remove the listed containers
+    docker rm -f $(docker ps -qf "name=op-geth|op-node|op-batcher")
+    ```
+
+  * Remove the concerned volume:
+
+    ```bash
+    # List the volume
+    docker volume ls -q --filter name=l2_geth_data
+
+    # Remove the listed volume
+    docker volume rm $(docker volume ls -q --filter name=l2_geth_data)
+    ```
+
+  * Reuse the deployment command used in [Deploy](#deploy) to restart the stopped containers
-- 
2.45.2


From b69b6ecb93eddb90517cad1781b313858ed2c05a Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Tue, 4 Apr 2023 20:24:04 +0530
Subject: [PATCH 7/8] Separate out instructions to run L2 with external L1

---
 .../stacks/fixturenet-optimism/L2-ONLY.md     | 87 +++++++++++++++++++
 app/data/stacks/fixturenet-optimism/README.md | 20 +----
 2 files changed, 89 insertions(+), 18 deletions(-)
 create mode 100644 app/data/stacks/fixturenet-optimism/L2-ONLY.md

diff --git a/app/data/stacks/fixturenet-optimism/L2-ONLY.md b/app/data/stacks/fixturenet-optimism/L2-ONLY.md
new file mode 100644
index 00000000..a4aef94d
--- /dev/null
+++ b/app/data/stacks/fixturenet-optimism/L2-ONLY.md
@@ -0,0 +1,87 @@
+# fixturenet-optimism
+
+Instructions to setup and deploy L2 fixturenet using [Optimism](https://stack.optimism.io)
+
+## Setup
+
+Pre-requisite: An L1 Ethereum RPC endpoint
+
+Clone required repositories:
+
+```bash
+laconic-so --stack fixturenet-optimism setup-repositories --exclude cerc-io/go-ethereum
+```
+
+Checkout to the required versions and branches in repos:
+
+```bash
+# Optimism
+cd ~/cerc/optimism
+git checkout @eth-optimism/sdk@0.0.0-20230329025055
+```
+
+Build the container images:
+
+```bash
+laconic-so --stack fixturenet-optimism build-containers --include cerc/foundry,cerc/optimism-contracts,cerc/optimism-op-node,cerc/optimism-l2geth,cerc/optimism-op-batcher
+```
+
+This should create the required docker images in the local image registry:
+* `cerc/foundry`
+* `cerc/optimism-contracts`
+* `cerc/optimism-l2geth`
+* `cerc/optimism-op-batcher`
+* `cerc/optimism-op-node`
+
+## Deploy
+
+Update the [l1-params.env](../../config/fixturenet-optimism/l1-params.env) file with L1 endpoint (`L1_RPC`, `L1_HOST` and `L1_PORT`) and other params
+
+* NOTE:
+  * Stack Orchestrator needs to be run in [`dev`](/docs/CONTRIBUTING.md#install-developer-mode) mode to be able to edit the env file
+  * If L1 is running on the host machine, use `host.docker.internal` as the hostname to access the host port
+
+Deploy the stack:
+
+```bash
+laconic-so --stack fixturenet-optimism deploy up --include fixturenet-optimism
+```
+
+The `fixturenet-optimism-contracts` service may take a while (`~15 mins`) to complete running as it:
+1. waits for the 'Merge' to happen on L1
+2. waits for a finalized block to exist on L1 (so that it can be taken as a starting block for roll ups)
+3. deploys the L1 contracts
+
+To list down and monitor the running containers:
+
+```bash
+laconic-so --stack fixturenet-optimism deploy ps
+
+# With status
+docker ps
+
+# Check logs for a container
+docker logs -f <CONTAINER_ID>
+```
+
+## Clean up
+
+Stop all services running in the background:
+
+```bash
+laconic-so --stack fixturenet-optimism deploy down --include fixturenet-optimism
+```
+
+Clear volumes created by this stack:
+
+```bash
+# List all relevant volumes
+docker volume ls -q --filter name=laconic*
+
+# Remove all the listed volumes
+docker volume rm $(docker volume ls -q --filter name=laconic*)
+```
+
+## Troubleshooting
+
+See [Troubleshooting](./README.md#troubleshooting)
\ No newline at end of file
diff --git a/app/data/stacks/fixturenet-optimism/README.md b/app/data/stacks/fixturenet-optimism/README.md
index c891c74a..1c65d5b1 100644
--- a/app/data/stacks/fixturenet-optimism/README.md
+++ b/app/data/stacks/fixturenet-optimism/README.md
@@ -2,15 +2,14 @@
 
 Instructions to setup and deploy an end-to-end L1+L2 stack with [fixturenet-eth](../fixturenet-eth/) (L1) and [Optimism](https://stack.optimism.io) (L2)
 
+We support running just the L2 part of stack, given an external L1 endpoint. Follow [L2-ONLY](./L2-ONLY.md) for the same.
+
 ## Setup
 
 Clone required repositories:
 
 ```bash
 laconic-so --stack fixturenet-optimism setup-repositories
-
-# Exclude cerc-io/go-ethereum repository if running L1 separately
-laconic-so --stack fixturenet-optimism setup-repositories --exclude cerc-io/go-ethereum
 ```
 
 Checkout to the required versions and branches in repos:
@@ -25,9 +24,6 @@ Build the container images:
 
 ```bash
 laconic-so --stack fixturenet-optimism build-containers
-
-# Only build containers required for L2 if running L1 separately
-laconic-so --stack fixturenet-optimism build-containers --include cerc/foundry,cerc/optimism-contracts,cerc/optimism-op-node,cerc/optimism-l2geth,cerc/optimism-op-batcher
 ```
 
 This should create the required docker images in the local image registry:
@@ -43,19 +39,10 @@ This should create the required docker images in the local image registry:
 
 ## Deploy
 
-(Optional) Update the [l1-params.env](../../config/fixturenet-optimism/l1-params.env) file with L1 endpoint (`L1_RPC`, `L1_HOST` and `L1_PORT`) and other params if running L1 separately
-
-* NOTE:
-  * Stack Orchestrator needs to be run in [`dev`](/docs/CONTRIBUTING.md#install-developer-mode) mode to be able to edit the env file
-  * If L1 is running on the host machine, use `host.docker.internal` as the hostname to access the host port
-
 Deploy the stack:
 
 ```bash
 laconic-so --stack fixturenet-optimism deploy up
-
-# Only start fixturenet-optimism pod (L2) if running L1 separately
-laconic-so --stack fixturenet-optimism deploy up --include fixturenet-optimism
 ```
 
 The `fixturenet-optimism-contracts` service may take a while (`~15 mins`) to complete running as it:
@@ -81,9 +68,6 @@ Stop all services running in the background:
 
 ```bash
 laconic-so --stack fixturenet-optimism deploy down
-
-# If only ran fixturenet-optimism pod (L2)
-laconic-so --stack fixturenet-optimism deploy down --include fixturenet-optimism
 ```
 
 Clear volumes created by this stack:
-- 
2.45.2


From 4b0c46dda2f6486b42380d85523198773d8baaee Mon Sep 17 00:00:00 2001
From: prathamesh0 <prathamesh.musale0@gmail.com>
Date: Wed, 5 Apr 2023 09:21:59 +0530
Subject: [PATCH 8/8] Update docs

---
 app/data/stacks/fixturenet-optimism/L2-ONLY.md |  2 +-
 app/data/stacks/fixturenet-optimism/README.md  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/data/stacks/fixturenet-optimism/L2-ONLY.md b/app/data/stacks/fixturenet-optimism/L2-ONLY.md
index a4aef94d..55eab385 100644
--- a/app/data/stacks/fixturenet-optimism/L2-ONLY.md
+++ b/app/data/stacks/fixturenet-optimism/L2-ONLY.md
@@ -4,7 +4,7 @@ Instructions to setup and deploy L2 fixturenet using [Optimism](https://stack.op
 
 ## Setup
 
-Pre-requisite: An L1 Ethereum RPC endpoint
+Prerequisite: An L1 Ethereum RPC endpoint
 
 Clone required repositories:
 
diff --git a/app/data/stacks/fixturenet-optimism/README.md b/app/data/stacks/fixturenet-optimism/README.md
index 1c65d5b1..65839e70 100644
--- a/app/data/stacks/fixturenet-optimism/README.md
+++ b/app/data/stacks/fixturenet-optimism/README.md
@@ -80,12 +80,6 @@ docker volume ls -q --filter name=laconic*
 docker volume rm $(docker volume ls -q --filter name=laconic*)
 ```
 
-## Known Issues
-
-* `fixturenet-eth` currently starts fresh on a restart
-* Resource requirements (memory + time) for building the `cerc/foundry` image are on the higher side
-  * `cerc/optimism-contracts` image is currently based on `cerc/foundry` (Optimism requires foundry installation)
-
 ## Troubleshooting
 
 * If `op-geth` service aborts or is restarted, the following error might occur in the `op-node` service:
@@ -116,3 +110,9 @@ docker volume rm $(docker volume ls -q --filter name=laconic*)
     ```
 
   * Reuse the deployment command used in [Deploy](#deploy) to restart the stopped containers
+
+## Known Issues
+
+* `fixturenet-eth` currently starts fresh on a restart
+* Resource requirements (memory + time) for building the `cerc/foundry` image are on the higher side
+  * `cerc/optimism-contracts` image is currently based on `cerc/foundry` (Optimism requires foundry installation)
-- 
2.45.2